[freeplane] 01/08: New upstream version 1.6.6

Felix Natter fnatter-guest at moszumanska.debian.org
Sat Sep 16 13:51:06 UTC 2017


This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit a4d65da6dc48a16523e056c22a49c8d6b48a3769
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Sep 16 15:10:29 2017 +0200

    New upstream version 1.6.6
---
 JOrtho_0.4_freeplane/build.gradle                  |   52 +-
 bin.dist.gradle                                    |    4 +-
 build.gradle                                       |   28 +-
 dist.gradle                                        |    8 +-
 freeplane/build.gradle                             |   21 +-
 freeplane/doc/FilterConsumer.jpg                   |  Bin 269826 -> 0 bytes
 freeplane/doc/FilterConsumerEnd.jpg                |  Bin 317954 -> 0 bytes
 freeplane/doc/FilterConsumerUnfold.jpg             |  Bin 190335 -> 0 bytes
 freeplane/doc/Freeplane_LaTeX.mm                   |    2 +-
 freeplane/doc/Images/Preferences_Joining nodes.png |  Bin 0 -> 1892 bytes
 .../doc/Images/doc/In-lineEditContextMenu.png      |  Bin 3127 -> 0 bytes
 freeplane/doc/Images/doc/NodeContextMenu.png       |  Bin 20425 -> 0 bytes
 freeplane/doc/Images/doc/goto node with ID.png     |  Bin 0 -> 4454 bytes
 freeplane/doc/Images/doc/key mapping dialog.png    |  Bin 0 -> 1404 bytes
 freeplane/doc/Images/doc/mapView v outlineView.png |  Bin 0 -> 1779266 bytes
 .../Images/doc/right-click menu - open maps.png    |  Bin 0 -> 170479 bytes
 freeplane/doc/Images/doc/tabs in workspace.png     |  Bin 0 -> 4128 bytes
 freeplane/doc/Images/examples.png                  |  Bin 0 -> 1844 bytes
 freeplane/doc/Images/eyes.png                      |  Bin 0 -> 835 bytes
 freeplane/doc/Images/icons toolbar - collapsed.png |  Bin 0 -> 163 bytes
 freeplane/doc/Images/key/F1.png                    |  Bin 1134 -> 0 bytes
 freeplane/doc/Images/key/F2.png                    |  Bin 1250 -> 0 bytes
 freeplane/doc/Images/key/Ins.png                   |  Bin 1118 -> 0 bytes
 freeplane/doc/Images/key/alt.png                   |  Bin 1333 -> 0 bytes
 freeplane/doc/Images/key/ctrl.png                  |  Bin 1404 -> 0 bytes
 freeplane/doc/Images/key/delete.png                |  Bin 1141 -> 0 bytes
 freeplane/doc/Images/key/down.png                  |  Bin 830 -> 0 bytes
 freeplane/doc/Images/key/end.png                   |  Bin 1128 -> 0 bytes
 freeplane/doc/Images/key/enter.png                 |  Bin 1387 -> 0 bytes
 freeplane/doc/Images/key/esc.png                   |  Bin 1116 -> 0 bytes
 freeplane/doc/Images/key/home.png                  |  Bin 1366 -> 0 bytes
 freeplane/doc/Images/key/insert.png                |  Bin 1512 -> 0 bytes
 freeplane/doc/Images/key/left.png                  |  Bin 834 -> 0 bytes
 freeplane/doc/Images/key/pgdn.png                  |  Bin 1222 -> 0 bytes
 freeplane/doc/Images/key/pgup.png                  |  Bin 1213 -> 0 bytes
 freeplane/doc/Images/key/right.png                 |  Bin 832 -> 0 bytes
 freeplane/doc/Images/key/shift.png                 |  Bin 1637 -> 0 bytes
 freeplane/doc/Images/key/space.png                 |  Bin 2064 -> 0 bytes
 freeplane/doc/Images/key/tab.png                   |  Bin 1388 -> 0 bytes
 freeplane/doc/Images/key/up.png                    |  Bin 793 -> 0 bytes
 freeplane/doc/Images/mouse/mouse.png               |  Bin 1419 -> 0 bytes
 freeplane/doc/Images/mouse/mouse_LB.png            |  Bin 1363 -> 0 bytes
 freeplane/doc/Images/mouse/mouse_LB_2x.png         |  Bin 1759 -> 0 bytes
 freeplane/doc/Images/mouse/mouse_SB_click.png      |  Bin 1451 -> 0 bytes
 freeplane/doc/Images/mouse/mouse_SB_scroll.png     |  Bin 1726 -> 0 bytes
 .../workspace/Freeplane workspace (annotated).png  |  Bin 0 -> 10210426 bytes
 .../Images/other/workspace/Freeplane workspace.png |  Bin 0 -> 10210426 bytes
 .../doc/Images/other/workspace/details arrow_.png  |  Bin 0 -> 1823 bytes
 .../doc/Images/other/workspace/f bar - split.png   |  Bin 0 -> 253010 bytes
 freeplane/doc/Images/other/workspace/f bar.png     |  Bin 0 -> 610450 bytes
 .../other/workspace/filter toolbar - split.png     |  Bin 0 -> 184464 bytes
 .../doc/Images/other/workspace/filter toolbar.png  |  Bin 0 -> 470123 bytes
 .../doc/Images/other/workspace/icons toolbar.png   |  Bin 0 -> 336075 bytes
 freeplane/doc/Images/other/workspace/menubar.png   |  Bin 0 -> 102000 bytes
 .../doc/Images/other/workspace/notes panel.png     |  Bin 0 -> 3105048 bytes
 .../Images/other/workspace/properties panel.png    |  Bin 0 -> 2952621 bytes
 .../doc/Images/other/workspace/resize arrows.png   |  Bin 0 -> 103324 bytes
 .../Images/other/workspace/right-click menu.png    |  Bin 0 -> 291593 bytes
 .../doc/Images/other/workspace/scroll bars.png     |  Bin 0 -> 2639262 bytes
 .../doc/Images/other/workspace/status line.png     |  Bin 0 -> 36172 bytes
 .../other/workspace/submenu flyouts (basic).png    |  Bin 0 -> 6375541 bytes
 .../doc/Images/other/workspace/submenu flyouts.png |  Bin 0 -> 6375541 bytes
 .../doc/Images/other/workspace/toolbar - split.png |  Bin 0 -> 203639 bytes
 freeplane/doc/Images/other/workspace/toolbar.png   |  Bin 0 -> 348463 bytes
 .../doc/Images/other/workspace/view - toolbars.png |  Bin 0 -> 802548 bytes
 .../other/workspace/view - view settings.png       |  Bin 0 -> 1046461 bytes
 .../doc/Images/properties toolbar - collapsed.png  |  Bin 0 -> 163 bytes
 freeplane/doc/freeplane.mm                         |   55 +-
 freeplane/doc/freeplaneApplications.mm             |  357 ++
 freeplane/doc/freeplaneApplications_ja.mm          |  360 ++
 freeplane/doc/freeplaneApplications_nl.mm          |  376 ++
 freeplane/doc/freeplaneFunctions.mm                |    2 +-
 freeplane/doc/freeplaneTutorial.mm                 | 5761 +++++++++++++++-----
 freeplane/doc/freeplaneTutorial_ja.mm              |   12 +-
 freeplane/doc/freeplaneTutorial_nl.mm              |   12 +-
 freeplane/doc/freeplane_de.mm                      |    3 -
 freeplane/doc/freeplane_es.mm                      |    8 -
 freeplane/doc/freeplane_et.mm                      |    8 -
 freeplane/doc/freeplane_fr.mm                      |    3 -
 freeplane/doc/freeplane_id.mm                      |    8 -
 freeplane/doc/freeplane_it.mm                      |    3 -
 freeplane/doc/freeplane_ja.mm                      |   25 +-
 freeplane/doc/freeplane_ru.mm                      |    8 -
 freeplane/doc/freeplane_vi.mm                      |    8 -
 freeplane/doc/history_en.txt                       |   84 +
 freeplane/doc/whatsNew-1.5.x.mm                    |   20 +-
 freeplane/external-resources/templates/BigMap.mm   |   71 +-
 .../external-resources/templates/conceptMap.mm     |    3 +-
 freeplane/external-resources/templates/essay.mm    |    3 +-
 .../templates/standard-1.6-noEdgeColor.mm          |   69 +
 .../external-resources/templates/standard-1.6.mm   |   70 +
 freeplane/external-resources/templates/standard.mm |   80 -
 .../external-resources/xml/browsemodemenu.xml      |  162 -
 freeplane/external-resources/xml/filemodemenu.xml  |   14 +-
 .../external-resources/xml/mindmapmodemenu.xml     |   39 +-
 freeplane/external-resources/xml/preferences.xml   |   53 +-
 freeplane/external-resources/xml/stylemodemenu.xml |    8 +-
 freeplane/format_translation.gradle                |  114 +-
 freeplane/git.gradle                               |   49 +-
 freeplane/resources/fonts/listcontrols-license.txt |    2 +
 freeplane/resources/fonts/listcontrols.ttf         |  Bin 0 -> 1584 bytes
 freeplane/resources/html/freeplane_applet.jnlp     |    1 -
 freeplane/resources/html/freeplanebrowser.html     |   29 -
 freeplane/resources/html/freeplanebrowser.xhtml    |   39 -
 freeplane/resources/images/1leftarrow.svg          |  195 +
 freeplane/resources/images/1rightarrow.svg         |  195 +
 freeplane/resources/images/AddAttributeAction.png  |  Bin 0 -> 422 bytes
 freeplane/resources/images/AddAttributeAction.svg  |  122 +
 .../resources/images/AddMenuItemLinkAction.png     |  Bin 0 -> 274 bytes
 .../resources/images/AddMenuItemLinkAction.svg     |  274 +
 freeplane/resources/images/AddSlideContent.svg     |  203 +
 .../resources/images/AllPresentationsToPNG.svg     | 1032 ++++
 .../resources/images/AssignAttributesAction.png    |  Bin 0 -> 850 bytes
 .../resources/images/AssignAttributesAction.svg    |  386 ++
 .../images/AutomaticEdgeColorHookAction.svg        |   19 +
 freeplane/resources/images/Back24.png              |  Bin 0 -> 959 bytes
 freeplane/resources/images/Back24.svg              |  112 +
 freeplane/resources/images/Bold16.gif              |  Bin 960 -> 0 bytes
 freeplane/resources/images/Bold16.svg              |   21 +
 freeplane/resources/images/Bold24.gif              |  Bin 188 -> 0 bytes
 freeplane/resources/images/Bold_on16.png           |  Bin 721 -> 0 bytes
 .../images/CenterSelectedNodeAutomatically.png     |  Bin 0 -> 539 bytes
 .../images/CenterSelectedNodeAutomatically.svg     |  139 +
 freeplane/resources/images/Cloud24.gif             |  Bin 985 -> 0 bytes
 freeplane/resources/images/Cloud24.svg             |   34 +
 freeplane/resources/images/Colors24.svg            |   41 +
 freeplane/resources/images/Copy24.gif              |  Bin 682 -> 0 bytes
 freeplane/resources/images/CopyPresentation.svg    |  848 +++
 freeplane/resources/images/CopySlide.svg           |  305 ++
 freeplane/resources/images/Cut24.gif               |  Bin 1193 -> 0 bytes
 .../resources/images/DecreaseNodeFontAction.svg    |   18 +
 freeplane/resources/images/DeleteDetailsAction.svg |   37 +
 freeplane/resources/images/DeletePresentation.svg  |  327 ++
 freeplane/resources/images/DeleteSlide.svg         |  187 +
 freeplane/resources/images/DownPresentation.svg    |  322 ++
 freeplane/resources/images/DownSlide.svg           |  319 ++
 .../resources/images/EditAttributesAction.svg      |   42 +
 .../resources/images/EditDetailsInDialogAction.svg |   31 +
 .../resources/images/EditNoteInDialogAction.svg    |   93 +
 .../resources/images/ExecuteScriptForAllNodes.svg  |  150 +
 .../images/ExecuteScriptForSelectionAction.svg     |  182 +
 freeplane/resources/images/ExecuteScripts.svg      |  348 ++
 .../resources/images/ExternalImageAddAction.png    |  Bin 763 -> 749 bytes
 .../resources/images/ExternalImageAddAction.svg    |  197 +
 .../resources/images/ExternalImageRemoveAction.png |  Bin 0 -> 864 bytes
 .../resources/images/ExternalImageRemoveAction.svg |  211 +
 .../resources/images/ExtractLinkFromTextAction.png |  Bin 985 -> 982 bytes
 .../resources/images/ExtractLinkFromTextAction.svg |  153 +
 freeplane/resources/images/Find16.gif              |  Bin 434 -> 0 bytes
 freeplane/resources/images/FirstSlide.svg          |  294 +
 freeplane/resources/images/FitToPage.svg           |  320 ++
 freeplane/resources/images/Folded.png              |  Bin 155 -> 0 bytes
 freeplane/resources/images/Forward24.png           |  Bin 0 -> 976 bytes
 freeplane/resources/images/Forward24.svg           |  112 +
 .../resources/images/HierarchicalIconsAction.svg   |   46 +
 .../resources/images/IncreaseNodeFontAction.svg    |  147 +
 freeplane/resources/images/Italic16.gif            |  Bin 924 -> 0 bytes
 freeplane/resources/images/Italic16.svg            |   20 +
 freeplane/resources/images/Italic24.gif            |  Bin 180 -> 0 bytes
 freeplane/resources/images/Italic_on16.png         |  Bin 642 -> 0 bytes
 freeplane/resources/images/JoinNodesAction.svg     |  124 +
 freeplane/resources/images/LastSlide.svg           |  293 +
 freeplane/resources/images/Mail.svg                |   28 +
 .../resources/images/MapBackgroundClearAction.png  |  Bin 950 -> 848 bytes
 .../resources/images/MapBackgroundClearAction.svg  |  386 ++
 .../resources/images/MapBackgroundColorAction.png  |  Bin 534 -> 573 bytes
 .../resources/images/MapBackgroundColorAction.svg  |  113 +
 .../resources/images/MapBackgroundImageAction.png  |  Bin 666 -> 698 bytes
 .../resources/images/MapBackgroundImageAction.svg  |  321 ++
 .../resources/images/MapBackgroundImageSize.png    |  Bin 0 -> 644 bytes
 .../resources/images/MapBackgroundImageSize.svg    |  536 ++
 freeplane/resources/images/MovePresentation.svg    |  300 +
 freeplane/resources/images/MoveSlide.svg           |  331 ++
 freeplane/resources/images/MoveToRootAction.png    |  Bin 0 -> 554 bytes
 freeplane/resources/images/MoveToRootAction.svg    |  294 +
 freeplane/resources/images/MoveTo_NextMM.svg       |  162 +
 freeplane/resources/images/MoveTo_NextNode.svg     |  132 +
 freeplane/resources/images/MoveTo_PrevMM.svg       |  162 +
 freeplane/resources/images/MoveTo_PrevNode.svg     |  123 +
 freeplane/resources/images/New24.gif               |  Bin 778 -> 0 bytes
 freeplane/resources/images/NewPresentation.svg     |  300 +
 freeplane/resources/images/NewSiblingAction.svg    |   51 +
 freeplane/resources/images/NewSlide.svg            |  175 +
 freeplane/resources/images/NewSummary.png          |  Bin 0 -> 480 bytes
 freeplane/resources/images/NewSummary.svg          |  103 +
 freeplane/resources/images/NextSlide.svg           |  299 +
 .../resources/images/NodeBackgroundColorAction.svg |   54 +
 freeplane/resources/images/NodeCenter.svg          |  276 +
 freeplane/resources/images/NodeColorAction.svg     |  250 +
 .../resources/images/NodeColorBlendAction.svg      |   28 +
 freeplane/resources/images/NodeLeft.svg            |  264 +
 freeplane/resources/images/NodeListAction.svg      |   98 +
 freeplane/resources/images/NodeRight.svg           |  268 +
 freeplane/resources/images/Normal24.gif            |  Bin 187 -> 0 bytes
 freeplane/resources/images/Open24.gif              |  Bin 462 -> 0 bytes
 freeplane/resources/images/OpenUserDirAction.svg   |  191 +
 freeplane/resources/images/Paste24.gif             |  Bin 374 -> 0 bytes
 .../resources/images/PlaceSelectedNodeOnSlide.svg  |  222 +
 .../resources/images/PresentationPreference.svg    |  333 ++
 freeplane/resources/images/PresentationToPNG.svg   |  715 +++
 freeplane/resources/images/PreviousSlide.svg       |  299 +
 freeplane/resources/images/Print24.gif             |  Bin 491 -> 0 bytes
 freeplane/resources/images/ReminderHookAction.svg  |  221 +
 freeplane/resources/images/RemoveEncryption.svg    |  172 +
 freeplane/resources/images/RemoveNoteAction.svg    |   44 +
 freeplane/resources/images/RemoveSlideContent.svg  |  204 +
 .../resources/images/RevisionPluginAction.svg      |   18 +
 freeplane/resources/images/Save24.gif              |  Bin 266 -> 0 bytes
 freeplane/resources/images/SaveAs24.gif            |  Bin 348 -> 0 bytes
 freeplane/resources/images/ScriptEditor.svg        |  223 +
 freeplane/resources/images/SelectSlideContent.svg  |  195 +
 .../images/SetAcceleratorOnNextClickAction.svg     |  198 +
 .../resources/images/SetFilterSlideContent.svg     |  305 ++
 .../resources/images/SetFoldingSlideContent.svg    |  169 +
 .../images/SetLinkByFileChooserAction.svg          |   33 +
 .../resources/images/SetLinkByTextFieldAction.svg  |   39 +
 freeplane/resources/images/SetSlideContent.svg     |  185 +
 freeplane/resources/images/SetZoomSlideContent.svg |  251 +
 .../resources/images/ShowAncestorsSlideContent.svg |  327 ++
 .../images/ShowDescendantsSlideContent.svg         |  327 ++
 .../ShowFirstSlideAndStartPresentationAction.png   |  Bin 0 -> 934 bytes
 .../ShowFirstSlideAndStartPresentationAction.svg   |  402 ++
 .../images/ShowOnlySelectedNodeSlideContent.svg    |  289 +
 .../resources/images/ShowPreferencesAction.svg     |  115 +
 freeplane/resources/images/SortNodes.svg           |   35 +
 freeplane/resources/images/StartPresentation.svg   |  218 +
 .../StartPresentationOrShowNextSlideAction.png     |  Bin 0 -> 918 bytes
 .../StartPresentationOrShowNextSlideAction.svg     |  308 ++
 freeplane/resources/images/StopPresentation.svg    |  209 +
 freeplane/resources/images/TimeListAction.svg      |  441 ++
 .../resources/images/TimeManagementAction.svg      |  538 ++
 freeplane/resources/images/Underline24.gif         |  Bin 193 -> 0 bytes
 freeplane/resources/images/UpPresentation.svg      |  321 ++
 freeplane/resources/images/UpSlide.svg             |  319 ++
 freeplane/resources/images/acceleratorPresets.svg  |  267 +
 freeplane/resources/images/addons.svg              | 1030 ++++
 freeplane/resources/images/algnCtr16.gif           |  Bin 862 -> 0 bytes
 freeplane/resources/images/algnCtr16.png           |  Bin 0 -> 350 bytes
 freeplane/resources/images/algnCtr16.svg           |  152 +
 freeplane/resources/images/algnCtr16_on.gif        |  Bin 1007 -> 0 bytes
 freeplane/resources/images/algnLft16.gif           |  Bin 862 -> 0 bytes
 freeplane/resources/images/algnLft16.png           |  Bin 0 -> 355 bytes
 freeplane/resources/images/algnLft16.svg           |  148 +
 freeplane/resources/images/algnLft16_on.gif        |  Bin 1007 -> 0 bytes
 freeplane/resources/images/algnRt16.gif            |  Bin 862 -> 0 bytes
 freeplane/resources/images/algnRt16.png            |  Bin 0 -> 359 bytes
 freeplane/resources/images/algnRt16.svg            |  148 +
 freeplane/resources/images/algnRt16_on.gif         |  Bin 1009 -> 0 bytes
 freeplane/resources/images/arrow-mode-backward.svg |   15 +
 freeplane/resources/images/arrow-mode-both.svg     |   15 +
 freeplane/resources/images/arrow-mode-forward.svg  |   15 +
 freeplane/resources/images/arrow-mode-none.svg     |   15 +
 freeplane/resources/images/bell.png                |  Bin 874 -> 846 bytes
 freeplane/resources/images/bell.svg                |  379 ++
 freeplane/resources/images/cancel_button.svg       |  234 +
 freeplane/resources/images/checkbox12.png          |  Bin 1192 -> 609 bytes
 freeplane/resources/images/checkbox12.svg          |  226 +
 freeplane/resources/images/clearFormat.png         |  Bin 690 -> 560 bytes
 freeplane/resources/images/clearFormat.svg         |  217 +
 freeplane/resources/images/clock.png               |  Bin 855 -> 875 bytes
 freeplane/resources/images/clock.svg               |  348 ++
 freeplane/resources/images/color_fill.svg          |   40 +
 freeplane/resources/images/colorpicker.svg         |   39 +
 freeplane/resources/images/connector_color.svg     |  112 +
 freeplane/resources/images/copy_id.svg             |   18 +
 freeplane/resources/images/delCol.png              |  Bin 0 -> 587 bytes
 freeplane/resources/images/delCol.svg              |  136 +
 freeplane/resources/images/delRow.png              |  Bin 0 -> 575 bytes
 freeplane/resources/images/delRow.svg              |  481 ++
 freeplane/resources/images/designer.svg            |   57 +
 freeplane/resources/images/edit12.svg              |  401 ++
 freeplane/resources/images/edit_add.png            |  Bin 584 -> 0 bytes
 freeplane/resources/images/edit_details.svg        |   33 +
 freeplane/resources/images/edit_long_node.svg      |   61 +
 freeplane/resources/images/edit_node.svg           |   60 +
 freeplane/resources/images/edit_remove.png         |  Bin 335 -> 0 bytes
 freeplane/resources/images/editcut.svg             |   42 +
 freeplane/resources/images/editdelete.svg          |  105 +
 freeplane/resources/images/editpaste.svg           |   44 +
 freeplane/resources/images/edittrash.png           |  Bin 235 -> 0 bytes
 freeplane/resources/images/export.svg              |   40 +
 freeplane/resources/images/f1.svg                  |   24 +
 freeplane/resources/images/f10.svg                 |   28 +
 freeplane/resources/images/f11.svg                 |   28 +
 freeplane/resources/images/f12.svg                 |   28 +
 freeplane/resources/images/f2.svg                  |   24 +
 freeplane/resources/images/f3.svg                  |   24 +
 freeplane/resources/images/f4.svg                  |   24 +
 freeplane/resources/images/f5.svg                  |   28 +
 freeplane/resources/images/f6.svg                  |   24 +
 freeplane/resources/images/f7.svg                  |   28 +
 freeplane/resources/images/f8.svg                  |   28 +
 freeplane/resources/images/f9.svg                  |   28 +
 freeplane/resources/images/fileclose.png           |  Bin 1027 -> 0 bytes
 freeplane/resources/images/fileopen.svg            |   29 +
 freeplane/resources/images/filesave.svg            |   42 +
 freeplane/resources/images/filesaveas.svg          |   65 +
 freeplane/resources/images/flag.svg                |  196 +
 freeplane/resources/images/fmtPara.png             |  Bin 0 -> 290 bytes
 freeplane/resources/images/fmtPara.svg             |  320 ++
 freeplane/resources/images/font.png                |  Bin 0 -> 392 bytes
 freeplane/resources/images/font.svg                |  140 +
 freeplane/resources/images/fontColor.png           |  Bin 0 -> 473 bytes
 freeplane/resources/images/fontColor.svg           |  312 ++
 freeplane/resources/images/formula.svg             |  136 +
 freeplane/resources/images/fullscreen.png          |  Bin 0 -> 624 bytes
 freeplane/resources/images/fullscreen.svg          |  195 +
 freeplane/resources/images/hotlistadd.png          |  Bin 502 -> 0 bytes
 freeplane/resources/images/hotlistdel.png          |  Bin 319 -> 0 bytes
 freeplane/resources/images/icon_trash.svg          | 1123 ++++
 freeplane/resources/images/idea.svg                |   46 +
 freeplane/resources/images/import.svg              |   40 +
 freeplane/resources/images/insCol.png              |  Bin 0 -> 583 bytes
 freeplane/resources/images/insCol.svg              |  427 ++
 freeplane/resources/images/insRow.png              |  Bin 0 -> 573 bytes
 freeplane/resources/images/insRow.svg              |  434 ++
 freeplane/resources/images/install_addons.svg      |  310 ++
 freeplane/resources/images/kalzium.svg             |   50 +
 freeplane/resources/images/kcmsystem.png           |  Bin 845 -> 0 bytes
 freeplane/resources/images/kword.svg               |  106 +
 freeplane/resources/images/manage_addons.svg       |  321 ++
 freeplane/resources/images/manage_themes.svg       |  269 +
 freeplane/resources/images/newNode.png             |  Bin 204 -> 0 bytes
 freeplane/resources/images/new_map_.svg            |  207 +
 freeplane/resources/images/ok_button.svg           |  245 +
 freeplane/resources/images/ol.png                  |  Bin 0 -> 331 bytes
 freeplane/resources/images/ol.svg                  |  300 +
 freeplane/resources/images/on_selected_node.png    |  Bin 1403 -> 0 bytes
 .../images/on_selected_node_recursively.png        |  Bin 1400 -> 0 bytes
 .../images/on_selected_node_recursively_small.png  |  Bin 2955 -> 0 bytes
 .../resources/images/on_selected_node_small.png    |  Bin 2929 -> 0 bytes
 freeplane/resources/images/on_single_node.png      |  Bin 822 -> 0 bytes
 .../resources/images/on_single_node_small.png      |  Bin 2895 -> 0 bytes
 freeplane/resources/images/redo.svg                |   25 +
 freeplane/resources/images/remove.png              |  Bin 422 -> 0 bytes
 freeplane/resources/images/remove_connector.svg    |  100 +
 freeplane/resources/images/remove_first_icon.svg   |   39 +
 freeplane/resources/images/remove_last_icon.svg    |   39 +
 freeplane/resources/images/split_node.svg          |  142 +
 freeplane/resources/images/spotlight.png           |  Bin 0 -> 679 bytes
 freeplane/resources/images/spotlight.svg           |  321 ++
 freeplane/resources/images/stock_text_indent.svg   |  126 +
 .../resources/images/svg/Progress_quarter_00.svg   |  147 +-
 .../resources/images/svg/Progress_quarter_01.svg   |  160 +-
 .../resources/images/svg/Progress_quarter_02.svg   |  162 +-
 .../resources/images/svg/Progress_quarter_03.svg   |  161 +-
 .../resources/images/svg/Progress_quarter_04.svg   |  119 +-
 .../resources/images/svg/Progress_tenth_00.svg     |  214 +-
 .../resources/images/svg/Progress_tenth_01.svg     |  229 +-
 .../resources/images/svg/Progress_tenth_02.svg     |  229 +-
 .../resources/images/svg/Progress_tenth_03.svg     |  234 +-
 .../resources/images/svg/Progress_tenth_04.svg     |  232 +-
 .../resources/images/svg/Progress_tenth_05.svg     |  229 +-
 .../resources/images/svg/Progress_tenth_06.svg     |  232 +-
 .../resources/images/svg/Progress_tenth_07.svg     |  229 +-
 .../resources/images/svg/Progress_tenth_08.svg     |  232 +-
 .../resources/images/svg/Progress_tenth_09.svg     |  229 +-
 .../resources/images/svg/Progress_tenth_10.svg     |  178 +-
 freeplane/resources/images/table.png               |  Bin 0 -> 441 bytes
 freeplane/resources/images/table.svg               |  122 +
 freeplane/resources/images/ul.png                  |  Bin 0 -> 384 bytes
 freeplane/resources/images/ul.svg                  |  288 +
 freeplane/resources/images/uline.svg               |  187 +
 freeplane/resources/images/uline_on.png            |  Bin 695 -> 0 bytes
 freeplane/resources/images/undo.svg                |   25 +
 freeplane/resources/images/update.svg              |  437 ++
 freeplane/resources/images/xeyes.svg               |  485 ++
 .../resources/translations/Resources_af.properties |  482 ++
 .../resources/translations/Resources_ca.properties |   78 +-
 .../resources/translations/Resources_cs.properties |  285 +-
 .../resources/translations/Resources_da.properties |   80 +-
 .../resources/translations/Resources_de.properties |  555 +-
 .../resources/translations/Resources_el.properties |   15 +-
 .../resources/translations/Resources_es.properties |  264 +-
 .../resources/translations/Resources_et.properties |    5 -
 .../resources/translations/Resources_eu.properties | 1026 +++-
 .../resources/translations/Resources_fr.properties |  174 +-
 .../resources/translations/Resources_gl.properties |    5 -
 .../resources/translations/Resources_hr.properties |  169 +-
 .../resources/translations/Resources_hu.properties |   90 +-
 .../resources/translations/Resources_id.properties |   59 +-
 .../resources/translations/Resources_it.properties |   15 +-
 .../resources/translations/Resources_ja.properties |  169 +-
 .../resources/translations/Resources_ko.properties |  194 +-
 .../resources/translations/Resources_lt.properties |    6 +-
 .../resources/translations/Resources_nb.properties |    7 +-
 .../resources/translations/Resources_nl.properties |  289 +-
 .../resources/translations/Resources_nn.properties |    3 -
 .../resources/translations/Resources_pl.properties |  741 ++-
 .../translations/Resources_pt_BR.properties        |   19 +-
 .../translations/Resources_pt_PT.properties        |  149 +-
 .../resources/translations/Resources_ru.properties |   68 +-
 .../resources/translations/Resources_sk.properties |  467 +-
 .../resources/translations/Resources_sl.properties |  395 +-
 .../resources/translations/Resources_sr.properties |   15 +-
 .../resources/translations/Resources_sv.properties |   45 +-
 .../resources/translations/Resources_tr.properties |  203 +-
 .../translations/Resources_uk_UA.properties        |  141 +-
 .../translations/Resources_zh_CN.properties        |  674 ++-
 .../translations/Resources_zh_TW.properties        |   18 +-
 freeplane/resources/xml/ExportWithXSLT.xml         |   19 +-
 freeplane/resources/xml/mapVersions.xml            |    1 +
 freeplane/resources/xslt/freeplane2applet.xsl      |   14 +-
 freeplane/resources/xslt/freeplane2flash.xsl       |  133 -
 freeplane/resources/xslt/freeplane2ws.xsl          |  105 +
 freeplane/resources/xslt/xml2mm.xsl                |    2 +-
 freeplane/signjar.gradle                           |   15 +-
 .../freeplane/core/io/xml/LocalEntityResolver.java |   15 +
 .../core/io/xml/XMLLocalParserFactory.java         |   12 +
 .../java/org/freeplane/core/io/xml/XMLParser.java  |    5 +
 .../core/resources/ResourceController.java         |   60 +-
 .../core/resources/SetBooleanPropertyAction.java   |    1 +
 .../core/resources/WindowConfigurationStorage.java |    5 +-
 .../core/resources/components/BooleanProperty.java |   10 +
 .../core/resources/components/ColorProperty.java   |    7 +-
 .../core/resources/components/ComboProperty.java   |   55 +-
 .../core/resources/components/OptionPanel.java     |   16 +-
 .../resources/components/OptionPanelBuilder.java   |  128 +-
 .../core/resources/components/PropertyAdapter.java |   13 +-
 .../components/ShowPreferencesAction.java          |    5 +-
 .../org/freeplane/core/ui/AFreeplaneAction.java    |   31 +-
 .../core/ui/ActionAcceleratorManager.java          |    6 +-
 .../org/freeplane/core/ui/ColoredIconCreator.java  |   14 -
 .../core/ui/MenuSplitterConfiguration.java         |    5 +
 .../core/ui/components/DashIconFactory.java        |   36 +
 .../freeplane/core/ui/components/FButtonBar.java   |   11 +-
 .../core/ui/components/FreeplaneToolBar.java       |   26 +-
 .../core/ui/components/JAutoToggleButton.java      |    4 +
 .../core/ui/components/JComboBoxWithBorder.java    |   32 +-
 .../core/ui/components/MultipleImage.java          |   17 +-
 .../ui/components/OneTouchCollapseResizer.java     |   22 +-
 .../components/OptionalDontShowMeAgainDialog.java  |    6 +-
 .../core/ui/components/RenderedContent.java        |   64 +
 .../ui/components/RenderedContentSupplier.java     |    5 +
 .../core/ui/components/ToolbarLayout.java          |   56 +-
 .../core/ui/components/TypedListCellRenderer.java  |   43 +-
 .../org/freeplane/core/ui/components/UITools.java  |  102 +-
 .../core/ui/components/calendar/JDayChooser.java   |    4 +-
 .../core/ui/components/html/CssRuleBuilder.java    |    8 +-
 .../core/ui/components/html/ScaledHTML.java        |    2 +-
 .../freeplane/core/ui/image/BigBufferedImage.java  |  231 +
 .../core/ui/menubuilders/action/ActionFinder.java  |   27 +-
 .../ui/menubuilders/menu/JMenuItemBuilder.java     |    9 +
 .../menu/MenuActionComponentProvider.java          |    1 +
 .../core/ui/menubuilders/menu/MenuIconScaling.java |   24 +
 .../menu/MenuRadioActionComponentProvider.java     |    1 +
 .../ui/textchanger/TranslatedElementFactory.java   |  123 +
 .../core/ui/textchanger/UITextChanger.java         |    6 +-
 .../main/java/org/freeplane/core/util/Compat.java  |    4 +-
 .../java/org/freeplane/core/util/FileUtils.java    |    4 +
 .../freeplane/core/util/FreeplaneIconUtils.java    |   94 +-
 .../org/freeplane/core/util/FreeplaneVersion.java  |    2 +-
 .../java/org/freeplane/core/util/HtmlUtils.java    |   30 +-
 .../java/org/freeplane/core/util/LogUtils.java     |    5 +-
 .../freeplane/core/util/LoggingOutputStream.java   |   22 +-
 .../java/org/freeplane/core/util/MenuUtils.java    |    3 +-
 .../java/org/freeplane/core/util/Quantity.java     |    6 +
 .../java/org/freeplane/features/DashVariant.java   |   34 +
 .../attribute/AttributeCompareCondition.java       |    2 +-
 .../attribute/AttributeConditionController.java    |   15 +-
 .../features/attribute/AttributeController.java    |    7 +-
 .../features/attribute/AttributeRegistry.java      |   14 +-
 .../mindmapmode/AttributeManagerDialog.java        |    6 +-
 .../mindmapmode/AttributeRegistryTable.java        |    4 +-
 .../mindmapmode/ImportAttributesDialog.java        |    2 +-
 .../features/clipboard/ClipboardController.java    |   19 +-
 .../features/clipboard/CopySingleAction.java       |    2 +-
 .../features/clipboard/MindMapHTMLWriter.java      |    4 +-
 .../mindmapmode/MClipboardController.java          |  147 +-
 .../clipboard/mindmapmode/SelectedPasteAction.java |    5 +-
 .../clipboard/mindmapmode/TargetFileCreator.java   |   47 +
 .../freeplane/features/cloud/CloudController.java  |   40 +-
 .../cloud/mindmapmode/MCloudController.java        |    2 +
 .../features/edge/AutomaticEdgeColorHook.java      |   13 +-
 .../org/freeplane/features/edge/EdgeBuilder.java   |   14 +-
 .../features/edge/EdgeColorConfiguration.java      |   28 +
 .../edge/EdgeColorsConfigurationFactory.java       |   80 +
 .../freeplane/features/edge/EdgeController.java    |   72 +-
 .../org/freeplane/features/edge/EdgeModel.java     |   10 +
 .../org/freeplane/features/edge/EdgeStyle.java     |    7 +-
 .../mindmapmode/ColorListEditorPanelBuilder.java   |  321 ++
 .../features/edge/mindmapmode/MEdgeController.java |   88 +
 .../features/encrypt/EncryptionController.java     |    7 +-
 .../export/mindmapmode/ExportController.java       |    4 +-
 .../features/export/mindmapmode/ExportToImage.java |   20 +-
 .../export/mindmapmode/ExportWithXSLT.java         |   11 +-
 .../features/export/mindmapmode/ImageCreator.java  |   11 +
 .../features/filter/AFilterComposerDialog.java     |   33 +-
 .../java/org/freeplane/features/filter/Filter.java |   94 +-
 .../features/filter/FilterComposerDialog.java      |   68 +
 .../features/filter/FilterController.java          |   27 +-
 .../org/freeplane/features/filter/FilterInfo.java  |   10 +-
 .../org/freeplane/features/filter/FoundNodes.java  |    2 +-
 .../filter/NextPresentationItemAction.java         |   29 +-
 .../filter/condition/ASelectableCondition.java     |   24 +-
 .../filter/condition/ConjunctConditions.java       |    5 +-
 .../filter/condition/DisjunctConditions.java       |    2 +-
 .../features/format/FormatController.java          |    4 +-
 .../features/format/ScannerController.java         |   79 +-
 .../features/help/FilePropertiesAction.java        |    8 +-
 .../freeplane/features/help/HelpController.java    |    8 -
 .../freeplane/features/help/HotKeyInfoAction.java  |    9 +-
 .../features/highlight/HighlightController.java    |   32 +
 .../features/highlight/NodeHighlighter.java        |   13 +
 .../freeplane/features/icon/HierarchicalIcons.java |   15 +-
 .../features/icon/IStateIconProvider.java          |    1 +
 .../features/icon/IconContainedCondition.java      |    2 +-
 .../freeplane/features/icon/IconController.java    |   45 +-
 .../org/freeplane/features/icon/IconStore.java     |    2 +-
 .../features/icon/PriorityCompareCondition.java    |    2 +-
 .../features/icon/PriorityConditionController.java |    2 +-
 .../java/org/freeplane/features/icon/UIIcon.java   |   10 +-
 .../org/freeplane/features/icon/UIIconSet.java     |    8 +-
 .../org/freeplane/features/icon/ZoomedIcon.java    |   26 +-
 .../features/icon/factory/IconStoreFactory.java    |   27 +-
 .../features/icon/factory/ImageIconFactory.java    |   68 +-
 .../features/icon/factory/MindIconFactory.java     |    2 +-
 .../features/icon/factory/WeakValueCache.java      |   26 +
 .../features/icon/mindmapmode/IconAction.java      |   27 +-
 .../icon/mindmapmode/IconSelectionPlugin.java      |   21 +-
 .../features/icon/mindmapmode/MIconController.java |   71 +-
 .../freeplane/features/link/ConnectorArrows.java   |   46 +
 .../freeplane/features/link/ConnectorModel.java    |    7 +-
 .../features/link/ConnectorProperties.java         |    8 +-
 .../org/freeplane/features/link/LinkBuilder.java   |    1 +
 .../freeplane/features/link/LinkController.java    |   68 +-
 .../freeplane/features/link/LinkTransformer.java   |    7 +-
 .../mindmapmode/ChangeConnectorArrowsAction.java   |   12 +-
 .../mindmapmode/ChangeConnectorDashAction.java     |   50 +-
 .../features/link/mindmapmode/MLinkController.java |   91 +-
 .../link/mindmapmode/MakeLinkFromAnchorAction.java |    6 +-
 .../link/mindmapmode/SelectMenuItemDialog.java     |    2 +-
 .../freeplane/features/map/FoldingController.java  |   15 +-
 .../freeplane/features/map/HideChildSubtree.java   |   31 -
 .../org/freeplane/features/map/IMapSelection.java  |   13 +
 .../org/freeplane/features/map/MapController.java  |  308 +-
 .../java/org/freeplane/features/map/MapModel.java  |    5 +
 .../freeplane/features/map/MapNavigationUtils.java |    6 +-
 .../freeplane/features/map/NodeIconSetModel.java   |   16 +-
 .../java/org/freeplane/features/map/NodeModel.java |    9 +-
 .../org/freeplane/features/map/NodePosition.java   |    1 +
 .../org/freeplane/features/map/NodeWriter.java     |   17 +
 .../features/map/ShowNextChildAction.java          |    4 +-
 .../org/freeplane/features/map/SummaryLevels.java  |   16 +-
 .../freeplane/features/map/ToggleFoldedAction.java |    3 +-
 .../features/map/filemode/FMapController.java      |    6 -
 .../features/map/filemode/FNodeModel.java          |   89 +-
 .../features/map/mindmapmode/MMapController.java   |    9 +-
 .../features/map/mindmapmode/MMapModel.java        |   11 +
 .../features/mode/CenterSelectedNodeAction.java    |   54 -
 .../features/mode/CloseAllMapsAction.java          |   19 +
 .../features/mode/CloseAllOtherMapsAction.java     |   22 +
 .../org/freeplane/features/mode/Controller.java    |   28 +-
 .../org/freeplane/features/mode/MapExtensions.java |   17 +
 .../features/mode/MoveSelectedNodeAction.java      |   61 +
 .../features/mode/PersistentNodeHook.java          |   11 +-
 .../features/mode/browsemode/BModeController.java  |   36 -
 .../features/nodestyle/NodeBorderModel.java        |  176 +
 .../features/nodestyle/NodeStyleBuilder.java       |  135 +-
 .../features/nodestyle/NodeStyleController.java    |  264 +-
 .../features/nodestyle/NodeStyleModel.java         |   49 +-
 .../nodestyle/filemode/FNodeStyleController.java   |   42 -
 .../mindmapmode/HorizontalTextAlignmentAction.java |   67 +
 .../mindmapmode/MNodeStyleController.java          |  222 +-
 .../nodestyle/mindmapmode/TextAlignAction.java     |   67 -
 .../freeplane/features/note/NoteController.java    |   48 +-
 .../features/note/mindmapmode/MNoteController.java |    7 +-
 .../features/note/mindmapmode/NoteManager.java     |    4 +
 .../mindmapmode/CollectionBoxController.java       |  243 +
 .../mindmapmode/CollectionChangeListener.java      |    5 +
 .../mindmapmode/CollectionChangedEvent.java        |   19 +
 .../mindmapmode/EscapeKeyEventDispatcher.java      |   26 +
 .../mindmapmode/MapPresentations.java              |   18 +
 .../presentations/mindmapmode/NamedElement.java    |    8 +
 .../mindmapmode/NamedElementCollection.java        |  179 +
 .../mindmapmode/NamedElementFactory.java           |    6 +
 .../mindmapmode/NavigationKeyEventDispatcher.java  |   42 +
 .../mindmapmode/NavigationPanelController.java     |  290 +
 .../presentations/mindmapmode/Presentation.java    |   34 +
 .../mindmapmode/PresentationAutomation.java        |   65 +
 .../mindmapmode/PresentationBuilder.java           |  258 +
 .../mindmapmode/PresentationController.java        |  232 +
 .../mindmapmode/PresentationEditorController.java  |  146 +
 .../PresentationKeyEventDispatcher.java            |   50 +
 .../mindmapmode/PresentationPngExporter.java       |  223 +
 .../mindmapmode/PresentationState.java             |  253 +
 .../mindmapmode/PresentationStateChangeEvent.java  |   22 +
 .../PresentationStateChangeListener.java           |    7 +
 .../features/presentations/mindmapmode/Slide.java  |  479 ++
 .../mindmapmode/SlideChangeEvent.java              |   15 +
 .../mindmapmode/SlideChangeListener.java           |    5 +
 .../mindmapmode/SlideEditorController.java         |  459 ++
 .../presentations/mindmapmode/Stringifyed.java     |   19 +
 .../UndoableNamedElementCollection.java            |  154 +
 .../presentations/mindmapmode/UndoableSlide.java   |  389 ++
 .../freeplane/features/print/PreviewDialog.java    |    2 +-
 .../features/styles/AutomaticLayoutController.java |   23 +-
 .../features/styles/ConditionPredicate.java        |    7 +
 .../features/styles/ConditionalStyleChecker.java   |   18 +
 .../features/styles/ConditionalStyleModel.java     |   32 +-
 .../features/styles/LogicalStyleController.java    |    5 +
 .../org/freeplane/features/styles/MapStyle.java    |    8 +-
 .../styles/SetBooleanMapPropertyAction.java        |    1 +
 .../styles/SetBooleanMapViewPropertyAction.java    |   95 +
 .../AManageConditionalStylesAction.java            |   11 +-
 .../styles/mindmapmode/ConditionalStyleTable.java  |   17 +-
 .../styles/mindmapmode/FilterComposerDialog.java   |   62 -
 .../mindmapmode/MLogicalStyleController.java       |   21 -
 .../features/styles/mindmapmode/MUIFactory.java    |   10 +-
 .../styles/mindmapmode/StyleEditorPanel.java       | 1213 -----
 ...BorderColorAndColorMatchesEdgeControlGroup.java |  146 +
 .../BorderDashAndDashMatchesEdgeControlGroup.java  |  145 +
 ...WidthAndBorderWidthMatchesEdgeControlGroup.java |  146 +
 .../ChildDistanceControlGroup.java                 |   88 +
 .../CloudColorShapeControlGroup.java               |  132 +
 .../mindmapmode/styleeditorpanel/ControlGroup.java |   34 +
 .../ControlGroupChangeListener.java                |   89 +
 .../styleeditorpanel/EdgeColorControlGroup.java    |   83 +
 .../styleeditorpanel/EdgeDashControlGroup.java     |   88 +
 .../styleeditorpanel/EdgeStyleControlGroup.java    |   91 +
 .../styleeditorpanel/EdgeWidthControlGroup.java    |   87 +
 .../styleeditorpanel/EnumToStringMapper.java       |   43 +
 .../styleeditorpanel/FontBoldControlGroup.java     |   83 +
 .../styleeditorpanel/FontItalicControlGroup.java   |   84 +
 .../styleeditorpanel/FontNameControlGroup.java     |   85 +
 .../styleeditorpanel/FontSizeControlGroup.java     |   95 +
 .../styleeditorpanel/FormatControlGroup.java       |   90 +
 .../styleeditorpanel/GroupSeparator.java           |   47 +
 .../styleeditorpanel/IconSizeControlGroup.java     |   54 +
 .../styleeditorpanel/MaxNodeWidthControlGroup.java |   85 +
 .../styleeditorpanel/MinNodeWidthControlGroup.java |   85 +
 .../styleeditorpanel/NextColumnControlGroup.java   |   47 +
 .../styleeditorpanel/NextLineControlGroup.java     |   45 +
 .../NodeBackgroundColorControlGroup.java           |   90 +
 .../styleeditorpanel/NodeColorControlGroup.java    |   86 +
 .../NodeFontHyperLinkControlGroup.java             |   83 +
 .../NodeHorizontalTextAlignmentControlGroup.java   |   94 +
 .../NodeNumberingControlGroup.java                 |   83 +
 .../styleeditorpanel/NodeShapeControlGroup.java    |  134 +
 .../styleeditorpanel/StyleControlGroup.java        |  264 +
 .../styleeditorpanel/StyleEditorPanel.java         |  219 +
 .../features/text/AbstractContentTransformer.java  |    8 +-
 .../features/text/FormatContentTransformer.java    |   27 +-
 .../features/text/IContentTransformer.java         |    1 +
 .../text/MatchCaseNodeContainsCondition.java       |    6 +-
 .../features/text/NodeContainsCondition.java       |    7 +-
 .../freeplane/features/text/NodeItemRelation.java  |    5 +
 .../features/text/NodeMatchesRegexpCondition.java  |    6 +-
 .../features/text/NodeTextCompareCondition.java    |    7 +-
 .../features/text/NodeTextConditionController.java |    2 +-
 .../freeplane/features/text/TextController.java    |   95 +-
 .../mindmapmode/ConditionalContentTransformer.java |   21 +-
 .../features/text/mindmapmode/EditNodeWYSIWYG.java |    4 +-
 .../features/text/mindmapmode/MTextController.java |  149 +-
 .../text/mindmapmode/SHTMLEditLinkAction.java      |    2 +-
 .../features/ui/CollapseableBoxBuilder.java        |    8 +-
 .../org/freeplane/features/ui/FrameController.java |   91 +-
 .../org/freeplane/features/ui/IMapViewManager.java |   22 +
 .../ui/UIComponentVisibilityDispatcher.java        |   12 +-
 .../features/url/FreeplaneUriConverter.java        |    2 +-
 .../org/freeplane/features/url/UrlManager.java     |    7 +-
 .../url/mindmapmode/ExportBranchAction.java        |   20 +-
 .../mindmapmode/ImportExplorerFavoritesAction.java |    4 +-
 .../mindmapmode/ImportFolderStructureAction.java   |    2 +-
 .../features/url/mindmapmode/MFileManager.java     |  111 +-
 .../freeplane/main/addons/AddOnsController.java    |    4 +-
 .../main/applet/AppletResourceController.java      |   11 +-
 .../main/applet/AppletViewController.java          |    8 +-
 .../org/freeplane/main/applet/BModeController.java |   36 +
 .../main/applet/BModeControllerFactory.java        |  111 +
 .../freeplane/main/applet/BToolbarContributor.java |  104 +
 .../org/freeplane/main/applet/FreeplaneApplet.java |  201 +-
 .../application/ApplicationResourceController.java |   56 +-
 .../application/ApplicationViewController.java     |    2 +-
 .../main/application/CommandLineParser.java        |   46 +-
 .../main/application/FreeplaneGUIStarter.java      |   32 +-
 .../main/application/UserPropertiesUpdater.java    |    3 +
 .../protocols/freeplaneresource/Handler.java       |    2 +
 .../main/browsemode/BModeControllerFactory.java    |  112 -
 .../main/browsemode/BToolbarContributor.java       |  104 -
 .../main/filemode/FModeControllerFactory.java      |    4 +-
 .../headlessmode/FreeplaneHeadlessStarter.java     |    2 +
 .../HeadlessMModeControllerFactory.java            |    7 +-
 .../headlessmode/HeadlessMapViewController.java    |   51 +
 .../main/mindmapmode/MModeControllerFactory.java   |   10 +-
 .../main/mindmapmode/UpdateCheckAction.java        |    4 -
 .../stylemode/SModeControllerFactory.java          |    8 +-
 .../freeplane/n3/nanoxml/XMLEntityResolver.java    |    2 +-
 .../filepreview/BitmapViewerComponent.java         |  126 +-
 .../features/filepreview/ScalableComponent.java    |    2 -
 .../swing/features/filepreview/ViewerBorder.java   |   44 +
 .../features/filepreview/ViewerController.java     |   65 +-
 .../swing/features/nodehistory/NodeHistory.java    |    2 +-
 .../features/time/mindmapmode/ReminderHook.java    |    7 +-
 .../features/time/mindmapmode/TimeManagement.java  |    8 +-
 .../time/mindmapmode/nodelist/NodeList.java        |   17 +-
 .../time/mindmapmode/nodelist/TableSorter.java     |    4 +-
 .../org/freeplane/view/swing/map/ArrowIcon.java    |    2 +-
 .../freeplane/view/swing/map/BubbleMainView.java   |    3 +-
 .../org/freeplane/view/swing/map/FoldingMark.java  |    7 +-
 .../org/freeplane/view/swing/map/ForkMainView.java |   29 +-
 .../org/freeplane/view/swing/map/MainView.java     |  107 +-
 .../org/freeplane/view/swing/map/MapScroller.java  |   23 +-
 .../java/org/freeplane/view/swing/map/MapView.java |  259 +-
 .../view/swing/map/MapViewController.java          |  150 +-
 .../view/swing/map/MapViewScrollPane.java          |   18 +-
 .../view/swing/map/NarrowHexagonMainView.java      |   21 +-
 .../org/freeplane/view/swing/map/NodeTooltip.java  |    6 +-
 .../org/freeplane/view/swing/map/NodeView.java     |  145 +-
 .../freeplane/view/swing/map/NodeViewFactory.java  |   31 +-
 .../org/freeplane/view/swing/map/OvalMainView.java |    7 +-
 .../view/swing/map/RectangleMainView.java          |    8 +-
 .../freeplane/view/swing/map/ShapedMainView.java   |   13 +-
 .../view/swing/map/VariableInsetsMainView.java     |   55 +-
 .../swing/map/VerticalNodeViewLayoutStrategy.java  |    4 +-
 .../view/swing/map/WideHexagonMainView.java        |   25 +-
 .../freeplane/view/swing/map/ZoomableLabelUI.java  |    2 -
 .../view/swing/map/attribute/AttributeTable.java   |   48 +-
 .../map/attribute/AttributeTableCellRenderer.java  |   23 +-
 .../view/swing/map/attribute/AttributeView.java    |    4 +-
 .../view/swing/map/edge/AutomaticEdgeStyle.java    |   20 +-
 .../freeplane/view/swing/map/edge/EdgeView.java    |   27 +-
 .../view/swing/map/edge/HorizontalEdgeView.java    |    1 -
 .../view/swing/map/edge/OutlineEdgeView.java       |   19 +-
 .../view/swing/map/edge/SharpBezierEdgeView.java   |    2 +-
 .../view/swing/map/edge/SharpLinearEdgeView.java   |    2 +-
 .../view/swing/map/link/ConnectorView.java         |   99 +-
 .../view/swing/map/link/EdgeLinkView.java          |    2 +
 .../view/swing/map/link/OutlineLinkView.java       |    3 +-
 .../swing/map/mindmapmode/EditNodeTextField.java   |   12 +-
 .../view/swing/ui/DefaultNodeKeyListener.java      |    3 +-
 .../swing/ui/DefaultNodeMouseMotionListener.java   |   18 +-
 .../view/swing/ui/LinkNavigatorMouseListener.java  |    8 +-
 .../view/swing/ui/UserInputListenerFactory.java    |    2 +
 .../ui/mindmapmode/GlassPaneNodeSelector.java      |    6 +-
 .../swing/ui/mindmapmode/MMapMouseListener.java    |   60 +-
 .../swing/ui/mindmapmode/MNodeDropListener.java    |   32 +-
 .../ui/components/html/CssRuleBuilderShould.java   |   12 +-
 .../ui/menubuilders/action/ActionFinderTest.java   |    2 +-
 .../ui/menubuilders/menu/JMenuItemBuilderTest.java |    4 +
 .../org/freeplane/core/util/QuantityShould.java    |    6 +
 .../mindmapmode/CollectionModelShould.java         |  274 +
 .../presentations/mindmapmode/MainFrame.java       |   41 +
 freeplane/viewer-resources/freeplane.properties    |  216 +-
 freeplane/viewer-resources/images/AddFilter.svg    |  279 +
 freeplane/viewer-resources/images/AndFilter.svg    |  429 ++
 .../viewer-resources/images/AttributesView.svg     |  346 ++
 freeplane/viewer-resources/images/BranchStats.png  |  Bin 609 -> 665 bytes
 freeplane/viewer-resources/images/BranchStats.svg  |  466 ++
 freeplane/viewer-resources/images/Btn_edit.gif     |  Bin 204 -> 0 bytes
 freeplane/viewer-resources/images/CloneAction.png  |  Bin 0 -> 632 bytes
 freeplane/viewer-resources/images/CloneAction.svg  |  957 ++++
 freeplane/viewer-resources/images/DeleteFilter.svg |  289 +
 freeplane/viewer-resources/images/DownFilter.svg   |  423 ++
 freeplane/viewer-resources/images/Executable.png   |  Bin 198 -> 0 bytes
 .../images/Freeplane_frame_icon_64x64.png          |  Bin
 freeplane/viewer-resources/images/IconNotFound.png |  Bin 194 -> 438 bytes
 freeplane/viewer-resources/images/IconNotFound.svg |  275 +
 freeplane/viewer-resources/images/Link.png         |  Bin 527 -> 267 bytes
 freeplane/viewer-resources/images/Link.svg         |   43 +
 freeplane/viewer-resources/images/LinkLocal.png    |  Bin 475 -> 253 bytes
 freeplane/viewer-resources/images/LinkLocal.svg    |   43 +
 freeplane/viewer-resources/images/Mail.svg         |  122 +
 freeplane/viewer-resources/images/MapStats.svg     |  231 +
 ...ction.png => MoveSelectedNodeAction.CENTER.png} |  Bin
 .../images/MoveSelectedNodeAction.CENTER.svg       |   99 +
 freeplane/viewer-resources/images/NameFilter.svg   |  444 ++
 freeplane/viewer-resources/images/NotFilter.svg    |  438 ++
 .../viewer-resources/images/OpenURLMapAction.png   |  Bin 0 -> 1036 bytes
 .../viewer-resources/images/OpenURLMapAction.svg   |  207 +
 freeplane/viewer-resources/images/OrFilter.svg     |  504 ++
 .../images/SetShortenerStateAction.svg             |  110 +
 .../images/ShowSelectionAsRectangleAction.svg      |   83 +
 freeplane/viewer-resources/images/SplitFilter.svg  |  427 ++
 freeplane/viewer-resources/images/UpFilter.svg     |  419 ++
 freeplane/viewer-resources/images/ZoomIn24.svg     |  149 +
 freeplane/viewer-resources/images/ZoomOut24.svg    |  154 +
 .../images/applies_to_filtered_nodes.svg           |   38 +
 .../viewer-resources/images/apply_quick_filter.svg |   40 +
 freeplane/viewer-resources/images/back.png         |  Bin 603 -> 0 bytes
 .../viewer-resources/images/calendar_clock_red.svg |  800 +++
 freeplane/viewer-resources/images/calendar_red.svg |  651 +++
 freeplane/viewer-resources/images/close.svg        |   39 +
 freeplane/viewer-resources/images/copy_single.svg  |   50 +
 .../images/edit_filtering_condition.svg            |   76 +
 freeplane/viewer-resources/images/editcopy.svg     |   47 +
 freeplane/viewer-resources/images/empty.png        |  Bin 83 -> 0 bytes
 .../viewer-resources/images/filePrintDirect.png    |  Bin 0 -> 836 bytes
 .../viewer-resources/images/filePrintDirect.svg    |  501 ++
 freeplane/viewer-resources/images/filefind.svg     |  280 +
 freeplane/viewer-resources/images/filenew.svg      |  154 +
 freeplane/viewer-resources/images/fileprint.svg    |   83 +
 freeplane/viewer-resources/images/filter.gif       |  Bin 874 -> 0 bytes
 freeplane/viewer-resources/images/filter.svg       |   33 +
 .../viewer-resources/images/filterConditions.png   |  Bin 0 -> 849 bytes
 .../viewer-resources/images/filterConditions.svg   |  253 +
 .../images/filter_selected_nodes.svg               |   38 +
 freeplane/viewer-resources/images/find_next.svg    |  299 +
 .../viewer-resources/images/find_previous.svg      |  299 +
 freeplane/viewer-resources/images/fold_all.svg     |  146 +
 .../viewer-resources/images/fold_one_level.svg     |   96 +
 freeplane/viewer-resources/images/forward.png      |  Bin 605 -> 0 bytes
 .../images/highlight_matching_nodes.svg            |   70 +
 freeplane/viewer-resources/images/icons/0%.png     |  Bin 542 -> 543 bytes
 freeplane/viewer-resources/images/icons/0%.svg     |  184 +
 freeplane/viewer-resources/images/icons/100%.png   |  Bin 683 -> 363 bytes
 freeplane/viewer-resources/images/icons/100%.svg   |  171 +
 freeplane/viewer-resources/images/icons/25%.png    |  Bin 637 -> 540 bytes
 freeplane/viewer-resources/images/icons/25%.svg    |  188 +
 freeplane/viewer-resources/images/icons/50%.png    |  Bin 673 -> 517 bytes
 freeplane/viewer-resources/images/icons/50%.svg    |  189 +
 freeplane/viewer-resources/images/icons/75%.png    |  Bin 700 -> 462 bytes
 freeplane/viewer-resources/images/icons/75%.svg    |  189 +
 freeplane/viewer-resources/images/icons/Mail.svg   |   28 +
 .../viewer-resources/images/icons/addition.svg     |   31 +
 freeplane/viewer-resources/images/icons/attach.svg |   15 +
 freeplane/viewer-resources/images/icons/audio.svg  |   50 +
 freeplane/viewer-resources/images/icons/back.svg   |   21 +
 freeplane/viewer-resources/images/icons/bee.svg    |   52 +
 freeplane/viewer-resources/images/icons/bell.svg   |   42 +
 .../viewer-resources/images/icons/bookmark.svg     |   21 +
 .../viewer-resources/images/icons/broken-line.svg  |   24 +
 freeplane/viewer-resources/images/icons/button.svg |  265 +
 .../images/icons/button_cancel.svg                 |   25 +
 .../viewer-resources/images/icons/button_ok.svg    |   21 +
 .../viewer-resources/images/icons/calendar.svg     |   56 +
 .../viewer-resources/images/icons/checked.svg      |   20 +
 .../viewer-resources/images/icons/clanbomber.svg   |   32 +
 freeplane/viewer-resources/images/icons/clock.svg  |   53 +
 freeplane/viewer-resources/images/icons/clock2.svg |   35 +
 freeplane/viewer-resources/images/icons/closed.svg |   26 +
 .../viewer-resources/images/icons/decrypted.svg    |  168 +
 .../viewer-resources/images/icons/desktop_new.svg  |   62 +
 .../viewer-resources/images/icons/division.svg     |   40 +
 freeplane/viewer-resources/images/icons/down.svg   |   21 +
 freeplane/viewer-resources/images/icons/edit.svg   |   49 +
 .../viewer-resources/images/icons/encrypted.svg    |  178 +
 .../viewer-resources/images/icons/executable.svg   |   24 +
 freeplane/viewer-resources/images/icons/family.svg |   77 +
 freeplane/viewer-resources/images/icons/fema.svg   |   59 +
 .../viewer-resources/images/icons/female1.svg      |   38 +
 .../viewer-resources/images/icons/female2.svg      |   40 +
 .../viewer-resources/images/icons/females.svg      |   57 +
 .../viewer-resources/images/icons/flag-black.svg   |   43 +
 .../viewer-resources/images/icons/flag-blue.svg    |   43 +
 .../viewer-resources/images/icons/flag-green.svg   |   47 +
 .../viewer-resources/images/icons/flag-orange.svg  |   43 +
 .../viewer-resources/images/icons/flag-pink.svg    |   43 +
 .../viewer-resources/images/icons/flag-yellow.svg  |   43 +
 freeplane/viewer-resources/images/icons/flag.svg   |   41 +
 freeplane/viewer-resources/images/icons/folder.svg |   34 +
 .../viewer-resources/images/icons/forward.svg      |   21 +
 .../images/icons/freemind_butterfly.svg            |   70 +
 freeplane/viewer-resources/images/icons/full-0.svg |   27 +
 freeplane/viewer-resources/images/icons/full-1.svg |   28 +
 freeplane/viewer-resources/images/icons/full-2.svg |   28 +
 freeplane/viewer-resources/images/icons/full-3.svg |   26 +
 freeplane/viewer-resources/images/icons/full-4.svg |   26 +
 freeplane/viewer-resources/images/icons/full-5.svg |   28 +
 freeplane/viewer-resources/images/icons/full-6.svg |   26 +
 freeplane/viewer-resources/images/icons/full-7.svg |   26 +
 freeplane/viewer-resources/images/icons/full-8.svg |   26 +
 freeplane/viewer-resources/images/icons/full-9.svg |   26 +
 freeplane/viewer-resources/images/icons/go.svg     |   38 +
 freeplane/viewer-resources/images/icons/gohome.svg |   43 +
 freeplane/viewer-resources/images/icons/group.svg  |   76 +
 freeplane/viewer-resources/images/icons/help.svg   |   31 +
 .../viewer-resources/images/icons/hourglass.svg    |   62 +
 freeplane/viewer-resources/images/icons/idea.svg   |  191 +
 freeplane/viewer-resources/images/icons/image.svg  |  191 +
 freeplane/viewer-resources/images/icons/info.svg   |   26 +
 .../viewer-resources/images/icons/internet.svg     |   46 +
 .../images/icons/internet_warning.svg              |   56 +
 .../viewer-resources/images/icons/kaddressbook.svg |   32 +
 freeplane/viewer-resources/images/icons/kmail.svg  |   46 +
 .../viewer-resources/images/icons/knotify.svg      |   36 +
 freeplane/viewer-resources/images/icons/korn.svg   |   41 +
 .../viewer-resources/images/icons/ksmiletris.svg   |   36 +
 freeplane/viewer-resources/images/icons/launch.svg |   46 +
 freeplane/viewer-resources/images/icons/licq.svg   |   43 +
 freeplane/viewer-resources/images/icons/list.svg   |   54 +
 freeplane/viewer-resources/images/icons/male1.svg  |   40 +
 freeplane/viewer-resources/images/icons/male2.svg  |   40 +
 freeplane/viewer-resources/images/icons/males.svg  |   57 +
 .../images/icons/messagebox_warning.svg            |   26 +
 .../viewer-resources/images/icons/mindmap.png      |  Bin 732 -> 798 bytes
 .../viewer-resources/images/icons/mindmap.svg      |  199 +
 .../images/icons/multiplication.svg                |   29 +
 .../viewer-resources/images/icons/narrative.svg    |   21 +
 .../viewer-resources/images/icons/negative.svg     |   26 +
 .../viewer-resources/images/icons/neutral.svg      |   26 +
 .../viewer-resources/images/icons/password.svg     |   34 +
 freeplane/viewer-resources/images/icons/pencil.svg |   40 +
 .../viewer-resources/images/icons/penguin.svg      |  821 +++
 .../viewer-resources/images/icons/positive.svg     |   31 +
 .../viewer-resources/images/icons/prepare.svg      |   38 +
 freeplane/viewer-resources/images/icons/redo.png   |  Bin 882 -> 0 bytes
 .../images/icons/revision-green.png                |  Bin 0 -> 744 bytes
 .../images/icons/revision-green.svg                |  132 +
 .../images/icons/revision-pink.png                 |  Bin 0 -> 823 bytes
 .../images/icons/revision-pink.svg                 |  130 +
 .../viewer-resources/images/icons/revision-red.png |  Bin 0 -> 729 bytes
 .../viewer-resources/images/icons/revision-red.svg |  130 +
 .../viewer-resources/images/icons/revision.svg     |   31 +
 .../viewer-resources/images/icons/smiley-angry.svg |   37 +
 .../images/icons/smiley-neutral.svg                |   36 +
 .../viewer-resources/images/icons/smiley-oh.svg    |   36 +
 .../viewer-resources/images/icons/smily_bad.svg    |   36 +
 .../viewer-resources/images/icons/stop-sign.svg    |   27 +
 freeplane/viewer-resources/images/icons/stop.svg   |  144 +
 .../viewer-resources/images/icons/subtraction.svg  |   34 +
 .../viewer-resources/images/icons/unchecked.svg    |   19 +
 freeplane/viewer-resources/images/icons/up.svg     |   21 +
 .../viewer-resources/images/icons/user_icon.svg    |  512 ++
 .../images/icons/very_negative.svg                 |   30 +
 .../images/icons/very_positive.svg                 |   31 +
 freeplane/viewer-resources/images/icons/video.svg  |   42 +
 freeplane/viewer-resources/images/icons/wizard.svg |   34 +
 freeplane/viewer-resources/images/icons/xmag.svg   |   33 +
 freeplane/viewer-resources/images/icons/yes.svg    |   29 +
 freeplane/viewer-resources/images/knotes.svg       |  577 ++
 freeplane/viewer-resources/images/lock.svg         |   37 +
 .../images/note_black_and_transp.svg               |  408 ++
 freeplane/viewer-resources/images/number.svg       |  133 +
 freeplane/viewer-resources/images/outline_view.svg |  120 +
 .../viewer-resources/images/print_preview.svg      |   61 +
 freeplane/viewer-resources/images/quit.svg         |   19 +
 .../viewer-resources/images/reapply_filter.svg     |   37 +
 freeplane/viewer-resources/images/redo_filter.svg  |   45 +
 .../viewer-resources/images/remove_filtering.svg   |   40 +
 .../images/select_all_found_nodes.svg              |   70 +
 .../viewer-resources/images/showAttributes.svg     |   93 +
 .../viewer-resources/images/show_ancestors.svg     |   41 +
 .../viewer-resources/images/show_descendants.svg   |   39 +
 freeplane/viewer-resources/images/text.svg         |  129 +
 freeplane/viewer-resources/images/undo_filter.svg  |   45 +
 freeplane/viewer-resources/images/unfold.png       |  Bin 502 -> 0 bytes
 freeplane/viewer-resources/images/unfold_all.svg   |  133 +
 .../images/unfold_filtered_ancestors.png           |  Bin 1078 -> 0 bytes
 .../viewer-resources/images/unfold_one_level.svg   |   97 +
 freeplane/viewer-resources/images/unlock.svg       |  153 +
 .../translations/Resources_en.properties           |  149 +-
 freeplane/viewer-resources/version.properties      |    2 +-
 freeplane/viewer-resources/xml/appletmenu.xml      |    9 +-
 .../src/test/resources/unsorted/Test_de.properties |    8 +-
 .../src/test/resources/unsorted/Test_en.properties |    8 +-
 .../src/test/resources/unsorted/Test_ru.properties |    8 +-
 freeplane_framework/build.gradle                   |   22 +-
 .../launchers/freeplane knopflerfish mac.launch    |   10 +-
 .../launchers/freeplane knopflerfish.launch        |    4 +-
 .../eclipse/launchers/freeplane.policy             |    5 +
 .../launch4j/freeplaneConsole.lj4.xml              |    6 +-
 freeplane_framework/launch4j/freeplaneGui.lj4.xml  |    6 +-
 freeplane_framework/script/freeplane.policy        |    1 +
 freeplane_framework/script/props.xargs             |    3 +
 .../windows-installer/Freeplane_without_Java.iss   |    6 +-
 .../windows-portable/App/AppInfo/appinfo.ini       |    4 +-
 .../org/freeplane/plugin/macos/MacChanges.java     |    2 +-
 freeplane_plugin_bugreport/build.gradle            |    2 +-
 .../plugin/bugreport/ReportGenerator.java          |    5 +-
 .../client/event/ImmutableGenericNodeUpdated.java  |  334 ++
 .../batch/ImmutableServerUpdatesFinished.java      |  386 ++
 .../event/batch/ImmutableUpdatesFinished.java      |  385 ++
 .../batch/ModifiableUpdateHeaderExtension.java     |  185 +
 .../event/children/ImmutableChildrenUpdated.java   |  350 ++
 .../children/ImmutableSpecialNodeTypeSet.java      |  276 +
 freeplane_plugin_formula/build.gradle              |    2 +-
 .../plugin/formula/FormulaTextTransformer.java     |   20 +-
 freeplane_plugin_jsyntaxpane/build.gradle          |    2 +-
 .../plugin/jsyntaxpane/NodeIdHighLighter.java      |    2 +-
 freeplane_plugin_latex/build.gradle                |    2 +-
 .../java/org/freeplane/plugin/latex/Activator.java |    1 -
 .../plugin/openmaps/OpenMapsNodeHook.java          |    7 +-
 freeplane_plugin_script/build.gradle               |   20 +-
 .../scripts/apiGenerator.groovy                    |   30 +-
 .../org/freeplane/plugin/script/GenericScript.java |    3 +-
 .../org/freeplane/plugin/script/GroovyScript.java  |   16 +-
 .../org/freeplane/plugin/script/GroovyShell.java   |  116 -
 .../script/InternationalizedSecurityManager.java   |   18 +
 .../plugin/script/RestrictingClassLoader.java      |   20 -
 .../freeplane/plugin/script/ScriptClassLoader.java |    3 +-
 .../freeplane/plugin/script/ScriptingPolicy.java   |    5 +-
 .../plugin/script/ScriptingRegistration.java       |    4 +-
 .../plugin/script/ScriptingSecurityManager.java    |   12 +
 .../plugin/script/addons/AddOnInstallerPanel.java  |    3 +-
 .../plugin/script/filter/ScriptCondition.java      |   24 +-
 .../plugin/script/proxy/AttributesProxy.java       |   15 +
 .../plugin/script/proxy/ControllerProxy.java       |    8 +-
 .../freeplane/plugin/script/proxy/IconsProxy.java  |    2 +-
 .../org/freeplane/plugin/script/proxy/Proxy.java   |   15 +-
 freeplane_plugin_svg/build.gradle                  |    2 +-
 .../java/org/freeplane/plugin/svg/Activator.java   |   21 -
 .../java/org/freeplane/plugin/svg/ExportPdf.java   |   90 -
 .../java/org/freeplane/plugin/svg/ExportSvg.java   |   69 -
 .../freeplane/plugin/svg/ExportVectorGraphic.java  |  106 -
 gitinfo.properties                                 |    2 +-
 gitinfo.txt                                        |    2 +-
 linux-packages.gradle                              |   54 +
 mac.dist.gradle                                    |  114 +-
 src.dist.gradle                                    |    8 +-
 win.dist.gradle                                    |    2 +-
 1001 files changed, 83240 insertions(+), 9674 deletions(-)

diff --git a/JOrtho_0.4_freeplane/build.gradle b/JOrtho_0.4_freeplane/build.gradle
index 62bd3d5..75a4377 100644
--- a/JOrtho_0.4_freeplane/build.gradle
+++ b/JOrtho_0.4_freeplane/build.gradle
@@ -14,32 +14,36 @@ jar {
     baseName "jortho"
 }
 
-task format_translation(dependsOn: configurations.ant_tasks) << {
-    ant.taskdef(
-        name: "format_translation",
-        classname: "org.freeplane.ant.FormatTranslation",
-        classpath: configurations.ant_tasks.asPath
-    )
+task format_translation(dependsOn: configurations.ant_tasks) {
+    doLast {
+        ant.taskdef(
+            name: "format_translation",
+            classname: "org.freeplane.ant.FormatTranslation",
+            classpath: configurations.ant_tasks.asPath
+        )
 
-    //TODO: Refer to resources in a better way. Should be able to get this from
-    //the source sets.
-    ant.format_translation(
-        dir: file("./src/main/resources/com/inet/jortho/i18n"),
-        includes: "*.properties",
-        eolstyle: "unix"
-    )
+        //TODO: Refer to resources in a better way. Should be able to get this from
+        //the source sets.
+        ant.format_translation(
+            dir: file("./src/main/resources/com/inet/jortho/i18n"),
+            includes: "*.properties",
+            eolstyle: "unix"
+        )
+    }
 }
 
-task check_translation(dependsOn: configurations.ant_tasks) << {
-    ant.taskdef(
-        name: "check_translation",
-        classname: "org.freeplane.ant.FormatTranslationCheck",
-        classpath: configurations.ant_tasks.asPath
-    )
+task check_translation(dependsOn: configurations.ant_tasks) {
+    doLast {
+        ant.taskdef(
+            name: "check_translation",
+            classname: "org.freeplane.ant.FormatTranslationCheck",
+            classpath: configurations.ant_tasks.asPath
+        )
 
-    ant.check_translation(
-        dir: file("./src/main/resources/com/inet/jortho/i18n"),
-        includes: "*.properties",
-        eolstyle: "unix"
-    )
+        ant.check_translation(
+            dir: file("./src/main/resources/com/inet/jortho/i18n"),
+            includes: "*.properties",
+            eolstyle: "unix"
+        )
+    }
 }
diff --git a/bin.dist.gradle b/bin.dist.gradle
index 820b146..4e79c77 100644
--- a/bin.dist.gradle
+++ b/bin.dist.gradle
@@ -2,12 +2,12 @@ task binZip(type: Zip) {
     destinationDir = new File(globalDist)
     archiveName = 'freeplane_bin-' + distVersion + '.zip'
 
-    from(globalBuild) {
+    from(globalBin) {
         include('**')
         exclude('freeplane.sh')
     }
 
-    from(globalBuild) {
+    from(globalBin) {
         include('freeplane.sh')
         fileMode = 0755
     }
diff --git a/build.gradle b/build.gradle
index cc7e311..62ff2d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,18 @@
+plugins {
+  id "nebula.ospackage" version "4.4.0"
+}
+
 allprojects {
     // in a multi-project setup, all projects must have the same version number!
     // the real (specific) version number is in freeplane/viewer-resources/version.properties!
     version = '1.5'
 	
     // WARNING: this is removed with "gradle clean"!!
-    ext.globalBuild = rootDir.path + '/BUILD'
+    ext.globalBin = rootDir.path + '/BIN'
 
     repositories {
-		maven { url "http://dl.bintray.com/freeplane/freeplane" } 
+		maven { url "http://dl.bintray.com/freeplane/freeplane" }
+		maven { url "http://www.knopflerfish.org/releases/6.1.0/maven2" }
         // this is necessary to grab both binary and source jars
         // for local (git) dependencies
         flatDir name: 'localGitDepsRepository',
@@ -84,7 +89,8 @@ subprojects {
     }
 
     dependencies {
-        testCompile group: 'junit', name: 'junit', version: '4.11'
+        testCompile 'junit:junit:4.11'
+        testCompile 'org.assertj:assertj-core:2.6.0'
     }
 
     task copyEclipseSettings(type: Copy) {
@@ -111,7 +117,7 @@ configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ /^freeplane$/ |
     }
 
     dependencies {
-        compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
+        compile group: 'org.knopflerfish.kf6', name:'framework', version: '8.0.4'
     }
 }
 
@@ -192,18 +198,24 @@ configure(subprojects.findAll {it.name =~ /plugin/ }) {
             include("*.jar")
             exclude('*-sources.jar')
         }
-        into(globalBuild + '/plugins/' + pluginid + '/lib/')
+        into(globalBin + '/plugins/' + pluginid + '/lib/')
     }
 
     task copyOSGiManifest(type: Copy) {
         from ("$buildDir/tmp/jar/") {
             include("MANIFEST.MF")
         }
-        into(globalBuild + '/plugins/' + pluginid + '/META-INF/')
+        into(globalBin + '/plugins/' + pluginid + '/META-INF/')
     }
 
+    task copyOSGiConfig(type: Copy) {
+        from ("OSGI-INF")
+        into(globalBin + '/plugins/' + pluginid + '/OSGI-INF/')
+    }
+	
     build.dependsOn copyOSGiJars
     build.dependsOn copyOSGiManifest
+	build.dependsOn copyOSGiConfig
 
     // create a separate non-OSGi(!) jar for each plugin!
     task pluginJar(type: Jar) {
@@ -233,9 +245,9 @@ configure(subprojects.findAll {it.name =~ /plugin/ }) {
 
 apply plugin: 'base' // necessary to get the global 'clean' task
 
-// remove globalBuild/**
+// remove globalBin/**
 task cleanBUILD(type: Delete) {
-    delete globalBuild
+    delete globalBin
 }
 clean.dependsOn(cleanBUILD)
 
diff --git a/dist.gradle b/dist.gradle
index fbb9324..ef144a4 100644
--- a/dist.gradle
+++ b/dist.gradle
@@ -9,10 +9,10 @@ ext.minorVersion = System.getProperty('minor', '')
 ext.distVersion = "$majorVersion${versionStatus.empty?'':'-'+versionStatus}${minorVersion.empty?'':'-pre' + minorVersion}"
 
 task gitinfoDist(type: Copy) {
-    from(globalBuild) {
+    from(globalBin) {
         include('gitinfo.txt')
     }
-    from(globalBuild + '/resources') {
+    from(globalBin + '/resources') {
         include('gitinfo.properties')
     }
     into(globalDist)
@@ -33,6 +33,7 @@ apply from: './mac.dist.gradle'
 apply from: './win.dist.gradle'
 apply from: './bin.dist.gradle'
 apply from: './src.dist.gradle'
+apply from: './linux-packages.gradle'
 
 // meta task
 task dist {
@@ -43,7 +44,8 @@ task dist {
     dependsOn windowsPortableInstaller
     dependsOn macDist
     dependsOn gitinfoDist
-	dependsOn historyDist
+    dependsOn historyDist
+    dependsOn freeplaneDeb
 }
 
 // clean
diff --git a/freeplane/build.gradle b/freeplane/build.gradle
index 81bba63..a4aee5a 100644
--- a/freeplane/build.gradle
+++ b/freeplane/build.gradle
@@ -6,6 +6,7 @@ configurations{
 dependencies {
 	
 	mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5'
+	mergedViewerDependencies ':kitfox-svg-salamander-1.1.1-p1'
 	
     compile project(':JOrtho_0.4_freeplane')
 
@@ -15,7 +16,7 @@ dependencies {
             'com.jgoodies:jgoodies-forms:1.9.0',
             'com.jgoodies:jgoodies-common:1.8.1'
 
-	compile  ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.18') {
+	compile  ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.17.3') {
 		exclude module: 'javahelp'
 		exclude module: 'mnemonicsetter'
 	}
@@ -175,7 +176,7 @@ jar {
         //instruction 'Export-Package', '*;-noimport:=true'
         //instruction 'Private-Package', '*'
         instruction 'Bundle-Activator', 'org.freeplane.main.osgi.Activator'
-        instruction 'Bundle-RequiredExecutionEnvironment', 'J2SE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
     }
 }
 
@@ -191,14 +192,14 @@ task copyOSGiJars(type: Copy) {
           include("*.jar")
           exclude('*-sources.jar')
      }
-     into(globalBuild + '/core/' + pluginid + '/lib/')
+     into(globalBin + '/core/' + pluginid + '/lib/')
 }
 
 task copyOSGiManifest(type: Copy) {
      from ("$buildDir/tmp/jar/") {
           include("MANIFEST.MF")
      }
-     into(globalBuild + '/core/' + pluginid + '/META-INF/')
+     into(globalBin + '/core/' + pluginid + '/META-INF/')
 }
 
 task viewerJar(type: Jar) {
@@ -267,11 +268,13 @@ task editorJar(type: Jar) {
 
 
 
-eclipseJdt << {
-    File f = file('.settings/org.eclipse.core.resources.prefs')
-    f.append('''encoding//resources/translations=ISO-8859-1
+eclipseJdt {
+    doLast {
+        File f = file('.settings/org.eclipse.core.resources.prefs')
+        f.append('''encoding//resources/translations=ISO-8859-1
 encoding//viewer-resources/translations=ISO-8859-1
 ''')
+    }
 }
 
 
@@ -294,7 +297,7 @@ task copyExternalResources(type: Copy) {
     from('external-resources') {
         include('**')
     }
-    into(globalBuild + '/resources')
+    into(globalBin + '/resources')
 
     // (exactly) one of these two groups (copy vs. create) is always disabled!
     dependsOn copyGitTxt
@@ -306,7 +309,7 @@ task copyDoc(type: Copy) {
     from('doc/') {
         include('**')
     }
-    into(globalBuild + '/doc')
+    into(globalBin + '/doc')
 }
 
 jar.dependsOn viewerJar
diff --git a/freeplane/doc/FilterConsumer.jpg b/freeplane/doc/FilterConsumer.jpg
deleted file mode 100644
index b65c8e8..0000000
Binary files a/freeplane/doc/FilterConsumer.jpg and /dev/null differ
diff --git a/freeplane/doc/FilterConsumerEnd.jpg b/freeplane/doc/FilterConsumerEnd.jpg
deleted file mode 100644
index 6cf0a45..0000000
Binary files a/freeplane/doc/FilterConsumerEnd.jpg and /dev/null differ
diff --git a/freeplane/doc/FilterConsumerUnfold.jpg b/freeplane/doc/FilterConsumerUnfold.jpg
deleted file mode 100644
index def2999..0000000
Binary files a/freeplane/doc/FilterConsumerUnfold.jpg and /dev/null differ
diff --git a/freeplane/doc/Freeplane_LaTeX.mm b/freeplane/doc/Freeplane_LaTeX.mm
index 1a6405b..db2d7e1 100644
--- a/freeplane/doc/Freeplane_LaTeX.mm
+++ b/freeplane/doc/Freeplane_LaTeX.mm
@@ -157,7 +157,7 @@
 </node>
 </node>
 </node>
-<node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      LaTeX equations in Freeplane &gt;= 1.3.x are&#xa;    </p>&#xa;    <p>&#xa;      created by either using a &quot;\latex &quot; prefix or by using <i>Format=LaTeX</i>&#160; (in <i>View-&gt;Properties panel</i>)&#xa;    </p>&#xa;  </body>&#xa;</html>" POSITION="right" ID="ID_1563783701" CREATED="1356 [...]
+<node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      LaTeX equations in Freeplane &gt;= 1.3.x are&#xa;    </p>&#xa;    <p>&#xa;      created by either using a &quot;\latex &quot; prefix or by using <i>Format=LaTeX</i>&#160; (in <i>View-&gt;Tool panel</i>)&#xa;    </p>&#xa;  </body>&#xa;</html>" POSITION="right" ID="ID_1563783701" CREATED="1356719071 [...]
 <node TEXT="http://freeplane.sourceforge.net/wiki/index.php/LaTeX_in_Freeplane" ID="ID_749593148" CREATED="1356719154745" MODIFIED="1356719154745" LINK="http://freeplane.sourceforge.net/wiki/index.php/LaTeX_in_Freeplane"/>
 <node TEXT="\latex example with prefix: $x_2=\frac{1}{3}$" ID="ID_866456539" CREATED="1356719164791" MODIFIED="1357649767422">
 <font SIZE="24"/>
diff --git a/freeplane/doc/Images/Preferences_Joining nodes.png b/freeplane/doc/Images/Preferences_Joining nodes.png
new file mode 100644
index 0000000..5975b13
Binary files /dev/null and b/freeplane/doc/Images/Preferences_Joining nodes.png differ
diff --git a/freeplane/doc/Images/doc/In-lineEditContextMenu.png b/freeplane/doc/Images/doc/In-lineEditContextMenu.png
deleted file mode 100644
index 1b4c3a7..0000000
Binary files a/freeplane/doc/Images/doc/In-lineEditContextMenu.png and /dev/null differ
diff --git a/freeplane/doc/Images/doc/NodeContextMenu.png b/freeplane/doc/Images/doc/NodeContextMenu.png
deleted file mode 100644
index 33c3e89..0000000
Binary files a/freeplane/doc/Images/doc/NodeContextMenu.png and /dev/null differ
diff --git a/freeplane/doc/Images/doc/goto node with ID.png b/freeplane/doc/Images/doc/goto node with ID.png
new file mode 100644
index 0000000..b7343ec
Binary files /dev/null and b/freeplane/doc/Images/doc/goto node with ID.png differ
diff --git a/freeplane/doc/Images/doc/key mapping dialog.png b/freeplane/doc/Images/doc/key mapping dialog.png
new file mode 100644
index 0000000..4cac46b
Binary files /dev/null and b/freeplane/doc/Images/doc/key mapping dialog.png differ
diff --git a/freeplane/doc/Images/doc/mapView v outlineView.png b/freeplane/doc/Images/doc/mapView v outlineView.png
new file mode 100644
index 0000000..248dd5c
Binary files /dev/null and b/freeplane/doc/Images/doc/mapView v outlineView.png differ
diff --git a/freeplane/doc/Images/doc/right-click menu - open maps.png b/freeplane/doc/Images/doc/right-click menu - open maps.png
new file mode 100644
index 0000000..740fc17
Binary files /dev/null and b/freeplane/doc/Images/doc/right-click menu - open maps.png differ
diff --git a/freeplane/doc/Images/doc/tabs in workspace.png b/freeplane/doc/Images/doc/tabs in workspace.png
new file mode 100644
index 0000000..aff637e
Binary files /dev/null and b/freeplane/doc/Images/doc/tabs in workspace.png differ
diff --git a/freeplane/doc/Images/examples.png b/freeplane/doc/Images/examples.png
new file mode 100644
index 0000000..f0985a8
Binary files /dev/null and b/freeplane/doc/Images/examples.png differ
diff --git a/freeplane/doc/Images/eyes.png b/freeplane/doc/Images/eyes.png
new file mode 100644
index 0000000..ef12edc
Binary files /dev/null and b/freeplane/doc/Images/eyes.png differ
diff --git a/freeplane/doc/Images/icons toolbar - collapsed.png b/freeplane/doc/Images/icons toolbar - collapsed.png
new file mode 100644
index 0000000..cec1a73
Binary files /dev/null and b/freeplane/doc/Images/icons toolbar - collapsed.png differ
diff --git a/freeplane/doc/Images/key/F1.png b/freeplane/doc/Images/key/F1.png
deleted file mode 100644
index 3676576..0000000
Binary files a/freeplane/doc/Images/key/F1.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/F2.png b/freeplane/doc/Images/key/F2.png
deleted file mode 100644
index d00316b..0000000
Binary files a/freeplane/doc/Images/key/F2.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/Ins.png b/freeplane/doc/Images/key/Ins.png
deleted file mode 100644
index c450556..0000000
Binary files a/freeplane/doc/Images/key/Ins.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/alt.png b/freeplane/doc/Images/key/alt.png
deleted file mode 100644
index f48bb84..0000000
Binary files a/freeplane/doc/Images/key/alt.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/ctrl.png b/freeplane/doc/Images/key/ctrl.png
deleted file mode 100644
index 00d570e..0000000
Binary files a/freeplane/doc/Images/key/ctrl.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/delete.png b/freeplane/doc/Images/key/delete.png
deleted file mode 100644
index b17bdd6..0000000
Binary files a/freeplane/doc/Images/key/delete.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/down.png b/freeplane/doc/Images/key/down.png
deleted file mode 100644
index cc11245..0000000
Binary files a/freeplane/doc/Images/key/down.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/end.png b/freeplane/doc/Images/key/end.png
deleted file mode 100644
index f777b10..0000000
Binary files a/freeplane/doc/Images/key/end.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/enter.png b/freeplane/doc/Images/key/enter.png
deleted file mode 100644
index 6fbbf12..0000000
Binary files a/freeplane/doc/Images/key/enter.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/esc.png b/freeplane/doc/Images/key/esc.png
deleted file mode 100644
index e902c56..0000000
Binary files a/freeplane/doc/Images/key/esc.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/home.png b/freeplane/doc/Images/key/home.png
deleted file mode 100644
index 1a36115..0000000
Binary files a/freeplane/doc/Images/key/home.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/insert.png b/freeplane/doc/Images/key/insert.png
deleted file mode 100644
index 8bfe836..0000000
Binary files a/freeplane/doc/Images/key/insert.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/left.png b/freeplane/doc/Images/key/left.png
deleted file mode 100644
index 48b90b4..0000000
Binary files a/freeplane/doc/Images/key/left.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/pgdn.png b/freeplane/doc/Images/key/pgdn.png
deleted file mode 100644
index 6af8c92..0000000
Binary files a/freeplane/doc/Images/key/pgdn.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/pgup.png b/freeplane/doc/Images/key/pgup.png
deleted file mode 100644
index dc6a792..0000000
Binary files a/freeplane/doc/Images/key/pgup.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/right.png b/freeplane/doc/Images/key/right.png
deleted file mode 100644
index a2008ea..0000000
Binary files a/freeplane/doc/Images/key/right.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/shift.png b/freeplane/doc/Images/key/shift.png
deleted file mode 100644
index 107b2a7..0000000
Binary files a/freeplane/doc/Images/key/shift.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/space.png b/freeplane/doc/Images/key/space.png
deleted file mode 100644
index c9caa65..0000000
Binary files a/freeplane/doc/Images/key/space.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/tab.png b/freeplane/doc/Images/key/tab.png
deleted file mode 100644
index 9425a0b..0000000
Binary files a/freeplane/doc/Images/key/tab.png and /dev/null differ
diff --git a/freeplane/doc/Images/key/up.png b/freeplane/doc/Images/key/up.png
deleted file mode 100644
index 250d57e..0000000
Binary files a/freeplane/doc/Images/key/up.png and /dev/null differ
diff --git a/freeplane/doc/Images/mouse/mouse.png b/freeplane/doc/Images/mouse/mouse.png
deleted file mode 100644
index 04fc016..0000000
Binary files a/freeplane/doc/Images/mouse/mouse.png and /dev/null differ
diff --git a/freeplane/doc/Images/mouse/mouse_LB.png b/freeplane/doc/Images/mouse/mouse_LB.png
deleted file mode 100644
index 88e2b72..0000000
Binary files a/freeplane/doc/Images/mouse/mouse_LB.png and /dev/null differ
diff --git a/freeplane/doc/Images/mouse/mouse_LB_2x.png b/freeplane/doc/Images/mouse/mouse_LB_2x.png
deleted file mode 100644
index b2aee65..0000000
Binary files a/freeplane/doc/Images/mouse/mouse_LB_2x.png and /dev/null differ
diff --git a/freeplane/doc/Images/mouse/mouse_SB_click.png b/freeplane/doc/Images/mouse/mouse_SB_click.png
deleted file mode 100644
index 84fa899..0000000
Binary files a/freeplane/doc/Images/mouse/mouse_SB_click.png and /dev/null differ
diff --git a/freeplane/doc/Images/mouse/mouse_SB_scroll.png b/freeplane/doc/Images/mouse/mouse_SB_scroll.png
deleted file mode 100644
index d9e2ce8..0000000
Binary files a/freeplane/doc/Images/mouse/mouse_SB_scroll.png and /dev/null differ
diff --git a/freeplane/doc/Images/other/workspace/Freeplane workspace (annotated).png b/freeplane/doc/Images/other/workspace/Freeplane workspace (annotated).png
new file mode 100644
index 0000000..a060545
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/Freeplane workspace (annotated).png differ
diff --git a/freeplane/doc/Images/other/workspace/Freeplane workspace.png b/freeplane/doc/Images/other/workspace/Freeplane workspace.png
new file mode 100644
index 0000000..b432a45
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/Freeplane workspace.png differ
diff --git a/freeplane/doc/Images/other/workspace/details arrow_.png b/freeplane/doc/Images/other/workspace/details arrow_.png
new file mode 100644
index 0000000..b796223
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/details arrow_.png differ
diff --git a/freeplane/doc/Images/other/workspace/f bar - split.png b/freeplane/doc/Images/other/workspace/f bar - split.png
new file mode 100644
index 0000000..10b9825
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/f bar - split.png differ
diff --git a/freeplane/doc/Images/other/workspace/f bar.png b/freeplane/doc/Images/other/workspace/f bar.png
new file mode 100644
index 0000000..d3e7284
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/f bar.png differ
diff --git a/freeplane/doc/Images/other/workspace/filter toolbar - split.png b/freeplane/doc/Images/other/workspace/filter toolbar - split.png
new file mode 100644
index 0000000..4efc3c9
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/filter toolbar - split.png differ
diff --git a/freeplane/doc/Images/other/workspace/filter toolbar.png b/freeplane/doc/Images/other/workspace/filter toolbar.png
new file mode 100644
index 0000000..4e81ef6
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/filter toolbar.png differ
diff --git a/freeplane/doc/Images/other/workspace/icons toolbar.png b/freeplane/doc/Images/other/workspace/icons toolbar.png
new file mode 100644
index 0000000..e962acb
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/icons toolbar.png differ
diff --git a/freeplane/doc/Images/other/workspace/menubar.png b/freeplane/doc/Images/other/workspace/menubar.png
new file mode 100644
index 0000000..b457e1a
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/menubar.png differ
diff --git a/freeplane/doc/Images/other/workspace/notes panel.png b/freeplane/doc/Images/other/workspace/notes panel.png
new file mode 100644
index 0000000..6639aef
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/notes panel.png differ
diff --git a/freeplane/doc/Images/other/workspace/properties panel.png b/freeplane/doc/Images/other/workspace/properties panel.png
new file mode 100644
index 0000000..dba0b63
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/properties panel.png differ
diff --git a/freeplane/doc/Images/other/workspace/resize arrows.png b/freeplane/doc/Images/other/workspace/resize arrows.png
new file mode 100644
index 0000000..ca68325
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/resize arrows.png differ
diff --git a/freeplane/doc/Images/other/workspace/right-click menu.png b/freeplane/doc/Images/other/workspace/right-click menu.png
new file mode 100644
index 0000000..0b27e75
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/right-click menu.png differ
diff --git a/freeplane/doc/Images/other/workspace/scroll bars.png b/freeplane/doc/Images/other/workspace/scroll bars.png
new file mode 100644
index 0000000..9495b76
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/scroll bars.png differ
diff --git a/freeplane/doc/Images/other/workspace/status line.png b/freeplane/doc/Images/other/workspace/status line.png
new file mode 100644
index 0000000..f47a1bc
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/status line.png differ
diff --git a/freeplane/doc/Images/other/workspace/submenu flyouts (basic).png b/freeplane/doc/Images/other/workspace/submenu flyouts (basic).png
new file mode 100644
index 0000000..1860e29
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/submenu flyouts (basic).png differ
diff --git a/freeplane/doc/Images/other/workspace/submenu flyouts.png b/freeplane/doc/Images/other/workspace/submenu flyouts.png
new file mode 100644
index 0000000..76c44ac
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/submenu flyouts.png differ
diff --git a/freeplane/doc/Images/other/workspace/toolbar - split.png b/freeplane/doc/Images/other/workspace/toolbar - split.png
new file mode 100644
index 0000000..43e3ea7
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/toolbar - split.png differ
diff --git a/freeplane/doc/Images/other/workspace/toolbar.png b/freeplane/doc/Images/other/workspace/toolbar.png
new file mode 100644
index 0000000..5273d3b
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/toolbar.png differ
diff --git a/freeplane/doc/Images/other/workspace/view - toolbars.png b/freeplane/doc/Images/other/workspace/view - toolbars.png
new file mode 100644
index 0000000..c97dc67
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/view - toolbars.png differ
diff --git a/freeplane/doc/Images/other/workspace/view - view settings.png b/freeplane/doc/Images/other/workspace/view - view settings.png
new file mode 100644
index 0000000..1c712f0
Binary files /dev/null and b/freeplane/doc/Images/other/workspace/view - view settings.png differ
diff --git a/freeplane/doc/Images/properties toolbar - collapsed.png b/freeplane/doc/Images/properties toolbar - collapsed.png
new file mode 100644
index 0000000..acf6ef4
Binary files /dev/null and b/freeplane/doc/Images/properties toolbar - collapsed.png differ
diff --git a/freeplane/doc/freeplane.mm b/freeplane/doc/freeplane.mm
index a0bac19..c645473 100644
--- a/freeplane/doc/freeplane.mm
+++ b/freeplane/doc/freeplane.mm
@@ -57,7 +57,6 @@
 </stylenode>
 <stylenode TEXT="MenuGroupLabel" COLOR="#000000" BACKGROUND_COLOR="#33ffcc" STYLE="bubble">
 <edge COLOR="#33ffcc" WIDTH="2"/>
-<attribute_layout NAME_WIDTH="58.5 pt" VALUE_WIDTH="87.0 pt"/>
 </stylenode>
 <stylenode TEXT="Title" COLOR="#ffffff" BACKGROUND_COLOR="#2ed2a9" STYLE="bubble">
 <font BOLD="true"/>
@@ -2132,7 +2131,7 @@
   <body>
     <ul>
       <li>
-        Deselect <i>View > Properties panel > Automatic edge color</i>
+        Deselect <i>View > Tool panel > Automatic edge color</i>
       </li>
     </ul>
   </body>
@@ -2956,7 +2955,6 @@
 </richcontent>
 <edge STYLE="bezier"/>
 <node TEXT="File" STYLE_REF="MainMenu" FOLDED="true" ID="ID_1242926404" CREATED="1455910903923" MODIFIED="1455910903923" TEXT_SHORTENED="true" MIN_WIDTH="60.0 px" HGAP_QUANTITY="19.0 px" VSHIFT_QUANTITY="27.0 px">
-<attribute_layout NAME_WIDTH="27.75 pt" VALUE_WIDTH="57.75 pt"/>
 <attribute NAME="Chapter" VALUE="1,2,6,8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MainMenu" LAST="false"/>
@@ -4866,7 +4864,6 @@
   </body>
 </html>
 </richcontent>
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="120.75 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Procedure" LAST="false"/>
@@ -4936,7 +4933,6 @@
 <attribute NAME="Chapter" VALUE="3"/>
 </node>
 <node TEXT="Hyperlink in attribute" ID="ID_457929879" CREATED="1455910903966" MODIFIED="1455910903966">
-<attribute_layout NAME_WIDTH="36.0 pt" VALUE_WIDTH="36.0 pt"/>
 <attribute NAME="See also" VALUE="#ID_278329781"/>
 <attribute NAME="See also" VALUE="#ID_1279811672"/>
 <attribute NAME="Chapter" VALUE="3"/>
@@ -5641,7 +5637,6 @@
 <node TEXT="" ID="ID_524484700" CREATED="1455910904137" MODIFIED="1455910904137">
 <hook NAME="SummaryNode"/>
 <node TEXT="" ID="ID_1791031466" CREATED="1455910903990" MODIFIED="1455910903990" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="67.5 pt" VALUE_WIDTH="144.0 pt"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
 </hook>
@@ -5756,7 +5751,6 @@
 </node>
 </node>
 <node TEXT="" STYLE_REF="Aggregatie als Toelichting" ID="ID_892520547" CREATED="1455910903994" MODIFIED="1455910903994" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="158.25 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Refine" LAST="false"/>
@@ -6268,7 +6262,6 @@
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="AlwaysUnfoldedNode"/>
 <node TEXT="Publish images" ID="ID_1111281504" CREATED="1455910903999" MODIFIED="1455910903999" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="198.0 pt"/>
 <attribute NAME="Chapter" VALUE="3,6"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
@@ -6390,7 +6383,6 @@
 <node TEXT="" FOLDED="true" ID="ID_560316882" CREATED="1455910904001" MODIFIED="1455910904001">
 <cloud COLOR="#f0f0f0" SHAPE="ARC"/>
 <node TEXT="" ID="ID_110645225" CREATED="1455910904001" MODIFIED="1455910904001" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="67.5 pt" VALUE_WIDTH="122.25 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
@@ -7085,7 +7077,6 @@
   </body>
 </html>
 </richcontent>
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="123.75 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="ToNote" LAST="false"/>
@@ -8085,7 +8076,6 @@
 <node TEXT="" ID="ID_1857769175" CREATED="1455910904141" MODIFIED="1455910904141">
 <hook NAME="SummaryNode"/>
 <node TEXT="Context menu's" FOLDED="true" ID="ID_832730564" CREATED="1455910904026" MODIFIED="1455910904026" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="171.0 pt"/>
 <attribute NAME="Chapter" VALUE="1,2,3,4,5"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
@@ -8136,7 +8126,7 @@
 </node>
 </node>
 </node>
-<node TEXT="Properties panel" FOLDED="true" ID="ID_1783882978" CREATED="1455910904026" MODIFIED="1455910904026" TEXT_SHORTENED="true"><richcontent TYPE="DETAILS">
+<node TEXT="Tool panel" FOLDED="true" ID="ID_1783882978" CREATED="1455910904026" MODIFIED="1455910904026" TEXT_SHORTENED="true"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -8153,7 +8143,7 @@
     <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
 </hook>
 <attribute NAME="Chapter" VALUE="3,4,5"/>
-<node TEXT="Properties panel" FOLDED="true" ID="ID_125269399" CREATED="1455910904026" MODIFIED="1455910904026" TEXT_SHORTENED="true">
+<node TEXT="Tool panel" FOLDED="true" ID="ID_125269399" CREATED="1455910904026" MODIFIED="1455910904026" TEXT_SHORTENED="true">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Definition" LAST="false"/>
 </hook>
@@ -8452,7 +8442,7 @@
     </p>
     <ul>
       <li>
-        View > Properties panel
+        View > Tool panel
       </li>
     </ul>
   </body>
@@ -8477,7 +8467,7 @@
     </p>
     <ul>
       <li>
-        View > Properties panel
+        View > Tool panel
       </li>
     </ul>
   </body>
@@ -9235,7 +9225,7 @@
 </hook>
 </node>
 <node TEXT="Center selected node" ID="ID_1435118166" CREATED="1455910904036" MODIFIED="1455910904036" TEXT_SHORTENED="true">
-<icon BUILTIN="../CenterSelectedNodeAction"/>
+<icon BUILTIN="../MoveSelectedNodeAction.CENTER"/>
 <richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
@@ -9930,7 +9920,7 @@
 
     </p>
     <p>
-      Properties that can be changed in the <i>Properties panel</i> are:
+      Properties that can be changed in the <i>Tool panel</i> are:
     </p>
     <ul>
       <li>
@@ -10034,7 +10024,7 @@
         <i>Styles > User defined styles</i>
       </li>
       <li>
-        <i>View > Properties panel : Styles, Conditional Node styles, Conditional map styles</i>
+        <i>View > Tool panel : Styles, Conditional Node styles, Conditional map styles</i>
       </li>
       <li>
         <i>Styles > Manage Conditional Node Styles</i>
@@ -10186,7 +10176,7 @@
         <i>Styles > predefined styles</i>
       </li>
       <li>
-        <i>View > Properties panel </i>
+        <i>View > Tool panel </i>
       </li>
       <li>
         <i>Styles > Manage Conditional Styles</i>
@@ -11068,7 +11058,7 @@ elements from the styles activated by conditions are copied.</pre>
     </p>
     <ul>
       <li>
-        <i>File > New map</i> uses the style <i>standard.mm</i>. You can define a user map as standard.mm by naming it that way and putting it in the directory that opens by selecting <i>Tools > Open user directory > templates. </i>
+        <i>File > New map</i> uses the style <i>standard-1.6.mm</i>. You can define a user map as standard-1.6.mm by naming it that way and putting it in the directory that opens by selecting <i>Tools > Open user directory > templates. </i>
       </li>
       <li>
         <i>In Tools > Preferences</i> can be defined that the standard mind map should have a different name.
@@ -11133,7 +11123,6 @@ elements from the styles activated by conditions are copied.</pre>
 <cloud COLOR="#f0f0f0" SHAPE="ARC"/>
 <hook NAME="AlwaysUnfoldedNode"/>
 <node TEXT="Style (and Node template)" ID="ID_1305038685" CREATED="1455910904047" MODIFIED="1455910904047" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="117.0 pt"/>
 <attribute NAME="Chapter" VALUE="4"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Definition" LAST="false"/>
@@ -12074,7 +12063,7 @@ elements from the styles activated by conditions are copied.</pre>
   </head>
   <body>
     <p>
-      An edge is a lineage between parent and child. The flow of the edge can be altered by clicking on it and drawing it to a different location. Technically an edge belongs to the child and edge properties like color can be changed in the child node. See <i>View > Properties panel. </i>An edge can be hidden, see Egde style.
+      An edge is a lineage between parent and child. The flow of the edge can be altered by clicking on it and drawing it to a different location. Technically an edge belongs to the child and edge properties like color can be changed in the child node. See <i>View > Tool panel. </i>An edge can be hidden, see Egde style.
     </p>
   </body>
 </html>
@@ -12102,10 +12091,10 @@ elements from the styles activated by conditions are copied.</pre>
     </p>
     <ul>
       <li>
-        View > Properties panel > Min node width
+        View > Tool panel > Min node width
       </li>
       <li>
-        View > Properties panel > Max node width
+        View > Tool panel > Max node width
       </li>
     </ul>
     <p>
@@ -12690,7 +12679,6 @@ elements from the styles activated by conditions are copied.</pre>
   </body>
 </html>
 </richcontent>
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="117.0 pt"/>
 <attribute NAME="Chapter" VALUE="1,2"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Definition" LAST="false"/>
@@ -13255,7 +13243,6 @@ elements from the styles activated by conditions are copied.</pre>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="51.0 pt" VALUE_WIDTH="51.0 pt"/>
 <attribute NAME="Chapter" VALUE="9"/>
 </node>
 <node TEXT="Select all matching nodes" ID="ID_164487469" CREATED="1455910904075" MODIFIED="1455910904075" TEXT_SHORTENED="true">
@@ -13802,7 +13789,6 @@ elements from the styles activated by conditions are copied.</pre>
 </node>
 </node>
 <node TEXT="Tools" STYLE_REF="MainMenu" FOLDED="true" ID="ID_1833899525" CREATED="1455910904080" MODIFIED="1455910904080" TEXT_SHORTENED="true" MIN_WIDTH="60.0 px">
-<attribute_layout NAME_WIDTH="27.75 pt" VALUE_WIDTH="57.75 pt"/>
 <attribute NAME="Chapter" VALUE="3,6,7,8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MainMenu" LAST="false"/>
@@ -13843,7 +13829,7 @@ elements from the styles activated by conditions are copied.</pre>
         <i>Node features > Time management </i>
       </li>
       <li>
-        <i>View > Properties panel > Calendar and Attribute</i>s
+        <i>View > Tool panel > Calendar and Attribute</i>s
       </li>
     </ul>
   </body>
@@ -15013,7 +14999,6 @@ elements from the styles activated by conditions are copied.</pre>
     <conditional_style ACTIVE="true" STYLE_REF="OptionalValue" LAST="false"/>
 </hook>
 <node TEXT="" ID="ID_390598009" CREATED="1455910904107" MODIFIED="1455910904107">
-<attribute_layout NAME_WIDTH="24.75 pt" VALUE_WIDTH="102.75 pt"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="OptionalValue" LAST="false"/>
 </hook>
@@ -15075,7 +15060,7 @@ elements from the styles activated by conditions are copied.</pre>
 </hook>
 </node>
 <node TEXT="Standard Template File" STYLE_REF="Method" FOLDED="true" ID="ID_1036795471" CREATED="1455910904107" MODIFIED="1455910904107">
-<node TEXT="standard.mm" ID="ID_706234894" CREATED="1455910904108" MODIFIED="1455910904108">
+<node TEXT="standard-1.6.mm" ID="ID_706234894" CREATED="1455910904108" MODIFIED="1455910904108">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="OptionalValue" LAST="false"/>
 </hook>
@@ -15726,7 +15711,6 @@ elements from the styles activated by conditions are copied.</pre>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="34.5 pt" VALUE_WIDTH="34.5 pt"/>
 <attribute NAME="Chapter" VALUE="3,8"/>
 </node>
 </node>
@@ -15828,7 +15812,6 @@ elements from the styles activated by conditions are copied.</pre>
 <node TEXT="" ID="ID_1081583553" CREATED="1455910904157" MODIFIED="1455910904157">
 <hook NAME="SummaryNode"/>
 <node TEXT="Behaviour" ID="ID_171435040" CREATED="1455910904112" MODIFIED="1455910904112">
-<attribute_layout NAME_WIDTH="54.75 pt" VALUE_WIDTH="77.25 pt"/>
 <attribute NAME="Chapter" VALUE="8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
@@ -15890,7 +15873,6 @@ elements from the styles activated by conditions are copied.</pre>
 <node TEXT="" ID="ID_1968306467" CREATED="1455910904158" MODIFIED="1455910904158">
 <hook NAME="SummaryNode"/>
 <node TEXT="Data formatting and parsing" ID="ID_1277533848" CREATED="1455910904113" MODIFIED="1455910904113" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="34.5 pt" VALUE_WIDTH="111.75 pt"/>
 <attribute NAME="Chapter" VALUE="4,8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
@@ -15907,7 +15889,7 @@ elements from the styles activated by conditions are copied.</pre>
     </p>
     <ul>
       <li>
-        <i>Properties panel . Calendar & Attributes .> Date/time and number formatting</i>
+        <i>Tool panel . Calendar & Attributes .> Date/time and number formatting</i>
       </li>
     </ul>
   </body>
@@ -16573,9 +16555,6 @@ elements from the styles activated by conditions are copied.</pre>
         </p>
       </li>
       <li>
-        <font face="SansSerif, sans-serif" color="#000000">Small maps can also use Export as Flash which also offers limited browsing functionality.</font>
-      </li>
-      <li>
         <font face="SansSerif, sans-serif" color="#000000">LaTeX and SVG images are not displayed in the Freeplane Applet nor in the Flash browser.</font>
       </li>
     </ul>
@@ -16874,7 +16853,7 @@ elements from the styles activated by conditions are copied.</pre>
   </head>
   <body>
     <p>
-      <i>View->Properties panel</i>, then <i>Core text->Format->LaTeX</i> :
+      <i>View->Tool panel</i>, then <i>Core text->Format->LaTeX</i> :
     </p>
   </body>
 </html>
diff --git a/freeplane/doc/freeplaneApplications.mm b/freeplane/doc/freeplaneApplications.mm
new file mode 100644
index 0000000..4490c4c
--- /dev/null
+++ b/freeplane/doc/freeplaneApplications.mm
@@ -0,0 +1,357 @@
+<map version="freeplane 1.5.6">
+<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p style="text-align: center">&#xa;      <font size="4"><a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Dashboard_for_GTD"><b>G</b></a></font><a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Dashboard_for_GTD">etting<font size="3">&# [...]
+    <properties fit_to_viewport="false;"/>
+
+<map_styles>
+<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" UNIFORM_SHAPE="true" VGAP_QUANTITY="24.0 pt">
+<font SIZE="24"/>
+<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px">
+<font NAME="SansSerif" SIZE="8" BOLD="false" ITALIC="false"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.attributes">
+<font SIZE="9"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.note"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.floating">
+<edge STYLE="hide_edge"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.important">
+<icon BUILTIN="yes"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000">
+<font SIZE="20"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
+<font SIZE="18"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
+<font SIZE="16"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
+<font SIZE="14"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
+<font SIZE="12"/>
+</stylenode>
+</stylenode>
+</stylenode>
+</map_styles>
+</hook>
+<hook NAME="AutomaticEdgeColor" COUNTER="13" RULE="ON_BRANCH_CREATION"/>
+<edge STYLE="linear" WIDTH="1"/>
+<node TEXT="With less" POSITION="left" ID="ID_892290459" CREATED="1318451679082" MODIFIED="1334842547204" HGAP_QUANTITY="181.0 px" VSHIFT_QUANTITY="25.0 px" COLOR="#0000ff" BACKGROUND_COLOR="#33ff00" STYLE="bubble">
+<icon BUILTIN="idea"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1129302195" STARTINCLINATION="132;0;" ENDINCLINATION="132;0;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<font SIZE="12" BOLD="true" ITALIC="true"/>
+<hook NAME="FreeNode"/>
+<edge STYLE="hide_edge" COLOR="#007c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <img src="Images/doc/freeplaneApplications.png">&#xa;  </body>&#xa;</html>" POSITION="right" ID="ID_470539907" CREATED="1317967796222" MODIFIED="1336132515904" HGAP_QUANTITY="21.0 px" VSHIFT_QUANTITY="-195.0 px">
+<edge STYLE="hide_edge" COLOR="#ff00ff" WIDTH="3"/>
+<hook NAME="FreeNode"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</node>
+<node TEXT="Brainstorm" LOCALIZED_STYLE_REF="defaultstyle.floating" FOLDED="true" POSITION="right" ID="ID_747441325" CREATED="1317963460911" MODIFIED="1335089608016" HGAP_QUANTITY="200.0 px" VSHIFT_QUANTITY="-159.0 px">
+<icon BUILTIN="family"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="16" FONT_FAMILY="Script MT Bold" DESTINATION="ID_1380673058" MIDDLE_LABEL="Think it" STARTINCLINATION="247;0;" ENDINCLINATION="204;-61;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Write <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Floating_nodes">digital post-its</a>
+    </p>
+    <p>
+      and order them in a map.<br/>
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff0000" WIDTH="3"/>
+<node TEXT="central topic" ID="ID_1607807952" CREATED="1318450079927" MODIFIED="1318450164274">
+<edge STYLE="linear"/>
+<node TEXT="with" ID="ID_1232722180" CREATED="1318450103144" MODIFIED="1318450108729"/>
+<node TEXT="sub" ID="ID_431013725" CREATED="1318450109593" MODIFIED="1318450114539"/>
+<node TEXT="topics" ID="ID_870254490" CREATED="1318450115378" MODIFIED="1318450125281"/>
+<node TEXT="as" ID="ID_1119376813" CREATED="1318450217732" MODIFIED="1318450225079">
+<node TEXT="the" ID="ID_693432684" CREATED="1318450225084" MODIFIED="1318450230954">
+<node TEXT="flow" ID="ID_924717182" CREATED="1318450230959" MODIFIED="1318450235039">
+<node TEXT="goes" ID="ID_166052506" CREATED="1318450235044" MODIFIED="1318450238916"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Scripting">Program</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1100351552" CREATED="1317963664772" MODIFIED="1319316372328" HGAP_QUANTITY="-99.0 px" VSHIFT_QUANTITY="-158.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Sofisitaced script
+    </p>
+    <p>
+      language for
+    </p>
+    <p>
+      programing
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#007c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Vault">Protect</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_803151767" CREATED="1317963651200" MODIFIED="1318588665665" HGAP_QUANTITY="-203.0 px" VSHIFT_QUANTITY="-110.0 px">
+<icon BUILTIN="password"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Vault for private information
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#00007c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#SWOT_analysis">Analyze</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1839755402" CREATED="1317963473454" MODIFIED="1335089373407" HGAP_QUANTITY="316.0 px" VSHIFT_QUANTITY="-106.0 px">
+<icon BUILTIN="xmag"/>
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1839755402" STARTINCLINATION="37;-27;" ENDINCLINATION="37;-27;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Show relations
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#0000ff" WIDTH="3"/>
+</node>
+<node TEXT="=3+4" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_70607341" CREATED="1317967038914" MODIFIED="1318527253158" HGAP_QUANTITY="-288.0 px" VSHIFT_QUANTITY="-47.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <a href="http://freeplane.sourceforge.net/wiki/index.php/Formula">Calculate</a>
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff0000" WIDTH="3"/>
+</node>
+<node TEXT="Do more" POSITION="right" ID="ID_1129302195" CREATED="1317972413136" MODIFIED="1334842539513" HGAP_QUANTITY="-189.0 px" VSHIFT_QUANTITY="-42.0 px" COLOR="#0000ff" BACKGROUND_COLOR="#33ff00" STYLE="bubble">
+<icon BUILTIN="wizard"/>
+<font SIZE="12" BOLD="true" ITALIC="true"/>
+<edge STYLE="hide_edge" COLOR="#7c7c00" WIDTH="3"/>
+<hook NAME="FreeNode"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Organize_your_collection">Organize</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1300937459" CREATED="1317963516276" MODIFIED="1335089284317" HGAP_QUANTITY="396.0 px" VSHIFT_QUANTITY= [...]
+<icon BUILTIN="attach"/>
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1300937459" STARTINCLINATION="95;0;" ENDINCLINATION="95;0;" STARTARROW="DEFAULT" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#00ff00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm#ID_887149959">Filter</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1380673058" CREATED="1317963795719" MODIFIED="1318715649655" HGAP_QUANTITY="443.0 px" VSHIFT_QUANTITY="18.0 px">
+<hook NAME="FreeNode"/>
+<edge COLOR="#7c007c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm#ID_1047570728">Remember</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_545955177" CREATED="1317963546352" MODIFIED="1318716312050" HGAP_QUANTITY="-314.0 px" VSHIFT_QUANTITY="40.0 px">
+<icon BUILTIN="calendar"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#00ffff" WIDTH="3"/>
+</node>
+<node TEXT="" POSITION="right" ID="ID_357689847" CREATED="1455910775784" MODIFIED="1455910775794">
+<edge COLOR="#808080"/>
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Do it" POSITION="right" ID="ID_692068107" CREATED="1317972888300" MODIFIED="1334842448376" COLOR="#ffffff" BACKGROUND_COLOR="#999900" STYLE="bubble" HGAP_QUANTITY="0.0 px" VSHIFT_QUANTITY="30.0 px">
+<icon BUILTIN="wizard"/>
+<font SIZE="12" BOLD="true"/>
+<edge STYLE="sharp_bezier" COLOR="#ff00ff" WIDTH="7"/>
+<node TEXT="what" ID="ID_1911860200" CREATED="1318453489510" MODIFIED="1318512293822" HGAP_QUANTITY="50.0 px" VSHIFT_QUANTITY="-10.0 px">
+<edge WIDTH="1"/>
+</node>
+<node TEXT="you" ID="ID_885513842" CREATED="1318453440855" MODIFIED="1318512301950" HGAP_QUANTITY="50.0 px" VSHIFT_QUANTITY="-10.0 px">
+<edge WIDTH="1"/>
+</node>
+<node TEXT="want" ID="ID_1053481930" CREATED="1318453447023" MODIFIED="1318512304555" HGAP_QUANTITY="50.0 px">
+<edge WIDTH="1"/>
+</node>
+</node>
+<node TEXT="your&#xa;way" POSITION="right" ID="ID_1333704057" CREATED="1317972906157" MODIFIED="1334842455474" HGAP_QUANTITY="10.0 px" VSHIFT_QUANTITY="10.0 px" COLOR="#ffffff" BACKGROUND_COLOR="#999900" STYLE="bubble">
+<font SIZE="12" BOLD="true"/>
+<edge STYLE="sharp_bezier" COLOR="#ff0000" WIDTH="5"/>
+<cloud COLOR="#ffff33" SHAPE="ARC"/>
+<node TEXT="the" ID="ID_1525382905" CREATED="1318453097317" MODIFIED="1318512372727">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="way" ID="ID_1287102772" CREATED="1318453647991" MODIFIED="1318512428934">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="you" ID="ID_1095910058" CREATED="1318453652398" MODIFIED="1318527651045">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="want" ID="ID_135701980" CREATED="1318492240091" MODIFIED="1318527751080">
+<edge STYLE="horizontal" WIDTH="1"/>
+<font SIZE="12"/>
+</node>
+<node TEXT="it" ID="ID_1148165886" CREATED="1318527681673" MODIFIED="1318527747429" VSHIFT_QUANTITY="-10.0 px">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+</node>
+<node TEXT="" POSITION="right" ID="ID_1411971282" CREATED="1455910775802" MODIFIED="1455910775802">
+<edge COLOR="#808080"/>
+<hook NAME="SummaryNode"/>
+<node TEXT="" ID="ID_45669475" CREATED="1317972993975" MODIFIED="1318512559178">
+<icon BUILTIN="ksmiletris"/>
+<edge WIDTH="1"/>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Meeting_support">Meet</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_941087087" CREATED="1317963530737" MODIFIED="1335088176296" HGAP_QUANTITY="-237.0 px" VSHIFT_QUANTITY="98.0 px">
+<icon BUILTIN="group"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#0000ff" WIDTH="3" TRANSPARENCY="255" DASH="3 3" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1100351552" STARTINCLINATION="-217;-41;" ENDINCLINATION="-189;0;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Simple and advanced meeting support
+    </p>
+    <p>
+      for agenda planning, taking notes and
+    </p>
+    <p>
+      keeping records.
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff00ff" WIDTH="3"/>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/mapsOnline/?map=MeetingBeginner.mm">Beginner</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" ID="ID_184991784" CREATED="1317972712983" MODIFIED="1335088675136">
+<icon BUILTIN="smiley-oh"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/mapsOnline/?map=MeetingAdvanced.mm">Advanced</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" ID="ID_1404449457" CREATED="1317972719278" MODIFIED="1335088750262">
+<icon BUILTIN="ksmiletris"/>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Writing_with_Freeplane">Write</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1510399467" CREATED="1317965217458" MODIFIED="1335089125284" HGAP_QUANTITY="356.0 px" VSHIFT_QUANTITY="111.0 px">
+<icon BUILTIN="list"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#ff0000" WIDTH="4" TRANSPARENCY="255" FONT_SIZE="16" FONT_FAMILY="Britannic Bold" DESTINATION="ID_360719522" MIDDLE_LABEL="Share it" STARTINCLINATION="88;183;" ENDINCLINATION="-3;215;" STARTARROW="NONE" ENDARROW="NONE"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Normal and scientific
+    </p>
+    <p>
+      writing support
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="FreeNode"/>
+<edge COLOR="#007c7c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm">Document</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_360719522" CREATED="1317966438145" MODIFIED="1335089993602" LINK="menuitem:_$GettingStartedAction$0" HGAP_QUANTITY="-2.0 px" VSHIFT_QUANTITY="149.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Versatile support for efficient documenting.
+    </p>
+    <p>
+      The Freeplane <a href="freeplaneTutorial.mm">Tutorial</a> is an example.
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#7c7c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm#ID_1838680824">Style</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1875337895" CREATED="1317967170441" MODIFIED="1320247625439" HGAP_QUANTITY="324.0 px" VSHIFT_QUANTITY="187.0 px">
+<arrowlink SHAPE="LINE" COLOR="#ff0000" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1875337895" STARTINCLINATION="32;38;" ENDINCLINATION="32;38;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#0000ff" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Assignment_.26_Presentation">Learn</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1583240168" CREATED="1317963552842" MODIFIED="1335088980275" HGAP_QUANTITY="110.0 px" VSHIFT_QUANTITY= [...]
+<icon BUILTIN="male1"/>
+<arrowlink SHAPE="LINE" COLOR="#ff0000" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1583240168" STARTINCLINATION="-9;57;" ENDINCLINATION="-9;57;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Provide assigments
+    </p>
+    <p>
+      and protected solutions
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ffff00" WIDTH="3"/>
+</node>
+<node TEXT="Present" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_501841034" CREATED="1317963565525" MODIFIED="1318589800951" HGAP_QUANTITY="222.0 px" VSHIFT_QUANTITY="221.0 px">
+<arrowlink SHAPE="LINE" COLOR="#ff0033" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_501841034" STARTINCLINATION="-1;65;" ENDINCLINATION="-1;65;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#7c0000" WIDTH="3"/>
+</node>
+</node>
+</map>
diff --git a/freeplane/doc/freeplaneApplications_ja.mm b/freeplane/doc/freeplaneApplications_ja.mm
new file mode 100644
index 0000000..1d9b3af
--- /dev/null
+++ b/freeplane/doc/freeplaneApplications_ja.mm
@@ -0,0 +1,360 @@
+<map version="freeplane 1.5.6">
+<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p style="text-align: center">&#xa;      <b><i>Freeplane &#12391; </i></b>&#xa;    </p>&#xa;    <p style="text-align: center">&#xa;      <b><font size="4"><a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Dashboard_for_GTD">G</a></font></b><a hr [...]
+    <properties fit_to_viewport="false;"/>
+
+<map_styles>
+<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" UNIFORM_SHAPE="true" VGAP_QUANTITY="24.0 pt">
+<font SIZE="24"/>
+<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px">
+<font NAME="SansSerif" SIZE="8" BOLD="false" ITALIC="false"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.attributes">
+<font SIZE="9"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.note"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.floating">
+<edge STYLE="hide_edge"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.important">
+<icon BUILTIN="yes"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000">
+<font SIZE="20"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
+<font SIZE="18"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
+<font SIZE="16"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
+<font SIZE="14"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
+<font SIZE="12"/>
+</stylenode>
+</stylenode>
+</stylenode>
+</map_styles>
+</hook>
+<hook NAME="AutomaticEdgeColor" COUNTER="13" RULE="ON_BRANCH_CREATION"/>
+<edge STYLE="linear" WIDTH="1"/>
+<node TEXT="&#x5c0f;&#x3055;&#x306a;&#x52b4;&#x529b;&#x3067;" POSITION="left" ID="ID_892290459" CREATED="1349505091036" MODIFIED="1349505091036" HGAP_QUANTITY="181.0 px" VSHIFT_QUANTITY="25.0 px" COLOR="#0000ff" BACKGROUND_COLOR="#33ff00" STYLE="bubble">
+<icon BUILTIN="idea"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1129302195" STARTINCLINATION="132;0;" ENDINCLINATION="132;0;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<font SIZE="12" BOLD="true" ITALIC="true"/>
+<hook NAME="FreeNode"/>
+<edge STYLE="hide_edge" COLOR="#007c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <img src="freeplaneApplications.png">&#xa;  </body>&#xa;</html>" POSITION="right" ID="ID_470539907" CREATED="1349505091036" MODIFIED="1349505091036" HGAP_QUANTITY="21.0 px" VSHIFT_QUANTITY="-195.0 px">
+<edge STYLE="hide_edge" COLOR="#ff00ff" WIDTH="3"/>
+<hook NAME="FreeNode"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</node>
+<node TEXT="&#x30d6;&#x30ec;&#x30fc;&#x30f3;&#x30b9;&#x30c8;&#x30fc;&#x30df;&#x30f3;&#x30b0;" LOCALIZED_STYLE_REF="defaultstyle.floating" FOLDED="true" POSITION="right" ID="ID_747441325" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUANTITY="200.0 px" VSHIFT_QUANTITY="-159.0 px">
+<icon BUILTIN="family"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="16" FONT_FAMILY="Script MT Bold" DESTINATION="ID_1380673058" MIDDLE_LABEL="&#x8003;&#x3048;&#x308b;&#xff01;" STARTINCLINATION="254;12;" ENDINCLINATION="116;-53;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      まっさらの <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Floating_nodes">デジタルポストイット</a>  をつくり、
+    </p>
+    <p>
+      それらをマップ内で並べ替えます。<br/>
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff0000" WIDTH="3"/>
+<node TEXT="&#x4e2d;&#x5fc3;&#x30c8;&#x30d4;&#x30c3;&#x30af;" ID="ID_1607807952" CREATED="1349505091052" MODIFIED="1349505091052">
+<edge STYLE="linear"/>
+<node TEXT="&#x4ed8;&#x304d;" ID="ID_1232722180" CREATED="1349505091052" MODIFIED="1349505091052"/>
+<node TEXT="&#x30b5;&#x30d6;" ID="ID_431013725" CREATED="1349505091052" MODIFIED="1349505091052"/>
+<node TEXT="&#x30c8;&#x30d4;&#x30c3;&#x30af;&#x30b9;" ID="ID_870254490" CREATED="1349505091052" MODIFIED="1349505091052"/>
+<node TEXT="&#x601d;&#x3044;" ID="ID_1119376813" CREATED="1349505091052" MODIFIED="1349505091052">
+<node TEXT="&#x3064;&#x304f;" ID="ID_693432684" CREATED="1349505091052" MODIFIED="1349505091052">
+<node TEXT="&#x307e;&#x307e;&#x306b;" ID="ID_924717182" CREATED="1349505091052" MODIFIED="1349505091052">
+<node TEXT="&#x9032;&#x3081;&#x308b;" ID="ID_166052506" CREATED="1349505091052" MODIFIED="1349505091052"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Scripting">&#12503;&#12525;&#12464;&#12521;&#12511;&#12531;&#12464;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1100351552" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUANT [...]
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      プログラミング用の洗練された
+    </p>
+    <p>
+      スクリプト言語付きです。
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#007c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Vault">&#12503;&#12525;&#12472;&#12455;&#12463;&#12488;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_803151767" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUA [...]
+<icon BUILTIN="password"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      個人情報管理用の秘密
+    </p>
+    <p>
+      保管機能付きです。
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#00007c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#SWOT_analysis">&#20998;&#12288;&#26512;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1839755402" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUANTITY="316.0 px" [...]
+<icon BUILTIN="xmag"/>
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1839755402" STARTINCLINATION="37;-27;" ENDINCLINATION="37;-27;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      関係を視覚化します。
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#0000ff" WIDTH="3"/>
+</node>
+<node TEXT="=3+4" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_70607341" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUANTITY="-288.0 px" VSHIFT_QUANTITY="-47.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <a href="http://freeplane.sourceforge.net/wiki/index.php/Formula">計算する</a>
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff0000" WIDTH="3"/>
+</node>
+<node TEXT="&#x5927;&#x304d;&#x306a;&#x6210;&#x679c;&#x3092;" POSITION="right" ID="ID_1129302195" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUANTITY="-189.0 px" VSHIFT_QUANTITY="-42.0 px" COLOR="#0000ff" BACKGROUND_COLOR="#33ff00" STYLE="bubble">
+<icon BUILTIN="wizard"/>
+<font SIZE="12" BOLD="true" ITALIC="true"/>
+<edge STYLE="hide_edge" COLOR="#7c7c00" WIDTH="3"/>
+<hook NAME="FreeNode"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Organize_your_collection">&#25972;&#12288;&#29702;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1300937459" CREATED="1349505091052" MODIFIED="1349505091052" HGAP_QUANTITY [...]
+<icon BUILTIN="attach"/>
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1300937459" STARTINCLINATION="95;0;" ENDINCLINATION="95;0;" STARTARROW="DEFAULT" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#00ff00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial_ja.mm#ID_887149959">&#12501;&#12451;&#12523;&#12479;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1380673058" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="443.0 px" VSHIFT_QUANTITY="18.0 px">
+<hook NAME="FreeNode"/>
+<edge COLOR="#7c007c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial_ja.mm#ID_1047570728">&#20633;&#12288;&#24536;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_545955177" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="-314.0 px" VSHIFT_QUANTITY="40.0 px">
+<icon BUILTIN="calendar"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#00ffff" WIDTH="3"/>
+</node>
+<node TEXT="" POSITION="right" ID="ID_373839993" CREATED="1455910829970" MODIFIED="1455910829976">
+<edge COLOR="#808080"/>
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="&#x3057;&#x307e;&#x3057;&#x3087;&#x3046;" POSITION="right" ID="ID_692068107" CREATED="1349505091067" MODIFIED="1349505091067" COLOR="#ffffff" BACKGROUND_COLOR="#999900" STYLE="bubble" HGAP_QUANTITY="0.0 px" VSHIFT_QUANTITY="30.0 px">
+<icon BUILTIN="wizard"/>
+<font SIZE="12" BOLD="true"/>
+<edge STYLE="sharp_bezier" COLOR="#ff00ff" WIDTH="7"/>
+<node TEXT="&#x3042;&#x306a;&#x305f;&#x306e;" ID="ID_1911860200" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="50.0 px" VSHIFT_QUANTITY="-10.0 px">
+<edge WIDTH="1"/>
+</node>
+<node TEXT="&#x3057;&#x305f;&#x3044;" ID="ID_885513842" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="50.0 px" VSHIFT_QUANTITY="-10.0 px">
+<edge WIDTH="1"/>
+</node>
+<node TEXT="&#x3053;&#x3068;" ID="ID_1053481930" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="50.0 px">
+<edge WIDTH="1"/>
+</node>
+</node>
+<node TEXT="&#x3042;&#x306a;&#x305f;&#x6d41;&#x3067;" POSITION="right" ID="ID_1333704057" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="10.0 px" VSHIFT_QUANTITY="10.0 px" COLOR="#ffffff" BACKGROUND_COLOR="#999900" STYLE="bubble">
+<font SIZE="12" BOLD="true"/>
+<edge STYLE="sharp_bezier" COLOR="#ff0000" WIDTH="5"/>
+<cloud COLOR="#ffff33" SHAPE="ARC"/>
+<node TEXT="&#x3042;&#x306a;&#x305f;&#x306e;" ID="ID_1525382905" CREATED="1349505091067" MODIFIED="1349505091067">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="&#x3057;&#x305f;&#x3044;" ID="ID_1287102772" CREATED="1349505091067" MODIFIED="1349505091067">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="&#x3088;&#x3046;&#x306a;" ID="ID_1095910058" CREATED="1349505091067" MODIFIED="1349505091067">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="&#x65b9;&#x6cd5;&#x3067;" ID="ID_135701980" CREATED="1349505091067" MODIFIED="1349505091067">
+<edge STYLE="horizontal" WIDTH="1"/>
+<font SIZE="12"/>
+</node>
+<node TEXT="&#x305d;&#x306e;&#x3053;&#x3068;&#x3092;" ID="ID_1148165886" CREATED="1349505091067" MODIFIED="1349505091067" VSHIFT_QUANTITY="-10.0 px">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+</node>
+<node TEXT="" POSITION="right" ID="ID_547950734" CREATED="1455910829976" MODIFIED="1455910829976">
+<edge COLOR="#808080"/>
+<hook NAME="SummaryNode"/>
+<node TEXT="" ID="ID_45669475" CREATED="1349505091067" MODIFIED="1349505091067">
+<icon BUILTIN="ksmiletris"/>
+<edge WIDTH="1"/>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Meeting_support">&#20250;&#12288;&#35696;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_941087087" CREATED="1349505091067" MODIFIED="1349505091067" HGAP_QUANTITY="-237.0 p [...]
+<icon BUILTIN="group"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#0000ff" WIDTH="3" TRANSPARENCY="255" DASH="3 3" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1100351552" STARTINCLINATION="-217;-41;" ENDINCLINATION="-189;0;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      議事進行プランづくりやメモの作成、
+    </p>
+    <p>
+      議事録作成など、簡単なものから高度
+    </p>
+    <p>
+      な機能まで会議を支援します。
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff00ff" WIDTH="3"/>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/mapsOnline/?map=MeetingBeginner.mm">&#20837;&#12288;&#38272;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" ID="ID_184991784" CREATED="1349505091067" MODIFIED="1349505091067">
+<icon BUILTIN="smiley-oh"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/mapsOnline/?map=MeetingAdvanced.mm">&#24540;&#12288;&#29992;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" ID="ID_1404449457" CREATED="1349505091067" MODIFIED="1349505091067">
+<icon BUILTIN="ksmiletris"/>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Writing_with_Freeplane">&#25991;&#31456;&#20316;&#25104;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1510399467" CREATED="1349505091067" MODIFIED="1349505091067" HGA [...]
+<icon BUILTIN="list"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#ff0000" WIDTH="4" TRANSPARENCY="255" FONT_SIZE="16" FONT_FAMILY="Britannic Bold" DESTINATION="ID_360719522" MIDDLE_LABEL="&#x5171;&#x6709;&#x3059;&#x308b;&#xff01;" STARTINCLINATION="93;186;" ENDINCLINATION="-3;215;" STARTARROW="NONE" ENDARROW="NONE"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      普通の文章作成や科学論文
+    </p>
+    <p>
+      の執筆を支援します。
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="FreeNode"/>
+<edge COLOR="#007c7c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial_ja.mm">&#25991;&#26360;&#20316;&#25104;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_360719522" CREATED="1349505091067" MODIFIED="1349505091067" LINK="menuitem:_$GettingStartedAction$0" HGAP_QUANTITY="-2.0 px" VSHIFT_QUANTITY= [...]
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      効率的な文書作成に向けて
+    </p>
+    <p>
+      様々な支援を行ないます。
+    </p>
+    <p>
+      Freeplane <a href="freeplaneTutorial_ja.mm">チュートリアル</a><br/> が好い見本です。
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#7c7c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial_ja.mm#ID_1838680824">&#12473;&#12479;&#12452;&#12523;&#35519;&#25972;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1875337895" CREATED="1349505091083" MODIFIED="1349505091083" HGAP_QUANTITY="332.0 px" VSHIFT_QUANTITY=" [...]
+<arrowlink SHAPE="LINE" COLOR="#ff0000" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1875337895" STARTINCLINATION="32;38;" ENDINCLINATION="32;38;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#0000ff" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Freeplane_Tutorial_Extensions#Assignment_.26_Presentation">&#23398;&#12288;&#32722;</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1583240168" CREATED="1349505091083" MODIFIED="1349505091083" HGAP_QUANT [...]
+<icon BUILTIN="male1"/>
+<arrowlink SHAPE="LINE" COLOR="#ff0000" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1583240168" STARTINCLINATION="-13;55;" ENDINCLINATION="-13;55;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      課題とあわせて、保護機能
+    </p>
+    <p>
+      付きの解答を用意します。
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ffff00" WIDTH="3"/>
+</node>
+<node TEXT="&#x30d7;&#x30ec;&#x30bc;&#x30f3;&#x30c6;&#x30fc;&#x30b7;&#x30e7;&#x30f3;" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_501841034" CREATED="1349505091083" MODIFIED="1349505091083" HGAP_QUANTITY="194.0 px" VSHIFT_QUANTITY="217.0 px">
+<arrowlink SHAPE="LINE" COLOR="#ff0033" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_501841034" STARTINCLINATION="-1;65;" ENDINCLINATION="-1;65;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#7c0000" WIDTH="3"/>
+</node>
+</node>
+</map>
diff --git a/freeplane/doc/freeplaneApplications_nl.mm b/freeplane/doc/freeplaneApplications_nl.mm
new file mode 100644
index 0000000..3621e24
--- /dev/null
+++ b/freeplane/doc/freeplaneApplications_nl.mm
@@ -0,0 +1,376 @@
+<map version="freeplane 1.5.6">
+<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p style="text-align: center">&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Dashboard_for_GTD"><font size="5"><b>D</b></font>ingen&#160;<font size="5"><b>G</b></font>edaan <font size="5"><b>K</b></font>rijgen</a&gt [...]
+    <properties fit_to_viewport="false;"/>
+
+<map_styles>
+<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" UNIFORM_SHAPE="true" VGAP_QUANTITY="24.0 pt">
+<font SIZE="24"/>
+<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="default" FORMAT_AS_HYPERLINK="true" COLOR="#000000" STYLE="fork" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px">
+<font NAME="SansSerif" SIZE="8" BOLD="false" ITALIC="false"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.attributes">
+<font SIZE="9"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.note"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.floating">
+<edge STYLE="hide_edge"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
+<font NAME="Liberation Sans" SIZE="12" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.important">
+<icon BUILTIN="yes"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right" STYLE="bubble">
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000">
+<font SIZE="20"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
+<font SIZE="18"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
+<font SIZE="16"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
+<font SIZE="14"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
+<font SIZE="12"/>
+</stylenode>
+</stylenode>
+</stylenode>
+</map_styles>
+</hook>
+<hook NAME="AutomaticEdgeColor" COUNTER="4" RULE="ON_BRANCH_CREATION"/>
+<edge STYLE="linear" WIDTH="1"/>
+<node TEXT="Met minder" POSITION="left" ID="ID_892290459" CREATED="1318451679082" MODIFIED="1336121957827" HGAP_QUANTITY="213.0 px" VSHIFT_QUANTITY="30.0 px" COLOR="#0000ff" BACKGROUND_COLOR="#33ff00" STYLE="bubble">
+<icon BUILTIN="idea"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1129302195" STARTINCLINATION="132;0;" ENDINCLINATION="132;0;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<font SIZE="12" BOLD="true" ITALIC="true"/>
+<hook NAME="FreeNode"/>
+<edge STYLE="hide_edge" COLOR="#007c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <img src="Images/doc/freeplaneApplications.png">&#xa;  </body>&#xa;</html>" POSITION="right" ID="ID_470539907" CREATED="1317967796222" MODIFIED="1336132579445" HGAP_QUANTITY="21.0 px" VSHIFT_QUANTITY="-195.0 px">
+<edge STYLE="hide_edge" COLOR="#ff00ff" WIDTH="3"/>
+<hook NAME="FreeNode"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Scripting">Programmeren</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1100351552" CREATED="1317963664772" MODIFIED="1320854026933" HGAP_QUANTITY="-99.0 px" VSHIFT_QUANTITY="-168.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Krachtige script
+    </p>
+    <p>
+      taal om in te
+    </p>
+    <p>
+      programmeren
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#007c00" WIDTH="3"/>
+</node>
+<node TEXT="Brainstormen" LOCALIZED_STYLE_REF="defaultstyle.floating" FOLDED="true" POSITION="right" ID="ID_747441325" CREATED="1317963460911" MODIFIED="1336121273942" HGAP_QUANTITY="200.0 px" VSHIFT_QUANTITY="-159.0 px">
+<icon BUILTIN="family"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="16" FONT_FAMILY="Script MT Bold" DESTINATION="ID_1380673058" MIDDLE_LABEL="Bedenken" STARTINCLINATION="247;0;" ENDINCLINATION="148;-57;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Scrijf zoals je denkt..
+    </p>
+    <p>
+      De standaard mind map
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff0000" WIDTH="3"/>
+<node TEXT="central topic" ID="ID_1607807952" CREATED="1318450079927" MODIFIED="1318450164274">
+<edge STYLE="linear"/>
+<node TEXT="with" ID="ID_1232722180" CREATED="1318450103144" MODIFIED="1318450108729"/>
+<node TEXT="sub" ID="ID_431013725" CREATED="1318450109593" MODIFIED="1318450114539"/>
+<node TEXT="topics" ID="ID_870254490" CREATED="1318450115378" MODIFIED="1318450125281"/>
+<node TEXT="as" ID="ID_1119376813" CREATED="1318450217732" MODIFIED="1318450225079">
+<node TEXT="the" ID="ID_693432684" CREATED="1318450225084" MODIFIED="1318450230954">
+<node TEXT="flow" ID="ID_924717182" CREATED="1318450230959" MODIFIED="1318450235039">
+<node TEXT="goes" ID="ID_166052506" CREATED="1318450235044" MODIFIED="1318450238916"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Vault">Beveiligen</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_803151767" CREATED="1317963651200" MODIFIED="1320851935569" HGAP_QUANTITY="-203.0 px" VSHIFT_QUANTITY="-110.0 px">
+<icon BUILTIN="password"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Informatiekluis
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#00007c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#SWOT_analysis">Analyseren</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1839755402" CREATED="1317963473454" MODIFIED="1320854021021" HGAP_QUANTITY="316.0 px" VSHIFT_QUANTITY="-96.0 px">
+<icon BUILTIN="xmag"/>
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1839755402" STARTINCLINATION="45;-33;" ENDINCLINATION="45;-33;" STARTARROW="DEFAULT" ENDARROW="DEFAULT"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Toon relaties
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#0000ff" WIDTH="3"/>
+</node>
+<node TEXT="=3+4" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_70607341" CREATED="1317967038914" MODIFIED="1320851972013" HGAP_QUANTITY="-288.0 px" VSHIFT_QUANTITY="-47.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <a href="http://freeplane.sourceforge.net/wiki/index.php/Formula">Berekenen</a>
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff0000" WIDTH="3"/>
+</node>
+<node TEXT="Doe meer" POSITION="right" ID="ID_1129302195" CREATED="1317972413136" MODIFIED="1336120108668" HGAP_QUANTITY="-189.0 px" VSHIFT_QUANTITY="-42.0 px" COLOR="#0000ff" BACKGROUND_COLOR="#33ff00" STYLE="bubble">
+<icon BUILTIN="wizard"/>
+<font SIZE="12" BOLD="true" ITALIC="true"/>
+<edge STYLE="hide_edge" COLOR="#7c7c00" WIDTH="3"/>
+<hook NAME="FreeNode"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Organize_your_collection">Organiseren</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1300937459" CREATED="1317963516276" MODIFIED="1336120493295" HGAP_QUANTITY="455.0 px" VSHIFT_QUANTITY="-38.0 px">
+<icon BUILTIN="attach"/>
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1300937459" STARTINCLINATION="86;0;" ENDINCLINATION="86;0;" STARTARROW="DEFAULT" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#00ff00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm#ID_887149959">Filteren</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1380673058" CREATED="1317963795719" MODIFIED="1336121058473" HGAP_QUANTITY="538.0 px" VSHIFT_QUANTITY="29.0 px">
+<hook NAME="FreeNode"/>
+<edge COLOR="#7c007c" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm#ID_1047570728">Waarschuwen</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_545955177" CREATED="1317963546352" MODIFIED="1320852032198" HGAP_QUANTITY="-314.0 px" VSHIFT_QUANTITY="40.0 px">
+<icon BUILTIN="calendar"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#00ffff" WIDTH="3"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Agenda functie
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Scientific_environment">Schrijven</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1510399467" CREATED="1317965217458" MODIFIED="1336121090266" HGAP_QUANTITY="484.0 px" VSHIFT_QUANTITY="94.0 px">
+<icon BUILTIN="list"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#ff0000" WIDTH="4" TRANSPARENCY="255" FONT_SIZE="14" FONT_FAMILY="Britannic Bold" DESTINATION="ID_360719522" MIDDLE_LABEL="Delen" STARTINCLINATION="28;230;" ENDINCLINATION="16;224;" STARTARROW="NONE" ENDARROW="NONE"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Ondersteuning voor
+    </p>
+    <p>
+      schrijven en weten-
+    </p>
+    <p>
+      schappelijke referenties
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="FreeNode"/>
+<edge COLOR="#007c7c" WIDTH="3"/>
+</node>
+<node TEXT="" POSITION="right" ID="ID_1132549453" CREATED="1455910822984" MODIFIED="1455910822989">
+<edge COLOR="#808080"/>
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Doe" POSITION="right" ID="ID_692068107" CREATED="1317972888300" MODIFIED="1336122192113" COLOR="#ffffff" BACKGROUND_COLOR="#999900" STYLE="bubble" HGAP_QUANTITY="0.0 px" VSHIFT_QUANTITY="30.0 px">
+<icon BUILTIN="wizard"/>
+<font SIZE="12" BOLD="true"/>
+<edge STYLE="sharp_bezier" COLOR="#ff00ff" WIDTH="7"/>
+<node TEXT="wat" ID="ID_1911860200" CREATED="1318453489510" MODIFIED="1320852825774" HGAP_QUANTITY="50.0 px" VSHIFT_QUANTITY="-10.0 px">
+<edge WIDTH="1"/>
+</node>
+<node TEXT="je" ID="ID_885513842" CREATED="1318453440855" MODIFIED="1320852833795" HGAP_QUANTITY="50.0 px" VSHIFT_QUANTITY="-10.0 px">
+<edge WIDTH="1"/>
+</node>
+<node TEXT="wilt" ID="ID_1053481930" CREATED="1318453447023" MODIFIED="1320852841041" HGAP_QUANTITY="50.0 px">
+<edge WIDTH="1"/>
+</node>
+</node>
+<node TEXT="Jouw&#xa;manier" POSITION="right" ID="ID_1333704057" CREATED="1317972906157" MODIFIED="1336122199991" HGAP_QUANTITY="10.0 px" VSHIFT_QUANTITY="10.0 px" COLOR="#ffffff" BACKGROUND_COLOR="#999900" STYLE="bubble">
+<font SIZE="12" BOLD="true"/>
+<edge STYLE="sharp_bezier" COLOR="#ff0000" WIDTH="5"/>
+<cloud COLOR="#ffff33" SHAPE="ARC"/>
+<node TEXT="op" ID="ID_1525382905" CREATED="1318453097317" MODIFIED="1320852886188">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="de manier" ID="ID_1287102772" CREATED="1318453647991" MODIFIED="1320852922801">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="die" ID="ID_1095910058" CREATED="1318453652398" MODIFIED="1320852896359">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+<node TEXT="jij" ID="ID_135701980" CREATED="1318492240091" MODIFIED="1320852900602">
+<edge STYLE="horizontal" WIDTH="1"/>
+<font SIZE="12"/>
+</node>
+<node TEXT="wilt" ID="ID_1148165886" CREATED="1318527681673" MODIFIED="1320852906889" VSHIFT_QUANTITY="-10.0 px">
+<edge STYLE="horizontal" WIDTH="1"/>
+</node>
+</node>
+<node TEXT="" POSITION="right" ID="ID_706916456" CREATED="1455910822989" MODIFIED="1455910822989">
+<edge COLOR="#808080"/>
+<hook NAME="SummaryNode"/>
+<node TEXT="" ID="ID_742181469" CREATED="1336120997196" MODIFIED="1455910822990" HGAP_QUANTITY="30.0 px">
+<icon BUILTIN="ksmiletris"/>
+<edge WIDTH="3"/>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#Meeting_support">Vergaderen</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_941087087" CREATED="1317963530737" MODIFIED="1336120196745" HGAP_QUANTITY="-237.0 px" VSHIFT_QUANTITY="108.0 px">
+<icon BUILTIN="group"/>
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#0000ff" WIDTH="3" TRANSPARENCY="255" DASH="3 3" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1100351552" STARTINCLINATION="-209;-29;" ENDINCLINATION="-189;0;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Simple and advanced meeting support
+    </p>
+    <p>
+      for agenda planning, taking notes and
+    </p>
+    <p>
+      keeping records.
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ff00ff" WIDTH="3"/>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://www.kioo.nl/freeplane/CoreMeeting">Beginner</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" ID="ID_184991784" CREATED="1317972712983" MODIFIED="1319316038308">
+<icon BUILTIN="smiley-oh"/>
+</node>
+<node TEXT="Gevorderde" ID="ID_1404449457" CREATED="1317972719278" MODIFIED="1320852087687">
+<icon BUILTIN="ksmiletris"/>
+</node>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Examples">Document</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_360719522" CREATED="1317966438145" MODIFIED="1318589645732" LINK="menuitem:_$GettingStartedAction$0" HGAP_QUANTITY="-2.0 px" VSHIFT_QUANTITY="149.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Versatile support for efficient documenting.
+    </p>
+    <p>
+      The Freeplane<a href="http://www.kioo.nl/freeplane/tutorial_en"> quick reference</a> is an example.
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#7c7c00" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="freeplaneTutorial.mm#ID_1838680824">Stylen</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1875337895" CREATED="1317967170441" MODIFIED="1336121070282" HGAP_QUANTITY="425.0 px" VSHIFT_QUANTITY="185.0 px">
+<arrowlink SHAPE="LINE" COLOR="#ff0000" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1875337895" STARTINCLINATION="32;38;" ENDINCLINATION="32;38;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#0000ff" WIDTH="3"/>
+</node>
+<node TEXT="<html>&#xa;  <head>&#xa;&#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      <a href="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane#School_environment">Leren</a>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_1583240168" CREATED="1317963552842" MODIFIED="1320852177980" HGAP_QUANTITY="110.0 px" VSHIFT_QUANTITY="208.0 px">
+<icon BUILTIN="male1"/>
+<arrowlink SHAPE="LINE" COLOR="#ff0000" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1583240168" STARTINCLINATION="-9;57;" ENDINCLINATION="-9;57;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Een opdracht en
+    </p>
+    <p>
+      afgeschermde
+    </p>
+    <p>
+      oplossingen
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge COLOR="#ffff00" WIDTH="3"/>
+</node>
+<node TEXT="Presenteren" LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_501841034" CREATED="1317963565525" MODIFIED="1336121085945" HGAP_QUANTITY="227.0 px" VSHIFT_QUANTITY="250.0 px">
+<arrowlink SHAPE="LINE" COLOR="#ff0033" WIDTH="2" TRANSPARENCY="255" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_501841034" STARTINCLINATION="-2;53;" ENDINCLINATION="-2;53;" STARTARROW="NONE" ENDARROW="NONE"/>
+<hook NAME="FreeNode"/>
+<edge COLOR="#7c0000" WIDTH="3"/>
+</node>
+</node>
+</map>
diff --git a/freeplane/doc/freeplaneFunctions.mm b/freeplane/doc/freeplaneFunctions.mm
index ccb3dd6..ec110ae 100644
--- a/freeplane/doc/freeplaneFunctions.mm
+++ b/freeplane/doc/freeplaneFunctions.mm
@@ -825,7 +825,7 @@
     </p>
     <ul>
       <li>
-        <i>Help > <b> </b></i><b><i>Tutorial</i> <a href="freeplaneTutorial.mm#ID_1812601804">Properties panel,</a> </b> <a href="freeplanefreeplane.mm#ID_1492225657">Edges</a> and <a href="freeplaneTutorial.mm#ID_1005719714">Automatic edge colour</a>
+        <i>Help > <b> </b></i><b><i>Tutorial</i> <a href="freeplaneTutorial.mm#ID_1812601804">Tool panel,</a> </b> <a href="freeplanefreeplane.mm#ID_1492225657">Edges</a> and <a href="freeplaneTutorial.mm#ID_1005719714">Automatic edge colour</a>
       </li>
       <li>
         <i>Help > Documentation<b> </b></i><b>Menu</b><i> </i> <a href="freeplane.mm#ID_881523974">Format > Edge styles/width/colour; automatic edge colour</a>
diff --git a/freeplane/doc/freeplaneTutorial.mm b/freeplane/doc/freeplaneTutorial.mm
index a7b7cf3..fb7f952 100644
--- a/freeplane/doc/freeplaneTutorial.mm
+++ b/freeplane/doc/freeplaneTutorial.mm
@@ -1,10 +1,10 @@
-<map version="freeplane 1.5.9">
+<map version="freeplane 1.6.0">
 <!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
 <attribute_registry>
     <attribute_name VISIBLE="true" NAME="See also"/>
     <attribute_name VISIBLE="true" NAME="a2"/>
 </attribute_registry>
-<node LOCALIZED_STYLE_REF="default" FOLDED="false" ID="ID_1723255651" CREATED="1283093380553" MODIFIED="1334247734742" BACKGROUND_COLOR="#00ff66">
+<node LOCALIZED_STYLE_REF="default" FOLDED="false" ID="ID_1723255651" CREATED="1283093380553" MODIFIED="1498338733343" BACKGROUND_COLOR="#00ff66">
 <icon BUILTIN="bee"/>
 <richcontent TYPE="NODE">
 
@@ -17,7 +17,7 @@
       <b>Tutorial </b>
     </p>
     <p>
-      <b>Freeplane 1.2</b>
+      <b>Freeplane 1.6</b>
     </p>
   </body>
 </html>
@@ -93,6 +93,26 @@
 <stylenode TEXT="Revision">
 <icon BUILTIN="revision"/>
 </stylenode>
+<stylenode TEXT="Purpose" BACKGROUND_COLOR="#ffcccc" TEXT_ALIGN="CENTER" MAX_WIDTH="110.0 pt" MIN_WIDTH="110.0 pt">
+<font BOLD="true"/>
+<edge COLOR="#ff3333"/>
+</stylenode>
+<stylenode TEXT="Actions" BACKGROUND_COLOR="#99ff99" TEXT_ALIGN="CENTER" MAX_WIDTH="110.0 pt" MIN_WIDTH="110.0 pt">
+<font BOLD="true"/>
+<edge COLOR="#009900"/>
+</stylenode>
+<stylenode TEXT="Notes and explanations" BACKGROUND_COLOR="#ccffff" TEXT_ALIGN="CENTER" MAX_WIDTH="110.0 pt" MIN_WIDTH="110.0 pt">
+<font BOLD="true"/>
+<edge COLOR="#0066ff"/>
+</stylenode>
+<stylenode TEXT="Tips and tricks" BACKGROUND_COLOR="#ffcc99" TEXT_ALIGN="CENTER" MAX_WIDTH="110.0 pt" MIN_WIDTH="110.0 pt">
+<font BOLD="true"/>
+<edge COLOR="#ff9900"/>
+</stylenode>
+<stylenode TEXT="Old documentation" BACKGROUND_COLOR="#eaeaea" TEXT_ALIGN="CENTER" MAX_WIDTH="110.0 pt" MIN_WIDTH="110.0 pt">
+<font BOLD="true"/>
+<edge COLOR="#666666"/>
+</stylenode>
 <stylenode TEXT="MyTemplate">
 <icon BUILTIN="females"/>
 <richcontent TYPE="DETAILS">
@@ -141,47 +161,8 @@
 </map_styles>
 </hook>
 <hook NAME="FirstGroupNode"/>
-<node LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="left" ID="ID_232622736" CREATED="1320005728532" MODIFIED="1334522518454" LINK="freeplaneFunctions.mm" HGAP_QUANTITY="0.0 px" VSHIFT_QUANTITY="-94.0 px" TEXT_SHORTENED="true"><richcontent TYPE="NODE">
-
-<html>
-  <head>
-    
-  </head>
-  <body>
-    <p style="text-align: center">
-      <font size="3"><a href="freeplaneFunctions.mm"><b>Functions index</b></a></font>
-    </p>
-  </body>
-</html>
-</richcontent>
-<hook NAME="FreeNode"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
-
-<html>
-  <head>
-
-  </head>
-  <body>
-    <p>
-      Click the link to open a mind map with the main functions of Freeplane. Hover the text to reveal hidden links to the descriptions of the functions you see in this <i>Quick reference</i> and in <i>Help > Documentation. </i>
-    </p>
-    <p>
-
-    </p>
-    <p>
-      <b>Note </b>
-    </p>
-    <ul>
-      <li>
-        To return from the index map to this map: select <i>Navigate >Go to previous map </i>(icon in tool bar)
-      </li>
-    </ul>
-  </body>
-</html>
-</richcontent>
-</node>
-<node TEXT="Introduction" STYLE_REF="Beginner" POSITION="right" ID="ID_86446891" CREATED="1314121556502" MODIFIED="1341130602702" BACKGROUND_COLOR="#00cc33" NUMBERED="true" MIN_WIDTH="200.0 px" HGAP_QUANTITY="22.0 px" VSHIFT_QUANTITY="16.0 px">
-<node ID="ID_131498432" CREATED="1479208899084" MODIFIED="1479210525907"><richcontent TYPE="NODE">
+<node TEXT="Introduction" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_86446891" CREATED="1314121556502" MODIFIED="1500801075908" BACKGROUND_COLOR="#00cc33" NUMBERED="true" MIN_WIDTH="200.0 px" HGAP_QUANTITY="22.0 px" VSHIFT_QUANTITY="16.0 px">
+<node ID="ID_131498432" CREATED="1479208899084" MODIFIED="1500801075908"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -229,7 +210,6 @@
     </p>
   </body>
 </html>
-
 </richcontent>
 </node>
 <node TEXT="Goal" STYLE_REF="Beginner" FOLDED="true" ID="ID_1074607965" CREATED="1314422854653" MODIFIED="1335300198070">
@@ -358,7 +338,7 @@
 <arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_1485150857" STARTINCLINATION="40;0;" ENDINCLINATION="40;0;" STARTARROW="DEFAULT" ENDARROW="NONE"/>
 <font BOLD="true" ITALIC="true"/>
 <hook URI="Images/doc/BackgroundContextMenu.png" SIZE="1.0" NAME="ExternalObject"/>
-<node TEXT="Open/close&#xa;Properties panel" ID="ID_724121688" CREATED="1333267051623" MODIFIED="1341130818119" HGAP_QUANTITY="56.0 px">
+<node TEXT="Open/close&#xa;Tool panel" ID="ID_724121688" CREATED="1333267051623" MODIFIED="1341130818119" HGAP_QUANTITY="56.0 px">
 <arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_724121688" STARTINCLINATION="97;-188;" ENDINCLINATION="97;-188;" STARTARROW="DEFAULT" ENDARROW="NONE"/>
 <edge STYLE="hide_edge"/>
 <font BOLD="true" ITALIC="true"/>
@@ -626,8 +606,10 @@
 <node TEXT="Edit > Node group > Always unfolded" STYLE_REF="Method" ID="ID_64183058" CREATED="1337203492981" MODIFIED="1337203523932"/>
 </node>
 </node>
-<node TEXT="Open map on Internet" STYLE_REF="Advanced" FOLDED="true" ID="ID_794559549" CREATED="1329413644062" MODIFIED="1335300198085">
-<node STYLE_REF="TitlesContent" ID="ID_663032265" CREATED="1329413694345" MODIFIED="1335091139945" HGAP_QUANTITY="-123.0 px" VSHIFT_QUANTITY="34.0 px"><richcontent TYPE="NODE">
+<node TEXT="Freeplane workspace" STYLE_REF="Advanced" FOLDED="true" ID="ID_222393549" CREATED="1323433444639" MODIFIED="1489244376074">
+<node TEXT="Purpose" STYLE_REF="Purpose" FOLDED="true" ID="ID_1359525886" CREATED="1483416459506" MODIFIED="1486862695287">
+<node TEXT="The Freeplane workspace is the area in which your map and program controls appear." ID="ID_516511911" CREATED="1489245157723" MODIFIED="1500212664713">
+<node TEXT="Workspace elements help you create, format, navigate, and manipulate your map." FOLDED="true" ID="ID_1338861606" CREATED="1489244487039" MODIFIED="1500801089971"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -635,20 +617,16 @@
   </head>
   <body>
     <p>
-      To open a mind map on Internet, this map must first be copied to your local computer. Menu <i>File > Open map from URL </i>does just this.
+      to display / hide details (such as this and following nodes) select node then press Alt+F2
     </p>
   </body>
 </html>
+
 </richcontent>
+<node TEXT="" ID="ID_748597006" CREATED="1500213151013" MODIFIED="1500213151015">
+<hook NAME="FirstGroupNode"/>
 </node>
-</node>
-</node>
-<node TEXT="Core map" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_1337127972" CREATED="1314109409850" MODIFIED="1335300531741" NUMBERED="true" MIN_WIDTH="200.0 px">
-<node TEXT="Node core" STYLE_REF="Beginner" FOLDED="true" ID="ID_1370298116" CREATED="1315860175003" MODIFIED="1335300258084" MIN_WIDTH="115.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1314148002" CREATED="1323461584875" MODIFIED="1335094931917" HGAP_QUANTITY="-102.0 px" VSHIFT_QUANTITY="105.0 px"><richcontent TYPE="NODE">
+<node TEXT="screenshot (without annotations)" STYLE_REF="image in details" ID="ID_1712284942" CREATED="1489245806679" MODIFIED="1500213083783"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -656,29 +634,13 @@
   </head>
   <body>
     <p>
-      The information of a node is displayed in two major area's. One area is called <b>node core</b> because it is situated in the inner area of the node and can have a bubble around it. The text you are reading now is in a node core. The colored area just above the one you are reading now is in the core of another node.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      The text in the core can be short like a title, or multi line and can contain different basic display components like images and icons. It can also contain hyperlinks, formulas and components for time mangement and password protection.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      Besides in the node core, text can be entered in <b>node details</b>, in <b>notes</b>  and in <b>attributes</b>. These fields are described later.
+      <img src="Images/other/workspace/Freeplane%20workspace.png" width="1000" height="563"/>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-</node>
 </node>
-<node STYLE_REF="Beginner" FOLDED="true" ID="ID_268413071" CREATED="1314125550476" MODIFIED="1335300258084" STYLE="combined" MIN_WIDTH="115.0 px"><richcontent TYPE="NODE">
+<node TEXT="screenshot (annotated)" STYLE_REF="image in details" ID="ID_1360309384" CREATED="1489246977880" MODIFIED="1500213185847"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -686,13 +648,49 @@
   </head>
   <body>
     <p>
-      Core text <i>in-line</i>
+      <img src="Images/other/workspace/Freeplane%20workspace%20(annotated).png" width="1000" height="563"/>
     </p>
   </body>
 </html>
 </richcontent>
-<edge STYLE="bezier"/>
-<node ID="ID_265318117" CREATED="1323437723250" MODIFIED="1341131023466" HGAP_QUANTITY="-95.0 px" VSHIFT_QUANTITY="150.0 px" STYLE="fork"><richcontent TYPE="NODE">
+</node>
+<node TEXT="" ID="ID_907526987" CREATED="1500213151006" MODIFIED="1500213151013">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="nodes contain details.  To view, select node then press Alt+f2" ID="ID_1450367192" CREATED="1500213151016" MODIFIED="1500213202879"/>
+</node>
+</node>
+<node TEXT="Elements of the workspace (e.g. toolbars, status line) appear around the edges of the workspace." FOLDED="true" ID="ID_429878063" CREATED="1489245179124" MODIFIED="1489599615535" VGAP_QUANTITY="20.999999374151248 pt">
+<node TEXT="top" FOLDED="true" ID="ID_1523745182" CREATED="1489245254483" MODIFIED="1489324983054" MAX_WIDTH="57.749998100102005 pt" MIN_WIDTH="57.749998100102005 pt">
+<node TEXT="Menubar" ID="ID_83343843" CREATED="1489245078100" MODIFIED="1489333883429" LINK="#ID_179323467" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+<node TEXT="Toolbar" ID="ID_1377496715" CREATED="1489245083635" MODIFIED="1489333883434" LINK="#ID_833229080" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+<node TEXT="Filter toolbar" ID="ID_1007394435" CREATED="1489245087252" MODIFIED="1489333883436" LINK="#ID_1735660338" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+<node TEXT="F-Bar" ID="ID_343234837" CREATED="1489245094715" MODIFIED="1489333883438" LINK="#ID_1658271207" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+</node>
+<node TEXT="bottom" FOLDED="true" ID="ID_50275597" CREATED="1489245257218" MODIFIED="1489324983054" MAX_WIDTH="57.749998100102005 pt" MIN_WIDTH="57.749998100102005 pt">
+<node TEXT="Status line" ID="ID_917851633" CREATED="1489245285530" MODIFIED="1489333883440" LINK="#ID_741945176" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+<node TEXT="Scroll bar (horizontal)" ID="ID_1274826999" CREATED="1489333851241" MODIFIED="1489333883441" LINK="#ID_1432333445" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+</node>
+<node TEXT="left side" FOLDED="true" ID="ID_90269899" CREATED="1489245259450" MODIFIED="1489324983055" MAX_WIDTH="57.749998100102005 pt" MIN_WIDTH="57.749998100102005 pt">
+<node TEXT="Icons toolbar" ID="ID_1594635729" CREATED="1489245280019" MODIFIED="1489333883443" LINK="#ID_655489570" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+</node>
+<node TEXT="right side" FOLDED="true" ID="ID_1513022284" CREATED="1489245265250" MODIFIED="1489324983056" MAX_WIDTH="57.749998100102005 pt" MIN_WIDTH="57.749998100102005 pt">
+<node TEXT="Properties panel" FOLDED="true" ID="ID_1902351042" CREATED="1489245271210" MODIFIED="1489333883446" LINK="#ID_236707457" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt">
+<node TEXT="Note: in Freeplane 1.6.x, Properties Panel was renamed "Tool Panel"" ID="ID_869088340" CREATED="1493475551404" MODIFIED="1493475588261"/>
+</node>
+<node TEXT="Scroll bar (vertical)" ID="ID_1894634754" CREATED="1489333893416" MODIFIED="1489333917179" LINK="#ID_1432333445" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt"/>
+</node>
+<node TEXT="dockable" FOLDED="true" ID="ID_560007157" CREATED="1489333935432" MODIFIED="1489599615534" MAX_WIDTH="57.749998100102005 pt" MIN_WIDTH="57.749998100102005 pt">
+<node TEXT="Note panel" FOLDED="true" ID="ID_1931415683" CREATED="1489333945224" MODIFIED="1489333975631" LINK="#ID_1377583638" MAX_WIDTH="117.74999666959057 pt" MIN_WIDTH="117.74999666959057 pt">
+<node TEXT="Can be positioned to any of the above locations." ID="ID_191769421" CREATED="1493475439126" MODIFIED="1493475469478"/>
+</node>
+</node>
+</node>
+<node TEXT="Please note: this is meant to be an overview of the workspace.  While it includes some "how to" information, more complete details can be found in other branches of the map." FOLDED="true" ID="ID_627094326" CREATED="1493477160817" MODIFIED="1493477281337" VGAP_QUANTITY="20.999999374151248 pt">
+<node TEXT="Links are provided here to those more detailed branches." ID="ID_1288068090" CREATED="1493477250712" MODIFIED="1493477272648"/>
+</node>
+</node>
+<node TEXT="workspace elements (purpose overview)" FOLDED="true" ID="ID_497653862" CREATED="1489245793739" MODIFIED="1500800927042"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -700,383 +698,346 @@
   </head>
   <body>
     <p>
-      When Freeplane first opens you will be greeted by a blank map. It contains one, elliptical form, the root node. The root node contains a text such as "New map". This text is highligted, meaning you can replace it by typing your own text. Simply type your title and press <i>Enter</i>. The <i>Insert</i>  key will add a child node - again just type and press <i>Enter</i>. A second <i>Enter</i>  will add a sibling. That's really all there is to it. If you  [...]
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b><br/>
+      Accessed by
     </p>
     <ul>
       <li>
-        To add a new line, press <i>Shift + Enter.</i>
-      </li>
-      <li>
-        If you right-click when editing text, a so called <b>context menu</b> for editing text opens, giving quick access to formatting functions like copy and paste.
-      </li>
-      <li>
-        If you first select a text and then right-click, a <i>Format</i> menu is displayed to make text bold etc. This formatting only applies to the selected  text.
+        menubar > <font color="#ff0000">View</font> (mostly Toolbars or View settings)
       </li>
       <li>
-        Editing can be only started using home, end, F2, double click or by starting to type a text
+        right-click > click element (right-click on <b><u><font color="#0000c0">blank</font></u></b>  spot in workspace, NOT on a node)
       </li>
     </ul>
   </body>
 </html>
 </richcontent>
-<edge STYLE="hide_edge"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node TEXT="New map" STYLE_REF="BeginnerTopic" ID="ID_1310307853" CREATED="1310134532663" MODIFIED="1323726805884" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../filenew"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+<node TEXT="Menubar" FOLDED="true" ID="ID_179323467" CREATED="1489245078100" MODIFIED="1493490654353" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Access to most Freeplane functionality." FOLDED="true" ID="ID_660314093" CREATED="1489589994670" MODIFIED="1489590040456">
+<node TEXT="Appears to top of workspace" ID="ID_863511295" CREATED="1489592384061" MODIFIED="1489592397446"/>
+</node>
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1879801720" CREATED="1489246271412" MODIFIED="1490650502462"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      Look up in the toolbar at the top of the screen.
+      <img src="Images/other/workspace/menubar.png" width="450" height="50"/>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Open saved map.." STYLE_REF="BeginnerTopic" ID="ID_1284635316" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../fileopen"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+</node>
+<node TEXT="Toolbar" FOLDED="true" ID="ID_833229080" CREATED="1489245083635" MODIFIED="1493490654359" LINK="#ID_1768620172" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The toolbar allows easy, one-click access to common Freeplane functionality" ID="ID_401265028" CREATED="1489599647567" MODIFIED="1489599672248"/>
+<node TEXT="screenshot (on 1 line in Freeplane - here : split to minimize space)" STYLE_REF="image in details" ID="ID_213137953" CREATED="1490650843311" MODIFIED="1490651389937" MAX_WIDTH="405.4999877959493 pt" MIN_WIDTH="405.4999877959493 pt"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
-
+    
   </head>
   <body>
-    <p>
-      Look up in the toolbar
-    </p>
+    <img src="Images/other/workspace/toolbar%20-%20split.png" width="529" height="96"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Print map" STYLE_REF="BeginnerTopic" ID="ID_111478060" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../fileprint"/>
-<richcontent TYPE="DETAILS">
+</node>
+<node TEXT="Filter toolbar" FOLDED="true" ID="ID_1735660338" CREATED="1489245087252" MODIFIED="1493490654363" LINK="#ID_1577175787" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The filter toolbar lets you create, save, and use criteria to limit the map content displayed." ID="ID_1329804604" CREATED="1489599819325" MODIFIED="1489599943552">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="This lets you manage large maps by restricting, based on your current activity, what is seen." ID="ID_1048144443" CREATED="1489599883612" MODIFIED="1489599933580"/>
+</node>
+<node TEXT="screenshot  (on 1 line in Freeplane - here : split to minimize space)" STYLE_REF="image in details" ID="ID_1062055828" CREATED="1489328236617" MODIFIED="1490651377209" MAX_WIDTH="657.9999805092817 pt" MIN_WIDTH="657.9999805092817 pt"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
-
+    
   </head>
   <body>
-    <p>
-      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Opens the dialog box associated with the printer on which the map will print.</span></font>
-    </p>
+    <img src="Images/other/workspace/filter%20toolbar%20-%20split.png" width="852" height="54"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Cut" STYLE_REF="BeginnerTopic" ID="ID_353410114" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../editcut"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+</node>
+<node TEXT="F-Bar" FOLDED="true" ID="ID_1658271207" CREATED="1489245094715" MODIFIED="1493490654366" LINK="#ID_1364416620" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The F-bar show how the function keys are currently assigned." FOLDED="true" ID="ID_839712673" CREATED="1489600099562" MODIFIED="1489600131922">
+<node TEXT="Located on top of workspace" ID="ID_558516299" CREATED="1490651725412" MODIFIED="1490651739398"/>
+<node TEXT="The F-bar shows keyboard assignments for functions and also for function keys used with Ctrl, Alt, Shift or any combination." FOLDED="true" ID="ID_1848158425" CREATED="1489600137985" MODIFIED="1489600342289">
+<node TEXT="Examples: Ctrl+Alt+F1 , Shift+Alt+F5" ID="ID_1663207491" CREATED="1489600303456" MODIFIED="1489600337920"/>
+</node>
+</node>
+<node TEXT="screenshot    (on 1 line in Freeplane - here : split to minimize space)" STYLE_REF="image in details" ID="ID_224100440" CREATED="1489328931158" MODIFIED="1490651671452" MAX_WIDTH="777.9999769330032 pt" MIN_WIDTH="777.9999769330032 pt"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
-
+    
   </head>
   <body>
-    <p>
-      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Cuts the node currently selected and all of its children.</span></font>
-    </p>
+    <img src="Images/other/workspace/f%20bar%20-%20split.png" width="1018" height="62"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Copy" STYLE_REF="BeginnerTopic" ID="ID_1274800359" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../editcopy"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+<node TEXT="Note" LOCALIZED_STYLE_REF="defaultstyle.note" FOLDED="true" ID="ID_55257225" CREATED="1489600163720" MODIFIED="1489600238818">
+<node TEXT="Keyboard shortcuts can be assigned to other keys or key combinations besides function keys.  The F-bar does not reflect shortcut assignments to those non-function keys." ID="ID_359682769" CREATED="1489600166327" MODIFIED="1493481415815"/>
+</node>
+</node>
+<node TEXT="Icons toolbar" FOLDED="true" ID="ID_655489570" CREATED="1489245098507" MODIFIED="1493490654372" LINK="#ID_970426412" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The icons toolbar is a convenient respository of icons you can use to enhance nodes." ID="ID_1205606813" CREATED="1493476613111" MODIFIED="1493476968597"/>
+<node TEXT="located on left of workspace" FOLDED="true" ID="ID_1946428755" CREATED="1489330348938" MODIFIED="1489330361678">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_264999644" CREATED="1489329098141" MODIFIED="1493482067294"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
-
+    
   </head>
   <body>
-    <p>
-      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Copies the node selected and all of its children.</span></font>
-    </p>
+    <img src="Images/other/workspace/icons%20toolbar.png" width="50" height="409"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Paste" STYLE_REF="BeginnerTopic" ID="ID_1705754282" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../editpaste"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+</node>
+</node>
+<node TEXT="Status line" FOLDED="true" ID="ID_741945176" CREATED="1489245104475" MODIFIED="1493490654377" LINK="#ID_1438513260" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The Status line shows, at a glance, some aspects of the node on which you hover." ID="ID_1904459435" CREATED="1493477958950" MODIFIED="1493482568666"/>
+<node TEXT="Located on bottom-left of workspace" FOLDED="true" ID="ID_1359468735" CREATED="1489330328701" MODIFIED="1493475739134">
+<node TEXT="Screenshot" STYLE_REF="image in details" ID="ID_862325455" CREATED="1489329729489" MODIFIED="1493475739139"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      <font color="#000000" face="SansSerif, sans-serif">Pasts copied text. If the selected node is in edit mode, the text will be added to the contents of the node. If the selected node is not in edit mode, the text will be added as a child node.</font>
+      <img src="Images/other/workspace/status%20line.png" width="324" height="24"/>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="New child node" STYLE_REF="BeginnerTopic" ID="ID_942355748" CREATED="1266249828031" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
-<icon BUILTIN="../idea"/>
-<richcontent TYPE="DETAILS">
+</node>
+<node TEXT="Information shown on status line" LOCALIZED_STYLE_REF="default" FOLDED="true" ID="ID_1080188187" CREATED="1489420302695" MODIFIED="1500800978247"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      <font color="#000000" face="SansSerif, sans-serif">Creates a new node as a child of  the currently-selected node. </font>
-    </p>
-    <p>
-
-    </p>
-    <p>
-      <font color="#000000" face="SansSerif, sans-serif"><b>Same effect: </b></font>
+      see <a href="freeplane:/%20/D:/GoogleDrive/Freeplane%20documentation%20project/mind%20maps/Freeplane%20workspace.mm#ID_862325455">screenshot</a>
     </p>
-    <ul>
-      <li>
-        <font color="#000000" face="SansSerif, sans-serif">press key <i>Ins</i></font>
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
-</node>
-<node TEXT="<Ins> New child node" ID="ID_45308529" CREATED="1316701840462" MODIFIED="1323438013786" STYLE="as_parent">
-<edge STYLE="horizontal"/>
-</node>
-<node TEXT="<Shift>+<Enter> New line" ID="ID_396169297" CREATED="1316702242678" MODIFIED="1323438013786" STYLE="as_parent">
-<edge STYLE="horizontal"/>
-</node>
-<node TEXT="<Enter> Finish edit, select node" ID="ID_780427702" CREATED="1316702397734" MODIFIED="1323438013786" STYLE="as_parent">
-<edge STYLE="horizontal"/>
-</node>
-<node TEXT="2*<Enter> New sibling node" ID="ID_420903085" CREATED="1316701822921" MODIFIED="1323438013786" STYLE="as_parent">
-<edge STYLE="horizontal"/>
+<node TEXT="" ID="ID_1915295181" CREATED="1493482391645" MODIFIED="1493482391647">
+<hook NAME="FirstGroupNode"/>
 </node>
-<node TEXT="Right-click: contextmenu" ID="ID_435495519" CREATED="1316724447049" MODIFIED="1323438013802" STYLE="as_parent">
-<edge STYLE="horizontal"/>
+<node TEXT="Node ID" ID="ID_799017331" CREATED="1489420306602" MODIFIED="1489591903629" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt"/>
+<node TEXT="Node content type" ID="ID_46925450" CREATED="1489420397998" MODIFIED="1489591903632" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt"/>
+<node TEXT="Filtering" ID="ID_785722919" CREATED="1489420423406" MODIFIED="1489591903633" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt"/>
+<node TEXT="Link destination" ID="ID_1937438334" CREATED="1489420528982" MODIFIED="1489591903633" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt"/>
+<node TEXT="" ID="ID_1897522544" CREATED="1493482391642" MODIFIED="1493482391645">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="for more details see the "how to access" branch" ID="ID_938346648" CREATED="1493482391648" MODIFIED="1493482422714" LINK="#ID_1438513260"/>
 </node>
 </node>
 </node>
-<node STYLE_REF="Beginner" FOLDED="true" ID="ID_1279324490" CREATED="1314126040831" MODIFIED="1335300258084" STYLE="combined" MIN_WIDTH="115.0 px"><richcontent TYPE="NODE">
+<node TEXT="Scrollbars" FOLDED="true" ID="ID_1432333445" CREATED="1489245111763" MODIFIED="1493490654381" LINK="#ID_511421073" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Scrollbars allow you to pan the map within the workspace, allowing you to bring into view map areas that are initially outside the workspace view." ID="ID_1402428214" CREATED="1493478635766" MODIFIED="1493478702183"/>
+<node TEXT="located on right & bottom of workspace" FOLDED="true" ID="ID_1725497930" CREATED="1489330308382" MODIFIED="1489330319550">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_645673562" CREATED="1489329729489" MODIFIED="1489591127077"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      Core text <i>in dialog</i>
-    </p>
+    <img src="Images/other/workspace/scroll%20bars.png" width="550" height="294"/>
   </body>
 </html>
 </richcontent>
-<node ID="ID_1433249332" CREATED="1323438495734" MODIFIED="1341131039869" HGAP_QUANTITY="-100.0 px" VSHIFT_QUANTITY="114.0 px" STYLE="fork"><richcontent TYPE="NODE">
+</node>
+</node>
+</node>
+<node TEXT="Properties panel" FOLDED="true" ID="ID_236707457" CREATED="1489245117491" MODIFIED="1493490654383" LINK="#ID_342720357" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The Properties Panel allows you to change properties of a node or multiple selected nodes, Calendar reminders, and "attributes" which you can optionally apply to nodes." FOLDED="true" ID="ID_18662208" CREATED="1493482914372" MODIFIED="1493483107428">
+<node TEXT="" ID="ID_885342025" CREATED="1493483443361" MODIFIED="1493483443365">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="The Format tab controls node properties (e.g. font, font size, node width, node background color, many more)." ID="ID_41125511" CREATED="1493483019691" MODIFIED="1493483165138"/>
+<node TEXT="The Calendar and attributes tab controls reminders as well as "attributes"." ID="ID_116731937" CREATED="1493483171848" MODIFIED="1493483227433"/>
+<node TEXT="" ID="ID_299097972" CREATED="1493483443358" MODIFIED="1493483443361">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="for more details, see "how to access"" ID="ID_1505447405" CREATED="1493483443369" MODIFIED="1493483473245" LINK="#ID_342720357"/>
+</node>
+</node>
+<node TEXT="located on right side of workspace" FOLDED="true" ID="ID_1060385352" CREATED="1489330284126" MODIFIED="1489330294381">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_106953503" CREATED="1489329729489" MODIFIED="1493475783761"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      A second way to edit a node is in a separate dialog. Right-click on the node. This opens the context menu of the node. (This context menu is different from the context menu for editing text !) In this context menu choose <b><i>Edit core in dialog</i>.</b> You can now type the text and use the shown options to format the text. When you close the dialog by pressing OK, the text will appear in the node. This dialog has more extensive options for formatting text than availabl [...]
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
-    </p>
-    <ul>
-      <li>
-        You can also open the edit window in the main menu bar. Choose <i>Edit </i>and then <i>Node core  </i>and you will see<i> Edit node core in dialog.</i>  In the following we write this procedure as <i>Edit > Node core > Edit node core in dialog</i>.
-      </li>
-    </ul>
+    <img src="Images/other/workspace/properties%20panel.png" width="363" height="499"/>
   </body>
 </html>
 </richcontent>
-<edge STYLE="hide_edge"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node TEXT="Has menu's of its own" ID="ID_1425310908" CREATED="1316724523734" MODIFIED="1329769343603">
-<edge STYLE="horizontal"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
-<node TEXT="<Enter>: New line" ID="ID_1043315983" CREATED="1316724531504" MODIFIED="1329769358251">
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Right-click: contextmenu" ID="ID_1846126640" CREATED="1316724447049" MODIFIED="1323438577431">
-<edge STYLE="horizontal"/>
+<node TEXT="Note" FOLDED="true" ID="ID_1956511390" CREATED="1489336765335" MODIFIED="1489336769432">
+<node TEXT="Beginning with version 1.6.1" FOLDED="true" ID="ID_1397007996" CREATED="1489336769438" MODIFIED="1493475819367">
+<node TEXT="Properties Panel includes an additional tab for managing presentations." ID="ID_843330248" CREATED="1493475819369" MODIFIED="1493475824763"/>
+<node TEXT="Properties Panel was renamed "Tool Panel"" ID="ID_1442640562" CREATED="1493475825289" MODIFIED="1493475839050"/>
 </node>
 </node>
 </node>
-<node TEXT="Saving & closing" STYLE_REF="Beginner" FOLDED="true" ID="ID_48547188" CREATED="1314127927655" MODIFIED="1335300258084" STYLE="combined" MIN_WIDTH="115.0 px">
-<node ID="ID_1460485800" CREATED="1323438690647" MODIFIED="1335094962930" HGAP_QUANTITY="-99.0 px" VSHIFT_QUANTITY="40.0 px" STYLE="fork"><richcontent TYPE="NODE">
+<node TEXT="Note panel" LOCALIZED_STYLE_REF="styles.important" FOLDED="true" ID="ID_1377583638" CREATED="1489330633219" MODIFIED="1493490654385" LINK="#ID_68046350" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Notes let you include larger, more detailed, more document-like information in your maps." FOLDED="true" ID="ID_309204504" CREATED="1493479713050" MODIFIED="1493480164503">
+<node TEXT="Nodes typically contain a few keywords only." ID="ID_500263262" CREATED="1493480179861" MODIFIED="1493480210790"/>
+</node>
+</node>
+<node TEXT="background color" FOLDED="true" ID="ID_1291906898" CREATED="1489245147739" MODIFIED="1493490654386" LINK="#ID_217694395" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Background color lets you pick the color of the workspace.  The default is white, but you have the full range of colors to choose from." FOLDED="true" ID="ID_177717705" CREATED="1493485210416" MODIFIED="1493485257168">
+<node TEXT="Some users like to stick with the white background and default black text.  While others prefer a darker background or even an image." ID="ID_614916239" CREATED="1493485673131" MODIFIED="1493485728883"/>
+</node>
+</node>
+<node TEXT="Outline view" FOLDED="true" ID="ID_366861344" CREATED="1493485781625" MODIFIED="1493490654387" LINK="#ID_66647782" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Freeplane defaults to a map, where branches radiate outward from the root node.  Outline view lets you see the information in your map in a more traditional outline, with the root node at the top with branches below." FOLDED="true" ID="ID_1317531430" CREATED="1493485817609" MODIFIED="1493485920936">
+<node TEXT="Think of Outline view as a Roman numeral outline -- without the letters and numerals." ID="ID_150391611" CREATED="1493485921584" MODIFIED="1493487211625"/>
+<node TEXT="Map view, generally, tends to spread out horizontally, particularly for small maps and maps with branches only on one side of the root node." ID="ID_1582763577" CREATED="1493486152453" MODIFIED="1493486198389"/>
+<node TEXT="Outline view always is vertical." ID="ID_1110557104" CREATED="1493486198868" MODIFIED="1493486227493"/>
+</node>
+<node TEXT="Here is a sample" FOLDED="true" ID="ID_1500210077" CREATED="1493486633647" MODIFIED="1493486644464">
+<node TEXT="image: map view vs outline view" ID="ID_58869847" CREATED="1493486645247" MODIFIED="1493487169871"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      Save the map you just made by pressing the floppy-disk icon in the menu bar (work menu) above, or choose menu <i>File > Save map</i>. Thereafter you can open another map with the map-icon or <i>File > Open saved map</i>.
-    </p>
+    <img src="Images/doc/mapView%20v%20outlineView.png" width="991" height="448"/>
   </body>
 </html>
 </richcontent>
-<edge STYLE="hide_edge"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node TEXT="Save map" STYLE_REF="BeginnerTopic" ID="ID_1253878525" CREATED="1310134532663" MODIFIED="1323726957514" TEXT_SHORTENED="true">
-<icon BUILTIN="../filesave"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+</node>
+</node>
+</node>
+<node TEXT="Miscellaneous" FOLDED="true" ID="ID_1903666170" CREATED="1493487284831" MODIFIED="1493490654388" LINK="#ID_1649950531" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="The remaining options on the right-click menu can be helpful for display and navigation.  These options also have related menu items and, in some cases, default keyboard shortcuts." FOLDED="true" ID="ID_892532777" CREATED="1493487324958" MODIFIED="1493488219182">
+<node TEXT="Full screen mode" FOLDED="true" ID="ID_789115752" CREATED="1493490773869" MODIFIED="1493490779222">
+<node TEXT="Lets you maximize your workspace, with no toolbars and other workspace elements visible.  This gives you the maximum room to work on your map.  It also is useful for sharing your map with others as a presentation." ID="ID_143144089" CREATED="1493490936700" MODIFIED="1493491041971"/>
+<node TEXT="Here is how" ID="ID_1637856399" CREATED="1493491047041" MODIFIED="1493491056131" LINK="#ID_671026272"/>
+</node>
+<node TEXT="Zoom to fit to page" FOLDED="true" ID="ID_460202687" CREATED="1493487484333" MODIFIED="1493488702248">
+<node TEXT="Fits all visible nodes within the workspace.  Nodes or branches that are not visible, either because of folding or filtering, will remain hidden." ID="ID_147860061" CREATED="1493488322579" MODIFIED="1493488450618"/>
+<node TEXT="This may be useful if you have zoomed in or out to see one part of the map but now want to see the whole map." ID="ID_63104077" CREATED="1493488458561" MODIFIED="1493488491538"/>
+<node TEXT="The more visible nodes a map has, the smaller each node is when you zoom to fit the map to the workspace." ID="ID_1821687007" CREATED="1493488499968" MODIFIED="1493488567881"/>
+<node TEXT="See how" ID="ID_524433115" CREATED="1493488751501" MODIFIED="1493488756646" LINK="#ID_1041694622"/>
+</node>
+<node TEXT="Center selected node" FOLDED="true" ID="ID_1704231229" CREATED="1493488135637" MODIFIED="1493488142566">
+<node TEXT="Positions the current node to the center of the workspace, both horizontally and vertically." FOLDED="true" ID="ID_187963795" CREATED="1493488802269" MODIFIED="1493488869694">
+<node TEXT="Note: if multiple nodes are selected, only the first node that was selected is centered." ID="ID_1955958556" CREATED="1493488894460" MODIFIED="1493488919182"/>
+</node>
+<node TEXT="Here is how" ID="ID_755306605" CREATED="1493489054322" MODIFIED="1493489068730" LINK="#ID_821639211"/>
+</node>
+<node TEXT="Goto root" FOLDED="true" ID="ID_1343222096" CREATED="1493488145038" MODIFIED="1493488149070">
+<node TEXT="Lets you quickly navigate to the root node.  Since the root node is the map's subject, to which everything in the map is related, it is often necessary to leave a branch, return to the root, and find a different branch.  Goto root gets you back to the root node from wherever you are in the map." ID="ID_1919363246" CREATED="1493489089513" MODIFIED="1493489285416"/>
+<node TEXT="Here is how" ID="ID_322379804" CREATED="1493489503444" MODIFIED="1493489508645" LINK="#ID_1570396934"/>
+</node>
+<node TEXT="Goto node with ID..." FOLDED="true" ID="ID_662714505" CREATED="1493488149708" MODIFIED="1493488157022">
+<node TEXT="Lets you quickly navigate to a node -- if you have that node's unique ID." ID="ID_1182384025" CREATED="1493489657010" MODIFIED="1493489685540"/>
+<node TEXT="Here is how" ID="ID_157430255" CREATED="1493489692474" MODIFIED="1493489701931" LINK="#ID_1350954187"/>
+</node>
+<node TEXT="Open maps" FOLDED="true" ID="ID_1973421781" CREATED="1493493001707" MODIFIED="1493493694246">
+<node TEXT="Lets you quickly make any open map the currently-active map for viewing or editing." ID="ID_1551960424" CREATED="1493493631234" MODIFIED="1493493825762"/>
+<node TEXT="Here is how" ID="ID_1856571656" CREATED="1493493676562" MODIFIED="1493493689547" LINK="#ID_750416001"/>
+</node>
+<node TEXT="Split views" FOLDED="true" ID="ID_1763778081" CREATED="1493493728178" MODIFIED="1493493736867">
+<node TEXT="You can see multiple maps at once by dragging them, by their tabs, onto the workspace." ID="ID_1856646469" CREATED="1493497057803" MODIFIED="1493497134890"/>
+<node TEXT="This is very useful if you want to examine two (or more) different maps or if you want to examine two (or more) different parts of the same map." ID="ID_1891284058" CREATED="1493497146168" MODIFIED="1493497188729"/>
+<node TEXT="Here is how" ID="ID_731342791" CREATED="1493497231455" MODIFIED="1493497241544" LINK="#ID_1386370819"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_1558965103" CREATED="1484432866260" MODIFIED="1486862695289">
+<node TEXT="To view or hide workspace elements" FOLDED="true" ID="ID_811833472" CREATED="1484855525954" MODIFIED="1489592147020">
+<node TEXT="You have control over which workspace elements are visible and which are hidden.  This gives you flexibility to make your workspace look the way you want." FOLDED="true" ID="ID_1121617333" CREATED="1493490533000" MODIFIED="1493490609064">
+<node TEXT="Note: In the descriptions below, keyboard shortcuts (if assigned) appear next to menu items." ID="ID_1004253431" CREATED="1489245557313" MODIFIED="1493479341089"/>
+</node>
+<node STYLE_REF="image in details" ID="ID_1604070684" CREATED="1489279409657" MODIFIED="1493490622791"><richcontent TYPE="NODE">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      Look in the toolbar for the icon button to save the current map.
+      Go to menubar <font color="#ff0000">View > Toolbars </font>and select/deselect the toolbars
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
-</node>
-<node TEXT="Save map as..." STYLE_REF="BeginnerTopic" ID="ID_449363060" CREATED="1310134532663" MODIFIED="1323438758087" TEXT_SHORTENED="true">
-<icon BUILTIN="../filesaveas"/>
 <richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
-
+    
   </head>
   <body>
-    <p>
-      Look up in the toolbar
-    </p>
+    <img src="Images/other/workspace/view%20-%20toolbars.png" width="790" height="440"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Close current map" STYLE_REF="BeginnerTopic" ID="ID_1018458898" CREATED="1310134532663" MODIFIED="1323438758087" TEXT_SHORTENED="true">
-<icon BUILTIN="../close"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+<node STYLE_REF="image in details" ID="ID_1666879143" CREATED="1489325637704" MODIFIED="1493490626895"><richcontent TYPE="NODE">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Closes the map that has focus. If multiple maps are open, focus refers to the tab that you are currently editing.</span></font>
+      Go to menubar <font color="#ff0000">View > View Settings </font><font color="#000000">and select/deselect options</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
-</node>
-</node>
-</node>
-<node TEXT="Free nodes" STYLE_REF="Advanced" FOLDED="true" ID="ID_1401167294" CREATED="1323470356903" MODIFIED="1335300258068" MIN_WIDTH="80.0 px">
-<node TEXT="Post-it nodes: free positionable, free floating" STYLE_REF="Advanced" FOLDED="true" ID="ID_630972811" CREATED="1323076049931" MODIFIED="1323806244665" HGAP_QUANTITY="18.0 px" VSHIFT_QUANTITY="227.0 px" STYLE="combined">
-<node ID="ID_830664496" CREATED="1323434577171" MODIFIED="1335094977002" HGAP_QUANTITY="-268.0 px" VSHIFT_QUANTITY="77.0 px" STYLE="fork"><richcontent TYPE="NODE">
+<richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      If you keep <i>Control</i> pressed and click at any free place of a mindmap, a so-called free positional, free floating node opens. This node behaves like a paper post-it: you can move it anywhere, independent of the nodes which are part of the root-hierarchy. The format of this node is determined by the system style <i>Floating node</i>. This standard style can be edited, giving all floating nodes this edited style. A post-it node can be  conected to a hierarchical  [...]
-    </p>
+    <img src="Images/other/workspace/view%20-%20view%20settings.png" width="760" height="458"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node STYLE_REF="SubWidth" ID="ID_1557640435" CREATED="1323470600645" MODIFIED="1335094985020" HGAP_QUANTITY="-581.0 px" VSHIFT_QUANTITY="187.0 px"><richcontent TYPE="NODE">
+</node>
+<node TEXT="or right-click on any non-node spot on the map and select/deselect the toolbars in the context menu" STYLE_REF="image in details" ID="ID_223680460" CREATED="1489244915821" MODIFIED="1493490629703"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      <i>The floating nodes with hidden edges are intended for adding meta information to maps like legends, titles, summaries, authors etc. If such informations relates to a whole map, these nodes should have a root node as their parent so that they are always visible and their position does not depend on anything else. Sometimes such information is relevant only for a part of a map. In this case a floating node with hidden edge can be attached to a non root node. For understanding of t [...]
-    </p>
-    <p>
-      <i>The free nodes do not require that you hide their edges. The second use case for them is a better use of map space. The automatic layout algorithm does not allow any map branches to overlap. If you want to create more compact maps you can convert some nodes to free nodes. This way they can be placed flexible. And their logical position relative to other sibling nodes now depends on their coordinates. You can see it too if you change to outline view which always reflect logical n [...]
-    </p>
+    <img src="Images/other/workspace/right-click%20menu.png" width="257" height="377"/>
   </body>
 </html>
 </richcontent>
 </node>
 </node>
-</node>
-<node TEXT="Making and moving a free floating node" STYLE_REF="Advanced" FOLDED="true" ID="ID_128387683" CREATED="1317135703793" MODIFIED="1323806240625" VGAP_QUANTITY="0.0 px" HGAP_QUANTITY="17.0 px" VSHIFT_QUANTITY="-230.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1188410566" CREATED="1323685758847" MODIFIED="1335094997999" HGAP_QUANTITY="-234.0 px" VSHIFT_QUANTITY="213.0 px"><richcontent TYPE="NODE">
+<node TEXT="workspace elements (how to access)" STYLE_REF="Bible" FOLDED="true" ID="ID_1889681567" CREATED="1489245793739" MODIFIED="1500800930214"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -1084,142 +1045,78 @@
   </head>
   <body>
     <p>
-      A free node is a node which is freely positionable, independently of the position of the other nodes of the mind map. A free node can be recognized by this behaviour and because the oval handle for moving the node is blue and filled in stead of red and open.  
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      A new, free node can be generated by keeping <i>Control</i> pressed and clicking a free place of the mind map. The newly generated free node will have the system  style <i>Free floating node</i>, wih proerties <i>rectangular cloud</i> and <i>hidden edge</i>. These properties can be changed in the usual way to e.g. no-cloud and visible edge. It is invisibly connected to the root.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      An existing node can be turned into a free node by selecting it and choosing  <i>Edit->Free positioned node (set/reset).</i> In this case the properties of the node (edge, cloud, folding)  stay as they are. You can set the properties for cloud and hidden edge in the usual way . The freed node initially appears near the node it is invisibly connected to and can be moved from there to any desired position by dragging its (blue) oval handle. Moving a free floati [...]
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
+      Accessed by
     </p>
     <ul>
       <li>
-        A free node made by clicking a free space of the mind map will be connected to the root node, also if the connecting edge is invisible. This explains why a child node of this free node, if moved onto the upper half of its parent free node, shifts towards the root node.
+        menubar > <font color="#ff0000">View</font> (mostly Toolbars or View settings)
+      </li>
+      <li>
+        right-click > click element (right-click on <b><u><font color="#0000c0">blank</font></u></b>  spot in workspace, NOT on a node)
       </li>
     </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="SubWidth" LAST="false"/>
-</hook>
+<node TEXT="Menubar" FOLDED="true" ID="ID_1228783654" CREATED="1489245078100" MODIFIED="1493490669669" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="can be accessed by" FOLDED="true" ID="ID_49694405" CREATED="1489590055173" MODIFIED="1489590065175">
+<node TEXT="Keyboard" FOLDED="true" ID="ID_143635411" CREATED="1489590065181" MODIFIED="1489592410187" MAX_WIDTH="49.49999834597116 pt" MIN_WIDTH="49.49999834597116 pt">
+<node TEXT="Press (and continue to hold down) Alt key" FOLDED="true" ID="ID_860037740" CREATED="1489590071158" MODIFIED="1489592445606">
+<node TEXT="(menubar hotkey options will be underlined)" ID="ID_676530459" CREATED="1489590102470" MODIFIED="1489590119319"/>
 </node>
-<node TEXT="Free floating node" LOCALIZED_STYLE_REF="defaultstyle.floating" ID="ID_1757242560" CREATED="1317754595087" MODIFIED="1335095015972" HGAP_QUANTITY="608.0 px" VSHIFT_QUANTITY="23.0 px" MAX_WIDTH="150.0 px">
-<hook NAME="FreeNode"/>
-<richcontent TYPE="DETAILS">
+<node TEXT="press letter corresponding to underlined option on menubar" FOLDED="true" ID="ID_1175847331" CREATED="1489590158788" MODIFIED="1489590180534">
+<node TEXT="(a submenu will open)" STYLE_REF="image in details" ID="ID_1215685226" CREATED="1489590276147" MODIFIED="1489592539570"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
-
+    
   </head>
   <body>
-    <p>
-      Hover with the cursor over the left side of me and see my blue, filled oval. Drag me around with this blue handle.
-    </p>
+    <img src="Images/other/workspace/submenu%20flyouts%20(basic).png" width="386" height="236"/>
   </body>
 </html>
 </richcontent>
 </node>
 </node>
+<node TEXT="release Alt key" ID="ID_1332496300" CREATED="1489590181324" MODIFIED="1489590195685"/>
+<node TEXT="navigate through menubar submenu using arrow keys" ID="ID_764038443" CREATED="1489590197204" MODIFIED="1489590227694"/>
 </node>
-<node TEXT="Icons" STYLE_REF="Advanced" FOLDED="true" ID="ID_222393549" CREATED="1323433444639" MODIFIED="1335300258068" STYLE="combined" MIN_WIDTH="80.0 px">
-<icon BUILTIN="bookmark"/>
-<icon BUILTIN="idea"/>
-<node ID="ID_715025500" CREATED="1323437305973" MODIFIED="1335982080280" HGAP_QUANTITY="-56.0 px" VSHIFT_QUANTITY="153.0 px" STYLE="fork"><richcontent TYPE="NODE">
+<node TEXT="Mouse" FOLDED="true" ID="ID_1149117372" CREATED="1489590067589" MODIFIED="1489592410190" MAX_WIDTH="49.49999834597116 pt" MIN_WIDTH="49.49999834597116 pt">
+<node TEXT="Click on menubar option you want" FOLDED="true" ID="ID_1347337331" CREATED="1489590231092" MODIFIED="1489590252885">
+<node TEXT="(a submenu will open)" STYLE_REF="image in details" ID="ID_66834632" CREATED="1489590276147" MODIFIED="1489592541788"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      An icon is a small picture. Freeplane has a library with icons. There are several menu's to select and an icon:
-    </p>
-    <ol>
-      <li>
-        The bar of icons which is showing at the side of the screen. If it is not showing, select <i>View > Toolbars > Icons toolbar.</i>
-      </li>
-      <li>
-        A table of icons which is displayed when you select <i>Edit > Icons > Icon from table.</i>
-      </li>
-      <li>
-        The structured menu of icons showing when you select <i>Edit > Icons  > Icons by category. </i>
-      </li>
-    </ol>
-    <p>
-      To add an icon to a node, select the node, then select the icon. To delete an icon, select the icon-remove first/last icon. These icons have a red cross
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
-    </p>
-    <ul>
-      <li>
-        You can add more icons to the same node core.
-      </li>
-      <li>
-        Icons cannot be added to node details or note fields.
-      </li>
-      <li>
-        It is possible to define and add your own icons to the tool bar.
-      </li>
-    </ul>
+    <img src="Images/other/workspace/submenu%20flyouts%20(basic).png" width="386" height="236"/>
   </body>
 </html>
 </richcontent>
-<edge STYLE="hide_edge"/>
 </node>
 </node>
-<node TEXT="Images" STYLE_REF="Advanced" FOLDED="true" ID="ID_1795262306" CREATED="1323469507087" MODIFIED="1335300258068" MIN_WIDTH="80.0 px">
-<node TEXT="Image (node core)" STYLE_REF="Advanced" FOLDED="true" ID="ID_806240384" CREATED="1315581148847" MODIFIED="1323806455078" STYLE="combined" HGAP_QUANTITY="18.0 px" VSHIFT_QUANTITY="12.0 px">
-<node ID="ID_199889694" CREATED="1323435536299" MODIFIED="1335095042430" HGAP_QUANTITY="-104.0 px" VSHIFT_QUANTITY="89.0 px" STYLE="fork"><richcontent TYPE="NODE">
+<node TEXT="click your way through the submenu that opens" ID="ID_1551122663" CREATED="1489590253147" MODIFIED="1489590274661"/>
+</node>
+<node TEXT="Note" FOLDED="true" ID="ID_200488388" CREATED="1489590297859" MODIFIED="1489590304588">
+<node TEXT="Submenus can have flyout menus" FOLDED="true" ID="ID_516052282" CREATED="1489590316571" MODIFIED="1489590343509">
+<node TEXT="indicated by right-pointing arrow head" STYLE_REF="image in details" ID="ID_1092315070" CREATED="1489590343514" MODIFIED="1489592566179"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      Each node core can contain one image which has a fixed "real size".  (If you need a different size, use a drawing program to resize the original image.) To add an image, select the node and choose menu <i>Edit > Node core > Image by choice </i>or <i>link</i>. This same menu can be used to convert the textual hyperlink address of an image to the image itself.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>See also</b>
-    </p>
-    <ul>
-      <li>
-        Node extensions for adding a scalable image.
-      </li>
-    </ul>
+    <img src="Images/other/workspace/submenu%20flyouts.png" width="386" height="236"/>
   </body>
 </html>
 </richcontent>
-<edge STYLE="hide_edge"/>
 </node>
+<node TEXT="Flyout menus offer more specific options" ID="ID_620129270" CREATED="1489591465527" MODIFIED="1489591480448"/>
 </node>
-<node TEXT="Link to image (red arrow)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1955041924" CREATED="1314282007169" MODIFIED="1333264692422" HGAP_QUANTITY="17.0 px" VSHIFT_QUANTITY="-1.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<edge STYLE="bezier"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_728788498" CREATED="1323469662830" MODIFIED="1335095056626" HGAP_QUANTITY="-145.0 px" VSHIFT_QUANTITY="169.0 px"><richcontent TYPE="NODE">
+</node>
+</node>
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1678107159" CREATED="1489246271412" MODIFIED="1489591842971"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -1227,44 +1124,38 @@
   </head>
   <body>
     <p>
-      An image in a node takes visual space which is scarce.  A hyperlink does not have this disadvantage, while you can still view the image if you press the hyperlink. To add a hyperlink to an image, copy the image source and paste it into the node (this is unlike drag and drop !). If you paste at the upper part of the node, a hyperlink to the image will be added in the node itself. If you paste at the child side of the node a child node will be created with the hyperlink. Th [...]
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
-    </p>
-    <ul>
-      <li>
-        It is possible to drop an image in stead of a hyperlink-to-an-image by keeping <i>Ctrl</i> pressed while dropping. In this case the image is not in the core, but in node details (resizable image).
-      </li>
-    </ul>
-    <p>
-      
+      <img src="Images/other/workspace/menubar.png" width="450" height="50"/>
     </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="Note" FOLDED="true" ID="ID_499168836" CREATED="1489592583963" MODIFIED="1489592588740">
+<node TEXT="The menubar can be hidden" FOLDED="true" ID="ID_1173743642" CREATED="1489592588745" MODIFIED="1489592626410">
+<node FOLDED="true" ID="ID_275486371" CREATED="1489592626412" MODIFIED="1489592656956"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
     <p>
-      <b>See also</b>
+      Menubar > <b><font color="#ff0000">View > Toolbars</font></b>
     </p>
-    <ul>
-      <li>
-        Inline-hyperlinks (underlined hyperlinks). With these it is possible to have multiple links in the text.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
+<node TEXT="uncheck Menubar" ID="ID_237682635" CREATED="1489592660162" MODIFIED="1489592670739"/>
 </node>
+<node TEXT="On blank area of workspace" FOLDED="true" ID="ID_591411088" CREATED="1489592674538" MODIFIED="1489592697362">
+<node TEXT="Right-click > uncheck Menubar" ID="ID_425313187" CREATED="1489592697373" MODIFIED="1489592712170"/>
 </node>
-<node TEXT="In-line image" STYLE_REF="Professional" FOLDED="true" ID="ID_680497355" CREATED="1314282819174" MODIFIED="1323806473283" HGAP_QUANTITY="17.0 px" VSHIFT_QUANTITY="-10.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<edge STYLE="bezier"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_990348986" CREATED="1323469818677" MODIFIED="1335095066189" HGAP_QUANTITY="-72.0 px" VSHIFT_QUANTITY="33.0 px"><richcontent TYPE="NODE">
+</node>
+</node>
+</node>
+<node TEXT="Toolbar" FOLDED="true" ID="ID_1768620172" CREATED="1489245083635" MODIFIED="1493490669672" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="To display/hide the Toolbar" FOLDED="true" ID="ID_255873740" CREATED="1489599647567" MODIFIED="1493480516529">
+<node ID="ID_1685604225" CREATED="1493480392754" MODIFIED="1493480496235"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1272,25 +1163,18 @@
   </head>
   <body>
     <p>
-      Professional users can add images within text with so-called HTML-code. There is also a script for this. See <i>Help > Documentation</i>.
+      menubar  <font color="#ff0000">View > Toolbars > Toolbar</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
+<node TEXT="On a clear spot (not on a node)," FOLDED="true" ID="ID_676307996" CREATED="1493480454841" MODIFIED="1493480476122">
+<node TEXT="right-click > Toolbar" ID="ID_1456763342" CREATED="1493480478225" MODIFIED="1493480487226"/>
 </node>
 </node>
-<node TEXT="Progress" STYLE_REF="Professional" FOLDED="true" ID="ID_1644368711" CREATED="1314283858479" MODIFIED="1335300258068" MIN_WIDTH="100.0 px">
-<node TEXT="When you need to show the progress of some sort, you can add a small or big progress indicator. The amount of progress can be changed. Note that the procedure to do so differs for small and large indicators." ID="ID_707469329" CREATED="1323436243939" MODIFIED="1329770386560" HGAP_QUANTITY="28.0 px" VSHIFT_QUANTITY="81.0 px" STYLE="fork"/>
-<node TEXT="Small progress (icon)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1826965169" CREATED="1314283872699" MODIFIED="1323806550925" HGAP_QUANTITY="26.0 px" VSHIFT_QUANTITY="1.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<icon BUILTIN="25%"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1268781768" CREATED="1323470955796" MODIFIED="1335095105705" HGAP_QUANTITY="-135.0 px" VSHIFT_QUANTITY="32.0 px"><richcontent TYPE="NODE">
+<node TEXT="Screenshots" FOLDED="true" ID="ID_1107591673" CREATED="1493480287011" MODIFIED="1493480294037">
+<node TEXT="screenshot (as it appears in the Freeplane workspace" STYLE_REF="image in details" ID="ID_1327701405" CREATED="1489246472851" MODIFIED="1493480338530" MAX_WIDTH="405.4999877959493 pt" MIN_WIDTH="411.0 px"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -1298,60 +1182,30 @@
   </head>
   <body>
     <p>
-      To add a small progress indicator, select <i>Edit > Core  > Progress >Up. </i>To increase the amount of progress, press<i> </i>  <i>Edit > Core > Progress >Up </i>again (repeatedly).
+      <img src="Images/other/workspace/toolbar.png" width="1455" height="36"/>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-</node>
 </node>
-<node TEXT="Large progress (icon & image)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1080017148" CREATED="1314283905093" MODIFIED="1323806554263" HGAP_QUANTITY="24.0 px" VSHIFT_QUANTITY="-52.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<icon BUILTIN="0%"/>
-<hook URI="freeplaneresource:/images/svg/Progress_tenth_01.svg" SIZE="1.0" NAME="ExternalObject"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node ID="ID_522359814" CREATED="1323470998328" MODIFIED="1335095114534" HGAP_QUANTITY="-182.0 px" VSHIFT_QUANTITY="122.0 px"><richcontent TYPE="NODE">
+<node TEXT="screenshot (on 1 line in Freeplane - here : split to minimize space)" STYLE_REF="image in details" ID="ID_1693966464" CREATED="1490650843311" MODIFIED="1493480338533" MAX_WIDTH="405.4999877959493 pt" MIN_WIDTH="411.0 px"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      To ad a large progress indicator, select <i>Edit > Core >Progress > Extended progress.</i> Then to increase the amount of progress %, double click. To decrease: Ctrl-double click.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
-    </p>
-    <ul>
-      <li>
-        Two images are displayed. The smaller one is a pictogram which is being displayed in the node core. The larger picture is an image displayed in node details.
-      </li>
-      <li>
-        <b>IMPORTANT</b>. The larger image (svg file) cannot be displayed in a Java Applet !
-      </li>
-    </ul>
+    <img src="Images/other/workspace/toolbar%20-%20split.png" width="529" height="96"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
 </node>
-<node TEXT="Joining nodes" STYLE_REF="Professional" FOLDED="true" ID="ID_998103410" CREATED="1316668137651" MODIFIED="1335300258068" MAX_WIDTH="600.0 px" MIN_WIDTH="100.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_795220191" CREATED="1323468276180" MODIFIED="1335095126221" HGAP_QUANTITY="-84.0 px" VSHIFT_QUANTITY="80.0 px"><richcontent TYPE="NODE">
+<node TEXT="Filter toolbar" FOLDED="true" ID="ID_1577175787" CREATED="1489245087252" MODIFIED="1493490669674" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="To display/hide the Filters toolbar" FOLDED="true" ID="ID_60226794" CREATED="1493480857973" MODIFIED="1493480959460">
+<node TEXT="menubar" FOLDED="true" ID="ID_180616353" CREATED="1493480961012" MODIFIED="1493480964724">
+<node ID="ID_989668794" CREATED="1493480964729" MODIFIED="1493481001597"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1359,36 +1213,21 @@
   </head>
   <body>
     <p>
-      The text of different node cores can be combined by selecting the nodes and choosing menu <i>Edit > Node core > Join nodes. </i>Child nodes of the joind nodes become childs of the new joined node.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
+      <font color="#ff0000">View > Toolbars > Filter toolbar</font>
     </p>
-    <ul>
-      <li>
-        This only works well if the node doesn't contain other node components like node details.
-      </li>
-      <li>
-        Hot key: <i>Ctrl + J</i>
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Splitting a node" STYLE_REF="Professional" FOLDED="true" ID="ID_247213553" CREATED="1316668117473" MODIFIED="1335300258084" MAX_WIDTH="600.0 px" MIN_WIDTH="100.0 px" STYLE="combined">
-<font ITALIC="false"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_497224980" CREATED="1323468073621" MODIFIED="1335095138046" HGAP_QUANTITY="-86.0 px" VSHIFT_QUANTITY="135.0 px"><richcontent TYPE="NODE">
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_892989809" CREATED="1493481005362" MODIFIED="1493481041468">
+<node TEXT="right-click > Filter toolbar" ID="ID_1595118023" CREATED="1493481042899" MODIFIED="1493481055882"/>
+</node>
+<node TEXT="keyboard shortcut" FOLDED="true" ID="ID_384721732" CREATED="1493481071690" MODIFIED="1493481077435">
+<node TEXT="Ctrl-F (default)" ID="ID_963944294" CREATED="1493481077439" MODIFIED="1493481088451"/>
+</node>
+</node>
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1662182563" CREATED="1489328236617" MODIFIED="1489591127081"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -1396,46 +1235,17 @@
   </head>
   <body>
     <p>
-      There are two different actions for splitting nodes. One is called from the main menu, the other from the editor.
-    </p>
-    <p>
-      
-    </p>
-    <ol>
-      <li>
-        A selected, multiline node core can be distributed over several nodes with each node containing one line by selecting the node and choosing menu <i>Edit > Node core > Split node.</i>
-      </li>
-      <li>
-        When editing a node, the text can be split at the cursor and distributed over two nodes. In the dialog editor, press the <i>Split button. Or</i> in the in-line editor press  <i>Alt + S</i>.
-      </li>
-    </ol>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
+      <img src="Images/other/workspace/filter%20toolbar.png" width="1679" height="30"/>
     </p>
-    <ul>
-      <li>
-        Other components like node details are not splitted.
-      </li>
-      <li>
-        See Help > Documentation for the details.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Calculating" STYLE_REF="Professional" FOLDED="true" ID="ID_448338872" CREATED="1316197624394" MODIFIED="1335300258084" LINK="http://freeplane.sourceforge.net/wiki/index.php/Formula" MIN_WIDTH="100.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_60050529" CREATED="1323467815625" MODIFIED="1335095146423" HGAP_QUANTITY="-83.0 px" VSHIFT_QUANTITY="116.0 px"><richcontent TYPE="NODE">
+<node TEXT="F-Bar" FOLDED="true" ID="ID_1364416620" CREATED="1489245094715" MODIFIED="1493490669676" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="To display/hide the F-Bar" FOLDED="true" ID="ID_1491222891" CREATED="1493481365934" MODIFIED="1493481590877">
+<node TEXT="menubar" FOLDED="true" ID="ID_1516423165" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_1107665202" CREATED="1493481595987" MODIFIED="1493481620077"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1443,96 +1253,50 @@
   </head>
   <body>
     <p>
-      A core text can, like a spreadsheet cell, contain a formula which starts with "=".  If this is the case,  the formula is calculated and only the result is displayed.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
+      <font color="#ff0000">View > Toolbars > F-Bar</font>
     </p>
-    <ul>
-      <li>
-        Scrips can be used to do calculations over branches, hence emulating spreadsheet like behaviour. Click the red arrow to go to the wiki page where this is explained.
-      </li>
-      <li>
-        As a standard setting a node core containing a formula is surrouded by a kind of bubble. You can remove this in<i> View > Node core > Don't mark formula's with a border</i>.
-      </li>
-      <li>
-        The automatic calculation can be prevented by opening the properties panel and setting field  <i>Format</i>  to <i>Text</i>.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_415575948" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > F-Bar" ID="ID_175427773" CREATED="1493481800979" MODIFIED="1493481812650"/>
 </node>
-<node TEXT="Selecting and moving nodes" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_272980743" CREATED="1314248580003" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
-<node TEXT="Scrolling and panning the map" STYLE_REF="Beginner" ID="ID_1577961914" CREATED="1314644535914" MODIFIED="1335300393571" MIN_WIDTH="1.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1560196388" CREATED="1323511488363" MODIFIED="1335095167077" HGAP_QUANTITY="-187.0 px" VSHIFT_QUANTITY="52.0 px"><richcontent TYPE="NODE">
+</node>
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1440130977" CREATED="1489328931158" MODIFIED="1489591127082"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      You can drag the whole map by:
-    </p>
-    <ul>
-      <li>
-        clicking in the background and drag the map around; or
-      </li>
-      <li>
-        pan the map with Ctrl+Shift+Cursor up/down/left/right
-      </li>
-    </ul>
+    <img src="Images/other/workspace/f%20bar.png" width="1679" height="22"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Selecting" STYLE_REF="Beginner" ID="ID_1573267345" CREATED="1323507663956" MODIFIED="1337158256746" MIN_WIDTH="60.0 px">
-<node TEXT="Automatic selection" STYLE_REF="Beginner" FOLDED="true" ID="ID_1387234491" CREATED="1314249066966" MODIFIED="1335300393587" MAX_WIDTH="600.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1185537684" CREATED="1323506992696" MODIFIED="1335095176609" HGAP_QUANTITY="-112.0 px" VSHIFT_QUANTITY="39.0 px"><richcontent TYPE="NODE">
+<node TEXT="Icons toolbar" FOLDED="true" ID="ID_970426412" CREATED="1489245098507" MODIFIED="1493490669677" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="located on left of workspace" FOLDED="true" ID="ID_1872991750" CREATED="1489330348938" MODIFIED="1489330361678">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1436907444" CREATED="1489329098141" MODIFIED="1493482173356"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      You can select a node by just hovering the cursor over it. After a short delay the node will show a blue border indicating it is selected. This is called <b>automatic selection</b>. You can also click a node to select it. Finally also the Goto actions in menu <i>Navigate </i>and method <i>Find</i> will select a node.
-    </p>
+    <img src="Images/other/workspace/icons%20toolbar.png" width="50" height="409"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Keeping the selection" STYLE_REF="Beginner" FOLDED="true" ID="ID_970057223" CREATED="1314248859369" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<edge STYLE="bezier" COLOR="#33ffcc"/>
-<node ID="ID_299898759" CREATED="1323507254371" MODIFIED="1335095184877" HGAP_QUANTITY="-125.0 px" VSHIFT_QUANTITY="39.0 px"><richcontent TYPE="NODE">
+<node TEXT="To display/hide the Icons toolbar" FOLDED="true" ID="ID_781993089" CREATED="1493481365934" MODIFIED="1493482146822">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_1958155705" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_440900188" CREATED="1493481595987" MODIFIED="1493481620077"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1540,50 +1304,34 @@
   </head>
   <body>
     <p>
-      The automatic selection of a node can be unpractical in some conditions. You can keep a node selected while moving the cursor over other nodes: select the node and then keep <i>Shift</i> pressed when you move the cursor over other nodes.
+      <font color="#ff0000">View > Toolbars > F-Bar</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
-<edge STYLE="hide_edge"/>
 </node>
 </node>
-<node TEXT="Key to the root" STYLE_REF="Beginner" FOLDED="true" ID="ID_1316263866" CREATED="1314249586526" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<edge STYLE="bezier"/>
-<node ID="ID_279008116" CREATED="1323507943923" MODIFIED="1335095192568" HGAP_QUANTITY="-81.0 px" VSHIFT_QUANTITY="23.0 px"><richcontent TYPE="NODE">
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1426217832" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Icons toolbar" ID="ID_1214757225" CREATED="1493481800979" MODIFIED="1493482155429"/>
+</node>
+<node TEXT="Clicking arrow on left of workspace minimizes/maximizes icons toolbar" FOLDED="true" ID="ID_1119106796" CREATED="1489329327421" MODIFIED="1493477681595">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1057914695" CREATED="1493482177479" MODIFIED="1493482249600"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      With a big map it is easy to get lost. If you press <i>Escape</i> the selection will jump to the root at once.
-    </p>
+    <img src="Images/icons%20toolbar%20-%20collapsed.png" width="13" height="96"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
-</node>
 </node>
-<node TEXT="Select all nodes" STYLE_REF="Beginner" FOLDED="true" ID="ID_376722702" CREATED="1329770963443" MODIFIED="1335300393587">
-<node TEXT="To select all nodes, first select the root (press Escape) and next press CTrl + A." STYLE_REF="TitlesContent" ID="ID_1214336373" CREATED="1329770999440" MODIFIED="1335095203971" HGAP_QUANTITY="-91.0 px" VSHIFT_QUANTITY="25.0 px"/>
 </node>
 </node>
-<node TEXT="Moving" STYLE_REF="Beginner" ID="ID_1560992291" CREATED="1314248654564" MODIFIED="1335300393571" MAX_WIDTH="600.0 px" MIN_WIDTH="60.0 px">
-<node TEXT="Moving a node in the hierarchy" STYLE_REF="Beginner" FOLDED="true" ID="ID_125921821" CREATED="1314250124540" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
-<node ID="ID_1599927930" CREATED="1323510888467" MODIFIED="1335095213253" HGAP_QUANTITY="-186.0 px" VSHIFT_QUANTITY="39.0 px"><richcontent TYPE="NODE">
+<node TEXT="Note" FOLDED="true" ID="ID_1106537764" CREATED="1489329321610" MODIFIED="1493477454917">
+<node ID="ID_1298792237" CREATED="1493477479773" MODIFIED="1493477595174"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1591,32 +1339,17 @@
   </head>
   <body>
     <p>
-      To disconnect a node from its current parent and connect it to another parent you can simply click and drag it to its new location. As you can read below it makes a difference at which position of the target node you drop. You can also move nodes by sorting.
+      Much more information about Icons toolbar is available <b><font color="#ff0000">HERE</font></b>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-</node>
 </node>
-<node TEXT="Moving a connected node in space" STYLE_REF="Beginner" FOLDED="true" ID="ID_293115184" CREATED="1314249849956" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node TEXT="To displace a node while leaving its connections in tact, find the oval handle which is at the parent side of a node. Move the cursor over the this side of the node  until the oval lights up. Then click the oval and drag wherever you want the node to go. All other nodes may move with it.  You can restore a moved node to itsoriginal position by double clicking its oval handle." ID="ID_1319283887" CREATED="1323510779368" MODIFIED="1335095222161" HGAP_QUANTITY="-208.0 px" VSHIFT [...]
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Dropping positions" STYLE_REF="Beginner" FOLDED="true" ID="ID_1039655261" CREATED="1314250309213" MODIFIED="1335300393587" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_786303568" CREATED="1323511320373" MODIFIED="1335095232146" HGAP_QUANTITY="-108.0 px" VSHIFT_QUANTITY="104.0 px" MIN_WIDTH="80.0 px"><richcontent TYPE="NODE">
+<node TEXT="Status line" FOLDED="true" ID="ID_1438513260" CREATED="1489245104475" MODIFIED="1493490669679" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="located on bottom-left of workspace" FOLDED="true" ID="ID_325023698" CREATED="1489330328701" MODIFIED="1489330345318">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_869545538" CREATED="1489329729489" MODIFIED="1489591870811"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -1624,36 +1357,14 @@
   </head>
   <body>
     <p>
-      Each node has two positions where you can drop another node. These positions are visible if the cursor is above it.
-    </p>
-    <ol>
-      <li>
-        If the cursor is near the top of the target node, the whole upper half lights up. If you drop a node here, the node will become a sibling above the target node.
-      </li>
-      <li>
-        If the cursor is near the child side of the target node, the left or right side of the node lights up. If you drop the node here it will be connected as a child node.
-      </li>
-    </ol>
-    <p>
-      <b>Note</b>
-    </p>
-    <p>
-      In case of the root it is possible to drop a node to the left or the right side. This is also true in case of a node with a hidden edge.
+      <img src="Images/other/workspace/status%20line.png" width="324" height="24"/>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Moving a group" STYLE_REF="Advanced" FOLDED="true" ID="ID_1040002877" CREATED="1316181690861" MODIFIED="1335300393587" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1239614830" CREATED="1323511365121" MODIFIED="1335095242208" HGAP_QUANTITY="-84.0 px" VSHIFT_QUANTITY="62.0 px"><richcontent TYPE="NODE">
+<node TEXT="Information shown on Status line" LOCALIZED_STYLE_REF="default" FOLDED="true" ID="ID_1783124829" CREATED="1489420302695" MODIFIED="1493482470587"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -1661,26 +1372,26 @@
   </head>
   <body>
     <p>
-      It is possible to move a whole group of nodes including the summary node:
+      see <a href="freeplane:/%20/D:/GoogleDrive/Freeplane%20documentation%20project/mind%20maps/Freeplane%20workspace.mm#ID_862325455">screenshot</a>
     </p>
-    <ol>
-      <li>
-        Select the group : with <i>Shift</i> pressed first select the first node and then select the summary node.
-      </li>
-      <li>
-        Keep <i>Shift</i> pressed and drag the group to its new location.
-      </li>
-    </ol>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
+<node TEXT="Node ID" FOLDED="true" ID="ID_1830722611" CREATED="1489420306602" MODIFIED="1489591903629" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt">
+<node TEXT="Whether Node ID displays in the Status line is controlled in Preferences > Appearance (tab) > Status line (section)" ID="ID_703964671" CREATED="1489420311921" MODIFIED="1493477821218"/>
 </node>
+<node TEXT="Node content type" FOLDED="true" ID="ID_1313541678" CREATED="1489420397998" MODIFIED="1489591903632" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt">
+<node TEXT="text" ID="ID_1437484626" CREATED="1489420412161" MODIFIED="1489591912953" MAX_WIDTH="40.49999861419205 pt" MIN_WIDTH="40.49999861419205 pt"/>
+<node TEXT="" ID="ID_376277404" CREATED="1489421415262" MODIFIED="1489421415264">
+<hook NAME="FirstGroupNode"/>
 </node>
-<node TEXT="Reset node position" STYLE_REF="Advanced" FOLDED="true" ID="ID_1352824494" CREATED="1335300691836" MODIFIED="1335300949728">
-<node STYLE_REF="TitlesContent" ID="ID_688846542" CREATED="1335300712264" MODIFIED="1335300958557" HGAP_QUANTITY="-121.0 px" VSHIFT_QUANTITY="31.0 px"><richcontent TYPE="NODE">
+<node TEXT="number" ID="ID_1793403716" CREATED="1489420415870" MODIFIED="1489591912956" MAX_WIDTH="40.49999861419205 pt" MIN_WIDTH="40.49999861419205 pt"/>
+<node TEXT="date" ID="ID_271331474" CREATED="1489420417950" MODIFIED="1489591912956" MAX_WIDTH="40.49999861419205 pt" MIN_WIDTH="40.49999861419205 pt"/>
+<node TEXT="" ID="ID_1644832452" CREATED="1489421415258" MODIFIED="1489421415261">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="must check checkbox in preferences > behavior > data formatting and parsing > recognize input of numbers and date-time" FOLDED="true" ID="ID_1859033376" CREATED="1489421415265" MODIFIED="1489421471106">
+<node ID="ID_407869765" CREATED="1489591939698" MODIFIED="1489591979203"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1688,7 +1399,7 @@
   </head>
   <body>
     <p>
-      After displacing nodes they can be set to their original positions. Select the nodes and choose <i>Edit > Reset node position.</i>
+      Preferences is accessed by menubar > <font color="#ff0000"><b>Tools > Preferences</b></font>
     </p>
   </body>
 </html>
@@ -1696,11 +1407,19 @@
 </node>
 </node>
 </node>
-<node TEXT="Sorting nodes" STYLE_REF="Advanced" FOLDED="true" ID="ID_1014457432" CREATED="1314338769195" MODIFIED="1335300393571" MAX_WIDTH="600.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_915226922" CREATED="1323511424855" MODIFIED="1335095252536" HGAP_QUANTITY="-80.0 px" VSHIFT_QUANTITY="44.0 px"><richcontent TYPE="NODE">
+</node>
+<node TEXT="Filtering" FOLDED="true" ID="ID_1590988753" CREATED="1489420423406" MODIFIED="1489591903633" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt">
+<node TEXT="Filtering is on if a funnel icon displays" ID="ID_1640127845" CREATED="1489420430831" MODIFIED="1489420449239"/>
+</node>
+<node TEXT="Hyperlink destination" FOLDED="true" ID="ID_361414550" CREATED="1489420528982" MODIFIED="1493477874137" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt">
+<node TEXT="When hovering over a node which contains a hyperlink." ID="ID_1642645129" CREATED="1493477843969" MODIFIED="1493477867009"/>
+</node>
+<node TEXT="Errors" FOLDED="true" ID="ID_132909201" CREATED="1493477983158" MODIFIED="1493477998256" MAX_WIDTH="87.74999720603236 pt" MIN_WIDTH="87.74999720603236 pt">
+<icon BUILTIN="messagebox_warning"/>
+<node TEXT="Sometimes, errors may occur.  If so, you will see a triangle icon with an exclamation mark inside (like the icon in this node.)" FOLDED="true" ID="ID_578909456" CREATED="1493478004607" MODIFIED="1493478096893">
+<icon BUILTIN="messagebox_warning"/>
+<node TEXT="If you want to view a log file, click on the errors section of the Status line.  The log file will open in your system's default text editor." ID="ID_1483473732" CREATED="1493478102974" MODIFIED="1493478166166"/>
+<node ID="ID_1309573240" CREATED="1493478379017" MODIFIED="1493478529319"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1708,46 +1427,35 @@
   </head>
   <body>
     <p>
-      You may want to sort nodes alphabetically. If you select a node, you can sort its children by right-cliking the node and choosing<i> Sort children. </i>More sorting options are available in<i> Edit > Moving and sorting</i>.
+      Please consider letting Freeplane automatically alert developers when you experience errors.  menubar <font color="#ff0000">Tools > Preferences > Environment (tab) > Automatic bug report (section) > Policy (dropdown)</font>.  Set to either "Always send" or "Show report dialog".
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
 </node>
-<node TEXT="Relating and grouping nodes" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_215646874" CREATED="1314109445053" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
-<node TEXT="Edges" STYLE_REF="Beginner" FOLDED="true" ID="ID_1492225657" CREATED="1314162236991" MODIFIED="1335300437470" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_751107880" CREATED="1323514479284" MODIFIED="1335095266982" HGAP_QUANTITY="-28.0 px" VSHIFT_QUANTITY="43.0 px"><richcontent TYPE="NODE">
+</node>
+</node>
+<node TEXT="Scrollbars" FOLDED="true" ID="ID_511421073" CREATED="1489245111763" MODIFIED="1493490669680" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="located on right & bottom of workspace" FOLDED="true" ID="ID_489211139" CREATED="1489330308382" MODIFIED="1489330319550">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_131057881" CREATED="1489329729489" MODIFIED="1493478729063"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
     
   </head>
   <body>
-    <p>
-      Edges are basic relations which define the node hierarchy. You can change the curving of edges, their color and thickness and you can  hide edges. The place to do so is in the <b>Properties panel</b> described below, or  menu <b>Format</b>.
-    </p>
+    <img src="Images/other/workspace/scroll%20bars.png" width="550" height="294"/>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Connectors" STYLE_REF="Beginner" FOLDED="true" ID="ID_1073407528" CREATED="1314129123086" MODIFIED="1335300437485" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1649729730" CREATED="1323514507513" MODIFIED="1335277476237" HGAP_QUANTITY="-55.0 px" VSHIFT_QUANTITY="150.0 px"><richcontent TYPE="NODE">
+<node TEXT="To display/hide the Scrollbars" FOLDED="true" ID="ID_845248614" CREATED="1493481365934" MODIFIED="1493482770304">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_828438729" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_962245491" CREATED="1493481595987" MODIFIED="1493482712544"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1755,58 +1463,39 @@
   </head>
   <body>
     <p>
-      It is possible to connect any two nodes with a line called (bilateral) <b>connector</b>:  right-click a node and drag to the node you want to connect.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      The <b>curving</b> of the connector can be changed by left-clicking and dragging the connector. Drag the dotten handle-lines to change the arrow orientation. The <b>style</b> of the connector can be changed and <b>labels</b> can be added to the connector: Right-click the connector and select the options in the context menu that opens.
-    </p>
-    <p>
-      
+      <font color="#ff0000">View > Toolbars > Scrollbars</font>
     </p>
-    <p>
-      <b>Note</b>
-    </p>
-    <ul>
-      <li>
-        <p>
-          Alternatively you can SHIFT + CTRL + left click to define a connector.
-        </p>
-      </li>
-      <li>
-        <p>
-          You can also select two nodes, then right-click the second node and choose <i>Add connector </i>while keeping<i> Ctrl </i>pressed. After entering a lable, press Enter.
-        </p>
-      </li>
-      <li>
-        For a connector without begin,  a <b>unilateral</b>  connector, right-click the node and drag onto itself.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
-<node TEXT="a" ID="ID_1328399304" CREATED="1314130936565" MODIFIED="1323517469534" HGAP_QUANTITY="25.0 px" STYLE="as_parent">
-<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_581303769" MIDDLE_LABEL="label" STARTINCLINATION="9;-23;" ENDINCLINATION="-28;-89;" STARTARROW="NONE" ENDARROW="DEFAULT"/>
-<edge STYLE="hide_edge"/>
-<node TEXT="b" ID="ID_273400211" CREATED="1314130940427" MODIFIED="1323517479815">
-<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_273400211" MIDDLE_LABEL="connector&#xa;without&#xa;begin" STARTINCLINATION="19;86;" ENDINCLINATION="19;86;" STARTARROW="NONE" ENDARROW="NONE"/>
-<edge STYLE="bezier"/>
-<node TEXT="c" ID="ID_581303769" CREATED="1314130942275" MODIFIED="1314130945036"/>
 </node>
 </node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1592890127" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Scrollbars" ID="ID_1972296594" CREATED="1493481800979" MODIFIED="1493482770305"/>
 </node>
 </node>
-<node TEXT="Summary node group" STYLE_REF="Advanced" FOLDED="true" ID="ID_1700918771" CREATED="1314129783832" MODIFIED="1335300437485" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_651594550" CREATED="1323514659262" MODIFIED="1335095290460" HGAP_QUANTITY="-119.0 px" VSHIFT_QUANTITY="78.0 px"><richcontent TYPE="NODE">
+<node TEXT="Note: you also can pan by hovering over a blank (non-node) spot, holding your left mouse button, and dragging." ID="ID_130260007" CREATED="1493478739613" MODIFIED="1493478795862"/>
+</node>
+<node TEXT="Properties panel" FOLDED="true" ID="ID_342720357" CREATED="1489245117491" MODIFIED="1493490669681" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="located on right side of workspace" FOLDED="true" ID="ID_445239308" CREATED="1489330284126" MODIFIED="1489330294381">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1037901778" CREATED="1489329729489" MODIFIED="1489591127078"><richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <img src="Images/other/workspace/properties%20panel.png" width="363" height="499"/>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="To display/hide the Properties panel" FOLDED="true" ID="ID_517494390" CREATED="1493481365934" MODIFIED="1493483314342">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_29500935" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_15664796" CREATED="1493481595987" MODIFIED="1493483314375"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1814,42 +1503,24 @@
   </head>
   <body>
     <p>
-      A group of siblings can be connected to a so called <b>summary node.</b>. This node connects the siblings with an accolade. Select the group of siblings and right-click one of the selected nodes while keeping <i>Ctrl</i>  pressed. Choose <i>New summary node (selected nodes) </i>in the node contextmenu.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Note</b>
+      <font color="#ff0000">View > Toolbars > Properties panel</font>
     </p>
-    <ul>
-      <li>
-         There are also more advanced options. Read more about these in the documentation.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node TEXT="" ID="ID_614882936" CREATED="1455910877279" MODIFIED="1455910877279">
-<hook NAME="FirstGroupNode"/>
 </node>
-<node TEXT="a" STYLE_REF="AdvancedTopic" ID="ID_902940862" CREATED="1314130883345" MODIFIED="1316165216808"/>
-<node TEXT="b" STYLE_REF="AdvancedTopic" ID="ID_303013117" CREATED="1314130889936" MODIFIED="1316165216824"/>
-<node TEXT="c" STYLE_REF="AdvancedTopic" ID="ID_1837144570" CREATED="1314130892393" MODIFIED="1316165216824" VSHIFT_QUANTITY="-9.0 px"/>
-<node TEXT="" ID="ID_1718735488" CREATED="1455910877283" MODIFIED="1455910877283">
-<hook NAME="SummaryNode"/>
-<node TEXT="Summary node" STYLE_REF="AdvancedTopic" ID="ID_460668684" CREATED="1314130905124" MODIFIED="1316165216824"/>
 </node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1162591358" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Properties panel" ID="ID_1637412603" CREATED="1493481800979" MODIFIED="1493483314375"/>
 </node>
+<node TEXT="keyboard shortcut" FOLDED="true" ID="ID_497415852" CREATED="1493483343630" MODIFIED="1493483349862">
+<edge COLOR="#acacac"/>
+<node TEXT="Alt+P (default)" ID="ID_788765336" CREATED="1493483349864" MODIFIED="1493483361408"/>
 </node>
-<node TEXT="Cloud node group" STYLE_REF="Advanced" FOLDED="true" ID="ID_1150908697" CREATED="1314130460475" MODIFIED="1335300437485" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1862713604" CREATED="1323514733122" MODIFIED="1335095305358" HGAP_QUANTITY="-101.0 px" VSHIFT_QUANTITY="52.0 px"><richcontent TYPE="NODE">
+</node>
+<node TEXT="The Properties panel tabs" FOLDED="true" ID="ID_1274600777" CREATED="1493478853861" MODIFIED="1493483510710">
+<node TEXT="Format tab" FOLDED="true" ID="ID_836542924" CREATED="1493478894964" MODIFIED="1493483909506" MAX_WIDTH="225.0 px" MIN_WIDTH="225.0 px"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -1857,27 +1528,16 @@
   </head>
   <body>
     <p>
-      It is possible to visually group a whole branch of nodes with a common background called <b>cloud</b>. Right-click the parent of the branch and choose <i>Nodes > Add cloud. </i>You can modify<i> </i>the color and style of the cloud in the <i>Properties panel </i>described below. To prevent the nodes in the node group from folding, select<i> Edit > Node group > All unfolded nodes.</i>
+      For a detailed discussion see <b><font color="#ff0000">HERE</font></b>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node TEXT="cloud a" STYLE_REF="AdvancedTopic" ID="ID_1742435994" CREATED="1314130827910" MODIFIED="1323517713897" VSHIFT_QUANTITY="15.0 px">
-<cloud COLOR="#f0f0f0" SHAPE="ARC"/>
-<node TEXT="b" ID="ID_1270291744" CREATED="1314130833239" MODIFIED="1314130836016"/>
-<node TEXT="c" ID="ID_1022872809" CREATED="1314130837348" MODIFIED="1314130840017"/>
+<node TEXT="gives you easy, convenient access to all of a node's properties, where you can change the properties." FOLDED="true" ID="ID_1647506341" CREATED="1493479001386" MODIFIED="1493479001388">
+<node TEXT="(e.g. font, font size, node width, node background color, many more)." ID="ID_471080488" CREATED="1493483019691" MODIFIED="1493483583813"/>
 </node>
-<node TEXT="cloud b" STYLE_REF="AdvancedTopic" ID="ID_539843005" CREATED="1314208596772" MODIFIED="1316165226464" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="-9.0 px">
-<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
-<node TEXT="e" ID="ID_249943796" CREATED="1314208605486" MODIFIED="1314208607670"/>
-<node TEXT="f" ID="ID_1428582117" CREATED="1314208608472" MODIFIED="1314208611937"/>
 </node>
-<node STYLE_REF="AdvancedTopic" ID="ID_649516172" CREATED="1310106596579" MODIFIED="1323517675474" TEXT_SHORTENED="true">
-<icon BUILTIN="../Cloud24"/>
-<richcontent TYPE="NODE">
+<node TEXT="Calendar and attributes tab" FOLDED="true" ID="ID_861913293" CREATED="1493478970731" MODIFIED="1493483924762" MAX_WIDTH="225.0 px" MIN_WIDTH="225.0 px"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -1885,46 +1545,33 @@
   </head>
   <body>
     <p>
-      icon-button for <i>Add default cloud</i>
+      For a detailed discussion see <b><font color="#ff0000">HERE</font></b>
     </p>
   </body>
 </html>
 </richcontent>
-<richcontent TYPE="DETAILS" HIDDEN="true">
+<node TEXT="Calendar tab allows you to" FOLDED="true" ID="ID_1510748401" CREATED="1493479014195" MODIFIED="1493483675334">
+<node TEXT="Insert a date into the core of a node or multiple selected nodes." ID="ID_1678828882" CREATED="1493483675341" MODIFIED="1493483741355"/>
+<node TEXT="Attach a reminder to a node or multiple selected nodes." ID="ID_1575208467" CREATED="1493483746930" MODIFIED="1493483784457"/>
+</node>
+<node TEXT="Attributes" FOLDED="true" ID="ID_1411897906" CREATED="1493483614667" MODIFIED="1493483619644">
+<node ID="ID_1074143712" CREATED="1493483820033" MODIFIED="1493483843011"><richcontent TYPE="NODE">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      Find this icon button in the toolbar
+      For a detailed discussion of attributes see <b><font color="#ff0000">HERE</font></b>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="bezier"/>
-</node>
 </node>
 </node>
 </node>
-<node TEXT="Hyperlinking" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_114835202" CREATED="1314284617264" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
-<node TEXT="What is a link ?" FOLDED="true" ID="ID_55001637" CREATED="1323100759475" MODIFIED="1335300461104">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="Beginner" LAST="false"/>
-</hook>
-<node TEXT="A dynamic link (hyperlink) is an electronic connection from a source node to a destination object. The destination can be a directory, file, web page, application, e-mail etc. The connection is click-able: double-click to open it. The link appears as an underlined text, or as a red or green arrow. The red arrow connects to an external address or an e-mail address. The green arrow connects to an internal address (other node). The underlined text can represent both. There can b [...]
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-</node>
-</node>
-<node TEXT="Linking nodes with anchor" STYLE_REF="Beginner" FOLDED="true" ID="ID_1524719322" CREATED="1336298056719" MODIFIED="1336299477442">
-<node STYLE_REF="TitlesContent" ID="ID_1594135890" CREATED="1336298585173" MODIFIED="1337500686337" HGAP_QUANTITY="-158.0 px" VSHIFT_QUANTITY="136.0 px"><richcontent TYPE="NODE">
+<node TEXT="Presentations tab (in Freeplane 1.6.x and newer)" FOLDED="true" ID="ID_847363101" CREATED="1493479047034" MODIFIED="1493483928746" MAX_WIDTH="225.0 px" MIN_WIDTH="225.0 px"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -1932,44 +1579,13 @@
   </head>
   <body>
     <p>
-      The following procudure makes it easy to make a link between two nodes, especially if two nodes are far apart in the map or are in different maps:
-    </p>
-    <ul>
-      <li>
-        right-click one of the nodes to be linked and select <i>Link > Set link anchor</i>
-      </li>
-      <li>
-        right-click the other node to be linked and select Link > Make link from anchor or <i>Link > Make link to anchor</i>.
-      </li>
-    </ul>
-    <p>
-      <b>Note</b>
+      For a detailed discussion see <b><font color="#ff0000">HERE</font></b>
     </p>
-    <ul>
-      <li>
-        <i>Set link anchor </i>will automatically replace the previous anchor.
-      </li>
-      <li>
-        The anchor will be lost after exiting Freeplane.
-      </li>
-      <li>
-        See below for a different procedure if nodes are more close to each other.
-      </li>
-      <li>
-        See attributes how to set  a link in an attribute value. There is an easy way to link to other nodes as well.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-</node>
-</node>
-<node TEXT="External link" STYLE_REF="Beginner" FOLDED="true" ID="ID_640110372" CREATED="1286651969385" MODIFIED="1335300461119" LINK="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane" STYLE="combined">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="120.75 pt"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1913035829" CREATED="1323512829161" MODIFIED="1335095327448" HGAP_QUANTITY="-83.0 px" VSHIFT_QUANTITY="240.0 px"><richcontent TYPE="NODE">
+<node TEXT="lets you organize your map into presentations and slides to show your map's information in a pre-planned presentation." FOLDED="true" ID="ID_968628392" CREATED="1493479081858" MODIFIED="1493479466334">
+<node ID="ID_1155390727" CREATED="1493479468214" MODIFIED="1493479483823"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -1977,65 +1593,36 @@
   </head>
   <body>
     <p>
-      A hyperlink to an address outside the map can be created by right-clicking a node and selecting <i>Link</i>. However, the easiest way to add a hyperlink or group of hyperlinks to external objects, is by drag and drop. Dropping a copy of a directory, file, or web address will generate a child node of the selected node containing a hyperlink. The target address of the hyperlink is contained in the title. This text may be removed or changed without changing the dynamics of the hyperli [...]
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      Dropping a group of hyperlinks will generate a group of child nodes, each containing one of the hyperlinks.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      To edit the target address of the hyperlink, right-click the node containing the link and choose <i>Links > Add or modify hyperlink (type)...</i> In the dialog that opens you can edit the address. With <i>Ctrl + V</i> a copied address can be pasted in the entry field.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      To link to a node in a different mind map, see<a href="#ID_1418102707"> Link from outside to a particular node</a>.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
-    </p>
-    <ul>
-      <li>
-        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
-      </li>
-      <li>
-        delete the text in the text field ( the address)
-      </li>
-    </ul>
-    <p>
-      <b>Note</b>
+      For more information see <b><font color="#ff0000">HERE</font></b>
     </p>
-    <ul>
-      <li>
-        The appearance of the arrow-hyperlink can be changed in Properties panel, to show the whole node core as underlined text. This is only possible if no other underlined hyperlink(s) is active,
-      </li>
-      <li>
-        If dropping an image file on a node, the image may be shown in stead of the hyperlink. For this keep Ctrl pressed while dropping.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Internal link" STYLE_REF="Beginner" FOLDED="true" ID="ID_1942100751" CREATED="1314360169447" MODIFIED="1335300461119" LINK="#ID_86446891" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1830541497" CREATED="1323512880196" MODIFIED="1335095339023" HGAP_QUANTITY="-78.0 px" VSHIFT_QUANTITY="89.0 px"><richcontent TYPE="NODE">
+</node>
+</node>
+<node TEXT="Note" FOLDED="true" ID="ID_396515716" CREATED="1489336765335" MODIFIED="1489336769432">
+<node TEXT="Beginning with version 1.6.1" FOLDED="true" ID="ID_1063877542" CREATED="1489336769438" MODIFIED="1493475819367">
+<node TEXT="Properties Panel includes an additional tab for managing presentations." ID="ID_961341651" CREATED="1493475819369" MODIFIED="1493475824763"/>
+<node TEXT="Properties Panel was renamed "Tool Panel"" ID="ID_395014690" CREATED="1493475825289" MODIFIED="1493475839050"/>
+</node>
+</node>
+</node>
+<node TEXT="Note panel" FOLDED="true" ID="ID_68046350" CREATED="1489330633219" MODIFIED="1493490669682" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Notes let you include larger, more detailed, more document-like information in your maps." ID="ID_705705993" CREATED="1493479713050" MODIFIED="1493480164505"/>
+<node TEXT="can be docked in several locations..." FOLDED="true" ID="ID_1201183220" CREATED="1489330828538" MODIFIED="1489331464455">
+<node TEXT="" ID="ID_1329223806" CREATED="1489330877990" MODIFIED="1489330877993">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="top" ID="ID_765153187" CREATED="1489330841466" MODIFIED="1489330856225" MAX_WIDTH="60.0 px" MIN_WIDTH="60.0 px"/>
+<node TEXT="bottom" ID="ID_1895090603" CREATED="1489330844154" MODIFIED="1489330856224" MAX_WIDTH="60.0 px" MIN_WIDTH="60.0 px"/>
+<node TEXT="left" ID="ID_580470853" CREATED="1489330846338" MODIFIED="1489330856223" MAX_WIDTH="60.0 px" MIN_WIDTH="60.0 px"/>
+<node TEXT="right" ID="ID_63040419" CREATED="1489330847914" MODIFIED="1489330856221" MAX_WIDTH="60.0 px" MIN_WIDTH="60.0 px"/>
+<node TEXT="" ID="ID_152209806" CREATED="1489330877939" MODIFIED="1489330877989">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node ID="ID_1292927872" CREATED="1489330877994" MODIFIED="1489330932151" MAX_WIDTH="206.2499940320851 pt" MIN_WIDTH="206.2499940320851 pt"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2043,36 +1630,51 @@
   </head>
   <body>
     <p>
-      A hyperlink from one node to another node (local hyperlink) can be created by selecting two nodes, then right-clicking one of them while keeping <i>Ctrl</i> pressed, and finally choosing menu <i>Links > Local hyperlink. </i>
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+      menubar <font color="#ff0000">View > Notes > Note panel position</font>
     </p>
-    <ul>
-      <li>
-        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
-      </li>
-      <li>
-        delete the text in the text field ( the address)
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Email link" STYLE_REF="Professional" FOLDED="true" ID="ID_869144882" CREATED="1270892460675" MODIFIED="1335300461119" LINK="mailto:%20jokro at freeplane.nl">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1480409284" CREATED="1323512986970" MODIFIED="1335095349771" HGAP_QUANTITY="-64.0 px" VSHIFT_QUANTITY="145.0 px"><richcontent TYPE="NODE">
+</node>
+<node TEXT="Resize by" FOLDED="true" ID="ID_282691784" CREATED="1489331477798" MODIFIED="1489331510223">
+<node TEXT="hover over separator between map area and note panel." FOLDED="true" ID="ID_1456082883" CREATED="1489331510228" MODIFIED="1489331637647">
+<node TEXT="a double-arrow cursor displays when resizing is active" FOLDED="true" ID="ID_1313194494" CREATED="1489331530895" MODIFIED="1489331603399">
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_637741576" CREATED="1489331759965" MODIFIED="1489591313108"><richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <img src="Images/other/workspace/resize%20arrows.png" width="190" height="118"/>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Drag the double-arrow cursor to increase or decrease note panel size." ID="ID_1115479346" CREATED="1489331575494" MODIFIED="1489331631719"/>
+</node>
+<node TEXT="screenshot" STYLE_REF="image in details" ID="ID_1060179331" CREATED="1489330754010" MODIFIED="1489591127075"><richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <img src="Images/other/workspace/notes%20panel.png" width="739" height="258"/>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="background color" FOLDED="true" ID="ID_217694395" CREATED="1489245147739" MODIFIED="1493490669683" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="To display/hide the background color" FOLDED="true" ID="ID_823484574" CREATED="1493481365934" MODIFIED="1493485382173">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_150196214" CREATED="1493481592900" MODIFIED="1493481595221">
+<node FOLDED="true" ID="ID_736252514" CREATED="1493481595987" MODIFIED="1493485531796"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2080,39 +1682,89 @@
   </head>
   <body>
     <p>
-      The simplest way to create an e-mail link which automatically opens your email program is to copy and paste the email address into a node. This will generate a<b> child node</b> of the selected node with the link. The text of the child node will consist of the e-mail address. You may replace this address by e.g. only the name.
+      <font color="#ff0000">Format > Map background</font>
     </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_1892150574" CREATED="1493485531800" MODIFIED="1493485531804"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
     <p>
-      
+      <font color="#ff0000">> background color</font>
     </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="Note: additional options" FOLDED="true" ID="ID_826400603" CREATED="1493485537012" MODIFIED="1493485552333">
+<node TEXT="Background image" ID="ID_1712636120" CREATED="1493485555084" MODIFIED="1493485601164"/>
+<node TEXT="Fit background image to window" ID="ID_1049336436" CREATED="1493485601939" MODIFIED="1493485613324"/>
+<node TEXT="Clear" ID="ID_1360707009" CREATED="1493485614411" MODIFIED="1493485619836"/>
+</node>
+</node>
+</node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_311869845" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > background color" ID="ID_471005451" CREATED="1493481800979" MODIFIED="1493485382175"/>
+</node>
+</node>
+</node>
+<node TEXT="Outline view" FOLDED="true" ID="ID_66647782" CREATED="1493485781625" MODIFIED="1493490669684" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="To display/hide the Outline view" FOLDED="true" ID="ID_1520448653" CREATED="1493481365934" MODIFIED="1493486874885">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_711208384" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_1115205538" CREATED="1493481595987" MODIFIED="1493486862959"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
     <p>
-      If you want to add the e-mail link to a particular node (and not to its newly generated child), right-click the node and choose<i> Add or modify hyperlink (type)...</i> Then enter in the text field:
+      <font color="#ff0000">View > View settings > Outline view</font>
     </p>
-    <ul>
-      <li>
-        <i>mailto:emailaddress</i><br/> e.g. mailto:jokro at freeplane.nl
-      </li>
-    </ul>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_878074297" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Outline view" ID="ID_1967868640" CREATED="1493481800979" MODIFIED="1493486868501"/>
+</node>
+</node>
+<node TEXT="Note" FOLDED="true" ID="ID_1796343659" CREATED="1493487078865" MODIFIED="1493487081291">
+<node TEXT="Vertical and horizontal spacing between nodes in Outline view is controlled in Preferences" FOLDED="true" ID="ID_884449573" CREATED="1493486897052" MODIFIED="1493487088091">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_781621524" CREATED="1493486949611" MODIFIED="1493486953004">
+<node ID="ID_811292743" CREATED="1493486953419" MODIFIED="1493486999517"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
     <p>
-      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+      <font color="#ff0000">Tools > Preferences > Appearance (tab) > Outline view (section)</font>
     </p>
-    <ul>
-      <li>
-        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
-      </li>
-      <li>
-        delete the text in the text field ( the address)
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
-<node STYLE_REF="Professional" FOLDED="true" ID="ID_241324782" CREATED="1315336877701" MODIFIED="1335300461119" STYLE="combined"><richcontent TYPE="NODE">
+</node>
+</node>
+</node>
+<node TEXT="Miscellaneous" FOLDED="true" ID="ID_1649950531" CREATED="1493487284831" MODIFIED="1493490669684" MAX_WIDTH="127.0 px" MIN_WIDTH="127.0 px">
+<node TEXT="Full screen mode" FOLDED="true" ID="ID_671026272" CREATED="1493490773869" MODIFIED="1493490779222">
+<node TEXT="To enter full screen mode..." FOLDED="true" ID="ID_539004628" CREATED="1493491940311" MODIFIED="1493491967872">
+<node TEXT="menubar" FOLDED="true" ID="ID_1551631938" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_119688425" CREATED="1493481595987" MODIFIED="1493492334901" LINK="ID_892881649"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2120,15 +1772,29 @@
   </head>
   <body>
     <p>
-      Underlined <a href="https://sourceforge.net/apps/phpbb/freeplane/viewforum.php?f=1">hyperlinks</a> .
+      <font color="#ff0000">View > View settings > Full screen mode</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1356533861" CREATED="1323512914336" MODIFIED="1335095382173" HGAP_QUANTITY="-133.0 px" VSHIFT_QUANTITY="268.0 px"><richcontent TYPE="NODE">
+</node>
+</node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1469526179" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Full screen mode" ID="ID_1421282182" CREATED="1493481800979" MODIFIED="1493492346563" LINK="ID_892881649"/>
+</node>
+<node TEXT="keyboard shortcut" FOLDED="true" ID="ID_292787154" CREATED="1493492347730" MODIFIED="1493492354659">
+<edge COLOR="#acacac"/>
+<node TEXT="F11 (default)" ID="ID_551549344" CREATED="1493492354664" MODIFIED="1493492363866"/>
+</node>
+</node>
+<node TEXT="Note" FOLDED="true" ID="ID_1582195960" CREATED="1493491107321" MODIFIED="1493491110417">
+<node TEXT="The "full screen" menu item, right-click item, or hotkey act as a toggle.  If you are in full screen mode, you turn it off.  If you are not in full screen mode, you turn it on." ID="ID_308125292" CREATED="1493491977247" MODIFIED="1493492066775"/>
+<node TEXT="You can still make workspace elements display while in full screen mode by using keyboard shortcuts." FOLDED="true" ID="ID_856395092" CREATED="1493491110422" MODIFIED="1493491144057">
+<node TEXT="For example, the filter toolbar (Ctrl+F) and properties panel (Alt+P) and note panel (Ctrl+Greater) ship with default hotkeys.  Pressing these hotkeys while in full screen mode with toggle these workspace elements between being displayed or hidden." ID="ID_254829597" CREATED="1493491144897" MODIFIED="1493491326351"/>
+<node TEXT="You can assign any workspace element to any key or key combination, which then can be used in full screen mode." FOLDED="true" ID="ID_950203404" CREATED="1493491329126" MODIFIED="1493491396047">
+<node TEXT="Key mapping can only be done using the menubar (not right-click context menus)." ID="ID_1315501707" CREATED="1493491396702" MODIFIED="1493491472374"/>
+<node FOLDED="true" ID="ID_436251085" CREATED="1493491480868" MODIFIED="1493491595405"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2136,65 +1802,3811 @@
   </head>
   <body>
     <p>
-      To define an underlined hyperlink (HTML-link), first open the text dialog for  Node core, Node details or Note. Then type and select the piece of text to which the link applies. And finally select  in the Edit menu of the dialog window <i>Add hyperlink (choose)...</i> or <i>Add or modify hyperlink (type)</i>. In the latter case you can  type the address of the hyperlink or you can paste a copied address by pressing Ctr + V. Example link: <font col [...]
+      Expose any menu item (e.g. <font color="#ff0000">Navigate > Goto node with ID...</font>) and hold the Ctrl key down while you click the menu item.
     </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="the "Enter new key" dialog will appear" ID="ID_1428031062" CREATED="1493491646139" MODIFIED="1493491740131"><richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <a href="Images/doc/key%20mapping%20dialog.png"><img src="Images/doc/key%20mapping%20dialog.png" width="309" height="117"/>
+</a>  </body>
+</html>
+</richcontent>
+</node>
+<node ID="ID_1661572768" CREATED="1493491745585" MODIFIED="1493491904683"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
     <p>
-      
+      press the key(s) you want to assign for this menu item.  <font color="#ff0000">Important</font>: do not press "Enter" or "Return" thinking that is the equivalent of the "OK" button.  You must <b><u>click the OK button</u></b> to complete your hotkey assignment.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Zoom to fit to page" FOLDED="true" ID="ID_1041694622" CREATED="1493487484333" MODIFIED="1493488709127">
+<node TEXT="To fit the map to the workspace..." FOLDED="true" ID="ID_545620046" CREATED="1493481365934" MODIFIED="1493488602121">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_340316805" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_1855840720" CREATED="1493481595987" MODIFIED="1493488638488"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <font color="#ff0000">View > Zoom > Zoom to fit to page</font>
     </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_977693354" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Zoom to fit map to page" ID="ID_148068463" CREATED="1493481800979" MODIFIED="1493488670279"/>
+</node>
+</node>
+</node>
+<node TEXT="Center selected node" FOLDED="true" ID="ID_821639211" CREATED="1493488135637" MODIFIED="1493488142566">
+<node TEXT="To center the selected node on the workspace.." FOLDED="true" ID="ID_1108171573" CREATED="1493481365934" MODIFIED="1493488960572">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_1877253568" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_570943971" CREATED="1493481595987" MODIFIED="1493488993789"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
     <p>
-      <b>Note</b>
+      <font color="#ff0000">View > View settings > Center selected node</font>
     </p>
-    <ul>
-      <li>
-        To change the text of the hyperlink, simply retype it. This will not alter the hyperlink address.
-      </li>
-      <li>
-        To change the address of the hyperlink, select the whole underlined text and then choose again <i>Add hyperlink (choose)...</i> or <i>Add or modify hyperlink (type).</i>
-      </li>
-      <li>
-        There can be multiple underlined hyperlinks in one Node core, Node details or Note field.
-      </li>
-      <li>
-        If the text is unformatted, or is formatted with the properties panel, the links are blue. If the text is formatted with the menu's of the edit-dialog, it has the color and size set in this dialog.
-      </li>
-      <li>
-        Ta add an internal hyperlink to another node, put #NodeId as address. To get the NodeID, right-click the node and select <i>Copy NodeId</i>. Then paste the NodeId with Ctrl + V in the link address which opens when you selct <i>Add or modify hyperlink (type)</i>. Don't forget to put # before the nodeId.
-      </li>
-      <li>
-        To link to a node in a different mind map, see<a href="#ID_1418102707"> Link from outside to a particular node</a>.
-      </li>
-      <li>
-        To link to a node in the same mindmap, the address should contain #NodeID. NodeID is got by rightclicking and selecting <i>Copy node ID</i>. It can be pasted with<i> Ctrl + V</i> in the fiield for the link address.
-      </li>
-      <li>
-        To remove the address and the text of an underlined hyperlink, delete all underlined text of the hyperlink. To delete only the address, leaving the text:
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1412600420" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Center selected node" ID="ID_280754916" CREATED="1493481800979" MODIFIED="1493488999019"/>
+</node>
+<node TEXT="keyboard shortcut" FOLDED="true" ID="ID_55471708" CREATED="1493489009042" MODIFIED="1493489015427">
+<edge COLOR="#acacac"/>
+<node TEXT="Alt+C (default)" ID="ID_431331679" CREATED="1493489015431" MODIFIED="1493489031011"/>
+</node>
+</node>
+</node>
+<node TEXT="Goto root" FOLDED="true" ID="ID_1570396934" CREATED="1493488145038" MODIFIED="1493488149070">
+<node TEXT="To return to the root node from anywhere in the map..." FOLDED="true" ID="ID_698577511" CREATED="1493481365934" MODIFIED="1493489316016">
+<edge COLOR="#acacac"/>
+<node TEXT="menubar" FOLDED="true" ID="ID_1892013563" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_1019197616" CREATED="1493481595987" MODIFIED="1493489467064"><richcontent TYPE="NODE">
 
-        <ul>
-          <li>
-            put the cursor inside the underlined text (do not select the text)
-          </li>
-          <li>
-            Choose Edit > Add or modify hyperlink (type)..
-          </li>
-          <li>
-            Delete the address in the dialog that opens.
-          </li>
-        </ul>
-      </li>
-    </ul>
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <font color="#ff0000">Navigate > Goto root</font>
+    </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Hyperlink to menu item" STYLE_REF="Professional" FOLDED="true" ID="ID_350080162" CREATED="1314359739019" MODIFIED="1335300461119" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1108178356" CREATED="1323513038412" MODIFIED="1335095393033" HGAP_QUANTITY="-132.0 px" VSHIFT_QUANTITY="86.0 px"><richcontent TYPE="NODE">
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1453490313" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="right-click > Goto root" ID="ID_1093806739" CREATED="1493481800979" MODIFIED="1493489399734"/>
+</node>
+<node TEXT="keyboard shortcut" FOLDED="true" ID="ID_874635808" CREATED="1493489410973" MODIFIED="1493489416982">
+<edge COLOR="#acacac"/>
+<node TEXT="Escape (default)" ID="ID_305926579" CREATED="1493489416986" MODIFIED="1493489425447"/>
+</node>
+</node>
+</node>
+<node TEXT="Goto node with ID..." FOLDED="true" ID="ID_1350954187" CREATED="1493488149708" MODIFIED="1493488157022">
+<node TEXT="To navigate to a node for which you know the ID..." FOLDED="true" ID="ID_1192540705" CREATED="1493481365934" MODIFIED="1493489726619">
+<edge COLOR="#acacac"/>
+<node TEXT="" ID="ID_1301989849" CREATED="1493490168072" MODIFIED="1493490168075">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="menubar" FOLDED="true" ID="ID_289848019" CREATED="1493481592900" MODIFIED="1493481595221">
+<node ID="ID_750369247" CREATED="1493481595987" MODIFIED="1493489790451"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <font color="#ff0000">Navigate > Goto node with ID...</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_1069177510" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="Goto node with ID..." ID="ID_1468293511" CREATED="1493481800979" MODIFIED="1493489798474"/>
+</node>
+<node TEXT="" ID="ID_690810575" CREATED="1493490168070" MODIFIED="1493490168072">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="(A dialog, titled "Goto node with ID...") will display." FOLDED="true" ID="ID_1837317222" CREATED="1493489964207" MODIFIED="1493489996080">
+<node TEXT="screenshot" ID="ID_615582079" CREATED="1493490051102" MODIFIED="1493490091062"><richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <a href="Images/doc/goto%20node%20with%20ID.png"><img src="Images/doc/goto%20node%20with%20ID.png" width="277" height="129"/>
+</a>  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="type or paste (from clipboard) the target node's ID;  press "OK" button." ID="ID_262572679" CREATED="1493489929072" MODIFIED="1493490126271"/>
+</node>
+</node>
+<node TEXT="Note: you must know (or have in the clipboard, so you can paste) the desired node's ID." FOLDED="true" ID="ID_573218066" CREATED="1493489814401" MODIFIED="1493489853642">
+<edge COLOR="#acacac"/>
+<node TEXT="To aquire the ID of a node..." FOLDED="true" ID="ID_735922627" CREATED="1493489854169" MODIFIED="1493489881665">
+<node TEXT="Hover over the node" ID="ID_810636828" CREATED="1493489882512" MODIFIED="1493489887321"/>
+<node TEXT="Right-click" FOLDED="true" ID="ID_1819890345" CREATED="1493489887912" MODIFIED="1493489894544">
+<node TEXT="Copy node ID" ID="ID_789213317" CREATED="1493489917184" MODIFIED="1493489922208"/>
+</node>
+<node TEXT="Note:" FOLDED="true" ID="ID_1147663864" CREATED="1493490336210" MODIFIED="1493490339916">
+<node TEXT="Node ID is distinct from node URI.  If you want to insert a hyperlink into a node, use node URI." ID="ID_435650045" CREATED="1493490340458" MODIFIED="1493490395275"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Open maps" FOLDED="true" ID="ID_750416001" CREATED="1493493001707" MODIFIED="1493493006771">
+<node TEXT="To quickly navigate to another map." FOLDED="true" ID="ID_187562700" CREATED="1493496568695" MODIFIED="1493496580776">
+<node TEXT="right-click (on a non-node spot on the workspace)" FOLDED="true" ID="ID_642228291" CREATED="1493481005362" MODIFIED="1493481751210">
+<edge COLOR="#acacac"/>
+<node TEXT="When you right-click on a non-node spot in the workspace, you can see your open maps and quickly navigate to them.  (The current map is indicated by a bullet.)" FOLDED="true" ID="ID_966714182" CREATED="1493493030004" MODIFIED="1493493461999">
+<node TEXT="image: right-click context menu (at top)" ID="ID_1477197155" CREATED="1493493333680" MODIFIED="1493493404367"><richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <a href="Images/doc/right-click%20menu%20-%20open%20maps.png"><img src="Images/doc/right-click%20menu%20-%20open%20maps.png" width="340" height="125"/>
+</a>  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Click on the map to which you want to switch.  That map becomes the currently focused-on map." ID="ID_1615849897" CREATED="1493493514364" MODIFIED="1493493571517"/>
+</node>
+<node TEXT="menubar" FOLDED="true" ID="ID_1957716711" CREATED="1493496591959" MODIFIED="1493496594184">
+<edge COLOR="#acacac"/>
+<node FOLDED="true" ID="ID_152260268" CREATED="1493496611184" MODIFIED="1493496622112"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <font color="#ff0000">Maps > Maps</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Click on the map to which you want to switch.  That map becomes the currently focused-on map." ID="ID_570481613" CREATED="1493493514364" MODIFIED="1493493571517"/>
+</node>
+</node>
+<node TEXT="moving between tabs" FOLDED="true" ID="ID_237222699" CREATED="1493496639742" MODIFIED="1493496650135">
+<edge COLOR="#acacac"/>
+<node TEXT="Each open map is represented by a tab, like the tabs on file folders in a filing cabinet.  The currently focused-on map's tab is colored, while the rest are gray." FOLDED="true" ID="ID_242655555" CREATED="1493496651047" MODIFIED="1493496952980">
+<node TEXT="image" ID="ID_1527855255" CREATED="1493496794021" MODIFIED="1493496831343"><richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <img src="Images/doc/tabs%20in%20workspace.png" width="446" height="94"/>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Click on the map you want to edit." FOLDED="true" ID="ID_1310462292" CREATED="1493496854067" MODIFIED="1493496864956">
+<node TEXT="alternatively, you can press Ctrl+Tab to navigate to the next tab to the right of the current tab.  To navigate to the next tab to the left of the current tab, press Ctrl+Shift+Tab." ID="ID_1401040951" CREATED="1493496869948" MODIFIED="1493496999164"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Split views" FOLDED="true" ID="ID_1386370819" CREATED="1493493728178" MODIFIED="1493493736867">
+<node TEXT="The basic technique is simple -- much easier to do than to explain." ID="ID_974767862" CREATED="1493497394765" MODIFIED="1493498239628"/>
+<node TEXT="Hover over the tab of one map, press and hold the left mouse button, and drag the tab onto the workspace -- indicated by bounding boxes, previewing a valid position to which you can drop the map." ID="ID_1017237024" CREATED="1493498223896" MODIFIED="1493498228221"/>
+<node TEXT="Maps can be docked to one of four positions on the workspace or, if you already have dragged a tab." ID="ID_650052617" CREATED="1493497524587" MODIFIED="1493497648485"/>
+<node TEXT="When you see the bounding box in the desired position, remove your finger from the mouse button.  The map will remain where the bounding box was." ID="ID_619211657" CREATED="1493497843336" MODIFIED="1493497901360"/>
+<node TEXT="In effect, this creates a new map view, showing two maps simultaneously.  This is similar to a window which has two panes." ID="ID_1362762323" CREATED="1493497905143" MODIFIED="1493498003767"/>
+<node TEXT="different sections of the same map" FOLDED="true" ID="ID_1467569986" CREATED="1493498040726" MODIFIED="1493498049182">
+<node TEXT="To simultaneously display sections of the same maps in the workspace you must first create a copy of the map." ID="ID_532944420" CREATED="1493497286559" MODIFIED="1493498097079"/>
+<node ID="ID_265487768" CREATED="1493498118788" MODIFIED="1493498199694"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Click on the map tab you want to copy, making it the current map.  Then access the menubar <font color="#ff0000">View > New map view</font>.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="A copy of the map is created to the right of the node you selected." ID="ID_1452898757" CREATED="1493498303530" MODIFIED="1493521903221"/>
+<node TEXT="Then you can drag and dock it as described above." ID="ID_1901194841" CREATED="1493521903931" MODIFIED="1493521940164"/>
+</node>
+<node TEXT="If, in the process of dragging a map's tab onto the workspace, you decide you do not want to complete the operation -- press the Escape key." ID="ID_356114307" CREATED="1493497730585" MODIFIED="1493497769026"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Notes and explanations" STYLE_REF="Notes and explanations" FOLDED="true" ID="ID_420165783" CREATED="1483416064359" MODIFIED="1486862695290">
+<node TEXT="Screenshots in map" LOCALIZED_STYLE_REF="default" FOLDED="true" ID="ID_1182530512" CREATED="1489246530884" MODIFIED="1489591205756">
+<node TEXT="Screenshots are contained in node details." LOCALIZED_STYLE_REF="default" FOLDED="true" ID="ID_646773965" CREATED="1489246536016" MODIFIED="1489591198437">
+<node TEXT="Node details can be visible or hidden.  If hidden, you need to make them visible to see them.  Hidden node details have an arrow on the bottom left corner of the node." ID="ID_1038085669" CREATED="1493522894719" MODIFIED="1493522989827">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="like this..." ID="ID_1024247540" CREATED="1493523007582" MODIFIED="1493523029221" STYLE="fork">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node ID="ID_1478849309" CREATED="1489327295807" MODIFIED="1489327550983"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <img src="Images/other/workspace/details%20arrow_.png" width="110" height="39"/>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="To show or hide node details" FOLDED="true" ID="ID_1289741991" CREATED="1493523045693" MODIFIED="1493523056998">
+<node ID="ID_788177810" CREATED="1489246558147" MODIFIED="1493523080672"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Menubar > <font color="#ff0000">View > Hide details</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="Keyboard shortcut : Alt+F2" ID="ID_1694221035" CREATED="1489246735241" MODIFIED="1489246775827"/>
+</node>
+</node>
+</node>
+<node TEXT="Hiding workspace elements" LOCALIZED_STYLE_REF="default" FOLDED="true" ID="ID_146682932" CREATED="1489592748729" MODIFIED="1489592761457">
+<node FOLDED="true" ID="ID_572505988" CREATED="1489592626412" MODIFIED="1489592656956"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Menubar > <b><font color="#ff0000">View > Toolbars</font></b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="uncheck workspace element to hide" ID="ID_492149232" CREATED="1489592660162" MODIFIED="1489592784306"/>
+</node>
+<node TEXT="On blank area of workspace" FOLDED="true" ID="ID_168756113" CREATED="1489592674538" MODIFIED="1489592697362">
+<node TEXT="Right-click > uncheck workspace element to hide" ID="ID_1179336680" CREATED="1489592697373" MODIFIED="1489592788161"/>
+</node>
+</node>
+</node>
+<node TEXT="Tips and tricks" STYLE_REF="Tips and tricks" FOLDED="true" ID="ID_1772859470" CREATED="1485134404008" MODIFIED="1486862695292">
+<node TEXT="youtube video (workspace overview)" ID="ID_1009597901" CREATED="1489325016077" MODIFIED="1489592179039" LINK="https://www.youtube.com/watch?v=wK1on8ipCVA"/>
+</node>
+</node>
+<node TEXT="Open map on Internet" STYLE_REF="Advanced" FOLDED="true" ID="ID_794559549" CREATED="1329413644062" MODIFIED="1335300198085">
+<node STYLE_REF="TitlesContent" ID="ID_663032265" CREATED="1329413694345" MODIFIED="1335091139945" HGAP_QUANTITY="-123.0 px" VSHIFT_QUANTITY="34.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To open a mind map on Internet, this map must first be copied to your local computer. Menu <i>File > Open map from URL </i>does just this.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Core map" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_1337127972" CREATED="1314109409850" MODIFIED="1335300531741" NUMBERED="true" MIN_WIDTH="200.0 px">
+<node TEXT="Node core" STYLE_REF="Beginner" FOLDED="true" ID="ID_1370298116" CREATED="1315860175003" MODIFIED="1335300258084" MIN_WIDTH="115.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1314148002" CREATED="1323461584875" MODIFIED="1335094931917" HGAP_QUANTITY="-102.0 px" VSHIFT_QUANTITY="105.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The information of a node is displayed in two major area's. One area is called <b>node core</b> because it is situated in the inner area of the node and can have a bubble around it. The text you are reading now is in a node core. The colored area just above the one you are reading now is in the core of another node.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      The text in the core can be short like a title, or multi line and can contain different basic display components like images and icons. It can also contain hyperlinks, formulas and components for time mangement and password protection.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      Besides in the node core, text can be entered in <b>node details</b>, in <b>notes</b>  and in <b>attributes</b>. These fields are described later.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node STYLE_REF="Beginner" FOLDED="true" ID="ID_268413071" CREATED="1314125550476" MODIFIED="1335300258084" STYLE="combined" MIN_WIDTH="115.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Core text <i>in-line</i>
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge STYLE="bezier"/>
+<node ID="ID_265318117" CREATED="1323437723250" MODIFIED="1341131023466" HGAP_QUANTITY="-95.0 px" VSHIFT_QUANTITY="150.0 px" STYLE="fork"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      When Freeplane first opens you will be greeted by a blank map. It contains one, elliptical form, the root node. The root node contains a text such as "New map". This text is highligted, meaning you can replace it by typing your own text. Simply type your title and press <i>Enter</i>. The <i>Insert</i>  key will add a child node - again just type and press <i>Enter</i>. A second <i>Enter</i>  will add a sibling. That's really all there is to it. If you  [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b><br/>
+    </p>
+    <ul>
+      <li>
+        To add a new line, press <i>Shift + Enter.</i>
+      </li>
+      <li>
+        If you right-click when editing text, a so called <b>context menu</b> for editing text opens, giving quick access to formatting functions like copy and paste.
+      </li>
+      <li>
+        If you first select a text and then right-click, a <i>Format</i> menu is displayed to make text bold etc. This formatting only applies to the selected  text.
+      </li>
+      <li>
+        Editing can be only started using home, end, F2, double click or by starting to type a text
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<edge STYLE="hide_edge"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node TEXT="New map" STYLE_REF="BeginnerTopic" ID="ID_1310307853" CREATED="1310134532663" MODIFIED="1323726805884" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../filenew"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Look up in the toolbar at the top of the screen.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Open saved map.." STYLE_REF="BeginnerTopic" ID="ID_1284635316" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../fileopen"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Look up in the toolbar
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Print map" STYLE_REF="BeginnerTopic" ID="ID_111478060" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../fileprint"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Opens the dialog box associated with the printer on which the map will print.</span></font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Cut" STYLE_REF="BeginnerTopic" ID="ID_353410114" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../editcut"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Cuts the node currently selected and all of its children.</span></font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Copy" STYLE_REF="BeginnerTopic" ID="ID_1274800359" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../editcopy"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Copies the node selected and all of its children.</span></font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Paste" STYLE_REF="BeginnerTopic" ID="ID_1705754282" CREATED="1310134532663" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../editpaste"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif">Pasts copied text. If the selected node is in edit mode, the text will be added to the contents of the node. If the selected node is not in edit mode, the text will be added as a child node.</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="New child node" STYLE_REF="BeginnerTopic" ID="ID_942355748" CREATED="1266249828031" MODIFIED="1323438013786" TEXT_SHORTENED="true" STYLE="as_parent">
+<icon BUILTIN="../idea"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif">Creates a new node as a child of  the currently-selected node. </font>
+    </p>
+    <p>
+
+    </p>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif"><b>Same effect: </b></font>
+    </p>
+    <ul>
+      <li>
+        <font color="#000000" face="SansSerif, sans-serif">press key <i>Ins</i></font>
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="<Ins> New child node" ID="ID_45308529" CREATED="1316701840462" MODIFIED="1323438013786" STYLE="as_parent">
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="<Shift>+<Enter> New line" ID="ID_396169297" CREATED="1316702242678" MODIFIED="1323438013786" STYLE="as_parent">
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="<Enter> Finish edit, select node" ID="ID_780427702" CREATED="1316702397734" MODIFIED="1323438013786" STYLE="as_parent">
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="2*<Enter> New sibling node" ID="ID_420903085" CREATED="1316701822921" MODIFIED="1323438013786" STYLE="as_parent">
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Right-click: contextmenu" ID="ID_435495519" CREATED="1316724447049" MODIFIED="1323438013802" STYLE="as_parent">
+<edge STYLE="horizontal"/>
+</node>
+</node>
+</node>
+<node STYLE_REF="Beginner" FOLDED="true" ID="ID_1279324490" CREATED="1314126040831" MODIFIED="1335300258084" STYLE="combined" MIN_WIDTH="115.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Core text <i>in dialog</i>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_1433249332" CREATED="1323438495734" MODIFIED="1341131039869" HGAP_QUANTITY="-100.0 px" VSHIFT_QUANTITY="114.0 px" STYLE="fork"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      A second way to edit a node is in a separate dialog. Right-click on the node. This opens the context menu of the node. (This context menu is different from the context menu for editing text !) In this context menu choose <b><i>Edit core in dialog</i>.</b> You can now type the text and use the shown options to format the text. When you close the dialog by pressing OK, the text will appear in the node. This dialog has more extensive options for formatting text than availabl [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        You can also open the edit window in the main menu bar. Choose <i>Edit </i>and then <i>Node core  </i>and you will see<i> Edit node core in dialog.</i>  In the following we write this procedure as <i>Edit > Node core > Edit node core in dialog</i>.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<edge STYLE="hide_edge"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node TEXT="Has menu's of its own" ID="ID_1425310908" CREATED="1316724523734" MODIFIED="1329769343603">
+<edge STYLE="horizontal"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+<node TEXT="<Enter>: New line" ID="ID_1043315983" CREATED="1316724531504" MODIFIED="1329769358251">
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Right-click: contextmenu" ID="ID_1846126640" CREATED="1316724447049" MODIFIED="1323438577431">
+<edge STYLE="horizontal"/>
+</node>
+</node>
+</node>
+<node TEXT="Saving & closing" STYLE_REF="Beginner" FOLDED="true" ID="ID_48547188" CREATED="1314127927655" MODIFIED="1335300258084" STYLE="combined" MIN_WIDTH="115.0 px">
+<node ID="ID_1460485800" CREATED="1323438690647" MODIFIED="1335094962930" HGAP_QUANTITY="-99.0 px" VSHIFT_QUANTITY="40.0 px" STYLE="fork"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Save the map you just made by pressing the floppy-disk icon in the menu bar (work menu) above, or choose menu <i>File > Save map</i>. Thereafter you can open another map with the map-icon or <i>File > Open saved map</i>.
+    </p>
+  </body>
+</html>
+</richcontent>
+<edge STYLE="hide_edge"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node TEXT="Save map" STYLE_REF="BeginnerTopic" ID="ID_1253878525" CREATED="1310134532663" MODIFIED="1323726957514" TEXT_SHORTENED="true">
+<icon BUILTIN="../filesave"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Look in the toolbar for the icon button to save the current map.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Save map as..." STYLE_REF="BeginnerTopic" ID="ID_449363060" CREATED="1310134532663" MODIFIED="1323438758087" TEXT_SHORTENED="true">
+<icon BUILTIN="../filesaveas"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Look up in the toolbar
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Close current map" STYLE_REF="BeginnerTopic" ID="ID_1018458898" CREATED="1310134532663" MODIFIED="1323438758087" TEXT_SHORTENED="true">
+<icon BUILTIN="../close"/>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      <font color="#000000" face="SansSerif, sans-serif"><span style="color: #000000; font-family: SansSerif, sans-serif">Closes the map that has focus. If multiple maps are open, focus refers to the tab that you are currently editing.</span></font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+</node>
+</node>
+<node TEXT="Free nodes" STYLE_REF="Advanced" FOLDED="true" ID="ID_1401167294" CREATED="1323470356903" MODIFIED="1335300258068" MIN_WIDTH="80.0 px">
+<node TEXT="Post-it nodes: free positionable, free floating" STYLE_REF="Advanced" FOLDED="true" ID="ID_630972811" CREATED="1323076049931" MODIFIED="1323806244665" HGAP_QUANTITY="18.0 px" VSHIFT_QUANTITY="227.0 px" STYLE="combined">
+<node ID="ID_830664496" CREATED="1323434577171" MODIFIED="1335094977002" HGAP_QUANTITY="-268.0 px" VSHIFT_QUANTITY="77.0 px" STYLE="fork"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      If you keep <i>Control</i> pressed and click at any free place of a mindmap, a so-called free positional, free floating node opens. This node behaves like a paper post-it: you can move it anywhere, independent of the nodes which are part of the root-hierarchy. The format of this node is determined by the system style <i>Floating node</i>. This standard style can be edited, giving all floating nodes this edited style. A post-it node can be  conected to a hierarchical  [...]
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node STYLE_REF="SubWidth" ID="ID_1557640435" CREATED="1323470600645" MODIFIED="1335094985020" HGAP_QUANTITY="-581.0 px" VSHIFT_QUANTITY="187.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <i>The floating nodes with hidden edges are intended for adding meta information to maps like legends, titles, summaries, authors etc. If such informations relates to a whole map, these nodes should have a root node as their parent so that they are always visible and their position does not depend on anything else. Sometimes such information is relevant only for a part of a map. In this case a floating node with hidden edge can be attached to a non root node. For understanding of t [...]
+    </p>
+    <p>
+      <i>The free nodes do not require that you hide their edges. The second use case for them is a better use of map space. The automatic layout algorithm does not allow any map branches to overlap. If you want to create more compact maps you can convert some nodes to free nodes. This way they can be placed flexible. And their logical position relative to other sibling nodes now depends on their coordinates. You can see it too if you change to outline view which always reflect logical n [...]
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Making and moving a free floating node" STYLE_REF="Advanced" FOLDED="true" ID="ID_128387683" CREATED="1317135703793" MODIFIED="1323806240625" VGAP_QUANTITY="0.0 px" HGAP_QUANTITY="17.0 px" VSHIFT_QUANTITY="-230.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1188410566" CREATED="1323685758847" MODIFIED="1335094997999" HGAP_QUANTITY="-234.0 px" VSHIFT_QUANTITY="213.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      A free node is a node which is freely positionable, independently of the position of the other nodes of the mind map. A free node can be recognized by this behaviour and because the oval handle for moving the node is blue and filled in stead of red and open.  
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      A new, free node can be generated by keeping <i>Control</i> pressed and clicking a free place of the mind map. The newly generated free node will have the system  style <i>Free floating node</i>, wih proerties <i>rectangular cloud</i> and <i>hidden edge</i>. These properties can be changed in the usual way to e.g. no-cloud and visible edge. It is invisibly connected to the root.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      An existing node can be turned into a free node by selecting it and choosing  <i>Edit->Free positioned node (set/reset).</i> In this case the properties of the node (edge, cloud, folding)  stay as they are. You can set the properties for cloud and hidden edge in the usual way . The freed node initially appears near the node it is invisibly connected to and can be moved from there to any desired position by dragging its (blue) oval handle. Moving a free floati [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        A free node made by clicking a free space of the mind map will be connected to the root node, also if the connecting edge is invisible. This explains why a child node of this free node, if moved onto the upper half of its parent free node, shifts towards the root node.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="SubWidth" LAST="false"/>
+</hook>
+</node>
+<node TEXT="Free floating node" LOCALIZED_STYLE_REF="defaultstyle.floating" ID="ID_1757242560" CREATED="1317754595087" MODIFIED="1335095015972" HGAP_QUANTITY="608.0 px" VSHIFT_QUANTITY="23.0 px" MAX_WIDTH="150.0 px">
+<hook NAME="FreeNode"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Hover with the cursor over the left side of me and see my blue, filled oval. Drag me around with this blue handle.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Icons" STYLE_REF="Advanced" FOLDED="true" ID="ID_1431316370" CREATED="1323433444639" MODIFIED="1498336163563">
+<icon BUILTIN="bookmark"/>
+<icon BUILTIN="idea"/>
+<node TEXT="Purpose" STYLE_REF="Purpose" FOLDED="true" ID="ID_1191713608" CREATED="1483416459506" MODIFIED="1486862695292">
+<node TEXT="Icons, small images, visually add meaning and interest to nodes. Icons are stored in a library." ID="ID_1802196286" CREATED="1484847817993" MODIFIED="1498399225958" VGAP_QUANTITY="6.0 pt">
+<node TEXT="The checkmark icon could symbolize a completed task." ID="ID_1383430036" CREATED="1484847880233" MODIFIED="1486862695292">
+<icon BUILTIN="button_ok"/>
+</node>
+<node TEXT="Numbers could indicate a list or steps in a process." FOLDED="true" ID="ID_274182351" CREATED="1484848042166" MODIFIED="1486862695293">
+<icon BUILTIN="full-1"/>
+<node TEXT="start with this" ID="ID_1973884951" CREATED="1484848908293" MODIFIED="1486862695293" MAX_WIDTH="86.99999758601196 pt" MIN_WIDTH="86.99999758601196 pt">
+<icon BUILTIN="full-1"/>
+</node>
+<node TEXT="then do this" ID="ID_858036391" CREATED="1484848908293" MODIFIED="1486862695293" MAX_WIDTH="86.99999758601196 pt" MIN_WIDTH="86.99999758601196 pt">
+<icon BUILTIN="full-2"/>
+</node>
+<node TEXT="end with this" ID="ID_295495697" CREATED="1484848908293" MODIFIED="1486862695293" MAX_WIDTH="86.99999758601196 pt" MIN_WIDTH="86.99999758601196 pt">
+<icon BUILTIN="full-3"/>
+</node>
+</node>
+<node TEXT="Icons can show a task's degree of completion." ID="ID_1248120020" CREATED="1484849003212" MODIFIED="1486862695293">
+<icon BUILTIN="75%"/>
+</node>
+<node TEXT="A phone icon could represent a phone call you need to make." FOLDED="true" ID="ID_22524611" CREATED="1484848073190" MODIFIED="1486862695293">
+<icon BUILTIN="kaddressbook"/>
+<node TEXT="Sally .  sales report" ID="ID_741182272" CREATED="1484849125570" MODIFIED="1486862695293">
+<icon BUILTIN="kaddressbook"/>
+</node>
+</node>
+<node TEXT="Multiple icons could simultaneously signify a task's priority, degree of completion, and assignment." ID="ID_1400635179" CREATED="1484852960936" MODIFIED="1486862695293">
+<icon BUILTIN="yes"/>
+<icon BUILTIN="75%"/>
+<icon BUILTIN="female2"/>
+</node>
+<node ID="ID_1146167776" CREATED="1484848626112" MODIFIED="1498404378714" MAX_WIDTH="197.99999427795427 pt" MIN_WIDTH="197.99999427795427 pt"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <img src="Images/eyes.png" width="50" height="24"/>
+     User-created icons add interest to a node.
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="The list of possible uses is limited only by your imagination and image resources." ID="ID_1331259786" CREATED="1484848833077" MODIFIED="1486862695293"/>
+</node>
+</node>
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_986224846" CREATED="1484432866260" MODIFIED="1486862695293">
+<node TEXT="Add icons" STYLE_REF="Title" FOLDED="true" ID="ID_847488926" CREATED="1484486158310" MODIFIED="1484952561070">
+<node TEXT="Select the node(s) to add the icon(s)" ID="ID_923625819" CREATED="1484869372420" MODIFIED="1486864071453" NUMBERED="true"/>
+<node TEXT="Select the icon(s)" FOLDED="true" ID="ID_1472563474" CREATED="1484869449348" MODIFIED="1486864073660" NUMBERED="true">
+<node FOLDED="true" ID="ID_479891300" CREATED="1485686718725" MODIFIED="1486866650180"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      from <b>icons toolbar </b>on the left of the Freeplane window
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="To view or hide the icons toolbar" FOLDED="true" ID="ID_1070049060" CREATED="1484855525954" MODIFIED="1486866644413">
+<node ID="ID_589325908" CREATED="1484880867431" MODIFIED="1485686966172"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      select menubar <font color="#ff0000">View > Toolbars > Icons toolbar.</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="or click narrow bar on the side of the screen" FOLDED="true" ID="ID_692093956" CREATED="1484882923124" MODIFIED="1485686901310">
+<node ID="ID_671938622" CREATED="1487472087749" MODIFIED="1487472149424"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p style="text-align: center">
+      .<img src="Images/icons%20toolbar%20-%20collapsed.png" width="13" height="96"/>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node ID="ID_1561609221" CREATED="1484492380951" MODIFIED="1486863191016"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      or right-click in an empty space of the background and select <font color="#ff0000">Icons toolbar</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node FOLDED="true" ID="ID_1068764451" CREATED="1485686764133" MODIFIED="1486905873892"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      or from <b>icon table</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_1442062176" CREATED="1484885264854" MODIFIED="1485686636613"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To open, go to menubar <font color="#ff0000">Edit > Icons  > Icons from table...</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node FOLDED="true" ID="ID_1805114168" CREATED="1485686781337" MODIFIED="1486863730582"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      or from <b>icon by category</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_152116552" CREATED="1484885332628" MODIFIED="1487724130007"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To open, go to menubar <font color="#ff0000">Edit > Icons > Icon by category...</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Remove icons" STYLE_REF="Title" FOLDED="true" ID="ID_1494420829" CREATED="1484485144258" MODIFIED="1486906267401">
+<node TEXT="Select the node(s) to remove the icon(s)" ID="ID_1263056057" CREATED="1484869955163" MODIFIED="1486863539704" NUMBERED="true"/>
+<node TEXT="Select the removing icon buttons from the icon lists" FOLDED="true" ID="ID_126519800" CREATED="1484870282803" MODIFIED="1498342497665" NUMBERED="true">
+<node TEXT="" ID="ID_60341091" CREATED="1486863644047" MODIFIED="1486863644049">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Remove first icon" FOLDED="true" ID="ID_455258285" CREATED="1455910903990" MODIFIED="1485686636628">
+<icon BUILTIN="../remove_first_icon"/>
+<node TEXT="Removes first icon from the left" ID="ID_1987360523" CREATED="1484486682135" MODIFIED="1485686636628"/>
+</node>
+<node TEXT="Remove last icon" FOLDED="true" ID="ID_1703739854" CREATED="1455910903992" MODIFIED="1485686636628">
+<icon BUILTIN="../remove_last_icon"/>
+<node TEXT="Removes last icon from the left" ID="ID_880182010" CREATED="1484486733151" MODIFIED="1485686636628"/>
+</node>
+<node TEXT="Remove all icons" ID="ID_530100091" CREATED="1455910903993" MODIFIED="1485686636628">
+<icon BUILTIN="../icon_trash"/>
+</node>
+<node TEXT="" ID="ID_695306571" CREATED="1486863644042" MODIFIED="1486863644046">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node ID="ID_1982056949" CREATED="1484870370290" MODIFIED="1486863785503"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The removing icon buttons are available in the <b>Icons toolbar</b>, <b>Icon from table</b> and in menubar <font color="#ff0000">Edit > Icons > Remove icons</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Notes and explanations" STYLE_REF="Notes and explanations" FOLDED="true" ID="ID_775665519" CREATED="1483416064359" MODIFIED="1484886273867">
+<node TEXT="Icons will always be to the left side of the text in the node core." ID="ID_1357575160" CREATED="1484487645846" MODIFIED="1486862695296"/>
+<node TEXT="Icons cannot be added to node details or note fields." ID="ID_895906040" CREATED="1484446117867" MODIFIED="1486862695296"/>
+<node TEXT="You can add your own icons to the icons tool bar." FOLDED="true" ID="ID_1645542217" CREATED="1484446117872" MODIFIED="1486862695296">
+<node ID="ID_554800168" CREATED="1484851987636" MODIFIED="1487729231707"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Put the file myicon.png in the <font color="#ff0000">icons</font> sub directory of the user directory which opens by going in the menubar <font color="#ff0000">Tools > Open user directory.</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="The standard size for icons is 16x16 pixels." ID="ID_1247642941" CREATED="1484852652195" MODIFIED="1486862695297"/>
+</node>
+<node TEXT="Icons can be part of the formatting defined in styles." FOLDED="true" ID="ID_1539044466" CREATED="1484850910815" MODIFIED="1486862695297">
+<node TEXT="See Styles" ID="ID_28365425" CREATED="1484851109621" MODIFIED="1486912161682">
+<icon BUILTIN="mindmap"/>
+</node>
+</node>
+<node ID="ID_167245263" CREATED="1498400069883" MODIFIED="1498400177407"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Icons size can be defined in <font color="#ff0000">Tool panel > Format tab</font>.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node FOLDED="true" ID="ID_244625014" CREATED="1484849720612" MODIFIED="1486920314751"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The <b>icons toolbar</b> can be configured to show the icons grouped by category
+    </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_1329762567" CREATED="1484849797821" MODIFIED="1486920839842"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To configure, go to menubar  <font color="#ff0000">Tools > Preferences > Appearance tab > Icons > Structured icon toolbar</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node FOLDED="true" ID="ID_809234500" CREATED="1498399333704" MODIFIED="1498399665913"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To hide or show icons in Freeplane, go to menubar <font color="#ff0000">View > View settings > Show icons</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Icons defined in styles are not affected by this command and will always be visible." ID="ID_1740089631" CREATED="1498399574745" MODIFIED="1498400047761"/>
+</node>
+</node>
+<node TEXT="Tips and tricks" STYLE_REF="Tips and tricks" FOLDED="true" ID="ID_1486114448" CREATED="1485134404008" MODIFIED="1485646510769">
+<node ID="ID_1063135647" CREATED="1485134467974" MODIFIED="1486910131145"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The <b>Icon from table</b><font color="#ff0000"> </font>can be accessed by creating a keyboard shortcut.
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="When the table is open" ID="ID_1102406095" CREATED="1486909623235" MODIFIED="1486910137715">
+<node ID="ID_1850097041" CREATED="1486909639512" MODIFIED="1486920902306"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      use keyboard arrow keys to select the desired icon and press <font color="#ff0000">Enter</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="or press keyboard key associated to the icon" ID="ID_1722243233" CREATED="1486909613775" MODIFIED="1487724775330">
+<node ID="ID_1324069885" CREATED="1484849797821" MODIFIED="1487724837253"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To configure icon with keyboard key, go to menubar  <font color="#ff0000">Tools > Preferences > Keystrokes tab. </font>Select the icon and press the desired  keyboard key.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="AlwaysUnfoldedNode"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="An icon can be added directly to a node by creating a keyboard shortcut." ID="ID_13536085" CREATED="1486910473258" MODIFIED="1486910728949">
+<node ID="ID_1355972436" CREATED="1484885332628" MODIFIED="1487724209915"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Create shortcut from <b>icon by category</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="See Keyboard shortcuts" ID="ID_162060797" CREATED="1486911451158" MODIFIED="1486912166441">
+<icon BUILTIN="mindmap"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Images" STYLE_REF="Advanced" FOLDED="true" ID="ID_1795262306" CREATED="1323469507087" MODIFIED="1335300258068" MIN_WIDTH="80.0 px">
+<node TEXT="Image (node core)" STYLE_REF="Advanced" FOLDED="true" ID="ID_806240384" CREATED="1315581148847" MODIFIED="1323806455078" STYLE="combined" HGAP_QUANTITY="18.0 px" VSHIFT_QUANTITY="12.0 px">
+<node ID="ID_199889694" CREATED="1323435536299" MODIFIED="1335095042430" HGAP_QUANTITY="-104.0 px" VSHIFT_QUANTITY="89.0 px" STYLE="fork"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Each node core can contain one image which has a fixed "real size".  (If you need a different size, use a drawing program to resize the original image.) To add an image, select the node and choose menu <i>Edit > Node core > Image by choice </i>or <i>link</i>. This same menu can be used to convert the textual hyperlink address of an image to the image itself.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>See also</b>
+    </p>
+    <ul>
+      <li>
+        Node extensions for adding a scalable image.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<edge STYLE="hide_edge"/>
+</node>
+</node>
+<node TEXT="Link to image (red arrow)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1955041924" CREATED="1314282007169" MODIFIED="1333264692422" HGAP_QUANTITY="17.0 px" VSHIFT_QUANTITY="-1.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<edge STYLE="bezier"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_728788498" CREATED="1323469662830" MODIFIED="1335095056626" HGAP_QUANTITY="-145.0 px" VSHIFT_QUANTITY="169.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      An image in a node takes visual space which is scarce.  A hyperlink does not have this disadvantage, while you can still view the image if you press the hyperlink. To add a hyperlink to an image, copy the image source and paste it into the node (this is unlike drag and drop !). If you paste at the upper part of the node, a hyperlink to the image will be added in the node itself. If you paste at the child side of the node a child node will be created with the hyperlink. Th [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        It is possible to drop an image in stead of a hyperlink-to-an-image by keeping <i>Ctrl</i> pressed while dropping. In this case the image is not in the core, but in node details (resizable image).
+      </li>
+    </ul>
+    <p>
+      
+    </p>
+    <p>
+      <b>See also</b>
+    </p>
+    <ul>
+      <li>
+        Inline-hyperlinks (underlined hyperlinks). With these it is possible to have multiple links in the text.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="In-line image" STYLE_REF="Professional" FOLDED="true" ID="ID_680497355" CREATED="1314282819174" MODIFIED="1323806473283" HGAP_QUANTITY="17.0 px" VSHIFT_QUANTITY="-10.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<edge STYLE="bezier"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_990348986" CREATED="1323469818677" MODIFIED="1335095066189" HGAP_QUANTITY="-72.0 px" VSHIFT_QUANTITY="33.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Professional users can add images within text with so-called HTML-code. There is also a script for this. See <i>Help > Documentation</i>.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+</node>
+<node TEXT="Progress" STYLE_REF="Professional" FOLDED="true" ID="ID_1644368711" CREATED="1314283858479" MODIFIED="1335300258068" MIN_WIDTH="100.0 px">
+<node TEXT="When you need to show the progress of some sort, you can add a small or big progress indicator. The amount of progress can be changed. Note that the procedure to do so differs for small and large indicators." ID="ID_707469329" CREATED="1323436243939" MODIFIED="1329770386560" HGAP_QUANTITY="28.0 px" VSHIFT_QUANTITY="81.0 px" STYLE="fork"/>
+<node TEXT="Small progress (icon)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1826965169" CREATED="1314283872699" MODIFIED="1323806550925" HGAP_QUANTITY="26.0 px" VSHIFT_QUANTITY="1.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<icon BUILTIN="25%"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1268781768" CREATED="1323470955796" MODIFIED="1335095105705" HGAP_QUANTITY="-135.0 px" VSHIFT_QUANTITY="32.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To add a small progress indicator, select <i>Edit > Core  > Progress >Up. </i>To increase the amount of progress, press<i> </i>  <i>Edit > Core > Progress >Up </i>again (repeatedly).
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Large progress (icon & image)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1080017148" CREATED="1314283905093" MODIFIED="1323806554263" HGAP_QUANTITY="24.0 px" VSHIFT_QUANTITY="-52.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<icon BUILTIN="0%"/>
+<hook URI="freeplaneresource:/images/svg/Progress_tenth_01.svg" SIZE="1.0" NAME="ExternalObject"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node ID="ID_522359814" CREATED="1323470998328" MODIFIED="1335095114534" HGAP_QUANTITY="-182.0 px" VSHIFT_QUANTITY="122.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To ad a large progress indicator, select <i>Edit > Core >Progress > Extended progress.</i> Then to increase the amount of progress %, double click. To decrease: Ctrl-double click.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        Two images are displayed. The smaller one is a pictogram which is being displayed in the node core. The larger picture is an image displayed in node details.
+      </li>
+      <li>
+        <b>IMPORTANT</b>. The larger image (svg file) cannot be displayed in a Java Applet !
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+</node>
+<node TEXT="Joining nodes" STYLE_REF="Professional" FOLDED="true" ID="ID_814086601" CREATED="1316668137651" MODIFIED="1485047368602">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node TEXT="Purpose" STYLE_REF="Purpose" FOLDED="true" ID="ID_689755140" CREATED="1483416459506" MODIFIED="1487726279172">
+<node ID="ID_55050823" CREATED="1483416448677" MODIFIED="1487726279178"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To combine the text of two or more node cores. The default separators are:
+    </p>
+    <ul>
+      <li>
+        Joining with line breaks
+      </li>
+      <li>
+        Joining with blank space
+      </li>
+      <li>
+        Joining with comma and blank space
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_77345376" CREATED="1484432866260" MODIFIED="1487726279179">
+<node TEXT="Join with line breaks" STYLE_REF="Title" ID="ID_823920383" CREATED="1483417620673" MODIFIED="1484957599293">
+<node TEXT="" ID="ID_309710236" CREATED="1484870176142" MODIFIED="1484870176145">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Select the nodes to join" ID="ID_1095567996" CREATED="1484693466826" MODIFIED="1487726279186" NUMBERED="true"/>
+<node ID="ID_1622448351" CREATED="1484693487626" MODIFIED="1487726279187" NUMBERED="true"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Press <font color="#ff0000">ALT + J</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_984019961" CREATED="1483417662303" MODIFIED="1487726279188"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      or go to menubar
+    </p>
+    <p>
+      <font color="#ff0000">Edit > Node core > Join nodes with "/n"</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="" ID="ID_1356926959" CREATED="1484870176136" MODIFIED="1484870176141">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Joining nodes A, B and C" ID="ID_1357475978" CREATED="1485025797446" MODIFIED="1487726279189">
+<node TEXT="A" ID="ID_944587770" CREATED="1483837176198" MODIFIED="1487726279190">
+<node TEXT="B" ID="ID_904135208" CREATED="1483837178563" MODIFIED="1487726279191" VGAP_QUANTITY="6.0 pt">
+<node TEXT="C" ID="ID_1686214765" CREATED="1484436785819" MODIFIED="1487726279192">
+<node TEXT="becomes" ID="ID_1072413837" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A&#xa;B&#xa;C" ID="ID_947222609" CREATED="1483837176198" MODIFIED="1487726279192"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="" ID="ID_461843294" CREATED="1483837393556" MODIFIED="1483837393584">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="A" ID="ID_1638063314" CREATED="1484436818315" MODIFIED="1487726279200"/>
+<node TEXT="B" ID="ID_414439227" CREATED="1484436820347" MODIFIED="1487726279201"/>
+<node TEXT="C" ID="ID_1094078492" CREATED="1484436822066" MODIFIED="1487726279202"/>
+<node TEXT="" ID="ID_1200189072" CREATED="1483837393498" MODIFIED="1483837393549">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="becomes" ID="ID_1989777097" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A&#xa;B&#xa;C" ID="ID_566794397" CREATED="1483837176198" MODIFIED="1487726279203"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Join with blank space" STYLE_REF="Title" ID="ID_1830677552" CREATED="1483417620673" MODIFIED="1484957603634">
+<node TEXT="" ID="ID_630275069" CREATED="1484870198006" MODIFIED="1484870198009">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Select the nodes to join" ID="ID_614831548" CREATED="1484693466826" MODIFIED="1487726279209" NUMBERED="true"/>
+<node ID="ID_332438887" CREATED="1483417662303" MODIFIED="1487726279210" NUMBERED="true"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Go to menubar
+    </p>
+    <p>
+      <font color="#ff0000">Edit > Node core > Join nodes with " "</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="" ID="ID_58127252" CREATED="1484870197996" MODIFIED="1484870198005">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Joining nodes A, B and C" ID="ID_185956720" CREATED="1485025797446" MODIFIED="1487726279211">
+<node TEXT="A" ID="ID_496862064" CREATED="1483837176198" MODIFIED="1487726279212">
+<node TEXT="B" ID="ID_86263605" CREATED="1483837178563" MODIFIED="1487726279213" VGAP_QUANTITY="6.0 pt">
+<node TEXT="C" ID="ID_919592341" CREATED="1484436785819" MODIFIED="1487726279214">
+<node TEXT="becomes" ID="ID_609286541" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A B C" ID="ID_121989495" CREATED="1483837176198" MODIFIED="1487726279215"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="" ID="ID_185335784" CREATED="1483837393556" MODIFIED="1483837393584">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="A" ID="ID_1199748496" CREATED="1484436818315" MODIFIED="1487726279215"/>
+<node TEXT="B" ID="ID_24013156" CREATED="1484436820347" MODIFIED="1487726279217"/>
+<node TEXT="C" ID="ID_1573367934" CREATED="1484436822066" MODIFIED="1487726279217"/>
+<node TEXT="" ID="ID_1461781234" CREATED="1483837393498" MODIFIED="1483837393549">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="becomes" ID="ID_1737353920" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A B C" ID="ID_1505752164" CREATED="1483837176198" MODIFIED="1487726279218"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Join with comma and blank space" STYLE_REF="Title" ID="ID_922691588" CREATED="1483417620673" MODIFIED="1484957610008">
+<node TEXT="" ID="ID_1864471857" CREATED="1484870212236" MODIFIED="1484870212238">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Select the nodes to join" ID="ID_771240835" CREATED="1484693466826" MODIFIED="1487726279219" NUMBERED="true"/>
+<node ID="ID_93510070" CREATED="1483417662303" MODIFIED="1487726279220" NUMBERED="true"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Go to menubar
+    </p>
+    <p>
+      <font color="#ff0000">Edit > Node core > Join nodes with ", "</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="" ID="ID_950336731" CREATED="1484870212229" MODIFIED="1484870212235">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Joining nodes A, B and C" ID="ID_459463810" CREATED="1485025797446" MODIFIED="1487726279221">
+<node TEXT="A" ID="ID_696732484" CREATED="1483837176198" MODIFIED="1487726279222">
+<node TEXT="B" ID="ID_1629821935" CREATED="1483837178563" MODIFIED="1487726279223" VGAP_QUANTITY="6.0 pt">
+<node TEXT="C" ID="ID_1181763331" CREATED="1484436785819" MODIFIED="1487726279224">
+<node TEXT="becomes" ID="ID_1916280882" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A, B, C" ID="ID_1243347679" CREATED="1483837176198" MODIFIED="1487726279225"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="" ID="ID_1439622475" CREATED="1483837393556" MODIFIED="1483837393584">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="A" ID="ID_1705498375" CREATED="1484436818315" MODIFIED="1487726279225"/>
+<node TEXT="B" ID="ID_1871084949" CREATED="1484436820347" MODIFIED="1487726279227"/>
+<node TEXT="C" ID="ID_848933378" CREATED="1484436822066" MODIFIED="1487726279227"/>
+<node TEXT="" ID="ID_1551557139" CREATED="1483837393498" MODIFIED="1483837393549">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="becomes" ID="ID_1837330280" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A, B, C" ID="ID_306306591" CREATED="1483837176198" MODIFIED="1487726279228"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Notes and explanations" STYLE_REF="Notes and explanations" FOLDED="true" ID="ID_1394935735" CREATED="1483416064359" MODIFIED="1484869816859">
+<node TEXT="Nodes will be joined following an order from top to bottom. The order of node selection will not determine the joining order." ID="ID_105498186" CREATED="1483486745522" MODIFIED="1498411060822"/>
+<node TEXT="Child nodes of the selected nodes to join will become children nodes of the new joined node." ID="ID_1264602690" CREATED="1483419689931" MODIFIED="1487726279244">
+<node ID="ID_1252211151" CREATED="1484437260206" MODIFIED="1498411119841"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Joining node "A" and node "1" using the command "<b>Joining with blank space"</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="" ID="ID_1236367519" CREATED="1484437206434" MODIFIED="1484437206436">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="A" ID="ID_527302135" CREATED="1483837176198" MODIFIED="1487726279255">
+<node TEXT="B" ID="ID_516281758" CREATED="1483837178563" MODIFIED="1487726279256" VGAP_QUANTITY="6.0 pt">
+<node TEXT="C" ID="ID_191576178" CREATED="1484436785819" MODIFIED="1487726279257"/>
+<node TEXT="D" ID="ID_1800336580" CREATED="1484437130982" MODIFIED="1487726279259">
+<node TEXT="E" ID="ID_1559269563" CREATED="1484437140408" MODIFIED="1487726279260"/>
+</node>
+</node>
+</node>
+<node TEXT="1" ID="ID_178711661" CREATED="1484437167654" MODIFIED="1487726279260">
+<node TEXT="2" ID="ID_1625670450" CREATED="1484437171832" MODIFIED="1487726279261">
+<node TEXT="3" ID="ID_1168372199" CREATED="1484437172512" MODIFIED="1487726279262">
+<node TEXT="4" ID="ID_1320926659" CREATED="1484437174414" MODIFIED="1487726279262"/>
+</node>
+</node>
+</node>
+<node TEXT="" ID="ID_266108770" CREATED="1484437206429" MODIFIED="1484437206433">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="becomes" ID="ID_1261308493" CREATED="1487726121544" MODIFIED="1487726123195">
+<node TEXT="A 1" ID="ID_1760066374" CREATED="1483837178563" MODIFIED="1487726279263" VGAP_QUANTITY="6.0 pt">
+<node TEXT="B" ID="ID_614855328" CREATED="1484439534439" MODIFIED="1487726279264">
+<node TEXT="C" ID="ID_1845867902" CREATED="1484436785819" MODIFIED="1487726279265"/>
+<node TEXT="D" ID="ID_809296389" CREATED="1484437130982" MODIFIED="1487726279265">
+<node TEXT="E" ID="ID_206671460" CREATED="1484437140408" MODIFIED="1487726279266"/>
+</node>
+</node>
+<node TEXT="2" ID="ID_703968223" CREATED="1484437171832" MODIFIED="1487726279267">
+<node TEXT="3" ID="ID_1103892878" CREATED="1484437172512" MODIFIED="1487726279267">
+<node TEXT="4" ID="ID_1963345462" CREATED="1484437174414" MODIFIED="1487726279268"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Joining nodes works best if the nodes selected do not contain other node components like node details, notes and attributes." ID="ID_262182822" CREATED="1483419527385" MODIFIED="1487726279269">
+<node TEXT="These components will be preserved only in the node in which all others will be joined into." ID="ID_1962604429" CREATED="1487725497106" MODIFIED="1487725497109"/>
+</node>
+<node ID="ID_1678415541" CREATED="1487725785765" MODIFIED="1498417557001" MAX_WIDTH="560.9999834597115 pt" MIN_WIDTH="560.9999834597115 pt"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      It is possible to configure other types of text separators by going into menubar  <font color="#ff0000">Tools > Preferences > Behavior tab </font>and adding the desired separator between double brackets in the Text separator box. For example, adding {{-}} will add the new command in the menubar <font color="#ff0000">Edit > Node core > Join nodes with "-". </font>
+    </p>
+    <p>
+      
+    </p>
+    <img src="Images/Preferences_Joining%20nodes.png" width="736" height="59"/>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Tips and tricks" STYLE_REF="Tips and tricks" FOLDED="true" ID="ID_347117512" CREATED="1485134404008" MODIFIED="1498419016831">
+<node TEXT="This command can be hotkey configurable." ID="ID_49447036" CREATED="1498418406461" MODIFIED="1498418421626"/>
+</node>
+</node>
+<node TEXT="Splitting a node" STYLE_REF="Professional" FOLDED="true" ID="ID_247213553" CREATED="1316668117473" MODIFIED="1335300258084" MAX_WIDTH="600.0 px" MIN_WIDTH="100.0 px" STYLE="combined">
+<font ITALIC="false"/>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_497224980" CREATED="1323468073621" MODIFIED="1335095138046" HGAP_QUANTITY="-86.0 px" VSHIFT_QUANTITY="135.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      There are two different actions for splitting nodes. One is called from the main menu, the other from the editor.
+    </p>
+    <p>
+      
+    </p>
+    <ol>
+      <li>
+        A selected, multiline node core can be distributed over several nodes with each node containing one line by selecting the node and choosing menu <i>Edit > Node core > Split node.</i>
+      </li>
+      <li>
+        When editing a node, the text can be split at the cursor and distributed over two nodes. In the dialog editor, press the <i>Split button. Or</i> in the in-line editor press  <i>Alt + S</i>.
+      </li>
+    </ol>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        Other components like node details are not splitted.
+      </li>
+      <li>
+        See Help > Documentation for the details.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Calculating" STYLE_REF="Professional" FOLDED="true" ID="ID_448338872" CREATED="1316197624394" MODIFIED="1335300258084" LINK="http://freeplane.sourceforge.net/wiki/index.php/Formula" MIN_WIDTH="100.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_60050529" CREATED="1323467815625" MODIFIED="1335095146423" HGAP_QUANTITY="-83.0 px" VSHIFT_QUANTITY="116.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      A core text can, like a spreadsheet cell, contain a formula which starts with "=".  If this is the case,  the formula is calculated and only the result is displayed.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        Scrips can be used to do calculations over branches, hence emulating spreadsheet like behaviour. Click the red arrow to go to the wiki page where this is explained.
+      </li>
+      <li>
+        As a standard setting a node core containing a formula is surrouded by a kind of bubble. You can remove this in<i> View > Node core > Don't mark formula's with a border</i>.
+      </li>
+      <li>
+        The automatic calculation can be prevented by opening the properties panel and setting field  <i>Format</i>  to <i>Text</i>.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+</node>
+<node TEXT="Selecting and moving nodes" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_272980743" CREATED="1314248580003" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
+<node TEXT="Scrolling and panning the map" STYLE_REF="Beginner" ID="ID_1577961914" CREATED="1314644535914" MODIFIED="1335300393571" MIN_WIDTH="1.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1560196388" CREATED="1323511488363" MODIFIED="1335095167077" HGAP_QUANTITY="-187.0 px" VSHIFT_QUANTITY="52.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      You can drag the whole map by:
+    </p>
+    <ul>
+      <li>
+        clicking in the background and drag the map around; or
+      </li>
+      <li>
+        pan the map with Ctrl+Shift+Cursor up/down/left/right
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Selecting" STYLE_REF="Beginner" ID="ID_1573267345" CREATED="1323507663956" MODIFIED="1337158256746" MIN_WIDTH="60.0 px">
+<node TEXT="Automatic selection" STYLE_REF="Beginner" FOLDED="true" ID="ID_1387234491" CREATED="1314249066966" MODIFIED="1335300393587" MAX_WIDTH="600.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1185537684" CREATED="1323506992696" MODIFIED="1335095176609" HGAP_QUANTITY="-112.0 px" VSHIFT_QUANTITY="39.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      You can select a node by just hovering the cursor over it. After a short delay the node will show a blue border indicating it is selected. This is called <b>automatic selection</b>. You can also click a node to select it. Finally also the Goto actions in menu <i>Navigate </i>and method <i>Find</i> will select a node.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Keeping the selection" STYLE_REF="Beginner" FOLDED="true" ID="ID_970057223" CREATED="1314248859369" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<edge STYLE="bezier" COLOR="#33ffcc"/>
+<node ID="ID_299898759" CREATED="1323507254371" MODIFIED="1335095184877" HGAP_QUANTITY="-125.0 px" VSHIFT_QUANTITY="39.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The automatic selection of a node can be unpractical in some conditions. You can keep a node selected while moving the cursor over other nodes: select the node and then keep <i>Shift</i> pressed when you move the cursor over other nodes.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+<edge STYLE="hide_edge"/>
+</node>
+</node>
+<node TEXT="Key to the root" STYLE_REF="Beginner" FOLDED="true" ID="ID_1316263866" CREATED="1314249586526" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<edge STYLE="bezier"/>
+<node ID="ID_279008116" CREATED="1323507943923" MODIFIED="1335095192568" HGAP_QUANTITY="-81.0 px" VSHIFT_QUANTITY="23.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      With a big map it is easy to get lost. If you press <i>Escape</i> the selection will jump to the root at once.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Select all nodes" STYLE_REF="Beginner" FOLDED="true" ID="ID_376722702" CREATED="1329770963443" MODIFIED="1335300393587">
+<node TEXT="To select all nodes, first select the root (press Escape) and next press CTrl + A." STYLE_REF="TitlesContent" ID="ID_1214336373" CREATED="1329770999440" MODIFIED="1335095203971" HGAP_QUANTITY="-91.0 px" VSHIFT_QUANTITY="25.0 px"/>
+</node>
+</node>
+<node TEXT="Moving" STYLE_REF="Beginner" ID="ID_1560992291" CREATED="1314248654564" MODIFIED="1335300393571" MAX_WIDTH="600.0 px" MIN_WIDTH="60.0 px">
+<node TEXT="Moving a node in the hierarchy" STYLE_REF="Beginner" FOLDED="true" ID="ID_125921821" CREATED="1314250124540" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+<node ID="ID_1599927930" CREATED="1323510888467" MODIFIED="1335095213253" HGAP_QUANTITY="-186.0 px" VSHIFT_QUANTITY="39.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To disconnect a node from its current parent and connect it to another parent you can simply click and drag it to its new location. As you can read below it makes a difference at which position of the target node you drop. You can also move nodes by sorting.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Moving a connected node in space" STYLE_REF="Beginner" FOLDED="true" ID="ID_293115184" CREATED="1314249849956" MODIFIED="1335300393587" MAX_WIDTH="550.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node TEXT="To displace a node while leaving its connections in tact, find the oval handle which is at the parent side of a node. Move the cursor over the this side of the node  until the oval lights up. Then click the oval and drag wherever you want the node to go. All other nodes may move with it.  You can restore a moved node to itsoriginal position by double clicking its oval handle." ID="ID_1319283887" CREATED="1323510779368" MODIFIED="1335095222161" HGAP_QUANTITY="-208.0 px" VSHIFT [...]
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Dropping positions" STYLE_REF="Beginner" FOLDED="true" ID="ID_1039655261" CREATED="1314250309213" MODIFIED="1335300393587" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_786303568" CREATED="1323511320373" MODIFIED="1335095232146" HGAP_QUANTITY="-108.0 px" VSHIFT_QUANTITY="104.0 px" MIN_WIDTH="80.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Each node has two positions where you can drop another node. These positions are visible if the cursor is above it.
+    </p>
+    <ol>
+      <li>
+        If the cursor is near the top of the target node, the whole upper half lights up. If you drop a node here, the node will become a sibling above the target node.
+      </li>
+      <li>
+        If the cursor is near the child side of the target node, the left or right side of the node lights up. If you drop the node here it will be connected as a child node.
+      </li>
+    </ol>
+    <p>
+      <b>Note</b>
+    </p>
+    <p>
+      In case of the root it is possible to drop a node to the left or the right side. This is also true in case of a node with a hidden edge.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Moving a group" STYLE_REF="Advanced" FOLDED="true" ID="ID_1040002877" CREATED="1316181690861" MODIFIED="1335300393587" MAX_WIDTH="600.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1239614830" CREATED="1323511365121" MODIFIED="1335095242208" HGAP_QUANTITY="-84.0 px" VSHIFT_QUANTITY="62.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      It is possible to move a whole group of nodes including the summary node:
+    </p>
+    <ol>
+      <li>
+        Select the group : with <i>Shift</i> pressed first select the first node and then select the summary node.
+      </li>
+      <li>
+        Keep <i>Shift</i> pressed and drag the group to its new location.
+      </li>
+    </ol>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Reset node position" STYLE_REF="Advanced" FOLDED="true" ID="ID_1352824494" CREATED="1335300691836" MODIFIED="1335300949728">
+<node STYLE_REF="TitlesContent" ID="ID_688846542" CREATED="1335300712264" MODIFIED="1335300958557" HGAP_QUANTITY="-121.0 px" VSHIFT_QUANTITY="31.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      After displacing nodes they can be set to their original positions. Select the nodes and choose <i>Edit > Reset node position.</i>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Sorting nodes" STYLE_REF="Advanced" FOLDED="true" ID="ID_1014457432" CREATED="1314338769195" MODIFIED="1335300393571" MAX_WIDTH="600.0 px" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_915226922" CREATED="1323511424855" MODIFIED="1335095252536" HGAP_QUANTITY="-80.0 px" VSHIFT_QUANTITY="44.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      You may want to sort nodes alphabetically. If you select a node, you can sort its children by right-cliking the node and choosing<i> Sort children. </i>More sorting options are available in<i> Edit > Moving and sorting</i>.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+</node>
+<node TEXT="Relating and grouping nodes" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_215646874" CREATED="1314109445053" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
+<node TEXT="Edges" STYLE_REF="Beginner" FOLDED="true" ID="ID_1492225657" CREATED="1314162236991" MODIFIED="1335300437470" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_751107880" CREATED="1323514479284" MODIFIED="1335095266982" HGAP_QUANTITY="-28.0 px" VSHIFT_QUANTITY="43.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Edges are basic relations which define the node hierarchy. You can change the curving of edges, their color and thickness and you can  hide edges. The place to do so is in the <b>Properties panel</b> described below, or  menu <b>Format</b>.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Connectors" STYLE_REF="Beginner" FOLDED="true" ID="ID_1073407528" CREATED="1314129123086" MODIFIED="1335300437485" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1649729730" CREATED="1323514507513" MODIFIED="1335277476237" HGAP_QUANTITY="-55.0 px" VSHIFT_QUANTITY="150.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      It is possible to connect any two nodes with a line called (bilateral) <b>connector</b>:  right-click a node and drag to the node you want to connect.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      The <b>curving</b> of the connector can be changed by left-clicking and dragging the connector. Drag the dotten handle-lines to change the arrow orientation. The <b>style</b> of the connector can be changed and <b>labels</b> can be added to the connector: Right-click the connector and select the options in the context menu that opens.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        <p>
+          Alternatively you can SHIFT + CTRL + left click to define a connector.
+        </p>
+      </li>
+      <li>
+        <p>
+          You can also select two nodes, then right-click the second node and choose <i>Add connector </i>while keeping<i> Ctrl </i>pressed. After entering a lable, press Enter.
+        </p>
+      </li>
+      <li>
+        For a connector without begin,  a <b>unilateral</b>  connector, right-click the node and drag onto itself.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+<node TEXT="a" ID="ID_1328399304" CREATED="1314130936565" MODIFIED="1323517469534" HGAP_QUANTITY="25.0 px" STYLE="as_parent">
+<arrowlink SHAPE="CUBIC_CURVE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_581303769" MIDDLE_LABEL="label" STARTINCLINATION="9;-23;" ENDINCLINATION="-28;-89;" STARTARROW="NONE" ENDARROW="DEFAULT"/>
+<edge STYLE="hide_edge"/>
+<node TEXT="b" ID="ID_273400211" CREATED="1314130940427" MODIFIED="1323517479815">
+<arrowlink SHAPE="LINE" COLOR="#000000" WIDTH="2" TRANSPARENCY="80" FONT_SIZE="12" FONT_FAMILY="SansSerif" DESTINATION="ID_273400211" MIDDLE_LABEL="connector&#xa;without&#xa;begin" STARTINCLINATION="19;86;" ENDINCLINATION="19;86;" STARTARROW="NONE" ENDARROW="NONE"/>
+<edge STYLE="bezier"/>
+<node TEXT="c" ID="ID_581303769" CREATED="1314130942275" MODIFIED="1314130945036"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Summary node group" STYLE_REF="Advanced" FOLDED="true" ID="ID_1700918771" CREATED="1314129783832" MODIFIED="1335300437485" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_651594550" CREATED="1323514659262" MODIFIED="1335095290460" HGAP_QUANTITY="-119.0 px" VSHIFT_QUANTITY="78.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      A group of siblings can be connected to a so called <b>summary node.</b>. This node connects the siblings with an accolade. Select the group of siblings and right-click one of the selected nodes while keeping <i>Ctrl</i>  pressed. Choose <i>New summary node (selected nodes) </i>in the node contextmenu.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+         There are also more advanced options. Read more about these in the documentation.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node TEXT="" ID="ID_614882936" CREATED="1455910877279" MODIFIED="1455910877279">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="a" STYLE_REF="AdvancedTopic" ID="ID_902940862" CREATED="1314130883345" MODIFIED="1316165216808"/>
+<node TEXT="b" STYLE_REF="AdvancedTopic" ID="ID_303013117" CREATED="1314130889936" MODIFIED="1316165216824"/>
+<node TEXT="c" STYLE_REF="AdvancedTopic" ID="ID_1837144570" CREATED="1314130892393" MODIFIED="1316165216824" VSHIFT_QUANTITY="-9.0 px"/>
+<node TEXT="" ID="ID_1718735488" CREATED="1455910877283" MODIFIED="1455910877283">
+<hook NAME="SummaryNode"/>
+<node TEXT="Summary node" STYLE_REF="AdvancedTopic" ID="ID_460668684" CREATED="1314130905124" MODIFIED="1316165216824"/>
+</node>
+</node>
+</node>
+<node TEXT="Cloud node group" STYLE_REF="Advanced" FOLDED="true" ID="ID_1150908697" CREATED="1314130460475" MODIFIED="1335300437485" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1862713604" CREATED="1323514733122" MODIFIED="1335095305358" HGAP_QUANTITY="-101.0 px" VSHIFT_QUANTITY="52.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      It is possible to visually group a whole branch of nodes with a common background called <b>cloud</b>. Right-click the parent of the branch and choose <i>Nodes > Add cloud. </i>You can modify<i> </i>the color and style of the cloud in the <i>Tool panel </i>described below. To prevent the nodes in the node group from folding, select<i> Edit > Node group > All unfolded nodes.</i>
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node TEXT="cloud a" STYLE_REF="AdvancedTopic" ID="ID_1742435994" CREATED="1314130827910" MODIFIED="1323517713897" VSHIFT_QUANTITY="15.0 px">
+<cloud COLOR="#f0f0f0" SHAPE="ARC"/>
+<node TEXT="b" ID="ID_1270291744" CREATED="1314130833239" MODIFIED="1314130836016"/>
+<node TEXT="c" ID="ID_1022872809" CREATED="1314130837348" MODIFIED="1314130840017"/>
+</node>
+<node TEXT="cloud b" STYLE_REF="AdvancedTopic" ID="ID_539843005" CREATED="1314208596772" MODIFIED="1316165226464" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="-9.0 px">
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+<node TEXT="e" ID="ID_249943796" CREATED="1314208605486" MODIFIED="1314208607670"/>
+<node TEXT="f" ID="ID_1428582117" CREATED="1314208608472" MODIFIED="1314208611937"/>
+</node>
+<node STYLE_REF="AdvancedTopic" ID="ID_649516172" CREATED="1310106596579" MODIFIED="1323517675474" TEXT_SHORTENED="true">
+<icon BUILTIN="../Cloud24"/>
+<richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      icon-button for <i>Add default cloud</i>
+    </p>
+  </body>
+</html>
+</richcontent>
+<richcontent TYPE="DETAILS" HIDDEN="true">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      Find this icon button in the toolbar
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="bezier"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Hyperlinking" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_114835202" CREATED="1314284617264" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
+<node TEXT="What is a link ?" FOLDED="true" ID="ID_55001637" CREATED="1323100759475" MODIFIED="1335300461104">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="Beginner" LAST="false"/>
+</hook>
+<node TEXT="A dynamic link (hyperlink) is an electronic connection from a source node to a destination object. The destination can be a directory, file, web page, application, e-mail etc. The connection is click-able: double-click to open it. The link appears as an underlined text, or as a red or green arrow. The red arrow connects to an external address or an e-mail address. The green arrow connects to an internal address (other node). The underlined text can represent both. There can b [...]
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Linking nodes with anchor" STYLE_REF="Beginner" FOLDED="true" ID="ID_1524719322" CREATED="1336298056719" MODIFIED="1336299477442">
+<node STYLE_REF="TitlesContent" ID="ID_1594135890" CREATED="1336298585173" MODIFIED="1337500686337" HGAP_QUANTITY="-158.0 px" VSHIFT_QUANTITY="136.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The following procudure makes it easy to make a link between two nodes, especially if two nodes are far apart in the map or are in different maps:
+    </p>
+    <ul>
+      <li>
+        right-click one of the nodes to be linked and select <i>Link > Set link anchor</i>
+      </li>
+      <li>
+        right-click the other node to be linked and select Link > Make link from anchor or <i>Link > Make link to anchor</i>.
+      </li>
+    </ul>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        <i>Set link anchor </i>will automatically replace the previous anchor.
+      </li>
+      <li>
+        The anchor will be lost after exiting Freeplane.
+      </li>
+      <li>
+        See below for a different procedure if nodes are more close to each other.
+      </li>
+      <li>
+        See attributes how to set  a link in an attribute value. There is an easy way to link to other nodes as well.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="External link" STYLE_REF="Beginner" FOLDED="true" ID="ID_640110372" CREATED="1286651969385" MODIFIED="1335300461119" LINK="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1913035829" CREATED="1323512829161" MODIFIED="1335095327448" HGAP_QUANTITY="-83.0 px" VSHIFT_QUANTITY="240.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      A hyperlink to an address outside the map can be created by right-clicking a node and selecting <i>Link</i>. However, the easiest way to add a hyperlink or group of hyperlinks to external objects, is by drag and drop. Dropping a copy of a directory, file, or web address will generate a child node of the selected node containing a hyperlink. The target address of the hyperlink is contained in the title. This text may be removed or changed without changing the dynamics of the hyperli [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      Dropping a group of hyperlinks will generate a group of child nodes, each containing one of the hyperlinks.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To edit the target address of the hyperlink, right-click the node containing the link and choose <i>Links > Add or modify hyperlink (type)...</i> In the dialog that opens you can edit the address. With <i>Ctrl + V</i> a copied address can be pasted in the entry field.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To link to a node in a different mind map, see<a href="#ID_1418102707"> Link from outside to a particular node</a>.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+    </p>
+    <ul>
+      <li>
+        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
+      </li>
+      <li>
+        delete the text in the text field ( the address)
+      </li>
+    </ul>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        The appearance of the arrow-hyperlink can be changed in Tool panel, to show the whole node core as underlined text. This is only possible if no other underlined hyperlink(s) is active,
+      </li>
+      <li>
+        If dropping an image file on a node, the image may be shown in stead of the hyperlink. For this keep Ctrl pressed while dropping.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Internal link" STYLE_REF="Beginner" FOLDED="true" ID="ID_1942100751" CREATED="1314360169447" MODIFIED="1335300461119" LINK="#ID_86446891" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1830541497" CREATED="1323512880196" MODIFIED="1335095339023" HGAP_QUANTITY="-78.0 px" VSHIFT_QUANTITY="89.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      A hyperlink from one node to another node (local hyperlink) can be created by selecting two nodes, then right-clicking one of them while keeping <i>Ctrl</i> pressed, and finally choosing menu <i>Links > Local hyperlink. </i>
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+    </p>
+    <ul>
+      <li>
+        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
+      </li>
+      <li>
+        delete the text in the text field ( the address)
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+    <conditional_style ACTIVE="true" STYLE_REF="BeginnerTopic" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Email link" STYLE_REF="Professional" FOLDED="true" ID="ID_869144882" CREATED="1270892460675" MODIFIED="1335300461119" LINK="mailto:%20jokro at freeplane.nl">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1480409284" CREATED="1323512986970" MODIFIED="1335095349771" HGAP_QUANTITY="-64.0 px" VSHIFT_QUANTITY="145.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The simplest way to create an e-mail link which automatically opens your email program is to copy and paste the email address into a node. This will generate a<b> child node</b> of the selected node with the link. The text of the child node will consist of the e-mail address. You may replace this address by e.g. only the name.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      If you want to add the e-mail link to a particular node (and not to its newly generated child), right-click the node and choose<i> Add or modify hyperlink (type)...</i> Then enter in the text field:
+    </p>
+    <ul>
+      <li>
+        <i>mailto:emailaddress</i><br/> e.g. mailto:jokro at freeplane.nl
+      </li>
+    </ul>
+    <p>
+      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+    </p>
+    <ul>
+      <li>
+        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
+      </li>
+      <li>
+        delete the text in the text field ( the address)
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node STYLE_REF="Professional" FOLDED="true" ID="ID_241324782" CREATED="1315336877701" MODIFIED="1335300461119" STYLE="combined"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Underlined <a href="https://sourceforge.net/apps/phpbb/freeplane/viewforum.php?f=1">hyperlinks</a> .
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1356533861" CREATED="1323512914336" MODIFIED="1335095382173" HGAP_QUANTITY="-133.0 px" VSHIFT_QUANTITY="268.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To define an underlined hyperlink (HTML-link), first open the text dialog for  Node core, Node details or Note. Then type and select the piece of text to which the link applies. And finally select  in the Edit menu of the dialog window <i>Add hyperlink (choose)...</i> or <i>Add or modify hyperlink (type)</i>. In the latter case you can  type the address of the hyperlink or you can paste a copied address by pressing Ctr + V. Example link: <font col [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        To change the text of the hyperlink, simply retype it. This will not alter the hyperlink address.
+      </li>
+      <li>
+        To change the address of the hyperlink, select the whole underlined text and then choose again <i>Add hyperlink (choose)...</i> or <i>Add or modify hyperlink (type).</i>
+      </li>
+      <li>
+        There can be multiple underlined hyperlinks in one Node core, Node details or Note field.
+      </li>
+      <li>
+        If the text is unformatted, or is formatted with the properties panel, the links are blue. If the text is formatted with the menu's of the edit-dialog, it has the color and size set in this dialog.
+      </li>
+      <li>
+        Ta add an internal hyperlink to another node, put #NodeId as address. To get the NodeID, right-click the node and select <i>Copy NodeId</i>. Then paste the NodeId with Ctrl + V in the link address which opens when you selct <i>Add or modify hyperlink (type)</i>. Don't forget to put # before the nodeId.
+      </li>
+      <li>
+        To link to a node in a different mind map, see<a href="#ID_1418102707"> Link from outside to a particular node</a>.
+      </li>
+      <li>
+        To link to a node in the same mindmap, the address should contain #NodeID. NodeID is got by rightclicking and selecting <i>Copy node ID</i>. It can be pasted with<i> Ctrl + V</i> in the fiield for the link address.
+      </li>
+      <li>
+        To remove the address and the text of an underlined hyperlink, delete all underlined text of the hyperlink. To delete only the address, leaving the text:
+
+        <ul>
+          <li>
+            put the cursor inside the underlined text (do not select the text)
+          </li>
+          <li>
+            Choose Edit > Add or modify hyperlink (type)..
+          </li>
+          <li>
+            Delete the address in the dialog that opens.
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Hyperlink to menu item" STYLE_REF="Professional" FOLDED="true" ID="ID_350080162" CREATED="1314359739019" MODIFIED="1335300461119" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1108178356" CREATED="1323513038412" MODIFIED="1335095393033" HGAP_QUANTITY="-132.0 px" VSHIFT_QUANTITY="86.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      You can also connect the menu item to a node, so that clicking the node will activate the menu item. To connect a node directly to a menu item, right-click the node and choose <i>Link  > Add hyperlink to menu item... </i>
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+    </p>
+    <ul>
+      <li>
+        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
+      </li>
+      <li>
+        delete the text in the text field ( the address)
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="F-keys" STYLE_REF="Professional" FOLDED="true" ID="ID_1819697018" CREATED="1314526511158" MODIFIED="1335300461119" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_116460964" CREATED="1323513079714" MODIFIED="1335095401972" HGAP_QUANTITY="-26.0 px" VSHIFT_QUANTITY="60.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      If you want to activate a menu item, you have to to navigate to it and click the menu item. To be able to work faster, you can connect a short cut or F-key to the menu item. For this choose <i>Tools > Assign shortcut</i>. You can also save a named sets with short keys for different situations with <i>Tools > Hotkeys > Save presets</i>. To install a previously saved set, just click <i>Tools > Hotkeys</i> and select a set from the list.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+<node TEXT="Link from outside to a particular node" STYLE_REF="Professional" FOLDED="true" ID="ID_1418102707" CREATED="1322224946352" MODIFIED="1335300461119" STYLE="combined">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_822375535" CREATED="1323513104618" MODIFIED="1335095425450" HGAP_QUANTITY="-228.0 px" VSHIFT_QUANTITY="149.0 px"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      To jump from another program or source mind map to a particular node in a target mindmap, the address field of the hyperlink should contain the path to the target mind map and the nodeID, seperated by #. If source and target mind map are in the same directory, the address can be defined  as destination.mm#NodeID, e.g.  as WhatIsMindmapping.mm#ID_930373151.  This has the advantage that if the containing direcory is moved as a whole, the link keeps correct. In the [...]
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Note</b>
+    </p>
+    <ul>
+      <li>
+        Jumping to a particular node only works for applications which pass the nodeID information. Of course Freeplane does this. Many other applications like MSWord do not pass the nodeID, hence you can only jump to the root node.( A work around in these cases might be to save the mind map in a folding state which shows the node you want to jum to.)
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+</node>
+<node TEXT="Formatting & styling" STYLE_REF="Advanced" FOLDED="true" POSITION="right" ID="ID_1778719162" CREATED="1291143603918" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MainMenu" LAST="false"/>
+</hook>
+<node TEXT="Formatting nodes" STYLE_REF="Advanced" FOLDED="true" ID="ID_215836627" CREATED="1484492723173" MODIFIED="1499027394252" NUMBERED="true">
+<node TEXT="Purpose" STYLE_REF="Purpose" FOLDED="true" ID="ID_1048626295" CREATED="1483416459506" MODIFIED="1490394239065">
+<node TEXT="Freeplane has many possibilities to set or change node format" ID="ID_1063739575" CREATED="1484494250195" MODIFIED="1499027398248"/>
+<node TEXT="You have control of ..." FOLDED="true" ID="ID_1508685009" CREATED="1490394278457" MODIFIED="1499020568549" VGAP_QUANTITY="10.0 pt">
+<node TEXT="Background color of a node" ID="ID_890431801" CREATED="1490394341387" MODIFIED="1490394460259" BACKGROUND_COLOR="#ccccff"/>
+<node TEXT="Shape of a node" ID="ID_516458905" CREATED="1490394377219" MODIFIED="1490394702351" STYLE="oval" SHAPE_HORIZONTAL_MARGIN="4.0 pt"/>
+<node TEXT="Size of the text" ID="ID_938799585" CREATED="1490394401896" MODIFIED="1499020568549">
+<font SIZE="20"/>
+</node>
+<node TEXT="Edge width, color and style" ID="ID_1430859807" CREATED="1490394413340" MODIFIED="1499011138634" HGAP_QUANTITY="37.999999284744284 pt" VSHIFT_QUANTITY="0.7499999776482589 pt">
+<edge STYLE="horizontal" COLOR="#009900" WIDTH="4" DASH="DASHES"/>
+</node>
+<node TEXT="... and much more." ID="ID_1932084403" CREATED="1490394430292" MODIFIED="1490394675978">
+<edge STYLE="horizontal"/>
+</node>
+</node>
+<node TEXT="You can also copy the formatting of a node, and paste it to other nodes by using" FOLDED="true" ID="ID_1287880664" CREATED="1491434054085" MODIFIED="1499020975246" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Copy format" STYLE_REF="Title" ID="ID_1501116501" CREATED="1491434139735" MODIFIED="1499020975246">
+<icon BUILTIN="../colorpicker"/>
+</node>
+<node TEXT="Paste format" STYLE_REF="Title" ID="ID_1886111683" CREATED="1491434142436" MODIFIED="1491434226347">
+<icon BUILTIN="../color_fill"/>
+</node>
+</node>
+</node>
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_554181153" CREATED="1484432866260" MODIFIED="1490495170291">
+<node TEXT="Change formatting" STYLE_REF="Title" FOLDED="true" ID="ID_1165590804" CREATED="1483417620673" MODIFIED="1499027406140" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Select the node(s) to change the property" ID="ID_631072212" CREATED="1490495372597" MODIFIED="1490495483386" NUMBERED="true"/>
+<node TEXT="Use one of these formatting options" FOLDED="true" ID="ID_1243040393" CREATED="1498409877688" MODIFIED="1498421316312" NUMBERED="true">
+<node TEXT="Formatting using the Toolbar" STYLE_REF="Title" FOLDED="true" ID="ID_583841334" CREATED="1484492723173" MODIFIED="1499027717141">
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_1983897449" CREATED="1484432866260" MODIFIED="1491354052976">
+<node TEXT="Select from a drop down list or select icon in the Toolbar to change the format property." ID="ID_524446865" CREATED="1490393892009" MODIFIED="1499027422367"/>
+</node>
+<node TEXT="Notes and explanations" STYLE_REF="Notes and explanations" FOLDED="true" ID="ID_1953175101" CREATED="1483416064359" MODIFIED="1490394239095">
+<node TEXT="Format properties that can be modified from Toolbar" FOLDED="true" ID="ID_1828711192" CREATED="1491431973624" MODIFIED="1491433134455">
+<node TEXT="Style" STYLE_REF="Title" FOLDED="true" ID="ID_150359732" CREATED="1491432021844" MODIFIED="1491432292117">
+<node TEXT="Defines the style of the node" ID="ID_466831239" CREATED="1491432596618" MODIFIED="1491433828453"/>
+</node>
+<node TEXT="Font family" STYLE_REF="Title" FOLDED="true" ID="ID_1682898632" CREATED="1491432030251" MODIFIED="1491432292131">
+<node TEXT="Selects font to use for node core text" ID="ID_494400990" CREATED="1490318652897" MODIFIED="1491432817437"/>
+</node>
+<node TEXT="Font size" STYLE_REF="Title" FOLDED="true" ID="ID_1310596257" CREATED="1491432039434" MODIFIED="1491432292136">
+<node TEXT="Selects font size for node core text" ID="ID_344352991" CREATED="1490318708672" MODIFIED="1491432824999"/>
+</node>
+<node TEXT="Bold" STYLE_REF="Title" FOLDED="true" ID="ID_271108670" CREATED="1491359643081" MODIFIED="1491432292143">
+<icon BUILTIN="../Bold16"/>
+<node ID="ID_1084594116" CREATED="1491353564941" MODIFIED="1491433083507"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Changes font to <b>Bold </b>of<b> </b>all text in the node core
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Italic" STYLE_REF="Title" FOLDED="true" ID="ID_414517597" CREATED="1491359657554" MODIFIED="1491432292148">
+<icon BUILTIN="../Italic16"/>
+<font ITALIC="true"/>
+<node ID="ID_836443696" CREATED="1491353691846" MODIFIED="1491433087333"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Changes font to <i>Italic of </i>all text in the node core
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="" ID="ID_1564629897" CREATED="1491362657953" MODIFIED="1491362657957">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Left aligned text" STYLE_REF="Title" ID="ID_152951343" CREATED="1490318750470" MODIFIED="1490481039438" TEXT_ALIGN="LEFT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="Centered text" STYLE_REF="Title" ID="ID_1778235391" CREATED="1490318782838" MODIFIED="1490481039451" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="Right aligned text" STYLE_REF="Title" ID="ID_1905118489" CREATED="1490318770776" MODIFIED="1490481039445" TEXT_ALIGN="RIGHT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="" ID="ID_1371288150" CREATED="1491362657941" MODIFIED="1491362657951">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Defines text alignment in node core" ID="ID_804262503" CREATED="1490318723184" MODIFIED="1491362680481"/>
+</node>
+<node TEXT="Cloud shape" STYLE_REF="Title" FOLDED="true" ID="ID_1450078566" CREATED="1491432245746" MODIFIED="1491432262350">
+<node TEXT="Add or removes the default cloud" FOLDED="true" ID="ID_1569256234" CREATED="1491432430186" MODIFIED="1491432463527">
+<node ID="ID_1627761662" CREATED="1491432921680" MODIFIED="1499024985191"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      You can define the default cloud in menu <font color="#ff0000">Tools > Preferences > Defaults tab</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Cloud color" STYLE_REF="Title" FOLDED="true" ID="ID_874568511" CREATED="1484505159213" MODIFIED="1491432220771">
+<icon BUILTIN="../Colors24"/>
+<node TEXT="Selects cloud color using a color chooser dialog" ID="ID_95635256" CREATED="1491432382794" MODIFIED="1491433104191"/>
+</node>
+</node>
+</node>
+<node TEXT="Tips and tricks" STYLE_REF="Tips and tricks" ID="ID_704222362" CREATED="1485134404008" MODIFIED="1485646510769"/>
+<node TEXT="Old documentation" STYLE_REF="Old documentation" FOLDED="true" ID="ID_1967057370" CREATED="1485134404008" MODIFIED="1498408669009" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Tool bar" STYLE_REF="Advanced" FOLDED="true" ID="ID_8679357" CREATED="1314167879005" MODIFIED="1498408691023">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node ID="ID_1218576189" CREATED="1323518244867" MODIFIED="1498408326060"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Some of the properties in the<i> Tool panel</i> are also available as <b>icons</b> in the <b>tool bar</b> which is below the main menu bar. Examples are <i>italic</i> and <b>bold</b>.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      <b>Important</b>
+    </p>
+    <ul>
+      <li>
+        Bold and italic set  in the <i>Tool panel</i>, menu <i>Format </i>or with the toolbar, are applied (forced) to the whole node core.
+      </li>
+      <li>
+        To apply bold and italic to a part of the node core, use the method described above in node <i>Beginner map</i>.
+      </li>
+      <li>
+        Using both methods at the same time to the same node may give unexpected effects. For example, it is not possible to remove bold set with the first method by using the second method.
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Formatting using Format menu" STYLE_REF="Title" FOLDED="true" ID="ID_1382142303" CREATED="1484492723173" MODIFIED="1499027717185">
+<node TEXT="Purpose" STYLE_REF="Purpose" FOLDED="true" ID="ID_184523797" CREATED="1483416459506" MODIFIED="1490394239065">
+<node FOLDED="true" ID="ID_603173143" CREATED="1491350920590" MODIFIED="1499012816166"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Format<b> </b>menu<b> </b>contains also some properties of a node which cannot be set in the Format tab in the Tool panel.
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Blinking node" ID="ID_4776371" CREATED="1491353051984" MODIFIED="1491361677291">
+<icon BUILTIN="../xeyes"/>
+<hook NAME="accessories/plugins/BlinkingNodeHook.properties"/>
+</node>
+<node TEXT="Blend color" ID="ID_554765439" CREATED="1491353064536" MODIFIED="1491361682872">
+<icon BUILTIN="../NodeColorBlendAction"/>
+</node>
+</node>
+</node>
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_45909216" CREATED="1484432866260" MODIFIED="1491354052976">
+<node TEXT="Change a format property" STYLE_REF="Title" FOLDED="true" ID="ID_1032261444" CREATED="1483417620673" MODIFIED="1499022188945" VGAP_QUANTITY="6.0 pt">
+<node FOLDED="true" ID="ID_1265623412" CREATED="1490393892009" MODIFIED="1499027464619"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Go to menu <font color="#ff0000">Format</font> and select the format property to modify.
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Node core" STYLE_REF="Title" FOLDED="true" ID="ID_218736920" CREATED="1491353597983" MODIFIED="1491361578353">
+<node TEXT="Bold" FOLDED="true" ID="ID_1880045383" CREATED="1491359643081" MODIFIED="1491359930881">
+<icon BUILTIN="../Bold16"/>
+<font BOLD="true"/>
+<node ID="ID_50889201" CREATED="1491353564941" MODIFIED="1491360020174"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Changes font to <b>Bold of </b>all text in the node
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Italic" FOLDED="true" ID="ID_1803206631" CREATED="1491359657554" MODIFIED="1491359919627">
+<icon BUILTIN="../Italic16"/>
+<font ITALIC="true"/>
+<node ID="ID_1779804913" CREATED="1491353691846" MODIFIED="1491359359626"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Changes font to <i>Italic of </i>all text in the node
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Larger font" FOLDED="true" ID="ID_390981923" CREATED="1491359667018" MODIFIED="1491359911248">
+<icon BUILTIN="../IncreaseNodeFontAction"/>
+<node TEXT="Increases font size of all text in the node" ID="ID_964459132" CREATED="1491353708829" MODIFIED="1491360007684"/>
+</node>
+<node TEXT="Smaller font" FOLDED="true" ID="ID_751578987" CREATED="1491359676129" MODIFIED="1491359903671">
+<icon BUILTIN="../DecreaseNodeFontAction"/>
+<node TEXT="Decreases font size of all text in the node" ID="ID_976863729" CREATED="1491353751334" MODIFIED="1491360014743"/>
+</node>
+<node TEXT="" ID="ID_664169116" CREATED="1491362657953" MODIFIED="1491362657957">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Left aligned text" STYLE_REF="Title" ID="ID_905805466" CREATED="1490318750470" MODIFIED="1490481039438" TEXT_ALIGN="LEFT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="Centered text" STYLE_REF="Title" ID="ID_1331377073" CREATED="1490318782838" MODIFIED="1490481039451" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="Right aligned text" STYLE_REF="Title" ID="ID_579931512" CREATED="1490318770776" MODIFIED="1490481039445" TEXT_ALIGN="RIGHT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="" ID="ID_1152676203" CREATED="1491362657941" MODIFIED="1491362657951">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Defines text alignment in node core" ID="ID_896931937" CREATED="1490318723184" MODIFIED="1491362680481"/>
+</node>
+<node TEXT="Node color" FOLDED="true" ID="ID_1695059297" CREATED="1491359685322" MODIFIED="1491359894279" COLOR="#ff0000">
+<node TEXT="Select text color using a color chooser dialog. The color is applied to all text in the node." FOLDED="true" ID="ID_1886499030" CREATED="1491353782933" MODIFIED="1491361044327">
+<node ID="ID_215748826" CREATED="1491358825767" MODIFIED="1491361791787" COLOR="#000000"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Reset the default color of the text by selecting <font color="#ff0000">Use default</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</node>
+<node TEXT="Blinking node" FOLDED="true" ID="ID_1415812131" CREATED="1491359696657" MODIFIED="1491359885059">
+<icon BUILTIN="../xeyes"/>
+<hook NAME="accessories/plugins/BlinkingNodeHook.properties"/>
+<node TEXT="Causes the node to blink. The node cycles through different colors while blinking." ID="ID_991377803" CREATED="1491353789590" MODIFIED="1491361904351"/>
+</node>
+<node TEXT="Blend color" FOLDED="true" ID="ID_1897045023" CREATED="1491359709185" MODIFIED="1491359872218">
+<icon BUILTIN="../NodeColorBlendAction"/>
+<node TEXT="Changes the text color to be closer to its background color." ID="ID_1889872302" CREATED="1491353802469" MODIFIED="1491359728007"/>
+</node>
+<node TEXT="Node background color..." FOLDED="true" ID="ID_1312584075" CREATED="1491359741353" MODIFIED="1491359851011" BACKGROUND_COLOR="#ffcc99">
+<icon BUILTIN="../NodeBackgroundColorAction"/>
+<node TEXT="Sets the background color using a color chooser dialog." ID="ID_693491248" CREATED="1491353841710" MODIFIED="1491361877292"/>
+</node>
+<node TEXT="Fork" FOLDED="true" ID="ID_1501272049" CREATED="1491359786465" MODIFIED="1491360349435" STYLE="fork">
+<node TEXT="Defines the node shape as fork" ID="ID_1920749609" CREATED="1491359599030" MODIFIED="1491360349425" STYLE="fork"/>
+</node>
+<node TEXT="Bubble" FOLDED="true" ID="ID_1992745197" CREATED="1491359798312" MODIFIED="1491359800327">
+<node TEXT="Defines the node shape as bubble" ID="ID_1385596913" CREATED="1491359599030" MODIFIED="1491360373394"/>
+</node>
+<node TEXT="Use plain text" FOLDED="true" ID="ID_1219330391" CREATED="1491359805369" MODIFIED="1491359811511">
+<node TEXT="When only parts of text and not the entire node core format is modified, this command brings all text to the default text style for the node." ID="ID_599814090" CREATED="1491360408928" MODIFIED="1491361360563"/>
+</node>
+</node>
+<node TEXT="Cloud shapes" STYLE_REF="Title" FOLDED="true" ID="ID_1728409143" CREATED="1491353597986" MODIFIED="1491361578366">
+<node TEXT="" ID="ID_1953644574" CREATED="1491361509888" MODIFIED="1491361509891">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Arc" FOLDED="true" ID="ID_672703222" CREATED="1484505315988" MODIFIED="1490320559891">
+<cloud COLOR="#ffcccc" SHAPE="ARC"/>
+<node TEXT="child" ID="ID_1229686653" CREATED="1499047786216" MODIFIED="1499051593239">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_706979462" CREATED="1499047786216" MODIFIED="1499051589843"/>
+<node TEXT="grandchild" ID="ID_1891074445" CREATED="1499047786216" MODIFIED="1499051589834"/>
+</node>
+<node TEXT="child" ID="ID_1715163263" CREATED="1499047786216" MODIFIED="1499047879617"/>
+<node TEXT="child" ID="ID_1990003970" CREATED="1499047786216" MODIFIED="1499047879617"/>
+</node>
+<node TEXT="Star" FOLDED="true" ID="ID_448124047" CREATED="1484505272644" MODIFIED="1490320564935" HGAP_QUANTITY="43.99999910593036 pt" VSHIFT_QUANTITY="2.2499999329447764 pt">
+<cloud COLOR="#ccccff" SHAPE="STAR"/>
+<node TEXT="child" ID="ID_1222142902" CREATED="1499047786216" MODIFIED="1499051631172">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_425735107" CREATED="1499047786216" MODIFIED="1499047869332"/>
+<node TEXT="grandchild" ID="ID_373425130" CREATED="1499047786216" MODIFIED="1499047873810"/>
+</node>
+</node>
+<node TEXT="Rectangle" FOLDED="true" ID="ID_183770431" CREATED="1484505308517" MODIFIED="1490320556140">
+<cloud COLOR="#ccffcc" SHAPE="RECT"/>
+<node TEXT="child" ID="ID_108117600" CREATED="1499047786216" MODIFIED="1499051641058">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_1131054015" CREATED="1499047786216" MODIFIED="1499047869332"/>
+</node>
+</node>
+<node TEXT="Round rectangle" FOLDED="true" ID="ID_1926327236" CREATED="1484505296961" MODIFIED="1490320577709">
+<cloud COLOR="#ffcc00" SHAPE="ROUND_RECT"/>
+<node TEXT="child" ID="ID_1899711161" CREATED="1499047786216" MODIFIED="1499051656683">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_551258868" CREATED="1499047786216" MODIFIED="1499047869332"/>
+</node>
+<node TEXT="child" ID="ID_290617404" CREATED="1499047786216" MODIFIED="1499047879617"/>
+<node TEXT="child" ID="ID_411133332" CREATED="1499047786216" MODIFIED="1499051659690">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_1393792644" CREATED="1499047786216" MODIFIED="1499047873810"/>
+</node>
+</node>
+<node TEXT="" ID="ID_144223462" CREATED="1491361509883" MODIFIED="1499051710061" VGAP_QUANTITY="6.0 pt">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="A cloud surrounds the node it is applied to and all its descendants." ID="ID_1053651579" CREATED="1490396885182" MODIFIED="1499051710072"/>
+</node>
+<node TEXT="Cloud color" STYLE_REF="Title" FOLDED="true" ID="ID_1625707485" CREATED="1484505159213" MODIFIED="1490321689375">
+<node TEXT="Changes the color of cloud." ID="ID_1376245777" CREATED="1490319725760" MODIFIED="1491362415410"/>
+</node>
+</node>
+<node TEXT="Edge properties" STYLE_REF="Title" FOLDED="true" ID="ID_1149082348" CREATED="1491353597989" MODIFIED="1491361578369">
+<node TEXT="Styles" STYLE_REF="Title" FOLDED="true" ID="ID_344522247" CREATED="1491362275610" MODIFIED="1491362964800">
+<node TEXT="As parent" FOLDED="true" ID="ID_1838085656" CREATED="1491362990532" MODIFIED="1491362994850">
+<node TEXT="Edge style will be the same as its parent node edge style" ID="ID_1601230879" CREATED="1491363586412" MODIFIED="1491363619014"/>
+</node>
+<node TEXT="Linear" ID="ID_572246152" CREATED="1490319373001" MODIFIED="1491362941037" HGAP_QUANTITY="55.999998748302495 pt" VSHIFT_QUANTITY="-31.499999061226873 pt">
+<edge STYLE="linear" COLOR="#00cc33" WIDTH="2"/>
+</node>
+<node TEXT="Smoothly curved (bezier)" ID="ID_659928825" CREATED="1490319321099" MODIFIED="1491362956015" HGAP_QUANTITY="63.499998524785084 pt" VSHIFT_QUANTITY="-9.749999709427364 pt"/>
+<node TEXT="Sharp linear" ID="ID_545560801" CREATED="1490319396297" MODIFIED="1491362958253" HGAP_QUANTITY="109.24999716132888 pt" VSHIFT_QUANTITY="33.74999899417165 pt">
+<edge STYLE="sharp_linear" COLOR="#ff6600" WIDTH="4"/>
+</node>
+<node TEXT="Sharply curved (bezier)" ID="ID_821912393" CREATED="1490319379817" MODIFIED="1491362964797" HGAP_QUANTITY="48.4999989718199 pt" VSHIFT_QUANTITY="37.499998882412946 pt">
+<edge STYLE="sharp_bezier" COLOR="#00cccc" WIDTH="4"/>
+</node>
+<node TEXT="Hide edge" ID="ID_540947272" CREATED="1490319355809" MODIFIED="1491362934162" HGAP_QUANTITY="67.99999839067465 pt" VSHIFT_QUANTITY="14.249999575316918 pt">
+<edge STYLE="hide_edge"/>
+</node>
+<node TEXT="Horizontal" ID="ID_1358390844" CREATED="1490319363569" MODIFIED="1491362937432" HGAP_QUANTITY="72.4999982565642 pt" VSHIFT_QUANTITY="11.999999642372142 pt">
+<edge STYLE="horizontal" COLOR="#cc00cc" WIDTH="3"/>
+</node>
+</node>
+<node TEXT="Edge Widths" STYLE_REF="Title" FOLDED="true" ID="ID_1629133980" CREATED="1491362288087" MODIFIED="1491362434775">
+<node TEXT="Parent" FOLDED="true" ID="ID_1841485488" CREATED="1491363022037" MODIFIED="1491363023528">
+<node TEXT="Edge width will be the same as its parent node edge width" ID="ID_1889215484" CREATED="1491363586412" MODIFIED="1491363789539"/>
+</node>
+<node TEXT="Thin" FOLDED="true" ID="ID_174371598" CREATED="1491363024018" MODIFIED="1491363027873">
+<node TEXT="The difference between "Thin" and "1" may not be apparent at lower zoom percentages." ID="ID_458274817" CREATED="1491363850431" MODIFIED="1491363850431"/>
+</node>
+<node TEXT="" ID="ID_319207823" CREATED="1499013903730" MODIFIED="1499013903734">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="1" ID="ID_1909443612" CREATED="1491363029449" MODIFIED="1491363030216"/>
+<node TEXT="2" ID="ID_1160984983" CREATED="1491363031785" MODIFIED="1491363032550"/>
+<node TEXT="4" ID="ID_1028770233" CREATED="1491363033729" MODIFIED="1491363034485"/>
+<node TEXT="8" ID="ID_663201197" CREATED="1491363035137" MODIFIED="1491363035958"/>
+<node TEXT="" ID="ID_1297839265" CREATED="1499013903719" MODIFIED="1499013903730">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Levels of thickness" ID="ID_300765166" CREATED="1499013903737" MODIFIED="1499013915801"/>
+</node>
+</node>
+<node TEXT="Edge color..." STYLE_REF="Title" FOLDED="true" ID="ID_1367624943" CREATED="1491362305967" MODIFIED="1491362434777">
+<node TEXT="Set the color of the edge using a color chooser dialog." ID="ID_1772999510" CREATED="1491353841710" MODIFIED="1491363149600"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Old documentation" STYLE_REF="Old documentation" FOLDED="true" ID="ID_76671619" CREATED="1485134404008" MODIFIED="1498338421309">
+<node TEXT="Menu Format" STYLE_REF="Advanced" FOLDED="true" ID="ID_308746343" CREATED="1314167687616" MODIFIED="1498408889676" HGAP_QUANTITY="29.0 px">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node FOLDED="true" ID="ID_1843912290" CREATED="1323518205453" MODIFIED="1498407449286"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The properties in the properties panel are also available through <b>menu Format</b>. Menu Format contains some properties which cannot be set in the properties panel as well. Examples are <i>map background</i> an <i>blinking node</i> (in Core).
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
+</hook>
+<node TEXT="Bold" STYLE_REF="AdvancedTopic" ID="ID_121573450" CREATED="1266251692562" MODIFIED="1323519139108" TEXT_SHORTENED="true" HGAP_QUANTITY="25.0 px" STYLE="as_parent">
+<icon BUILTIN="../Bold16"/>
+<font NAME="SansSerif" SIZE="12" BOLD="true" ITALIC="false"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <p>
+      This icon-button in the toolbar affects thee whole node text.
+    </p>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+<node TEXT="Italic" STYLE_REF="AdvancedTopic" ID="ID_313105065" CREATED="1266251689531" MODIFIED="1323519147984" TEXT_SHORTENED="true">
+<icon BUILTIN="../Italic16"/>
+<font ITALIC="true"/>
+<richcontent TYPE="DETAILS">
+
+<html>
+  <head>
+
+  </head>
+  <body>
+    <ul>
+      <li>
+        This icon-button in the toolbar affects the whole node text
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
+</hook>
+<edge STYLE="horizontal"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Formatting using Format tab" STYLE_REF="Title" FOLDED="true" ID="ID_113967254" CREATED="1316668137651" MODIFIED="1499027717201">
+<hook NAME="NodeConditionalStyles">
+    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
+</hook>
+<node TEXT="Purpose" STYLE_REF="Purpose" FOLDED="true" ID="ID_973634813" CREATED="1483416459506" MODIFIED="1490313934016">
+<node ID="ID_1868517480" CREATED="1484502030267" MODIFIED="1490490578905"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The <b>format tab </b>is the most versatile method to change properties of a node.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node ID="ID_1879589683" CREATED="1490309405065" MODIFIED="1499013536733"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The tab<b> </b>is in the <b>Tool panel </b>which is visible on the right side of Freeplane window.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="How to" STYLE_REF="Actions" FOLDED="true" ID="ID_1282910488" CREATED="1484432866260" MODIFIED="1490495102114">
+<node FOLDED="true" ID="ID_947457883" CREATED="1483485768372" MODIFIED="1498406087803" NUMBERED="true"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Open the <font color="#ff0000">Tool panel</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node ID="ID_669965515" CREATED="1490478752169" MODIFIED="1490478763647"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Press <font color="#ff0000">ALT + P</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node ID="ID_451547386" CREATED="1484492138834" MODIFIED="1499027333323"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      or select in menubar <font color="#ff0000">View > Toolbars > Tool panel</font>.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="or click narrow bar on the right side of Freeplane window" FOLDED="true" ID="ID_1724249204" CREATED="1484882923124" MODIFIED="1490392611489">
+<node ID="ID_511444276" CREATED="1490392458662" MODIFIED="1490392502856"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <img src="Images/properties%20toolbar%20-%20collapsed.png" width="13" height="96"/>
+      .
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node ID="ID_452809988" CREATED="1484492380951" MODIFIED="1499013747058"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      or right-click in a blank area of the mindmap and select <font color="#ff0000">Tool panel</font>.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node ID="ID_789235112" CREATED="1485686718725" MODIFIED="1498406144736" NUMBERED="true"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Select the <font color="#ff0000">Format tab</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+<node TEXT="Change the value of the properties by selecting the option from the drop down menu or typing the value of the property." ID="ID_1587546358" CREATED="1484691804971" MODIFIED="1490394239088" NUMBERED="true"/>
+</node>
+<node TEXT="Notes and explanations" STYLE_REF="Notes and explanations" FOLDED="true" ID="ID_1512156" CREATED="1483416064359" MODIFIED="1490313934037">
+<node FOLDED="true" ID="ID_51883983" CREATED="1484492875430" MODIFIED="1490490292479"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The <b>format tab</b> shows the format properties of the node which has the focus.
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="By selecting more than one node, the first one selected will have the focus." ID="ID_1383941408" CREATED="1498414824110" MODIFIED="1498414865146"/>
+<node TEXT="It is possible to select and change more than one node at a time." ID="ID_1366560516" CREATED="1484493882465" MODIFIED="1498414893983"/>
+</node>
+<node TEXT="While the tab is showing, you can select a different node to give it the focus." ID="ID_634553406" CREATED="1484493903487" MODIFIED="1490490285054"/>
+<node TEXT="The change takes effect immediately. There is no need to press an OK button or leave the panel. Just select other node(s) and change the property." ID="ID_243057475" CREATED="1484501660798" MODIFIED="1490396835460"/>
+<node FOLDED="true" ID="ID_1958981167" CREATED="1484497650795" MODIFIED="1490490267937" VGAP_QUANTITY="6.0 pt"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      The groups of format properties that can be changed are:
+    </p>
+    <ul>
+      <li>
+        Node style
+      </li>
+      <li>
+        Node conditional styles applied to node
+      </li>
+      <li>
+        Map conditional styles applied to node
+      </li>
+      <li>
+        Color of whole core
+      </li>
+      <li>
+        Core text
+      </li>
+      <li>
+        Node shape
+      </li>
+      <li>
+        Node border
+      </li>
+      <li>
+        Font of whole core
+      </li>
+      <li>
+        Icons
+      </li>
+      <li>
+        Edges
+      </li>
+      <li>
+        Clouds
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Node style" STYLE_REF="Title" FOLDED="true" ID="ID_1000178007" CREATED="1484497773239" MODIFIED="1490313934055">
+<node TEXT="Apply level styles" STYLE_REF="Title" FOLDED="true" ID="ID_1173015425" CREATED="1484503469096" MODIFIED="1490313934066">
+<node FOLDED="true" ID="ID_809752624" CREATED="1490312227953" MODIFIED="1490312445012"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Applies a style defined as <b>level styles </b>that depends on the level (or hierarchy) in which a node is in the map.
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="for non leave nodes" STYLE_REF="Title" FOLDED="true" ID="ID_473831407" CREATED="1484514322364" MODIFIED="1490313934068">
+<node TEXT="Apply a level style to all nodes except for the last node in the hierarchy of the branch" ID="ID_1569064090" CREATED="1490310254841" MODIFIED="1490531059622"/>
+</node>
+<node TEXT="for all nodes" STYLE_REF="Title" FOLDED="true" ID="ID_1815488017" CREATED="1484514341803" MODIFIED="1490313934069">
+<node TEXT="Apply a level style to all nodes" ID="ID_10677081" CREATED="1490470211127" MODIFIED="1490470231452"/>
+</node>
+<node TEXT="disabled" STYLE_REF="Title" FOLDED="true" ID="ID_1737336545" CREATED="1484514347050" MODIFIED="1490313934070">
+<node TEXT="Level style will be disabled and branches and nodes will have edge colors defined in the properties panel." ID="ID_1472380797" CREATED="1490311022347" MODIFIED="1490531213179"/>
+</node>
+</node>
+<node TEXT="The predefined number of level styles depend on the template file." ID="ID_475744328" CREATED="1490310433310" MODIFIED="1490471346561"/>
+<node ID="ID_422084831" CREATED="1490471346573" MODIFIED="1490530289742"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      It is possible to increase or decrease this number by adding or removing styles in the window that opens in menu <font color="#ff0000">Format > Manage styles > Edit styles </font>and defining<font color="#ff0000">  Apply level styles</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Automatic edge color" STYLE_REF="Title" FOLDED="true" ID="ID_544577955" CREATED="1484503503502" MODIFIED="1490313934071">
+<node TEXT="The color of branches and  nodes will be automatically generated following a defined scheme." FOLDED="true" ID="ID_1842209256" CREATED="1490310918412" MODIFIED="1490472697805">
+<node TEXT="for branches" STYLE_REF="Title" FOLDED="true" ID="ID_1751046584" CREATED="1484507180262" MODIFIED="1490313934072">
+<node TEXT="Each main branch starting from the Root node will have specific colors." ID="ID_215747519" CREATED="1490310882652" MODIFIED="1490310882652"/>
+</node>
+<node TEXT="for levels" STYLE_REF="Title" FOLDED="true" ID="ID_645801806" CREATED="1484507191612" MODIFIED="1490313934074">
+<node TEXT="Nodes will have colors depending on the level  they belong to." ID="ID_1209806157" CREATED="1490310937756" MODIFIED="1490472715007"/>
+</node>
+<node TEXT="for columns" STYLE_REF="Title" FOLDED="true" ID="ID_870329368" CREATED="1484507205174" MODIFIED="1490313934075">
+<node TEXT="Nodes will have colors depending on horizontal distance from the root node." ID="ID_556141426" CREATED="1490310944259" MODIFIED="1490472721080"/>
+<node TEXT="This option works only when all nodes of the mindmap have a fixed width." FOLDED="true" ID="ID_29403502" CREATED="1490392099518" MODIFIED="1490493477157">
+<node TEXT="Nodes and summary nodes will always have alternating colors along the horizontal distance from the root node." ID="ID_1631154198" CREATED="1490472828405" MODIFIED="1490493625542"/>
+</node>
+<node ID="ID_1765422792" CREATED="1490471044383" MODIFIED="1490471253234"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Template file <b>Bigmap.mm</b> uses automatic edge color for columns.
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="on branch creation" STYLE_REF="Title" FOLDED="true" ID="ID_504439219" CREATED="1484507220756" MODIFIED="1490313934076">
+<node ID="ID_1392651166" CREATED="1490311005232" MODIFIED="1490311005232"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Each main branch starting from the Root node will have specific colors. These colors will be kept by the branches even when disabling <font color="#ff0000">Automatic edge color</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="disabled" STYLE_REF="Title" FOLDED="true" ID="ID_202638910" CREATED="1484507229547" MODIFIED="1490313934078">
+<node TEXT="Automatic edge color will be disabled and branches and nodes will have edge colors defined in the properties panel." ID="ID_532971778" CREATED="1490311022347" MODIFIED="1490531177257"/>
+</node>
+</node>
+</node>
+<node TEXT="Edit edge colors" STYLE_REF="Title" FOLDED="true" ID="ID_889684573" CREATED="1490311046128" MODIFIED="1490311632804">
+<node ID="ID_1698241216" CREATED="1490311200886" MODIFIED="1490311312101"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Opens a dialogue box to configure the scheme of colors used by <font color="#ff0000">Automatic edge color</font>
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+<node TEXT="Style" STYLE_REF="Title" FOLDED="true" ID="ID_1523486972" CREATED="1491433879374" MODIFIED="1491433887744">
+<node TEXT="Defines the style of the node" ID="ID_37766303" CREATED="1491432596618" MODIFIED="1491433828453"/>
+</node>
+</node>
+<node TEXT="Node conditional styles applied to node" STYLE_REF="Title" FOLDED="true" ID="ID_1757691762" CREATED="1484503542445" MODIFIED="1490313934079">
+<node TEXT="Manage conditional styles applied to the selected node(s)" ID="ID_124546519" CREATED="1490311499936" MODIFIED="1490311880985"/>
+</node>
+<node TEXT="Map conditional styles applied to node" STYLE_REF="Title" FOLDED="true" ID="ID_376453017" CREATED="1484503555501" MODIFIED="1490313934090">
+<node TEXT="Manage conditional styles applied to map" ID="ID_807813761" CREATED="1490311524296" MODIFIED="1490311539308"/>
+</node>
+<node TEXT="Color of whole core" STYLE_REF="Title" FOLDED="true" ID="ID_1539236706" CREATED="1484497788174" MODIFIED="1490313934096">
+<node TEXT="Text" STYLE_REF="Title" FOLDED="true" ID="ID_912386471" CREATED="1484503584448" MODIFIED="1490313934098">
+<node TEXT="Define the color of the text in the node core" FOLDED="true" ID="ID_1301547194" CREATED="1490311433252" MODIFIED="1490313139402">
+<node TEXT="Red" ID="ID_619754945" CREATED="1490481499432" MODIFIED="1490481522855" COLOR="#ff0033"/>
+<node TEXT="Blue" ID="ID_615092476" CREATED="1490481504740" MODIFIED="1490481530070" COLOR="#0000ff"/>
+<node TEXT="Green" ID="ID_1304030291" CREATED="1490481511740" MODIFIED="1490481567324" COLOR="#00cc33"/>
+</node>
+</node>
+<node TEXT="Background" STYLE_REF="Title" FOLDED="true" ID="ID_1345564487" CREATED="1484503587893" MODIFIED="1490313934099">
+<node TEXT="Define the color of the background of the node core" FOLDED="true" ID="ID_1813906066" CREATED="1490311448146" MODIFIED="1490313146870">
+<node TEXT="Red" ID="ID_65339864" CREATED="1490481499432" MODIFIED="1490481624067" BACKGROUND_COLOR="#ff9999"/>
+<node TEXT="Blue" ID="ID_704575692" CREATED="1490481504740" MODIFIED="1490481635021" BACKGROUND_COLOR="#99ccff"/>
+<node TEXT="Green" ID="ID_1823902540" CREATED="1490481511740" MODIFIED="1490481643691" BACKGROUND_COLOR="#99ff99"/>
+</node>
+</node>
+</node>
+<node TEXT="Core text" STYLE_REF="Title" FOLDED="true" ID="ID_1774124613" CREATED="1484497800150" MODIFIED="1490481712190" FORMAT="NO_FORMAT">
+<node TEXT="Format" STYLE_REF="Title" FOLDED="true" ID="ID_989771730" CREATED="1484503631535" MODIFIED="1490313934101">
+<node TEXT="Define the format of the text in the node core" ID="ID_1116936727" CREATED="1490313199988" MODIFIED="1490313232424"/>
+</node>
+<node TEXT="Node numbering" STYLE_REF="Title" FOLDED="true" ID="ID_434774429" CREATED="1484503636269" MODIFIED="1490313934102">
+<node TEXT="Automatically numbers the node core" ID="ID_901295174" CREATED="1490312953758" MODIFIED="1490313240616"/>
+<node TEXT="Selecting a node, its siblings and descendents will number ascending the family tree." FOLDED="true" ID="ID_1528438291" CREATED="1490476914462" MODIFIED="1498407860239">
+<node STYLE_REF="Idea" FOLDED="true" ID="ID_1423889297" CREATED="1483838122037" MODIFIED="1487471952760"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      <img src="Images/examples.png" width="32" height="32"/>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Without automatic numbering" FOLDED="true" ID="ID_1285519836" CREATED="1490477056926" MODIFIED="1490479792737">
+<edge COLOR="#ff9900"/>
+<node TEXT="Node" FOLDED="true" ID="ID_1321082768" CREATED="1490479489247" MODIFIED="1490479490352">
+<node TEXT="Node" FOLDED="true" ID="ID_1455218133" CREATED="1490479489247" MODIFIED="1490479490352">
+<node TEXT="Node" ID="ID_1075815155" CREATED="1490479524437" MODIFIED="1490479525528"/>
+</node>
+<node TEXT="Node" ID="ID_1924920783" CREATED="1490479496987" MODIFIED="1490479500416"/>
+<node TEXT="Node" FOLDED="true" ID="ID_1334300302" CREATED="1490479501074" MODIFIED="1490479502376">
+<node TEXT="Node" ID="ID_93780120" CREATED="1490479508453" MODIFIED="1490479514729"/>
+<node TEXT="Node" FOLDED="true" ID="ID_1617766807" CREATED="1490479515450" MODIFIED="1490479516952">
+<node TEXT="Node" ID="ID_769070462" CREATED="1490479518749" MODIFIED="1490479519544"/>
+</node>
+</node>
+</node>
+<node TEXT="Node" FOLDED="true" ID="ID_112876972" CREATED="1490479501074" MODIFIED="1490479502376">
+<node TEXT="Node" ID="ID_351463149" CREATED="1490479508453" MODIFIED="1490479514729"/>
+<node TEXT="Node" FOLDED="true" ID="ID_656431672" CREATED="1490479515450" MODIFIED="1490479516952">
+<node TEXT="Node" ID="ID_570198457" CREATED="1490479518749" MODIFIED="1490479519544"/>
+</node>
+</node>
+</node>
+<node TEXT="With automatic numbering" FOLDED="true" ID="ID_1812934414" CREATED="1490477056926" MODIFIED="1490479814667">
+<edge COLOR="#666600"/>
+<node TEXT="Node" FOLDED="true" ID="ID_577166468" CREATED="1490479489247" MODIFIED="1490479490352" NUMBERED="true">
+<node TEXT="Node" FOLDED="true" ID="ID_432923465" CREATED="1490479489247" MODIFIED="1490479490352" NUMBERED="true">
+<node TEXT="Node" ID="ID_1560346383" CREATED="1490479524437" MODIFIED="1490479525528" NUMBERED="true"/>
+</node>
+<node TEXT="Node" ID="ID_727421537" CREATED="1490479496987" MODIFIED="1490479500416" NUMBERED="true"/>
+<node TEXT="Node" FOLDED="true" ID="ID_1685368136" CREATED="1490479501074" MODIFIED="1490479502376" NUMBERED="true">
+<node TEXT="Node" ID="ID_267193652" CREATED="1490479508453" MODIFIED="1490479514729" NUMBERED="true"/>
+<node TEXT="Node" FOLDED="true" ID="ID_1429619024" CREATED="1490479515450" MODIFIED="1490479516952" NUMBERED="true">
+<node TEXT="Node" ID="ID_875838504" CREATED="1490479518749" MODIFIED="1490479519544" NUMBERED="true"/>
+</node>
+</node>
+</node>
+<node TEXT="Node" FOLDED="true" ID="ID_457686219" CREATED="1490479501074" MODIFIED="1490479502376" NUMBERED="true">
+<node TEXT="Node" ID="ID_249740843" CREATED="1490479508453" MODIFIED="1490479514729" NUMBERED="true"/>
+<node TEXT="Node" FOLDED="true" ID="ID_1627562984" CREATED="1490479515450" MODIFIED="1490479516952" NUMBERED="true">
+<node TEXT="Node" ID="ID_373895161" CREATED="1490479518749" MODIFIED="1490479519544" NUMBERED="true"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="The numbering is placed on the left side of the node core." ID="ID_1183792059" CREATED="1490479683634" MODIFIED="1490481435647"/>
+</node>
+</node>
+<node TEXT="Node shape" STYLE_REF="Title" FOLDED="true" ID="ID_1278873512" CREATED="1484497650795" MODIFIED="1490313934103">
+<node TEXT="Node shape" STYLE_REF="Title" FOLDED="true" ID="ID_109750690" CREATED="1484503655943" MODIFIED="1490313934006">
+<node TEXT="Define the node shape" FOLDED="true" ID="ID_1009941017" CREATED="1490313264270" MODIFIED="1490313267985">
+<node TEXT="Fork" STYLE_REF="Title" ID="ID_1130465908" CREATED="1490313298572" MODIFIED="1490314448825" STYLE="fork" SHAPE_HORIZONTAL_MARGIN="4.0 pt"/>
+<node TEXT="Bubble" STYLE_REF="Title" ID="ID_748450462" CREATED="1490313302235" MODIFIED="1490313364912"/>
+<node TEXT="Oval" STYLE_REF="Title" ID="ID_1049503373" CREATED="1490313309153" MODIFIED="1490313375501" STYLE="oval" SHAPE_HORIZONTAL_MARGIN="4.0 pt"/>
+<node TEXT="Rectangle" STYLE_REF="Title" ID="ID_1214294194" CREATED="1490313312396" MODIFIED="1490313378485" STYLE="rectangle" SHAPE_HORIZONTAL_MARGIN="4.0 pt"/>
+<node TEXT="Wide hexagon" STYLE_REF="Title" ID="ID_82816065" CREATED="1490313321232" MODIFIED="1490314282984" STYLE="wide_hexagon" SHAPE_HORIZONTAL_MARGIN="4.0 pt"/>
+<node TEXT="Narrow hexagon" STYLE_REF="Title" ID="ID_1434607100" CREATED="1490313324977" MODIFIED="1490313385356" STYLE="narrow_hexagon" SHAPE_HORIZONTAL_MARGIN="4.0 pt"/>
+<node TEXT="As parent" STYLE_REF="Title" FOLDED="true" ID="ID_1242128051" CREATED="1490313342657" MODIFIED="1490313391690" STYLE="as_parent" SHAPE_HORIZONTAL_MARGIN="4.0 pt">
+<node TEXT="Node has same node shape as its parent" ID="ID_1518537303" CREATED="1490313440578" MODIFIED="1490313454160"/>
+</node>
+<node TEXT="Combined" STYLE_REF="Title" FOLDED="true" ID="ID_1725601135" CREATED="1490313355424" MODIFIED="1490313398095" STYLE="combined" SHAPE_HORIZONTAL_MARGIN="4.0 pt">
+<node FOLDED="true" ID="ID_633912998" CREATED="1490313457266" MODIFIED="1490313788071" STYLE="combined" SHAPE_HORIZONTAL_MARGIN="4.0 pt"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      When node is unfolded, the shape of the node is <b>fork</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Unfolded" ID="ID_517208644" CREATED="1490313814552" MODIFIED="1490313816787"/>
+</node>
+<node FOLDED="true" ID="ID_1599287676" CREATED="1490313457266" MODIFIED="1490318113907" STYLE="combined" SHAPE_HORIZONTAL_MARGIN="4.0 pt"><richcontent TYPE="NODE">
+
+<html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      When node is folded, the shape of the node is <b>bubble</b>
+    </p>
+  </body>
+</html>
+</richcontent>
+<node TEXT="Unfolded" ID="ID_618014394" CREATED="1490313814552" MODIFIED="1490313816787"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Horizontal margin" STYLE_REF="Title" FOLDED="true" ID="ID_1761214190" CREATED="1484503660173" MODIFIED="1490313934105">
+<node TEXT="Set the horizontal margin (spacing) between the text in the core and the node border" FOLDED="true" ID="ID_1410328805" CREATED="1490314056557" MODIFIED="1490494887036" STYLE="bubble" SHAPE_HORIZONTAL_MARGIN="4.0 pt">
+<node TEXT="Text with horizontal margin 2 pt" ID="ID_1256570209" CREATED="1490481151810" MODIFIED="1490481303237" STYLE="bubble"/>
+<node TEXT="Text with horizontal margin 20 pt" ID="ID_578747155" CREATED="1490481151810" MODIFIED="1490481329659" STYLE="bubble" SHAPE_HORIZONTAL_MARGIN="20.0 pt"/>
+</node>
+<node TEXT="Set unit of measure in" FOLDED="true" ID="ID_112687934" CREATED="1490317947710" MODIFIED="1490318073372">
+<node TEXT="px" FOLDED="true" ID="ID_1325261602" CREATED="1490317967389" MODIFIED="1490317973825">
+<node TEXT="pixels" ID="ID_1689522964" CREATED="1490317998301" MODIFIED="1490318000536"/>
+</node>
+<node TEXT="in" FOLDED="true" ID="ID_1232132236" CREATED="1490317980275" MODIFIED="1490317981281">
+<node TEXT="inches" ID="ID_1624173045" CREATED="1490318004053" MODIFIED="1490318006816"/>
+</node>
+<node TEXT="mm" FOLDED="true" ID="ID_502173901" CREATED="1490317985443" MODIFIED="1490317986368">
+<node TEXT="millimeters" ID="ID_80888553" CREATED="1490318009181" MODIFIED="1490318011960"/>
+</node>
+<node TEXT="cm" FOLDED="true" ID="ID_321522943" CREATED="1490317992027" MODIFIED="1490317993167">
+<node TEXT="centimeters" ID="ID_470777784" CREATED="1490318015124" MODIFIED="1490318017978"/>
+</node>
+<node TEXT="pt" FOLDED="true" ID="ID_951849031" CREATED="1490317994610" MODIFIED="1490317995525">
+<node TEXT="points" ID="ID_262690012" CREATED="1490318020445" MODIFIED="1490318037402"/>
+</node>
+</node>
+</node>
+<node TEXT="Vertical margin" STYLE_REF="Title" FOLDED="true" ID="ID_632164522" CREATED="1484503666631" MODIFIED="1490313934106">
+<node TEXT="Set the vertical margin (spacing) between the text in the core and the node border" FOLDED="true" ID="ID_1273181893" CREATED="1490314056557" MODIFIED="1490494904403">
+<node TEXT="Text with vertical margin 2 pt" ID="ID_1874613867" CREATED="1490481151810" MODIFIED="1490481252718" STYLE="bubble"/>
+<node TEXT="Text with vertical margin 10 pt" ID="ID_37128828" CREATED="1490481151810" MODIFIED="1490481271484" STYLE="bubble" SHAPE_VERTICAL_MARGIN="10.0 pt"/>
+</node>
+<node TEXT="Set unit of measure in" FOLDED="true" ID="ID_1289525366" CREATED="1490317947710" MODIFIED="1490318073372">
+<node TEXT="px" FOLDED="true" ID="ID_291262380" CREATED="1490317967389" MODIFIED="1490317973825">
+<node TEXT="pixels" ID="ID_1718509555" CREATED="1490317998301" MODIFIED="1490318000536"/>
+</node>
+<node TEXT="in" FOLDED="true" ID="ID_1552729706" CREATED="1490317980275" MODIFIED="1490317981281">
+<node TEXT="inches" ID="ID_855989535" CREATED="1490318004053" MODIFIED="1490318006816"/>
+</node>
+<node TEXT="mm" FOLDED="true" ID="ID_33341712" CREATED="1490317985443" MODIFIED="1490317986368">
+<node TEXT="millimeters" ID="ID_1920271580" CREATED="1490318009181" MODIFIED="1490318011960"/>
+</node>
+<node TEXT="cm" FOLDED="true" ID="ID_1757759680" CREATED="1490317992027" MODIFIED="1490317993167">
+<node TEXT="centimeters" ID="ID_1068081950" CREATED="1490318015124" MODIFIED="1490318017978"/>
+</node>
+<node TEXT="pt" FOLDED="true" ID="ID_1631803221" CREATED="1490317994610" MODIFIED="1490317995525">
+<node TEXT="points" ID="ID_634292254" CREATED="1490318020445" MODIFIED="1490318037402"/>
+</node>
+</node>
+</node>
+<node TEXT="Uniform" STYLE_REF="Title" FOLDED="true" ID="ID_1520714242" CREATED="1484503678054" MODIFIED="1490313934108">
+<node TEXT="Select to make height of the node the same as its width." ID="ID_330274987" CREATED="1490474002670" MODIFIED="1490494932682"/>
+<node TEXT="Non-uniform Bubble" STYLE_REF="Title" FOLDED="true" ID="ID_1600307155" CREATED="1490313302235" MODIFIED="1490473432364" STYLE="bubble" SHAPE_HORIZONTAL_MARGIN="4.0 pt" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Non-uniform Oval" STYLE_REF="Title" FOLDED="true" ID="ID_974475602" CREATED="1490313309153" MODIFIED="1490473565465" STYLE="oval" SHAPE_HORIZONTAL_MARGIN="4.0 pt" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Non-uniform Rectangle" STYLE_REF="Title" FOLDED="true" ID="ID_1371838379" CREATED="1490313312396" MODIFIED="1490473579497" STYLE="rectangle" SHAPE_HORIZONTAL_MARGIN="4.0 pt" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Non-uniform Wide hexagon" STYLE_REF="Title" FOLDED="true" ID="ID_59142121" CREATED="1490313321232" MODIFIED="1490473897220" STYLE="wide_hexagon" SHAPE_HORIZONTAL_MARGIN="4.0 pt" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Non-uniform Narrow hexagon" STYLE_REF="Title" ID="ID_161318977" CREATED="1490313324977" MODIFIED="1490473864603" STYLE="narrow_hexagon" SHAPE_HORIZONTAL_MARGIN="4.0 pt" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Uniform Bubble" STYLE_REF="Title" FOLDED="true" ID="ID_701036451" CREATED="1490313302235" MODIFIED="1490474254178" STYLE="bubble" SHAPE_HORIZONTAL_MARGIN="4.0 pt" UNIFORM_SHAPE="true" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Uniform oval" STYLE_REF="Title" FOLDED="true" ID="ID_1232132080" CREATED="1490313309153" MODIFIED="1490473418068" STYLE="oval" SHAPE_HORIZONTAL_MARGIN="4.0 pt" UNIFORM_SHAPE="true" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Uniform Rectangle" STYLE_REF="Title" FOLDED="true" ID="ID_1617679558" CREATED="1490313312396" MODIFIED="1490468395695" STYLE="rectangle" SHAPE_HORIZONTAL_MARGIN="4.0 pt" UNIFORM_SHAPE="true" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Uniform Wide hexagon" STYLE_REF="Title" FOLDED="true" ID="ID_85043285" CREATED="1490313321232" MODIFIED="1490468395701" STYLE="wide_hexagon" SHAPE_HORIZONTAL_MARGIN="4.0 pt" UNIFORM_SHAPE="true" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt">
+<node TEXT="Uniform Narrow hexagon" STYLE_REF="Title" ID="ID_1912995771" CREATED="1490313324977" MODIFIED="1490468395703" STYLE="narrow_hexagon" SHAPE_HORIZONTAL_MARGIN="4.0 pt" UNIFORM_SHAPE="true" MAX_WIDTH="80.0 pt" MIN_WIDTH="80.0 pt"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="" ID="ID_1847028781" CREATED="1490316921721" MODIFIED="1490316921726">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="" ID="ID_911249122" CREATED="1490320162616" MODIFIED="1490320162623">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="" ID="ID_1314571518" CREATED="1490320202737" MODIFIED="1490320202740">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Node width" STYLE_REF="Title" FOLDED="true" ID="ID_1380994862" CREATED="1490321999775" MODIFIED="1490322014501">
+<node TEXT="" ID="ID_1076042307" CREATED="1490322065172" MODIFIED="1490322065175">
+<hook NAME="FirstGroupNode"/>
+</node>
+<node TEXT="Min node width" STYLE_REF="Title" FOLDED="true" ID="ID_277964074" CREATED="1484503683924" MODIFIED="1490314644980">
+<node TEXT="Set the minimum node width" ID="ID_1992258809" CREATED="1490314587942" MODIFIED="1490316756667"/>
+</node>
+<node TEXT="Max node width" STYLE_REF="Title" FOLDED="true" ID="ID_1460439723" CREATED="1484503689653" MODIFIED="1490314644993">
+<node TEXT="Set the maximum node width" ID="ID_1324996721" CREATED="1490314599851" MODIFIED="1490316762684"/>
+</node>
+<node TEXT="" ID="ID_1529635094" CREATED="1490322065166" MODIFIED="1490322065171">
+<hook NAME="SummaryNode"/>
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="Set unit of measure in" FOLDED="true" ID="ID_666696835" CREATED="1490317947710" MODIFIED="1490318073372">
+<node TEXT="px" FOLDED="true" ID="ID_1253633214" CREATED="1490317967389" MODIFIED="1490317973825">
+<node TEXT="pixels" ID="ID_761380187" CREATED="1490317998301" MODIFIED="1490318000536"/>
+</node>
+<node TEXT="in" FOLDED="true" ID="ID_523553659" CREATED="1490317980275" MODIFIED="1490317981281">
+<node TEXT="inches" ID="ID_982372905" CREATED="1490318004053" MODIFIED="1490318006816"/>
+</node>
+<node TEXT="mm" FOLDED="true" ID="ID_589332287" CREATED="1490317985443" MODIFIED="1490317986368">
+<node TEXT="millimeters" ID="ID_1335733805" CREATED="1490318009181" MODIFIED="1490318011960"/>
+</node>
+<node TEXT="cm" FOLDED="true" ID="ID_1557388557" CREATED="1490317992027" MODIFIED="1490317993167">
+<node TEXT="centimeters" ID="ID_628776635" CREATED="1490318015124" MODIFIED="1490318017978"/>
+</node>
+<node TEXT="pt" FOLDED="true" ID="ID_1749565787" CREATED="1490317994610" MODIFIED="1490317995525">
+<node TEXT="points" ID="ID_734760153" CREATED="1490318020445" MODIFIED="1490318037402"/>
+</node>
+</node>
+<node TEXT="By setting the same value for minimum and maximum node width, a fixed node width will be used regardless of the amount of text in the node core." ID="ID_1372175477" CREATED="1490316921728" MODIFIED="1490320419461"/>
+</node>
+</node>
+<node TEXT="Child gap" STYLE_REF="Title" FOLDED="true" ID="ID_822643295" CREATED="1484503695060" MODIFIED="1490314644994">
+<node TEXT="Set the spacing between child nodes" FOLDED="true" ID="ID_990143548" CREATED="1490316619063" MODIFIED="1490316770049">
+<node TEXT="Child gap 1 pt" FOLDED="true" ID="ID_1957152892" CREATED="1490320976580" MODIFIED="1490321061283" VGAP_QUANTITY="1.0 pt">
+<node TEXT="A" ID="ID_1220674571" CREATED="1490321002631" MODIFIED="1490321003877"/>
+<node TEXT="B" ID="ID_1117112513" CREATED="1490321009070" MODIFIED="1490321011427"/>
+<node TEXT="C" ID="ID_429680728" CREATED="1490321012406" MODIFIED="1490321013532"/>
+<node TEXT="D" ID="ID_1911968222" CREATED="1490321014005" MODIFIED="1490321015084"/>
+<node TEXT="E" ID="ID_763930929" CREATED="1490321015805" MODIFIED="1490321017316"/>
+</node>
+<node TEXT="Child gap 10 pt" FOLDED="true" ID="ID_1370519144" CREATED="1490320976580" MODIFIED="1490321058150" VGAP_QUANTITY="10.0 pt">
+<node TEXT="A" ID="ID_1145537875" CREATED="1490321002631" MODIFIED="1490321003877"/>
+<node TEXT="B" ID="ID_1183782424" CREATED="1490321009070" MODIFIED="1490321011427"/>
+<node TEXT="C" ID="ID_534757195" CREATED="1490321012406" MODIFIED="1490321013532"/>
+<node TEXT="D" ID="ID_79722788" CREATED="1490321014005" MODIFIED="1490321015084"/>
+<node TEXT="E" ID="ID_909600402" CREATED="1490321015805" MODIFIED="1490321017316"/>
+</node>
+</node>
+<node TEXT="Set unit of measure in" FOLDED="true" ID="ID_445399376" CREATED="1490317947710" MODIFIED="1490320937159" VGAP_QUANTITY="1.0 pt">
+<node TEXT="px" FOLDED="true" ID="ID_1074016350" CREATED="1490317967389" MODIFIED="1490317973825">
+<node TEXT="pixels" ID="ID_1029453220" CREATED="1490317998301" MODIFIED="1490318000536"/>
+</node>
+<node TEXT="in" FOLDED="true" ID="ID_956163677" CREATED="1490317980275" MODIFIED="1490317981281">
+<node TEXT="inches" ID="ID_981117856" CREATED="1490318004053" MODIFIED="1490318006816"/>
+</node>
+<node TEXT="mm" FOLDED="true" ID="ID_1417094468" CREATED="1490317985443" MODIFIED="1490317986368">
+<node TEXT="millimeters" ID="ID_69602340" CREATED="1490318009181" MODIFIED="1490318011960"/>
+</node>
+<node TEXT="cm" FOLDED="true" ID="ID_536547760" CREATED="1490317992027" MODIFIED="1490317993167">
+<node TEXT="centimeters" ID="ID_1724969493" CREATED="1490318015124" MODIFIED="1490318017978"/>
+</node>
+<node TEXT="pt" FOLDED="true" ID="ID_1778612105" CREATED="1490317994610" MODIFIED="1490317995525">
+<node TEXT="points" ID="ID_274705987" CREATED="1490318020445" MODIFIED="1490318037402"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Node border" STYLE_REF="Title" FOLDED="true" ID="ID_449535647" CREATED="1490312033562" MODIFIED="1490312039721">
+<node TEXT="Line width" STYLE_REF="Title" FOLDED="true" ID="ID_125296083" CREATED="1490316668274" MODIFIED="1490318199201">
+<node TEXT="Set the border line width" FOLDED="true" ID="ID_1624385254" CREATED="1490317610328" MODIFIED="1490321906786">
+<node TEXT="Border line width 2 px" ID="ID_1403240434" CREATED="1490321909337" MODIFIED="1490494040668" BORDER_WIDTH="2.0 px"/>
+<node TEXT="Border line width 4 px" ID="ID_889364323" CREATED="1490321909337" MODIFIED="1490494049059" BORDER_WIDTH="4.0 px"/>
+<node TEXT="Border line width 8 px" ID="ID_1039588182" CREATED="1490321909337" MODIFIED="1490494054509" BORDER_WIDTH="8.0 px"/>
+</node>
+<node TEXT="Set unit of measure in" FOLDED="true" ID="ID_1230400599" CREATED="1490317947710" MODIFIED="1490318073372">
+<node TEXT="px" FOLDED="true" ID="ID_1267422600" CREATED="1490317967389" MODIFIED="1490317973825">
+<node TEXT="pixels" ID="ID_494853125" CREATED="1490317998301" MODIFIED="1490318000536"/>
+</node>
+<node TEXT="in" FOLDED="true" ID="ID_1208050643" CREATED="1490317980275" MODIFIED="1490317981281">
+<node TEXT="inches" ID="ID_160015579" CREATED="1490318004053" MODIFIED="1490318006816"/>
+</node>
+<node TEXT="mm" FOLDED="true" ID="ID_1619788019" CREATED="1490317985443" MODIFIED="1490317986368">
+<node TEXT="millimeters" ID="ID_283565221" CREATED="1490318009181" MODIFIED="1490318011960"/>
+</node>
+<node TEXT="cm" FOLDED="true" ID="ID_802052797" CREATED="1490317992027" MODIFIED="1490317993167">
+<node TEXT="centimeters" ID="ID_1610149320" CREATED="1490318015124" MODIFIED="1490318017978"/>
+</node>
+<node TEXT="pt" FOLDED="true" ID="ID_473186314" CREATED="1490317994610" MODIFIED="1490317995525">
+<node TEXT="points" ID="ID_203083367" CREATED="1490318020445" MODIFIED="1490318037402"/>
+</node>
+</node>
+</node>
+<node TEXT="Use edge width" STYLE_REF="Title" FOLDED="true" ID="ID_1844478307" CREATED="1490316683012" MODIFIED="1490317115084">
+<node TEXT="Use the edge width to set line width of node border" ID="ID_1512697032" CREATED="1490317721159" MODIFIED="1490318477841"/>
+</node>
+<node TEXT="Use edge line type" STYLE_REF="Title" FOLDED="true" ID="ID_1144471037" CREATED="1490316694460" MODIFIED="1490317115089">
+<node TEXT="Use the edge line type to set line type of node border" ID="ID_286919931" CREATED="1490317721159" MODIFIED="1490318462041"/>
+</node>
+<node TEXT="Border line type" STYLE_REF="Title" FOLDED="true" ID="ID_695681718" CREATED="1490316706132" MODIFIED="1490321819971" VGAP_QUANTITY="10.0 pt">
+<node TEXT="Border line type 1" ID="ID_746184052" CREATED="1490317853275" MODIFIED="1490321775693" BORDER_WIDTH="2.0 px" BORDER_DASH="SOLID"/>
+<node TEXT="Border line type 2" ID="ID_1083570670" CREATED="1490317853275" MODIFIED="1490321809309" BORDER_WIDTH="2.0 px" BORDER_DASH="CLOSE_DOTS"/>
+<node TEXT="Border line type 3" ID="ID_1237826248" CREATED="1490317853275" MODIFIED="1490321806485" BORDER_WIDTH="2.0 px" BORDER_DASH="DASHES"/>
+<node TEXT="Border line type 4" ID="ID_1494300969" CREATED="1490317853275" MODIFIED="1490321803431" BORDER_WIDTH="2.0 px" BORDER_DASH="DISTANT_DOTS"/>
+<node TEXT="Border line type 5" ID="ID_980524683" CREATED="1490317853275" MODIFIED="1490321800253" BORDER_WIDTH="2.0 px" BORDER_DASH="DOTS_AND_DASHES"/>
+</node>
+<node TEXT="Use edge color" STYLE_REF="Title" FOLDED="true" ID="ID_683869336" CREATED="1490316713867" MODIFIED="1490317115095">
+<node TEXT="By default, the color of node border is set as edge color" ID="ID_1457385649" CREATED="1490318221443" MODIFIED="1490318428543"/>
+<node TEXT="Deselect to choose a different color" ID="ID_289085647" CREATED="1490318288233" MODIFIED="1490318321519"/>
+</node>
+<node TEXT="Color" STYLE_REF="Title" FOLDED="true" ID="ID_1056909101" CREATED="1490316722548" MODIFIED="1490317115098">
+<node TEXT="Set the color of node border independently from edge color" ID="ID_583923348" CREATED="1490318323950" MODIFIED="1490320820912" BORDER_COLOR_LIKE_EDGE="false" BORDER_COLOR="#ff0000"/>
+</node>
+</node>
+<node TEXT="Font of whole core" STYLE_REF="Title" FOLDED="true" ID="ID_1320322796" CREATED="1484497650800" MODIFIED="1490313934112">
+<node TEXT="Font family" STYLE_REF="Title" FOLDED="true" ID="ID_504363388" CREATED="1484503909613" MODIFIED="1490493794606" FORMAT="NO_FORMAT">
+<node TEXT="Select font to use for node core text" ID="ID_1300260159" CREATED="1490318652897" MODIFIED="1490318672382"/>
+</node>
+<node TEXT="Font size" STYLE_REF="Title" FOLDED="true" ID="ID_1816820010" CREATED="1484503922339" MODIFIED="1490317120621">
+<node TEXT="Select font size" ID="ID_1542253406" CREATED="1490318708672" MODIFIED="1490318713996"/>
+</node>
+<node TEXT="Bold" STYLE_REF="Title" ID="ID_633297510" CREATED="1484503928029" MODIFIED="1490472262966">
+<font SIZE="10"/>
+</node>
+<node TEXT="Italic" STYLE_REF="Title" ID="ID_593095636" CREATED="1484503930740" MODIFIED="1490472268802" FORMAT_AS_HYPERLINK="true">
+<font ITALIC="true"/>
+</node>
+<node TEXT="Text Alignment" STYLE_REF="Title" FOLDED="true" ID="ID_676563679" CREATED="1484503938123" MODIFIED="1490317120628">
+<node TEXT="Select text alignment in node core" FOLDED="true" ID="ID_581673430" CREATED="1490318723184" MODIFIED="1490318734076">
+<node TEXT="Default" STYLE_REF="Title" FOLDED="true" ID="ID_1214747054" CREATED="1490318747296" MODIFIED="1490481039424" TEXT_ALIGN="DEFAULT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt">
+<node TEXT="Left aligned text" ID="ID_1722982300" CREATED="1490318750470" MODIFIED="1490318869493"/>
+</node>
+<node TEXT="Left aligned text" STYLE_REF="Title" ID="ID_1347786239" CREATED="1490318750470" MODIFIED="1490481039438" TEXT_ALIGN="LEFT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="Right aligned text" STYLE_REF="Title" ID="ID_612108527" CREATED="1490318770776" MODIFIED="1490481039445" TEXT_ALIGN="RIGHT" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+<node TEXT="Centered text" STYLE_REF="Title" ID="ID_1591411488" CREATED="1490318782838" MODIFIED="1490481039451" MAX_WIDTH="120.0 pt" MIN_WIDTH="120.0 pt"/>
+</node>
+</node>
+<node TEXT="Hyperlink" STYLE_REF="Title" FOLDED="true" ID="ID_205209514" CREATED="1484503947075" MODIFIED="1490317120630">
+<node TEXT="Sets the whole node core to an underlined hyperlink." FOLDED="true" ID="ID_409945778" CREATED="1490472023450" MODIFIED="1490472290079">
+<node TEXT="So the user does not have to click the arrow icon, but can click on the whole core to follow the link." ID="ID_1769631020" CREATED="1490472290100" MODIFIED="1490472300976"/>
+</node>
+<node TEXT="Works only for a node with an arrow-link and when no underlined hyperlink in the core text." ID="ID_123672270" CREATED="1490396197459" MODIFIED="1490474492763"/>
+</node>
+</node>
+<node TEXT="Icons" STYLE_REF="Title" FOLDED="true" ID="ID_1454947934" CREATED="1490312050706" MODIFIED="1490312057099">
+<node TEXT="Icon size" STYLE_REF="Title" FOLDED="true" ID="ID_36052313" CREATED="1490317128395" MODIFIED="1490317137963">
+<node TEXT="Define the size of icons in the node" FOLDED="true" ID="ID_1614596991" CREATED="1490319773400" MODIFIED="1490481004063">
+<node TEXT="  12pt" ID="ID_838022492" CREATED="1490320677952" MODIFIED="1490320760414">
+<icon BUILTIN="button_ok"/>
+</node>
+<node TEXT=" 16pt" ID="ID_1629605663" CREATED="1490320677952" MODIFIED="1490320766357" ICON_SIZE="16.0 pt">
+<icon BUILTIN="button_ok"/>
+</node>
+<node TEXT=" 8pt" ID="ID_1558579758" CREATED="1490320677952" MODIFIED="1490320773460" ICON_SIZE="8.0 pt">
+<icon BUILTIN="button_ok"/>
+</node>
+</node>
+<node TEXT="Set unit of measure in" FOLDED="true" ID="ID_1137808193" CREATED="1490317947710" MODIFIED="1490318073372">
+<node TEXT="px" FOLDED="true" ID="ID_726544530" CREATED="1490317967389" MODIFIED="1490317973825">
+<node TEXT="pixels" ID="ID_1130585311" CREATED="1490317998301" MODIFIED="1490318000536"/>
+</node>
+<node TEXT="in" FOLDED="true" ID="ID_1486101741" CREATED="1490317980275" MODIFIED="1490317981281">
+<node TEXT="inches" ID="ID_1159086290" CREATED="1490318004053" MODIFIED="1490318006816"/>
+</node>
+<node TEXT="mm" FOLDED="true" ID="ID_644466595" CREATED="1490317985443" MODIFIED="1490317986368">
+<node TEXT="millimeters" ID="ID_1887939300" CREATED="1490318009181" MODIFIED="1490318011960"/>
+</node>
+<node TEXT="cm" FOLDED="true" ID="ID_495398822" CREATED="1490317992027" MODIFIED="1490317993167">
+<node TEXT="centimeters" ID="ID_1857895636" CREATED="1490318015124" MODIFIED="1490318017978"/>
+</node>
+<node TEXT="pt" FOLDED="true" ID="ID_766825140" CREATED="1490317994610" MODIFIED="1490317995525">
+<node TEXT="points" ID="ID_810461637" CREATED="1490318020445" MODIFIED="1490318037402"/>
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Edges" STYLE_REF="Title" FOLDED="true" ID="ID_1414163711" CREATED="1484497650810" MODIFIED="1490313934120">
+<node TEXT="Edge width" STYLE_REF="Title" FOLDED="true" ID="ID_911449255" CREATED="1484497650819" MODIFIED="1490318964666">
+<node TEXT="Set edge width" FOLDED="true" ID="ID_45892567" CREATED="1490318561020" MODIFIED="1490473216366" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Edge width 0" ID="ID_361678207" CREATED="1490321573861" MODIFIED="1490473166056" HGAP_QUANTITY="29.749999530613437 pt" VSHIFT_QUANTITY="-9.749999709427366 pt"/>
+<node TEXT="Edge width 2" ID="ID_414687193" CREATED="1490321573861" MODIFIED="1490473170478" HGAP_QUANTITY="44.749999083578615 pt" VSHIFT_QUANTITY="1.4999999552965178 pt">
+<edge WIDTH="2"/>
+</node>
+<node TEXT="Edge width 4" ID="ID_325154008" CREATED="1490321573861" MODIFIED="1490473177569" HGAP_QUANTITY="46.99999901652339 pt" VSHIFT_QUANTITY="7.499999776482589 pt">
+<edge WIDTH="4"/>
+</node>
+<node TEXT="Edge width 8" ID="ID_822944717" CREATED="1490321573861" MODIFIED="1490473181965" HGAP_QUANTITY="38.74999926239254 pt" VSHIFT_QUANTITY="17.249999485909953 pt">
+<edge WIDTH="8"/>
+</node>
+</node>
+</node>
+<node TEXT="Edge line type" STYLE_REF="Title" FOLDED="true" ID="ID_1376187402" CREATED="1490318993764" MODIFIED="1490319027144">
+<node TEXT="Select line type" FOLDED="true" ID="ID_1268295632" CREATED="1490319036799" MODIFIED="1490321391633" VGAP_QUANTITY="10.0 pt">
+<node TEXT="Edge line type 1" ID="ID_1405886633" CREATED="1490321281965" MODIFIED="1490321406338" HGAP_QUANTITY="38.74999926239254 pt" VSHIFT_QUANTITY="2.2499999329447764 pt">
+<edge WIDTH="2"/>
+</node>
+<node TEXT="Edge line type 2" ID="ID_398463052" CREATED="1490321281965" MODIFIED="1490321417976" HGAP_QUANTITY="65.74999845772986 pt" VSHIFT_QUANTITY="8.249999754130847 pt">
+<edge WIDTH="2" DASH="CLOSE_DOTS"/>
+</node>
+<node TEXT="Edge line type 3" ID="ID_1192163546" CREATED="1490321281965" MODIFIED="1490321423131" HGAP_QUANTITY="66.49999843537813 pt" VSHIFT_QUANTITY="1.4999999552965178 pt">
+<edge WIDTH="2" DASH="DASHES"/>
+</node>
+<node TEXT="Edge line type 4" ID="ID_765788335" CREATED="1490321281965" MODIFIED="1490321428152" HGAP_QUANTITY="67.99999839067465 pt" VSHIFT_QUANTITY="14.249999575316918 pt">
+<edge WIDTH="2" DASH="DISTANT_DOTS"/>
+</node>
+<node TEXT="Edge line type 5" ID="ID_1675104796" CREATED="1490321281965" MODIFIED="1490321433728" HGAP_QUANTITY="48.499998971819906 pt" VSHIFT_QUANTITY="0.7499999776482589 pt">
+<edge WIDTH="2" DASH="DOTS_AND_DASHES"/>
+</node>
+</node>
+</node>
+<node TEXT="Edge style" STYLE_REF="Title" FOLDED="true" ID="ID_666399637" CREATED="1484497650814" MODIFIED="1490318964677">
+<node TEXT="Select edge style" FOLDED="true" ID="ID_544107889" CREATED="1490318944191" MODIFIED="1499025299866" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Smoothly curved (bezier)" ID="ID_22779030" CREATED="1490319321099" MODIFIED="1490319331851"/>
+<node TEXT="Hide edge" ID="ID_359729621" CREATED="1490319355809" MODIFIED="1490319573778" HGAP_QUANTITY="115.9999969601632 pt" VSHIFT_QUANTITY="-26.249999217689062 pt">
+<edge STYLE="hide_edge"/>
+</node>
+<node TEXT="Horizontal" ID="ID_535911346" CREATED="1490319363569" MODIFIED="1490321533146" HGAP_QUANTITY="96.49999754130847 pt" VSHIFT_QUANTITY="-5.249999843537812 pt">
+<edge STYLE="horizontal" COLOR="#cc00cc" WIDTH="3"/>
+</node>
+<node TEXT="Linear" ID="ID_1072333071" CREATED="1490319373001" MODIFIED="1490321511787" HGAP_QUANTITY="139.24999626725923 pt" VSHIFT_QUANTITY="55.49999834597116 pt">
+<edge STYLE="linear" COLOR="#00cc33" WIDTH="2"/>
+</node>
+<node TEXT="Sharply curved (bezier)" ID="ID_1152337607" CREATED="1490319379817" MODIFIED="1499025299862" HGAP_QUANTITY="127.99999660253533 pt" VSHIFT_QUANTITY="26.999999195337324 pt">
+<edge STYLE="sharp_bezier" COLOR="#00cccc" WIDTH="4"/>
+</node>
+<node TEXT="Sharp linear" ID="ID_1368042269" CREATED="1490319396297" MODIFIED="1490321477787" HGAP_QUANTITY="63.499998524785084 pt" VSHIFT_QUANTITY="0.7499999776482618 pt">
+<edge STYLE="sharp_linear" COLOR="#ff6600" WIDTH="4"/>
+</node>
+</node>
+</node>
+<node TEXT="Edge color" STYLE_REF="Title" FOLDED="true" ID="ID_107891534" CREATED="1484504690765" MODIFIED="1490318964679">
+<node TEXT="Set color of edge" ID="ID_745193861" CREATED="1490319636129" MODIFIED="1490468637066"/>
+</node>
+</node>
+<node TEXT="Clouds" STYLE_REF="Title" FOLDED="true" ID="ID_1303716109" CREATED="1484497650821" MODIFIED="1490313934124">
+<node TEXT="A cloud surrounds the node it is applied to and all its descendants." FOLDED="true" ID="ID_349113859" CREATED="1490396885182" MODIFIED="1499048161076">
+<node TEXT="Cloud color" STYLE_REF="Title" FOLDED="true" ID="ID_1228013104" CREATED="1484505159213" MODIFIED="1490321689375">
+<node TEXT="Change the background color of cloud." ID="ID_1007181608" CREATED="1490319725760" MODIFIED="1490468675006"/>
+</node>
+<node TEXT="Cloud shape" STYLE_REF="Title" FOLDED="true" ID="ID_1766305225" CREATED="1484497650823" MODIFIED="1499051539446" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Arc" STYLE_REF="Title" FOLDED="true" ID="ID_1799950749" CREATED="1484505315988" MODIFIED="1499047984476">
+<cloud COLOR="#ffcccc" SHAPE="ARC"/>
+<node TEXT="child" ID="ID_872866412" CREATED="1499047786216" MODIFIED="1499051626479">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_876483030" CREATED="1499047786216" MODIFIED="1499047869332"/>
+<node TEXT="grandchild" ID="ID_1897057856" CREATED="1499047786216" MODIFIED="1499047873810"/>
+</node>
+<node TEXT="child" ID="ID_1920986166" CREATED="1499047786216" MODIFIED="1499047879617"/>
+<node TEXT="child" ID="ID_36973622" CREATED="1499047786216" MODIFIED="1499047879617"/>
+</node>
+<node TEXT="Star" STYLE_REF="Title" FOLDED="true" ID="ID_887127520" CREATED="1484505272644" MODIFIED="1499048050764">
+<cloud COLOR="#ccccff" SHAPE="STAR"/>
+<node TEXT="child" ID="ID_1860361059" CREATED="1499047786216" MODIFIED="1499051631172">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_1663332469" CREATED="1499047786216" MODIFIED="1499047869332"/>
+<node TEXT="grandchild" ID="ID_1568776690" CREATED="1499047786216" MODIFIED="1499047873810"/>
+</node>
+</node>
+<node TEXT="Rectangle" STYLE_REF="Title" FOLDED="true" ID="ID_570534042" CREATED="1484505308517" MODIFIED="1499047984493">
+<cloud COLOR="#ccffcc" SHAPE="RECT"/>
+<node TEXT="child" ID="ID_1785274149" CREATED="1499047786216" MODIFIED="1499051641058">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_216104353" CREATED="1499047786216" MODIFIED="1499047869332"/>
+</node>
+</node>
+<node TEXT="Round rectangle" STYLE_REF="Title" FOLDED="true" ID="ID_747786348" CREATED="1484505296961" MODIFIED="1499047984495">
+<cloud COLOR="#ffcc00" SHAPE="ROUND_RECT"/>
+<node TEXT="child" ID="ID_730314269" CREATED="1499047786216" MODIFIED="1499051656683">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_1224543193" CREATED="1499047786216" MODIFIED="1499047869332"/>
+</node>
+<node TEXT="child" ID="ID_1971847724" CREATED="1499047786216" MODIFIED="1499047879617"/>
+<node TEXT="child" ID="ID_1975833534" CREATED="1499047786216" MODIFIED="1499051659690">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node TEXT="grandchild" ID="ID_31911930" CREATED="1499047786216" MODIFIED="1499047873810"/>
+</node>
+</node>
+</node>
+</node>
+</node>
+</node>
+<node ID="ID_174288554" CREATED="1484691905388" MODIFIED="1490394239100"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2202,35 +5614,13 @@
   </head>
   <body>
     <p>
-      You can also connect the menu item to a node, so that clicking the node will activate the menu item. To connect a node directly to a menu item, right-click the node and choose <i>Link  > Add hyperlink to menu item... </i>
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      To remove a hyperlink (arrow-link) or e-mail address, right-click the node and:
+      Changing a property will set a check in the <font color="#ff0000">Change </font>value, indicating that the specific property has changed.
     </p>
-    <ul>
-      <li>
-        select <i>Add or modify hyperlink (type)... </i>or press<i> Ctrl + K; </i>and
-      </li>
-      <li>
-        delete the text in the text field ( the address)
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-</node>
 </node>
-<node TEXT="F-keys" STYLE_REF="Professional" FOLDED="true" ID="ID_1819697018" CREATED="1314526511158" MODIFIED="1335300461119" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_116460964" CREATED="1323513079714" MODIFIED="1335095401972" HGAP_QUANTITY="-26.0 px" VSHIFT_QUANTITY="60.0 px"><richcontent TYPE="NODE">
+<node ID="ID_1413039456" CREATED="1484521556497" MODIFIED="1490396673865"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2238,21 +5628,19 @@
   </head>
   <body>
     <p>
-      If you want to activate a menu item, you have to to navigate to it and click the menu item. To be able to work faster, you can connect a short cut or F-key to the menu item. For this choose <i>Tools > Assign shortcut</i>. You can also save a named sets with short keys for different situations with <i>Tools > Hotkeys > Save presets</i>. To install a previously saved set, just click <i>Tools > Hotkeys</i> and select a set from the list.
+      Uncheck <font color="#ff0000">Change</font> value if you want to return to defined style for the node. Also uncheck <font color="#ff0000">Change</font> value if you want conditional styles to affect (set) the property.
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
 </node>
 </node>
-<node TEXT="Link from outside to a particular node" STYLE_REF="Professional" FOLDED="true" ID="ID_1418102707" CREATED="1322224946352" MODIFIED="1335300461119" STYLE="combined">
+<node TEXT="Old documentation" STYLE_REF="Old documentation" FOLDED="true" ID="ID_392739037" CREATED="1485134404008" MODIFIED="1499021341034" VGAP_QUANTITY="6.0 pt">
+<node TEXT="Editing a property" STYLE_REF="Advanced" FOLDED="true" ID="ID_740451427" CREATED="1314163244315" MODIFIED="1498415215562">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
-<node ID="ID_822375535" CREATED="1323513104618" MODIFIED="1335095425450" HGAP_QUANTITY="-228.0 px" VSHIFT_QUANTITY="149.0 px"><richcontent TYPE="NODE">
+<node FOLDED="true" ID="ID_261259888" CREATED="1323518049125" MODIFIED="1498415183186"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2260,39 +5648,45 @@
   </head>
   <body>
     <p>
-      To jump from another program or source mind map to a particular node in a target mindmap, the address field of the hyperlink should contain the path to the target mind map and the nodeID, seperated by #. If source and target mind map are in the same directory, the address can be defined  as destination.mm#NodeID, e.g.  as WhatIsMindmapping.mm#ID_930373151.  This has the advantage that if the containing direcory is moved as a whole, the link keeps correct. In the [...]
+      The <i>Tool panel</i> shows the properties of the node which has the focus. Only the properties of the selected node can be changed. (Generally you select one node, but with some properties it is possible to select and change more than one node at a time.) While the panel is showing, you can select a different node to give it the focus. To change a property, change the value of the property. This will also set a check indicating the changed value applies. Uncheck if you want t [...]
     </p>
     <p>
       
     </p>
     <p>
-      <b>Note</b>
+      As a first example, find the properties group named <i>Node Shape</i> and click on <i>Node style</i>. A menu drops down with options like <i>Bubble</i>, <i>Fork</i>  and <i>As parent</i>. Try these options and see what happens. For the node you are reading now option <i>Bubble</i> was chosen. As you may notice, this option only applies to the core.
+    </p>
+    <p>
+      
+    </p>
+    <p>
+      As a second example, find node group <i>Edges </i>and check the box for <i>Edge style</i>. Clicking next to <i>Edge style</i> will drop down a menu with possible styles like <i>Linear</i>, <i>Smoothly curved</i>, <i>Hidden</i>, and others. Try these to know which styles are possible. Or select me to see a few examples of changed properties in the <i>Tool panel.</i>
     </p>
-    <ul>
-      <li>
-        Jumping to a particular node only works for applications which pass the nodeID information. Of course Freeplane does this. Many other applications like MSWord do not pass the nodeID, hence you can only jump to the root node.( A work around in these cases might be to save the mind map in a folding state which shows the node you want to jum to.)
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
 </hook>
+<node TEXT="linear" STYLE_REF="AdvancedTopic" ID="ID_1775517582" CREATED="1314172753397" MODIFIED="1323518514233" HGAP_QUANTITY="14.0 px" VSHIFT_QUANTITY="-26.0 px">
+<edge STYLE="linear"/>
 </node>
+<node TEXT="curved" STYLE_REF="AdvancedTopic" ID="ID_1317923820" CREATED="1314172748460" MODIFIED="1323518517665" HGAP_QUANTITY="35.0 px" VSHIFT_QUANTITY="-27.0 px">
+<edge STYLE="bezier"/>
 </node>
+<node TEXT="hidden" STYLE_REF="AdvancedTopic" ID="ID_1790298981" CREATED="1314172761269" MODIFIED="1323518014549" HGAP_QUANTITY="40.0 px" VSHIFT_QUANTITY="-5.0 px">
+<edge STYLE="hide_edge"/>
 </node>
-<node TEXT="Formatting & styling" STYLE_REF="Advanced" FOLDED="true" POSITION="right" ID="ID_1778719162" CREATED="1291143603918" MODIFIED="1335300531756" NUMBERED="true" MIN_WIDTH="200.0 px">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MainMenu" LAST="false"/>
-</hook>
-<node TEXT="Properties" STYLE_REF="Advanced" FOLDED="true" ID="ID_873516196" CREATED="1314162578896" MODIFIED="1335300487421" NUMBERED="true" MIN_WIDTH="90.0 px">
-<node TEXT="Properties panel" STYLE_REF="Advanced" FOLDED="true" ID="ID_1812601804" CREATED="1314162700896" MODIFIED="1323807343250" HGAP_QUANTITY="32.0 px" VSHIFT_QUANTITY="457.0 px" MAX_WIDTH="550.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
-<icon BUILTIN="info"/>
+<node TEXT="horizontal" STYLE_REF="AdvancedTopic" ID="ID_1854825442" CREATED="1314172936705" MODIFIED="1323518524951" HGAP_QUANTITY="39.0 px" VSHIFT_QUANTITY="25.0 px">
+<edge STYLE="horizontal"/>
+</node>
+</node>
+</node>
+<node TEXT="Tool panel" STYLE_REF="Advanced" FOLDED="true" ID="ID_429040611" CREATED="1314162700896" MODIFIED="1498408295680">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
-<node ID="ID_503272481" CREATED="1323517943396" MODIFIED="1335095486775" HGAP_QUANTITY="-105.0 px" VSHIFT_QUANTITY="105.0 px"><richcontent TYPE="NODE">
+<node ID="ID_1242458312" CREATED="1323517943396" MODIFIED="1498407455166"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2300,7 +5694,7 @@
   </head>
   <body>
     <p>
-      Freeplane has many possibilities to to set or change properties which apply to a whole node or all nodes. You can think of the basic color of a node, enclosing a node in a bubble, the size of the text, the width of the node core and much more. The most versatile method to edit properties is in the <b>Properties panel</b>. To open or close the Properties panel, right-click in an empty space of the background and select <i>Properties panel</i>.
+      Freeplane has many possibilities to to set or change properties which apply to a whole node or all nodes. You can think of the basic color of a node, enclosing a node in a bubble, the size of the text, the width of the node core and much more. The most versatile method to edit properties is in the <b>Tool panel</b>. To open or close the Tool panel, right-click in an empty space of the background and select <i>Tool panel</i>.
     </p>
     <p>
       
@@ -2310,7 +5704,7 @@
     </p>
     <ul>
       <li>
-        An alternative way to open or close the panel, choose <i>View > Properties panel</i>.
+        An alternative way to open or close the panel, choose <i>View > Tool panel</i>.
       </li>
       <li>
         An alternative way to change properties, use menu <i>Format.</i>
@@ -2324,11 +5718,11 @@
 </hook>
 </node>
 </node>
-<node TEXT="Editing a property" STYLE_REF="Advanced" FOLDED="true" ID="ID_1707940964" CREATED="1314163244315" MODIFIED="1323519043605" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="1.0 px" MAX_WIDTH="500.0 px" MIN_WIDTH="1.0 px" STYLE="combined">
+<node TEXT="Automatic edge color" STYLE_REF="Advanced" FOLDED="true" ID="ID_1843870131" CREATED="1314164029738" MODIFIED="1499021341034">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
-<node ID="ID_676577574" CREATED="1323518049125" MODIFIED="1335095498771" HGAP_QUANTITY="-101.0 px" VSHIFT_QUANTITY="159.0 px"><richcontent TYPE="NODE">
+<node ID="ID_1584997985" CREATED="1323518106869" MODIFIED="1498407568685"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2336,19 +5730,7 @@
   </head>
   <body>
     <p>
-      The <i>Properties panel</i> shows the properties of the node which has the focus. Only the properties of the selected node can be changed. (Generally you select one node, but with some properties it is possible to select and change more than one node at a time.) While the panel is showing, you can select a different node to give it the focus. To change a property, change the value of the property. This will also set a check indicating the changed value applies. Uncheck if you  [...]
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      As a first example, find the properties group named <i>Node Shape</i> and click on <i>Node style</i>. A menu drops down with options like <i>Bubble</i>, <i>Fork</i>  and <i>As parent</i>. Try these options and see what happens. For the node you are reading now option <i>Bubble</i> was chosen. As you may notice, this option only applies to the core.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      As a second example, find node group <i>Edges </i>and check the box for <i>Edge style</i>. Clicking next to <i>Edge style</i> will drop down a menu with possible styles like <i>Linear</i>, <i>Smoothly curved</i>, <i>Hidden</i>, and others. Try these to know which styles are possible. Or cselect me to see a few examples of changed properties in the <i>Properties panel.</i>
+      By default each new map in Freeplane will generate a different color for each new branch. This supports one of the principles held by the inventor of the mind map, which states that colors help the brain to structure and memorize information more easily. This property is called <b>Automatic edge color.</b> This property can be disabled in the Propertieds panel. To disable automatic edge color, open the Tool panel and find the properties group <i>Node style</i>, at the top [...]
     </p>
   </body>
 </html>
@@ -2356,25 +5738,13 @@
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
 </hook>
-<node TEXT="linear" STYLE_REF="AdvancedTopic" ID="ID_34702829" CREATED="1314172753397" MODIFIED="1323518514233" HGAP_QUANTITY="14.0 px" VSHIFT_QUANTITY="-26.0 px">
-<edge STYLE="linear"/>
-</node>
-<node TEXT="curved" STYLE_REF="AdvancedTopic" ID="ID_1333040751" CREATED="1314172748460" MODIFIED="1323518517665" HGAP_QUANTITY="35.0 px" VSHIFT_QUANTITY="-27.0 px">
-<edge STYLE="bezier"/>
-</node>
-<node TEXT="hidden" STYLE_REF="AdvancedTopic" ID="ID_1968961455" CREATED="1314172761269" MODIFIED="1323518014549" HGAP_QUANTITY="40.0 px" VSHIFT_QUANTITY="-5.0 px">
-<edge STYLE="hide_edge"/>
-</node>
-<node TEXT="horizontal" STYLE_REF="AdvancedTopic" ID="ID_494591913" CREATED="1314172936705" MODIFIED="1323518524951" HGAP_QUANTITY="39.0 px" VSHIFT_QUANTITY="25.0 px">
-<edge STYLE="horizontal"/>
-</node>
 </node>
 </node>
-<node TEXT="Automatic edge color" STYLE_REF="Advanced" FOLDED="true" ID="ID_1005719714" CREATED="1314164029738" MODIFIED="1323519032435" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="-2.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<node TEXT="Automatic node numbering" STYLE_REF="Advanced" FOLDED="true" ID="ID_80905537" CREATED="1314283445398" MODIFIED="1498408625628">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
-<node ID="ID_1565463565" CREATED="1323518106869" MODIFIED="1335095510596" HGAP_QUANTITY="-125.0 px" VSHIFT_QUANTITY="67.0 px"><richcontent TYPE="NODE">
+<node ID="ID_1916225082" CREATED="1323518137156" MODIFIED="1498407432400"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2382,7 +5752,7 @@
   </head>
   <body>
     <p>
-      By default each new map in Freeplane will generate a different color for each new branch. This supports one of the principles held by the inventor of the mind map, which states that colors help the brain to structure and memorize information more easily. This property is called <b>Automatic edge color.</b> This property can be disabled in the Propertieds panel. To disable automatic edge color, open the Properties panel and find the properties group <i>Node style</i>, at t [...]
+      The <i>Properties Panel </i>contains the property automatic <b>node numbering </b>to give a node a number. You can set node numbering for a group of nodes by first selecting the group (keep Shift or Control pressed when you click nodes) and then checking this option in the <i>Properties Panel</i>.
     </p>
   </body>
 </html>
@@ -2392,11 +5762,15 @@
 </hook>
 </node>
 </node>
-<node TEXT="Automatic node numbering" STYLE_REF="Advanced" FOLDED="true" ID="ID_1861361284" CREATED="1314283445398" MODIFIED="1323518950816" HGAP_QUANTITY="30.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1531819965" CREATED="1323518137156" MODIFIED="1335095522187" HGAP_QUANTITY="-163.0 px" VSHIFT_QUANTITY="42.0 px"><richcontent TYPE="NODE">
+</node>
+</node>
+</node>
+</node>
+<node TEXT="Copy and Paste a format" STYLE_REF="Title" FOLDED="true" ID="ID_1701827639" CREATED="1491434001797" MODIFIED="1499015250189">
+<node TEXT="Select the node from which to copy the format" ID="ID_564524415" CREATED="1499052489068" MODIFIED="1499052509153" NUMBERED="true"/>
+<node TEXT="" ID="ID_307587777" CREATED="1499015710873" MODIFIED="1499027497623" NUMBERED="true">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node FOLDED="true" ID="ID_1831599264" CREATED="1491434542562" MODIFIED="1499015473430"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2404,22 +5778,16 @@
   </head>
   <body>
     <p>
-      The <i>Properties Panel </i>contains the property automatic <b>node numbering </b>to give a node a number. You can set node numbering for a group of nodes by first selecting the group (keep Shift or Control pressed when you click nodes) and then checking this option in the <i>Properties Panel</i>.
+      Go to menubar <font color="#ff0000">Format > Copy format</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
+<node TEXT="Copy format" STYLE_REF="Title" ID="ID_357736777" CREATED="1491434139735" MODIFIED="1491434219585">
+<icon BUILTIN="../colorpicker"/>
 </node>
 </node>
-<node TEXT="Other properties" STYLE_REF="Advanced" FOLDED="true" ID="ID_457725429" CREATED="1314167397870" MODIFIED="1323807323251" HGAP_QUANTITY="31.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
-<font ITALIC="false"/>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node STYLE_REF="TitlesContent" ID="ID_1014522598" CREATED="1323518167241" MODIFIED="1335095532420" HGAP_QUANTITY="-92.0 px" VSHIFT_QUANTITY="42.0 px"><richcontent TYPE="NODE">
+<node ID="ID_1222830648" CREATED="1499015492975" MODIFIED="1499015516768"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2427,18 +5795,17 @@
   </head>
   <body>
     <p>
-      Scan the options of the panel. The properties in the group <i>Node Style</i>  will be described in a moment. Most other properties are self-explaining. All properties are described in detail in the Freeplane documentation.
+      or press <font color="#ff0000">ALT + SHIFT + C</font>
     </p>
   </body>
 </html>
 </richcontent>
 </node>
 </node>
-<node TEXT="Menu Format" STYLE_REF="Advanced" FOLDED="true" ID="ID_1128382958" CREATED="1314167687616" MODIFIED="1323807329819" HGAP_QUANTITY="29.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_1716769321" CREATED="1323518205453" MODIFIED="1335095546772" HGAP_QUANTITY="-67.0 px" VSHIFT_QUANTITY="41.0 px"><richcontent TYPE="NODE">
+<node TEXT="Select the node(s) to paste the format" ID="ID_346287774" CREATED="1491434581225" MODIFIED="1491434611318" NUMBERED="true"/>
+<node TEXT="" ID="ID_980890694" CREATED="1499015753508" MODIFIED="1499027484005" NUMBERED="true">
+<hook NAME="AlwaysUnfoldedNode"/>
+<node FOLDED="true" ID="ID_1206641102" CREATED="1491434613696" MODIFIED="1499027598869"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2446,65 +5813,35 @@
   </head>
   <body>
     <p>
-      The properties in the properties panel are also available through <b>menu Format</b>. Menu Format contains some properties which cannot be set in the properties panel as well. Examples are <i>map background</i> an <i>blinking node</i> (in Core).
+      Go to menubar <font color="#ff0000">Format > Paste format</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
-<node TEXT="Bold" STYLE_REF="AdvancedTopic" ID="ID_25890496" CREATED="1266251692562" MODIFIED="1323519139108" TEXT_SHORTENED="true" HGAP_QUANTITY="25.0 px" STYLE="as_parent">
-<icon BUILTIN="../Bold16"/>
-<font NAME="SansSerif" SIZE="12" BOLD="true" ITALIC="false"/>
-<richcontent TYPE="DETAILS">
+<node TEXT="Paste format" STYLE_REF="Title" ID="ID_1248195549" CREATED="1491434142436" MODIFIED="1491434226347">
+<icon BUILTIN="../color_fill"/>
+</node>
+</node>
+<node ID="ID_1812080321" CREATED="1499015492975" MODIFIED="1499015768762"><richcontent TYPE="NODE">
 
 <html>
   <head>
-
+    
   </head>
   <body>
     <p>
-      This icon-button in the toolbar affects thee whole node text.
+      or press <font color="#ff0000">ALT + SHIFT + V</font>
     </p>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
-<node TEXT="Italic" STYLE_REF="AdvancedTopic" ID="ID_408787243" CREATED="1266251689531" MODIFIED="1323519147984" TEXT_SHORTENED="true">
-<icon BUILTIN="../Italic16"/>
-<font ITALIC="true"/>
-<richcontent TYPE="DETAILS">
-
-<html>
-  <head>
-
-  </head>
-  <body>
-    <ul>
-      <li>
-        This icon-button in the toolbar affects the whole node text
-      </li>
-    </ul>
-  </body>
-</html>
-</richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
-</hook>
-<edge STYLE="horizontal"/>
 </node>
 </node>
 </node>
-<node TEXT="Tool bar" STYLE_REF="Advanced" FOLDED="true" ID="ID_1235607524" CREATED="1314167879005" MODIFIED="1323807334296" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="-456.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
-</hook>
-<node ID="ID_158808063" CREATED="1323518244867" MODIFIED="1335095560220" HGAP_QUANTITY="-38.0 px" VSHIFT_QUANTITY="123.0 px"><richcontent TYPE="NODE">
+<node TEXT="Notes and explanations" STYLE_REF="Notes and explanations" FOLDED="true" ID="ID_827629733" CREATED="1483416064359" MODIFIED="1490394239095">
+<node TEXT="Some text format properties can also be set for a part of the node core." FOLDED="true" ID="ID_1641932173" CREATED="1336465141192" MODIFIED="1499103530952">
+<node ID="ID_338212128" CREATED="1499103459032" MODIFIED="1499104002560"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2512,36 +5849,17 @@
   </head>
   <body>
     <p>
-      Some of the properties in the<i> Properties panel</i> are also available as <b>icons</b> in the <b>tool bar</b> which is below the main menu bar. Examples are <i>italic</i> and <b>bold</b>.
-    </p>
-    <p>
-      
-    </p>
-    <p>
-      <b>Important</b>
+      For this you have to be in core text edit mode by using commands <b>Edit node core in-line </b>or <b>Edit node core in dialog.</b>
     </p>
-    <ul>
-      <li>
-        Bold and italic set  in the <i>Properties panel</i>, menu <i>Format </i>or with the toolbar, are applied (forced) to the whole node core.
-      </li>
-      <li>
-        To apply bold and italic to a part of the node core, use the method described above in node <i>Beginner map</i>.
-      </li>
-      <li>
-        Using both methods at the same time to the same node may give unexpected effects. For example, it is not possible to remove bold set with the first method by using the second method.
-      </li>
-    </ul>
   </body>
 </html>
 </richcontent>
-<hook NAME="NodeConditionalStyles">
-    <conditional_style ACTIVE="true" STYLE_REF="TitlesContent" LAST="false"/>
-</hook>
+</node>
 </node>
 </node>
 </node>
 <node TEXT="Styles" STYLE_REF="Advanced" FOLDED="true" ID="ID_1838680824" CREATED="1314646406529" MODIFIED="1335300487437" NUMBERED="true" MIN_WIDTH="90.0 px">
-<node TEXT="Why styles ?" FOLDED="true" ID="ID_539515158" CREATED="1323521177251" MODIFIED="1323807405276" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="138.0 px" STYLE="combined">
+<node TEXT="Why styles ?" ID="ID_539515158" CREATED="1323521177251" MODIFIED="1323807405276" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="138.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Advanced" LAST="false"/>
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
@@ -2564,7 +5882,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Find & apply a style" STYLE_REF="Advanced" FOLDED="true" ID="ID_512501370" CREATED="1291199304490" MODIFIED="1323807409160" HGAP_QUANTITY="29.0 px" VSHIFT_QUANTITY="-1.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<node TEXT="Find & apply a style" STYLE_REF="Advanced" ID="ID_512501370" CREATED="1291199304490" MODIFIED="1323807409160" HGAP_QUANTITY="29.0 px" VSHIFT_QUANTITY="-1.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2595,7 +5913,7 @@
         In menu<i> Format > Apply style</i>
       </li>
       <li>
-        <font color="#000000" face="SansSerif, sans-serif">In the Properties panel, in properties group <i>Node Style,</i> in field <i>Style. </i>N.B. To open the Properties panel, right-click in an empty space in the background and select Properties panel.</font>
+        <font color="#000000" face="SansSerif, sans-serif">In the Tool panel, in properties group <i>Node Style,</i> in field <i>Style. </i>N.B. To open the Tool panel, right-click in an empty space in the background and select Tool panel.</font>
       </li>
     </ul>
   </body>
@@ -2606,7 +5924,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Removing an applied style" STYLE_REF="Advanced" FOLDED="true" ID="ID_1937448981" CREATED="1335278263350" MODIFIED="1335278358664" HGAP_QUANTITY="28.0 px">
+<node TEXT="Removing an applied style" STYLE_REF="Advanced" ID="ID_1937448981" CREATED="1335278263350" MODIFIED="1335278358664" HGAP_QUANTITY="28.0 px">
 <node STYLE_REF="TitlesContent" ID="ID_1278689402" CREATED="1335278278365" MODIFIED="1335278541211" HGAP_QUANTITY="-157.0 px" VSHIFT_QUANTITY="43.0 px"><richcontent TYPE="NODE">
 
 <html>
@@ -2622,7 +5940,7 @@
 </richcontent>
 </node>
 </node>
-<node TEXT="Edit styles in node dialog" STYLE_REF="Advanced" FOLDED="true" ID="ID_1277682010" CREATED="1291196100290" MODIFIED="1323807416508" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="2.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<node TEXT="Edit styles in node dialog" STYLE_REF="Advanced" ID="ID_1277682010" CREATED="1291196100290" MODIFIED="1323807416508" HGAP_QUANTITY="30.0 px" VSHIFT_QUANTITY="2.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2655,7 +5973,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Apply multiple styles" FOLDED="true" ID="ID_270284358" CREATED="1314342119553" MODIFIED="1329821005551" HGAP_QUANTITY="31.0 px" VSHIFT_QUANTITY="1.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<node TEXT="Apply multiple styles" ID="ID_270284358" CREATED="1314342119553" MODIFIED="1329821005551" HGAP_QUANTITY="31.0 px" VSHIFT_QUANTITY="1.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Advanced" LAST="false"/>
     <conditional_style ACTIVE="true" STYLE_REF="Example" LAST="false"/>
@@ -2668,7 +5986,7 @@
   </head>
   <body>
     <p>
-      Styles can indicate that a node contains specific information. As an example, the parent node "Äpply multiple styles" of the node you are reading  is made up of two styles: Advanced, and Example. Advanced makes the yellow color and Example adds the eye-icon. To implement this example, first define the two styles and then apply them as node conditional styles by opening the<i> Properties panel </i>and clicking below <i>Node conditional styles for node.  [...]
+      Styles can indicate that a node contains specific information. As an example, the parent node "Äpply multiple styles" of the node you are reading  is made up of two styles: Advanced, and Example. Advanced makes the yellow color and Example adds the eye-icon. To implement this example, first define the two styles and then apply them as node conditional styles by opening the<i> Tool panel </i>and clicking below <i>Node conditional styles for node. </i>No [...]
     </p>
     <ul>
       <li>
@@ -2704,7 +6022,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Conditional styles" STYLE_REF="Professional" FOLDED="true" ID="ID_1632551821" CREATED="1314343996581" MODIFIED="1329858287410" HGAP_QUANTITY="31.0 px" VSHIFT_QUANTITY="-1.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<node TEXT="Conditional styles" STYLE_REF="Professional" ID="ID_1632551821" CREATED="1314343996581" MODIFIED="1329858287410" HGAP_QUANTITY="31.0 px" VSHIFT_QUANTITY="-1.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
     <conditional_style ACTIVE="true" STYLE_REF="Example" LAST="false"/>
@@ -2726,7 +6044,7 @@
       <b>Example: Revisions</b>
     </p>
     <p>
-      First a style <i>Revision </i>was defined with a special revision R-icon (see the styles list). Then in the<i> Properties panel</i>  I clicked below<i> Conditional map styles </i>to open its dialog<i>.</i> I pressed <i>New</i> to add a filter. I clicked the new rule and defined a filter (Modified after, date). I selected this filter rule and pressed <i>OK</i>.  
+      First a style <i>Revision </i>was defined with a special revision R-icon (see the styles list). Then in the<i> Tool panel</i>  I clicked below<i> Conditional map styles </i>to open its dialog<i>.</i> I pressed <i>New</i> to add a filter. I clicked the new rule and defined a filter (Modified after, date). I selected this filter rule and pressed <i>OK</i>.  
     </p>
     <p>
       
@@ -2751,7 +6069,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Hierarchical level styles" STYLE_REF="Professional" FOLDED="true" ID="ID_521918713" CREATED="1314344484933" MODIFIED="1323807439362" HGAP_QUANTITY="30.0 px" MAX_WIDTH="550.0 px">
+<node TEXT="Hierarchical level styles" STYLE_REF="Professional" ID="ID_521918713" CREATED="1314344484933" MODIFIED="1323807439362" HGAP_QUANTITY="30.0 px" MAX_WIDTH="550.0 px">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2763,7 +6081,7 @@
   </head>
   <body>
     <p>
-      One possible application of conditional node styles is to give each node level a different appearance automatically. Say you need five node levels. Then you define 5 styles, one for each level. Next you define 5 conditional style rules. To make it easy Freeplane has predefined this case for you. In <i>Properties panel</i> you can check  <b>Apply level styles </b>in the properties group Node Style. If checked each node level will get a different appearance automatical [...]
+      One possible application of conditional node styles is to give each node level a different appearance automatically. Say you need five node levels. Then you define 5 styles, one for each level. Next you define 5 conditional style rules. To make it easy Freeplane has predefined this case for you. In <i>Tool panel</i> you can check  <b>Apply level styles </b>in the properties group Node Style. If checked each node level will get a different appearance automatically. Th [...]
     </p>
     <p>
       
@@ -2808,7 +6126,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Map style" STYLE_REF="Professional" FOLDED="true" ID="ID_13843990" CREATED="1291196992351" MODIFIED="1323807434292" HGAP_QUANTITY="31.0 px" VSHIFT_QUANTITY="-130.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
+<node TEXT="Map style" STYLE_REF="Professional" ID="ID_13843990" CREATED="1291196992351" MODIFIED="1323807434292" HGAP_QUANTITY="31.0 px" VSHIFT_QUANTITY="-130.0 px" MAX_WIDTH="550.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2845,7 +6163,7 @@
   </body>
 </html>
 </richcontent>
-<node FOLDED="true" ID="ID_357953420" CREATED="1323613544023" MODIFIED="1335095694181" HGAP_QUANTITY="-583.0 px" VSHIFT_QUANTITY="137.0 px"><richcontent TYPE="NODE">
+<node ID="ID_357953420" CREATED="1323613544023" MODIFIED="1335095694181" HGAP_QUANTITY="-583.0 px" VSHIFT_QUANTITY="137.0 px"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2914,15 +6232,15 @@
 </node>
 </node>
 </node>
-<node TEXT="Other" STYLE_REF="Advanced" ID="ID_429763637" CREATED="1323251384433" MODIFIED="1335300487437" NUMBERED="true" MIN_WIDTH="90.0 px">
+<node TEXT="Other" STYLE_REF="Advanced" FOLDED="true" ID="ID_429763637" CREATED="1323251384433" MODIFIED="1500800025211" NUMBERED="true" MIN_WIDTH="90.0 px">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MainWidth" LAST="false"/>
 </hook>
-<node TEXT="Pasting unformatted text from your browser" STYLE_REF="Advanced" FOLDED="true" ID="ID_1745656146" CREATED="1323251632079" MODIFIED="1335300487437" STYLE="combined">
+<node TEXT="Pasting unformatted text from your browser" STYLE_REF="Advanced" ID="ID_1745656146" CREATED="1323251632079" MODIFIED="1500800034730" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
-<node ID="ID_885396924" CREATED="1323522491275" MODIFIED="1335095704602" HGAP_QUANTITY="-264.0 px" VSHIFT_QUANTITY="32.0 px"><richcontent TYPE="NODE">
+<node ID="ID_885396924" CREATED="1323522491275" MODIFIED="1500800034730" HGAP_QUANTITY="-240.0 px" VSHIFT_QUANTITY="38.0 px"><richcontent TYPE="NODE">
 
 <html>
   <head>
@@ -2940,7 +6258,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Fixed node width" STYLE_REF="Advanced" FOLDED="true" ID="ID_1709254927" CREATED="1321975856238" MODIFIED="1335300487437" MIN_WIDTH="1.0 px" STYLE="combined">
+<node TEXT="Fixed node width" STYLE_REF="Advanced" ID="ID_1709254927" CREATED="1321975856238" MODIFIED="1335300487437" MIN_WIDTH="1.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2959,7 +6277,7 @@
         <i>Format > Set node width limits</i>; or see
       </li>
       <li>
-        Properties panel
+        Tool panel
       </li>
     </ul>
     <p>
@@ -2976,7 +6294,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Copying format (node core)" STYLE_REF="Advanced" FOLDED="true" ID="ID_1195279427" CREATED="1316670043816" MODIFIED="1335300487437" STYLE="combined">
+<node TEXT="Copying format (node core)" STYLE_REF="Advanced" ID="ID_1195279427" CREATED="1316670043816" MODIFIED="1335300487437" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2998,7 +6316,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Paste options" STYLE_REF="Advanced" FOLDED="true" ID="ID_506336466" CREATED="1322990524257" MODIFIED="1335300487437" MIN_WIDTH="1.0 px" STYLE="combined">
+<node TEXT="Paste options" STYLE_REF="Advanced" ID="ID_506336466" CREATED="1322990524257" MODIFIED="1335300487437" MIN_WIDTH="1.0 px" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -3036,7 +6354,7 @@
 </node>
 </node>
 </node>
-<node TEXT="Publishing & sharing" STYLE_REF="Advanced" FOLDED="true" POSITION="right" ID="ID_1613405030" CREATED="1314258163054" MODIFIED="1337158975198" NUMBERED="true" MIN_WIDTH="200.0 px" HGAP_QUANTITY="19.0 px" VSHIFT_QUANTITY="-17.0 px">
+<node TEXT="Publishing & sharing" STYLE_REF="Advanced" FOLDED="true" POSITION="right" ID="ID_1613405030" CREATED="1314258163054" MODIFIED="1498338726866" NUMBERED="true" MIN_WIDTH="200.0 px">
 <node TEXT="Printing" STYLE_REF="Advanced" FOLDED="true" ID="ID_1344283469" CREATED="1314352873779" MODIFIED="1335300511773" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
@@ -3184,46 +6502,7 @@
 </node>
 </node>
 </node>
-<node LOCALIZED_STYLE_REF="defaultstyle.floating" POSITION="right" ID="ID_766584529" CREATED="1320005728532" MODIFIED="1334247867982" LINK="freeplaneApplications.mm" HGAP_QUANTITY="-4.0 px" VSHIFT_QUANTITY="158.0 px" TEXT_SHORTENED="true"><richcontent TYPE="NODE">
-
-<html>
-  <head>
-    
-  </head>
-  <body>
-    <p style="text-align: center">
-      Applications index
-    </p>
-  </body>
-</html>
-</richcontent>
-<richcontent TYPE="DETAILS">
-
-<html>
-  <head>
-
-  </head>
-  <body>
-    <p>
-      Click the link to open a mind map with the main applications of Freeplane. An Internet connection is needed to follow the links in the index.<i> </i>
-    </p>
-    <p>
-
-    </p>
-    <p>
-      <b>Note </b>
-    </p>
-    <ul>
-      <li>
-        To return from the index map to this map: select <i>Navigate >Go to previous map </i>(icon in tool bar)
-      </li>
-    </ul>
-  </body>
-</html>
-</richcontent>
-<hook NAME="FreeNode"/>
-</node>
-<node TEXT="Node extensions" STYLE_REF="Advanced" FOLDED="true" POSITION="left" ID="ID_143196514" CREATED="1314206563418" MODIFIED="1335300552660" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Node extensions" STYLE_REF="Advanced" FOLDED="true" POSITION="right" ID="ID_143196514" CREATED="1314206563418" MODIFIED="1498338725473" NUMBERED="true" MIN_WIDTH="180.0 px">
 <node TEXT="Edit text in node details" STYLE_REF="Advanced" ID="ID_898889730" CREATED="1314197390735" MODIFIED="1335301078849"><richcontent TYPE="DETAILS">
 
 <html>
@@ -3474,7 +6753,6 @@
 </node>
 <node TEXT="Attributes (node extension)" STYLE_REF="Professional" ID="ID_1324773677" CREATED="1314208168037" MODIFIED="1335301078849" MIN_WIDTH="1.0 px">
 <node TEXT="Attributes in node extensions" STYLE_REF="Professional" ID="ID_1657366174" CREATED="1314209542018" MODIFIED="1335096051051" HGAP_QUANTITY="-160.0 px" VSHIFT_QUANTITY="84.0 px" MAX_WIDTH="550.0 px">
-<attribute_layout NAME_WIDTH="25.5 pt" VALUE_WIDTH="69.0 pt"/>
 <attribute NAME="Name" VALUE="John"/>
 <attribute NAME="email" VALUE="john at gmail.com"/>
 <richcontent TYPE="DETAILS">
@@ -3517,7 +6795,7 @@
     </p>
     <ul>
       <li>
-        <i>Properties panel > Calendar & Attributes</i>
+        <i>Tool panel > Calendar & Attributes</i>
       </li>
       <li>
         <i>Edit > Node extensions</i>
@@ -3552,9 +6830,7 @@
   </body>
 </html>
 </richcontent>
-<node TEXT="Hyperlink (arrow) in attribute" STYLE_REF="Professional" ID="ID_457929879" CREATED="1312540477537" MODIFIED="1323091000613" HGAP_QUANTITY="-550.0 px" VSHIFT_QUANTITY="80.0 px" MAX_WIDTH="550.0 px">
-<attribute_layout NAME_WIDTH="36.0 pt" VALUE_WIDTH="75.75 pt"/>
-<richcontent TYPE="DETAILS">
+<node TEXT="Hyperlink (arrow) in attribute" STYLE_REF="Professional" ID="ID_457929879" CREATED="1312540477537" MODIFIED="1323091000613" HGAP_QUANTITY="-550.0 px" VSHIFT_QUANTITY="80.0 px" MAX_WIDTH="550.0 px"><richcontent TYPE="DETAILS">
 
 <html>
   <head>
@@ -3605,7 +6881,7 @@
 </node>
 </node>
 </node>
-<node TEXT="Notes of nodes" STYLE_REF="Advanced" FOLDED="true" POSITION="left" ID="ID_274601394" CREATED="1314208248182" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Notes of nodes" STYLE_REF="Advanced" FOLDED="true" POSITION="right" ID="ID_274601394" CREATED="1314208248182" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
 <node ID="ID_1960771486" CREATED="1323524664411" MODIFIED="1329839626607"><richcontent TYPE="NODE">
 
 <html>
@@ -3638,7 +6914,7 @@
 </richcontent>
 </node>
 </node>
-<node TEXT="Date & time actions" STYLE_REF="Professional" FOLDED="true" POSITION="left" ID="ID_1959496513" CREATED="1303932101749" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Date & time actions" STYLE_REF="Professional" FOLDED="true" POSITION="right" ID="ID_1959496513" CREATED="1303932101749" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="SubMenu" LAST="false"/>
 </hook>
@@ -3663,7 +6939,7 @@
         <i>Tools > Time management , </i>with submenu's for<i> Managing time </i>and for<i> managing tasks</i>
       </li>
       <li>
-        <i>Properties panel > Calendar and Attribute</i>s, NOT for managing task
+        <i>Tool panel > Calendar and Attribute</i>s, NOT for managing task
       </li>
     </ul>
   </body>
@@ -3835,7 +7111,7 @@
 </node>
 </node>
 </node>
-<node TEXT="Filtering & finding nodes" STYLE_REF="Professional" FOLDED="true" POSITION="left" ID="ID_828862571" CREATED="1314109608813" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Filtering & finding nodes" STYLE_REF="Professional" FOLDED="true" POSITION="right" ID="ID_828862571" CREATED="1314109608813" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
 <node TEXT="Why filtering ?" STYLE_REF="Professional" FOLDED="true" ID="ID_887149959" CREATED="1314362530273" MODIFIED="1335301113247" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
@@ -4192,7 +7468,6 @@
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="51.0 pt" VALUE_WIDTH="51.0 pt"/>
 </node>
 <node TEXT="Select all matching" STYLE_REF="ProfessionalTopic" ID="ID_164487469" CREATED="1310134532663" MODIFIED="1316165694652" TEXT_SHORTENED="true">
 <icon BUILTIN="../select_all_found_nodes"/>
@@ -4545,7 +7820,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Loading and using filter set for this Quick reference" STYLE_REF="Professional" FOLDED="true" ID="ID_1284293100" CREATED="1316177216317" MODIFIED="1335301113247" LINK="http://www.kioo.nl/freeplane/tutorial_en/filterSet" MIN_WIDTH="1.0 px">
+<node TEXT="Loading and using filter set for this Quick reference" STYLE_REF="Professional" FOLDED="true" ID="ID_1284293100" CREATED="1316177216317" MODIFIED="1335301113247" MIN_WIDTH="1.0 px">
 <node TEXT="Consider using a powerfull feature of Freeplane, filtering, to present to you only the information of&#xa;one of these 3 levels (Beginner, Advanced, Professional) at a time.&#xa;&#xa;The procedure for filtering is described below. If you click on the red arrow in my parent node, the instruction is illustrated in an animation." ID="ID_352888342" CREATED="1323529491351" MODIFIED="1329857586148"/>
 <node TEXT="Load filter set for this Quick reference" ID="ID_551050917" CREATED="1317234746190" MODIFIED="1323808520350">
 <icon BUILTIN="full-0"/>
@@ -4609,7 +7884,7 @@
     <conditional_style ACTIVE="true" STYLE_REF="SubWidth" LAST="false"/>
 </hook>
 </node>
-<node TEXT="Unfold to make visible" ID="ID_1451237301" CREATED="1316176206878" MODIFIED="1323808558352" LINK="FilterExampleEnd.jpg" HGAP_QUANTITY="15.0 px" VSHIFT_QUANTITY="-8.0 px">
+<node TEXT="Unfold to make visible" ID="ID_1451237301" CREATED="1316176206878" MODIFIED="1323808558352" HGAP_QUANTITY="15.0 px" VSHIFT_QUANTITY="-8.0 px">
 <icon BUILTIN="full-2"/>
 <richcontent TYPE="DETAILS">
 
@@ -4665,7 +7940,7 @@
 </node>
 </node>
 </node>
-<node TEXT="Protecting map or nodes" STYLE_REF="Professional" FOLDED="true" POSITION="left" ID="ID_1232153769" CREATED="1314339453691" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Protecting map or nodes" STYLE_REF="Professional" FOLDED="true" POSITION="right" ID="ID_1232153769" CREATED="1314339453691" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
 <node TEXT="Protecting child nodes with a password" STYLE_REF="Professional" FOLDED="true" ID="ID_1433157907" CREATED="1314362016509" MODIFIED="1335301133075" STYLE="combined">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
@@ -4725,7 +8000,7 @@
 </node>
 </node>
 </node>
-<node TEXT="Fine tuning Freeplane" STYLE_REF="Professional" FOLDED="true" POSITION="left" ID="ID_1746471823" CREATED="1314215326284" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Fine tuning Freeplane" STYLE_REF="Professional" FOLDED="true" POSITION="right" ID="ID_1746471823" CREATED="1314215326284" MODIFIED="1335300552676" NUMBERED="true" MIN_WIDTH="180.0 px">
 <node ID="ID_931065203" CREATED="1323095428935" MODIFIED="1335301155181"><richcontent TYPE="NODE">
 
 <html>
@@ -4778,7 +8053,7 @@
   </head>
   <body>
     <p>
-      Map <i>standard.mm</i> in  <i>Tools > Open user directory > Templates</i> serves as a map template for each new mind map. Consider adapting the style "default" of this template map to your personal favourites, e.g.
+      Map <i>standard-1.6.mm</i> in  <i>Tools > Open user directory > Templates</i> serves as a map template for each new mind map. Consider adapting the style "default" of this template map to your personal favourites, e.g.
     </p>
     <ul>
       <li>
@@ -5225,37 +8500,7 @@
 </node>
 </node>
 </node>
-<node LOCALIZED_STYLE_REF="default" POSITION="left" ID="ID_871432906" CREATED="1335301290823" MODIFIED="1335301474192" HGAP_QUANTITY="39.0 px" VSHIFT_QUANTITY="105.0 px">
-<icon BUILTIN="idea"/>
-<richcontent TYPE="NODE">
-
-<html>
-  <head>
-    
-  </head>
-  <body>
-    <p>
-      <a href="freeplane.mm#ID_1040911735">FAQ</a>
-    </p>
-  </body>
-</html>
-</richcontent>
-<hook NAME="FreeNode"/>
-<richcontent TYPE="DETAILS" HIDDEN="true">
-
-<html>
-  <head>
-
-  </head>
-  <body>
-    <p>
-      Frequently Asked Questions
-    </p>
-  </body>
-</html>
-</richcontent>
-</node>
-<node TEXT="Best practices" STYLE_REF="Beginner" FOLDED="true" POSITION="left" ID="ID_722085722" CREATED="1314363768463" MODIFIED="1335300552676" BACKGROUND_COLOR="#00cc33" NUMBERED="true" MIN_WIDTH="180.0 px">
+<node TEXT="Best practices" STYLE_REF="Beginner" FOLDED="true" POSITION="right" ID="ID_722085722" CREATED="1314363768463" MODIFIED="1335300552676" BACKGROUND_COLOR="#00cc33" NUMBERED="true" MIN_WIDTH="180.0 px">
 <node STYLE_REF="Beginner" ID="ID_163805859" CREATED="1314422714136" MODIFIED="1335301176959"><richcontent TYPE="NODE">
 
 <html>
@@ -5483,7 +8728,7 @@
 </richcontent>
 </node>
 </node>
-<node TEXT="Map with all Freeplane Functions (index)" ID="ID_1680872369" CREATED="1329896383911" MODIFIED="1329897008344" LINK="#ID_232622736"><richcontent TYPE="DETAILS" HIDDEN="true">
+<node TEXT="Map with all Freeplane Functions (index)" ID="ID_1680872369" CREATED="1329896383911" MODIFIED="1329897008344"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
@@ -5505,7 +8750,7 @@
 </html>
 </richcontent>
 </node>
-<node TEXT="Map with example applications (index)" ID="ID_311616726" CREATED="1329896409752" MODIFIED="1329896989686" LINK="#ID_766584529"><richcontent TYPE="DETAILS" HIDDEN="true">
+<node TEXT="Map with example applications (index)" ID="ID_311616726" CREATED="1329896409752" MODIFIED="1329896989686"><richcontent TYPE="DETAILS" HIDDEN="true">
 
 <html>
   <head>
diff --git a/freeplane/doc/freeplaneTutorial_ja.mm b/freeplane/doc/freeplaneTutorial_ja.mm
index ff4a75f..c55feaf 100644
--- a/freeplane/doc/freeplaneTutorial_ja.mm
+++ b/freeplane/doc/freeplaneTutorial_ja.mm
@@ -2114,7 +2114,6 @@
 </node>
 </node>
 <node TEXT="&#x5916;&#x90e8;&#x30ea;&#x30f3;&#x30af;" STYLE_REF="Beginner" FOLDED="true" ID="ID_640110372" CREATED="1455910883508" MODIFIED="1455910883508" LINK="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane" STYLE="combined">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="120.75 pt"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -2897,7 +2896,7 @@
   </head>
   <body>
     <p>
-       Advanced makes the yellow color and Example adds the eye-icon. To implement this example, first define the two styles and then apply them as node conditional styles by opening the<i> Properties panel </i>and clicking below <i>Node conditional styles for node. </i>Now a dialog opens and in this<i> </i>dialog:
+       Advanced makes the yellow color and Example adds the eye-icon. To implement this example, first define the two styles and then apply them as node conditional styles by opening the<i> Tool panel </i>and clicking below <i>Node conditional styles for node. </i>Now a dialog opens and in this<i> </i>dialog:
     </p>
   </body>
 </html>
@@ -3698,7 +3697,6 @@
 </node>
 <node TEXT="&#x5c5e;&#x6027;&#xff08;&#x30ce;&#x30fc;&#x30c9;&#x62e1;&#x5f35;&#x60c5;&#x5831;&#xff09;" STYLE_REF="Professional" FOLDED="true" ID="ID_1324773677" CREATED="1455910883522" MODIFIED="1455910883522" MIN_WIDTH="1.0 px">
 <node TEXT="&#x30ce;&#x30fc;&#x30c9;&#x62e1;&#x5f35;&#x60c5;&#x5831;&#x306e;&#x5c5e;&#x6027;" STYLE_REF="Professional" FOLDED="true" ID="ID_1657366174" CREATED="1455910883523" MODIFIED="1455910883523" HGAP_QUANTITY="-128.0 px" VSHIFT_QUANTITY="80.0 px" MAX_WIDTH="550.0 px">
-<attribute_layout NAME_WIDTH="24.75 pt" VALUE_WIDTH="61.5 pt"/>
 <attribute NAME="Name" VALUE="John"/>
 <attribute NAME="email" VALUE="john at gmail.com"/>
 <richcontent TYPE="DETAILS">
@@ -3780,7 +3778,6 @@
 </html>
 </richcontent>
 <node TEXT="&#x5c5e;&#x6027;&#x4e2d;&#x306e;&#x30cf;&#x30a4;&#x30d1;&#x30fc;&#x30ea;&#x30f3;&#x30af;&#xff08;&#x77e2;&#x5370;&#x578b;&#xff09;" STYLE_REF="Professional" ID="ID_457929879" CREATED="1455910883523" MODIFIED="1455910883523" HGAP_QUANTITY="-550.0 px" VSHIFT_QUANTITY="80.0 px" MAX_WIDTH="550.0 px">
-<attribute_layout NAME_WIDTH="36.0 pt" VALUE_WIDTH="75.75 pt"/>
 <richcontent TYPE="DETAILS">
 
 <html>
@@ -4503,7 +4500,6 @@
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="51.0 pt" VALUE_WIDTH="51.0 pt"/>
 </node>
 <node TEXT="&#x8a72;&#x5f53;&#x30ce;&#x30fc;&#x30c9;&#x3092;&#x5168;&#x3066;&#x9078;&#x629e;" STYLE_REF="ProfessionalTopic" ID="ID_164487469" CREATED="1455910883534" MODIFIED="1455910883534" TEXT_SHORTENED="true">
 <icon BUILTIN="../select_all_found_nodes"/>
@@ -4857,7 +4853,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="&#x3053;&#x306e;&#x300c;&#x30af;&#x30a3;&#x30c3;&#x30af;&#x30ea;&#x30d5;&#x30a1;&#x30ec;&#x30f3;&#x30b9;&#x300d;&#x7528;&#x306e;&#x30d5;&#x30a3;&#x30eb;&#x30bf;&#x30bb;&#x30c3;&#x30c8;&#x306e;&#x8aad;&#x307f;&#x8fbc;&#x307f;&#x3068;&#x6d3b;&#x7528;" STYLE_REF="Professional" FOLDED="true" ID="ID_1284293100" CREATED="1455910883544" MODIFIED="1455910883544" LINK="http://www.kioo.nl/freeplane/tutorial_en/filterSet" MIN_WIDTH="1.0 px">
+<node TEXT="&#x3053;&#x306e;&#x300c;&#x30af;&#x30a3;&#x30c3;&#x30af;&#x30ea;&#x30d5;&#x30a1;&#x30ec;&#x30f3;&#x30b9;&#x300d;&#x7528;&#x306e;&#x30d5;&#x30a3;&#x30eb;&#x30bf;&#x30bb;&#x30c3;&#x30c8;&#x306e;&#x8aad;&#x307f;&#x8fbc;&#x307f;&#x3068;&#x6d3b;&#x7528;" STYLE_REF="Professional" FOLDED="true" ID="ID_1284293100" CREATED="1455910883544" MODIFIED="1455910883544" MIN_WIDTH="1.0 px">
 <node TEXT="&#xff08;&#x521d;&#x7d1a;&#x3001;&#x4e2d;&#x7d1a;&#x3001;&#x4e0a;&#x7d1a;&#x306e;&#xff09;&#xff13;&#x3064;&#x306e;&#x719f;&#x9054;&#x5ea6;&#x306e;&#x3069;&#x308c;&#x304b;&#xff11;&#x3064;&#x3060;&#x3051;&#x3092;&#x8868;&#x793a;&#x3055;&#x305b;&#x308b;&#x5834;&#x5408;&#x306f;&#x3001;&#x30d5;&#x30a3;&#x30eb;&#x30bf;&#x3068;&#x3044;&#x3046; Freeplane &#x306e;&#x5f37;&#x529b;&#x306a;&#x6a5f;&#x80fd;&#x306e;&#x5229;&#x7528;&#x3092;&#x691c;&#x8a0e;&#x3057;&#x3066;&#x304f;&#x3060;&#x30 [...]
 <node TEXT="&#x3053;&#x306e;&#x30af;&#x30a3;&#x30c3;&#x30af;&#x30ea;&#x30d5;&#x30a1;&#x30ec;&#x30f3;&#x30b9;&#x7528;&#x306e;&#x30d5;&#x30a3;&#x30eb;&#x30bf;&#x30bb;&#x30c3;&#x30c8;&#x3092;&#x8aad;&#x307f;&#x8fbc;&#x3080;" ID="ID_551050917" CREATED="1455910883544" MODIFIED="1455910883544">
 <icon BUILTIN="full-0"/>
@@ -4914,7 +4910,7 @@
     <conditional_style ACTIVE="true" STYLE_REF="SubWidth" LAST="false"/>
 </hook>
 </node>
-<node TEXT="&#x5c55;&#x958b;&#x3057;&#x3066;&#x53ef;&#x8996;&#x72b6;&#x614b;&#x306b;&#x3059;&#x308b;" ID="ID_1451237301" CREATED="1455910883544" MODIFIED="1455910883544" LINK="FilterExampleEnd.jpg" HGAP_QUANTITY="19.0 px" VSHIFT_QUANTITY="-8.0 px">
+<node TEXT="&#x5c55;&#x958b;&#x3057;&#x3066;&#x53ef;&#x8996;&#x72b6;&#x614b;&#x306b;&#x3059;&#x308b;" ID="ID_1451237301" CREATED="1455910883544" MODIFIED="1455910883544" HGAP_QUANTITY="19.0 px" VSHIFT_QUANTITY="-8.0 px">
 <icon BUILTIN="full-2"/>
 <richcontent TYPE="DETAILS">
 
@@ -5090,7 +5086,7 @@
   </head>
   <body>
     <p>
-      <i>「ツール > ユーザディレクトリを開く > Template」</i>の<i>「standard.mm」</i>というマップが、新規マインドマップ作成時テンプレートマップとなります。& [...]
+      <i>「ツール > ユーザディレクトリを開く > Template」</i>の<i>「standard-1.6.mm」</i>というマップが、新規マインドマップ作成時テンプレートマップとなります&#122 [...]
     </p>
     <ul>
       <li>
diff --git a/freeplane/doc/freeplaneTutorial_nl.mm b/freeplane/doc/freeplaneTutorial_nl.mm
index 0a45e66..83b6e56 100644
--- a/freeplane/doc/freeplaneTutorial_nl.mm
+++ b/freeplane/doc/freeplaneTutorial_nl.mm
@@ -1844,7 +1844,6 @@
 </node>
 </node>
 <node TEXT="Externe koppeling" STYLE_REF="Beginner" FOLDED="true" ID="ID_640110372" CREATED="1286651969385" MODIFIED="1336125011738" LINK="http://freeplane.sourceforge.net/wiki/index.php/Tutorial_Freeplane" STYLE="combined">
-<attribute_layout NAME_WIDTH="82" VALUE_WIDTH="161"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuTitle" LAST="false"/>
 </hook>
@@ -3391,7 +3390,6 @@
 </node>
 <node TEXT="Attributen (knoopuitbreiding)" STYLE_REF="Professional" FOLDED="true" ID="ID_1324773677" CREATED="1314208168037" MODIFIED="1323706758395" MIN_WIDTH="1">
 <node TEXT="Wat zijn attributen ?" STYLE_REF="Professional" ID="ID_1657366174" CREATED="1314209542018" MODIFIED="1336118227857" HGAP="-170" VSHIFT="83" MAX_WIDTH="550">
-<attribute_layout NAME_WIDTH="34" VALUE_WIDTH="92"/>
 <attribute NAME="Name" VALUE="John"/>
 <attribute NAME="email" VALUE="john at gmail.com"/>
 <richcontent TYPE="DETAILS">
@@ -3477,7 +3475,6 @@
 </html>
 </richcontent>
 <node TEXT="Hyperlink (pijl) in attribuutwaarde" STYLE_REF="Professional" ID="ID_457929879" CREATED="1312540477537" MODIFIED="1336118261522" HGAP="-550" VSHIFT="80" MAX_WIDTH="550">
-<attribute_layout NAME_WIDTH="48" VALUE_WIDTH="101"/>
 <richcontent TYPE="DETAILS">
 
 <html>
@@ -3995,7 +3992,6 @@
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="68" VALUE_WIDTH="68"/>
 <edge STYLE="horizontal"/>
 </node>
 <node TEXT="Filteren en selecteren" STYLE_REF="ProfessionalOnderwerp" ID="ID_164487469" CREATED="1310134532663" MODIFIED="1330166218726" TEXT_SHORTENED="true">
@@ -4296,7 +4292,7 @@
 </hook>
 </node>
 </node>
-<node TEXT="Laden en gebruiken van de filterset voor deze Quick reference" STYLE_REF="Professional" FOLDED="true" ID="ID_1284293100" CREATED="1316177216317" MODIFIED="1323713282573" LINK="http://www.kioo.nl/freeplane/tutorial_en/filterSet" MIN_WIDTH="1" VSHIFT="-30">
+<node TEXT="Laden en gebruiken van de filterset voor deze Quick reference" STYLE_REF="Professional" FOLDED="true" ID="ID_1284293100" CREATED="1316177216317" MODIFIED="1323713282573" MIN_WIDTH="1" VSHIFT="-30">
 <node TEXT="Consider using a powerfull feature of Freeplane, filtering, to present to you only the information of&#xa;one of these 3 levels (Beginner, Advanced, Professional) at a time.&#xa;&#xa;The procedure for filtering is described to the left.  If you do not see it, click on the colored bar above&#xa;this text to unhide it. If you click on the red arrow, the instruction is illustrated in an animation." ID="ID_352888342" CREATED="1323529491351" MODIFIED="1323529654285"/>
 <node TEXT="Load filter set for this Quick reference" ID="ID_551050917" CREATED="1317234746190" MODIFIED="1323811074382">
 <icon BUILTIN="full-0"/>
@@ -4360,7 +4356,7 @@
     <conditional_style ACTIVE="true" STYLE_REF="SubWidth" LAST="false"/>
 </hook>
 </node>
-<node TEXT="Unfold to make visible" ID="ID_1451237301" CREATED="1316176206878" MODIFIED="1323811105176" HGAP="15" VSHIFT="-8" LINK="FilterExampleEnd.jpg">
+<node TEXT="Unfold to make visible" ID="ID_1451237301" CREATED="1316176206878" MODIFIED="1323811105176" HGAP="15" VSHIFT="-8">
 <icon BUILTIN="full-2"/>
 <richcontent TYPE="DETAILS">
 
@@ -4521,10 +4517,10 @@
     </p>
     <ul>
       <li>
-        De veranderde standaardstijl geldt alleen voor de mindmap waarin je werkt. Om de standaardstijl voor alle nieuwe mindmaps toe te passen, moet je de mindmap <i>standard.mm</i> aanpassen. Deze bevindt zich in: <i>Extra > Openen gebruikersdirectory > Templates.</i>
+        De veranderde standaardstijl geldt alleen voor de mindmap waarin je werkt. Om de standaardstijl voor alle nieuwe mindmaps toe te passen, moet je de mindmap <i>standard-1.6.mm</i> aanpassen. Deze bevindt zich in: <i>Extra > Openen gebruikersdirectory > Templates.</i>
       </li>
       <li>
-        Overweeg om in standard.mm de optie "Hyperlinks" aan te vinken. Dit zorgt er voor dat de tekst van een pijl-hyperlink wordt onderstreept en klikbaar is.
+        Overweeg om in standard-1.6.mm de optie "Hyperlinks" aan te vinken. Dit zorgt er voor dat de tekst van een pijl-hyperlink wordt onderstreept en klikbaar is.
       </li>
     </ul>
   </body>
diff --git a/freeplane/doc/freeplane_de.mm b/freeplane/doc/freeplane_de.mm
index db4a3b8..08e117d 100644
--- a/freeplane/doc/freeplane_de.mm
+++ b/freeplane/doc/freeplane_de.mm
@@ -383,7 +383,6 @@
 </node>
 <node TEXT="Knoten k&#xf6;nnen Attribute haben" ID="ID_1044646484" CREATED="1270893318566" MODIFIED="1274817881371" COLOR="#407000">
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
-<attribute_layout NAME_WIDTH="30.0 pt" VALUE_WIDTH="36.75 pt"/>
 <attribute NAME="x" VALUE="10"/>
 <attribute NAME="y" VALUE="20"/>
 </node>
@@ -2470,7 +2469,6 @@
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
 <node TEXT="Ein Knoten kann Attribute haben" ID="ID_1293545211" CREATED="1270893318566" MODIFIED="1275062896518">
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
-<attribute_layout NAME_WIDTH="30.0 pt" VALUE_WIDTH="36.75 pt"/>
 <attribute NAME="x" VALUE="10"/>
 <attribute NAME="y" VALUE="20"/>
 </node>
@@ -3800,7 +3798,6 @@
 <node TEXT="Im Freeplane Applet kannst Du MindMaps nur betrachten und nicht bearbeiten. Durch klicken auf einen Knoten kannst Du den Zweig aber ein- und ausfalten. Auch das Umherschieben mit gedr&#xfc;ckter linker Maustaste und das Durchsuchen (mit Kontext-Men&#xfc;) funktioniert" ID="_Freeplane_Link_514864900" CREATED="1270892460645" MODIFIED="1275340105130">
 <font NAME="SansSerif" SIZE="12"/>
 </node>
-<node TEXT="Kleinere Maps kannst Du auch als Flash-Applet exportieren, was aber weniger Navigationsm&#xf6;glichkeiten bietet." ID="ID_814739863" CREATED="1270895588942" MODIFIED="1275340135154"/>
 <node TEXT="LaTeX und SVG Bilder werden in den Applets nicht dargestellt." ID="ID_1798905971" CREATED="1271097701298" MODIFIED="1275340146193"/>
 </node>
 <node TEXT="Das Team" POSITION="left" ID="_Freeplane_Link_784043927" CREATED="1270892460645" MODIFIED="1275340221218" COLOR="#006666">
diff --git a/freeplane/doc/freeplane_es.mm b/freeplane/doc/freeplane_es.mm
index 060b149..6ea26bd 100644
--- a/freeplane/doc/freeplane_es.mm
+++ b/freeplane/doc/freeplane_es.mm
@@ -229,14 +229,6 @@
 <edge WIDTH="thin"/>
 </node>
 </node>
-<node TEXT="David Butt" FOLDED="true" ID="Freeplane_Link_1024053399" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#996600">
-<font NAME="SansSerif" SIZE="12"/>
-<edge WIDTH="thin"/>
-<node TEXT="Tutorial flash" ID="ID_133522658" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#999999">
-<font NAME="Dialog" SIZE="10"/>
-<edge WIDTH="thin"/>
-</node>
-</node>
 <node TEXT="David Low" FOLDED="true" ID="Freeplane_Link_1534904708" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#996600">
 <font NAME="SansSerif" SIZE="12"/>
 <edge WIDTH="thin"/>
diff --git a/freeplane/doc/freeplane_et.mm b/freeplane/doc/freeplane_et.mm
index 841a191..6e91252 100644
--- a/freeplane/doc/freeplane_et.mm
+++ b/freeplane/doc/freeplane_et.mm
@@ -259,14 +259,6 @@
 <edge WIDTH="thin"/>
 </node>
 </node>
-<node TEXT="David Butt" ID="Freeplane_Link_1024053399" CREATED="1124560950701" MODIFIED="1216272352345" COLOR="#996600">
-<font NAME="SansSerif" SIZE="12"/>
-<edge WIDTH="thin"/>
-<node TEXT="Flash-i &#xf5;petus" ID="ID_49661074" CREATED="1124560950701" MODIFIED="1216187545261" COLOR="#999999">
-<font NAME="Dialog" SIZE="10"/>
-<edge WIDTH="thin"/>
-</node>
-</node>
 <node TEXT="David Low" ID="ID_1167712813" CREATED="1124560950701" MODIFIED="1216272353298" COLOR="#996600">
 <font NAME="SansSerif" SIZE="12"/>
 <edge WIDTH="thin"/>
diff --git a/freeplane/doc/freeplane_fr.mm b/freeplane/doc/freeplane_fr.mm
index f89e999..7f525b0 100644
--- a/freeplane/doc/freeplane_fr.mm
+++ b/freeplane/doc/freeplane_fr.mm
@@ -392,7 +392,6 @@
 </node>
 <node TEXT="Les noeuds peuvent avoir des attributs" ID="ID_1044646484" CREATED="1270893318566" MODIFIED="1275421927062" COLOR="#407000">
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
-<attribute_layout NAME_WIDTH="30.0 pt" VALUE_WIDTH="36.75 pt"/>
 <attribute NAME="x" VALUE="10"/>
 <attribute NAME="y" VALUE="20"/>
 </node>
@@ -749,7 +748,6 @@
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
 <node TEXT="Les noeuds peuvent poss&#xe9;der des attributs" ID="ID_1293545211" CREATED="1270893318566" MODIFIED="1277229590453">
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
-<attribute_layout NAME_WIDTH="30.0 pt" VALUE_WIDTH="36.75 pt"/>
 <attribute NAME="x" VALUE="10"/>
 <attribute NAME="y" VALUE="20"/>
 </node>
@@ -1249,7 +1247,6 @@
 <font NAME="Dialog" SIZE="12"/>
 </node>
 <node TEXT="Avec l'applet Java Freeplane, les cartes sont en lecture seule. Aucune modification n'est possible. Cliquez sur un noeud pour l'ouvrir ou suivre un lien. D&#xe9;placez la carte en cliquant sur le fond de la carte. Un menu contextuel est accessible d'un clic droit de la souris, ce qui permet par exemple d'effectuer une recherche dans la carte." ID="Freeplane_Link_1948548375" CREATED="1275400917568" MODIFIED="1277392249468"/>
-<node TEXT="L'exportation de petites cartes est envisageable en Flash, qui offre, comme l 'export en applet Java, des fonctions de manipulations de la carte mais celles-ci sont plus limit&#xe9;es." ID="ID_996038672" CREATED="1275774133046" MODIFIED="1277392296796"/>
 <node TEXT="LaTeX et les fichiers SVG ne sont pas visibles via les exportations Flash et Java" ID="ID_1688517766" CREATED="1275774318671" MODIFIED="1275774358390"/>
 </node>
 <node TEXT="Cr&#xe9;dits" FOLDED="true" POSITION="left" ID="_Freeplane_Link_784043927" CREATED="1270892460645" MODIFIED="1275774493609" COLOR="#006666">
diff --git a/freeplane/doc/freeplane_id.mm b/freeplane/doc/freeplane_id.mm
index 945acbe..fdf3006 100644
--- a/freeplane/doc/freeplane_id.mm
+++ b/freeplane/doc/freeplane_id.mm
@@ -227,14 +227,6 @@
 <edge WIDTH="thin"/>
 </node>
 </node>
-<node TEXT="David Butt" FOLDED="true" ID="Freeplane_Link_1024053399" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#996600">
-<font NAME="SansSerif" SIZE="12"/>
-<edge WIDTH="thin"/>
-<node TEXT="Tutorial Flash" ID="ID_158863537" CREATED="1124560950701" MODIFIED="1208966057187" COLOR="#999999">
-<font NAME="Dialog" SIZE="10"/>
-<edge WIDTH="thin"/>
-</node>
-</node>
 <node TEXT="David Low" FOLDED="true" ID="ID_1572312597" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#996600">
 <font NAME="SansSerif" SIZE="12"/>
 <edge WIDTH="thin"/>
diff --git a/freeplane/doc/freeplane_it.mm b/freeplane/doc/freeplane_it.mm
index 1cce5af..04f0697 100644
--- a/freeplane/doc/freeplane_it.mm
+++ b/freeplane/doc/freeplane_it.mm
@@ -178,9 +178,6 @@
 <node TEXT="L'applet di Freeplane, consente solo la visualizzazione delle mappe. Non &#xe8; possibile modificarle. Premendo su un nodo, per commutare la visualizzazione di Espansione/Collassamento. Per spostare la mappa, cliccare e trascinare lo sfondo. Per cercare nella mappa, usare il menu contestuale del nodo." ID="_Freeplane_Link_514864900" CREATED="1124560950701" MODIFIED="1280837258123" COLOR="#006666">
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
 </node>
-<node TEXT="Piccole mappe possono anche essere esportate come "Flash", che offre per&#xf2; funzionalit&#xe0; limitate  per l'esplorazione" ID="ID_74116190" CREATED="1280837118793" MODIFIED="1280837258139" COLOR="#006666">
-<font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
-</node>
 <node TEXT="I componenti LaTeX e le immagini SVG, non sono visualizzate nell'applet di Freeplane e nemmeno nella modalit&#xe0; Flash" ID="ID_1756113383" CREATED="1280837189060" MODIFIED="1280837258154" COLOR="#006666">
 <font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
 </node>
diff --git a/freeplane/doc/freeplane_ja.mm b/freeplane/doc/freeplane_ja.mm
index fb8a79f..81089a8 100644
--- a/freeplane/doc/freeplane_ja.mm
+++ b/freeplane/doc/freeplane_ja.mm
@@ -57,7 +57,6 @@
 </stylenode>
 <stylenode TEXT="MenuGroupLabel" COLOR="#000000" BACKGROUND_COLOR="#33ffcc" STYLE="bubble">
 <edge COLOR="#33ffcc" WIDTH="2"/>
-<attribute_layout NAME_WIDTH="58.5 pt" VALUE_WIDTH="87.0 pt"/>
 </stylenode>
 <stylenode TEXT="Title" COLOR="#ffffff" BACKGROUND_COLOR="#2ed2a9" STYLE="bubble">
 <font BOLD="true"/>
@@ -277,7 +276,6 @@
 </richcontent>
 <edge STYLE="bezier"/>
 <node TEXT="&#x30d5;&#x30a1;&#x30a4;&#x30eb;" STYLE_REF="MainMenu" FOLDED="true" ID="ID_1242926404" CREATED="1455910948847" MODIFIED="1455910948847" TEXT_SHORTENED="true" MIN_WIDTH="60.0 px" HGAP_QUANTITY="19.0 px" VSHIFT_QUANTITY="27.0 px">
-<attribute_layout NAME_WIDTH="27.75 pt" VALUE_WIDTH="57.75 pt"/>
 <attribute NAME="Chapter" VALUE="1,2,6,8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MainMenu" LAST="false"/>
@@ -2290,7 +2288,6 @@
   </body>
 </html>
 </richcontent>
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="120.75 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Procedure" LAST="false"/>
@@ -2360,7 +2357,6 @@
 <attribute NAME="Chapter" VALUE="3"/>
 </node>
 <node TEXT="&#x5c5e;&#x6027;&#x3067;&#x306e;&#x30cf;&#x30a4;&#x30d1;&#x30fc;&#x30ea;&#x30f3;&#x30af;" ID="ID_284791629" CREATED="1455910948894" MODIFIED="1455910948894" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="36.0 pt" VALUE_WIDTH="36.0 pt"/>
 <attribute NAME="See also" VALUE="#ID_278329781"/>
 <attribute NAME="See also" VALUE="#ID_1279811672"/>
 <attribute NAME="Chapter" VALUE="3"/>
@@ -3100,7 +3096,6 @@
 <node TEXT="" ID="ID_897938627" CREATED="1455910949160" MODIFIED="1455910949160">
 <hook NAME="SummaryNode"/>
 <node TEXT="" ID="ID_1351859449" CREATED="1455910948904" MODIFIED="1455910948904">
-<attribute_layout NAME_WIDTH="67.5 pt" VALUE_WIDTH="144.0 pt"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
 </hook>
@@ -3215,7 +3210,6 @@
 </node>
 </node>
 <node TEXT="" STYLE_REF="Aggregatie als Toelichting" ID="ID_892520547" CREATED="1455910948907" MODIFIED="1455910948907" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="158.25 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Refine" LAST="false"/>
@@ -3757,7 +3751,6 @@
 </hook>
 <attribute NAME="Chapter" VALUE="3"/>
 <node TEXT="&#x753b;&#x50cf;&#x3092;&#x516c;&#x958b;" ID="ID_452599330" CREATED="1455910948910" MODIFIED="1455910948910" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="198.0 pt"/>
 <attribute NAME="Chapter" VALUE="3,6"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
@@ -3845,7 +3838,6 @@
 <node TEXT="" FOLDED="true" ID="ID_1214682222" CREATED="1455910948941" MODIFIED="1455910948941" TEXT_SHORTENED="true">
 <cloud COLOR="#f0f0f0" SHAPE="ARC"/>
 <node TEXT="" ID="ID_1094419120" CREATED="1455910948941" MODIFIED="1455910948941" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="67.5 pt" VALUE_WIDTH="122.25 pt"/>
 <attribute NAME="Chapter" VALUE="3" OBJECT="org.freeplane.features.format.FormattedNumber|3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
@@ -3977,7 +3969,6 @@
 <node TEXT="" FOLDED="true" ID="ID_560316882" CREATED="1455910948942" MODIFIED="1455910948942">
 <cloud COLOR="#f0f0f0" SHAPE="ARC"/>
 <node TEXT="" ID="ID_110645225" CREATED="1455910948942" MODIFIED="1455910948942" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="67.5 pt" VALUE_WIDTH="122.25 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Exception" LAST="false"/>
@@ -4567,7 +4558,6 @@
   </body>
 </html>
 </richcontent>
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="123.75 pt"/>
 <attribute NAME="Chapter" VALUE="3"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="ToNote" LAST="false"/>
@@ -5909,7 +5899,6 @@
 <node TEXT="" ID="ID_691111776" CREATED="1455910949163" MODIFIED="1455910949163">
 <hook NAME="SummaryNode"/>
 <node TEXT="&#x30b3;&#x30f3;&#x30c6;&#x30ad;&#x30b9;&#x30c8;&#x30e1;&#x30cb;&#x30e5;&#x30fc;" FOLDED="true" ID="ID_1460700080" CREATED="1455910949004" MODIFIED="1455910949004" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="171.0 pt"/>
 <attribute NAME="Chapter" VALUE="1,2,3,4,5"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
@@ -7072,7 +7061,7 @@
 <edge COLOR="#00ffff"/>
 </node>
 <node TEXT="&#x9078;&#x629e;&#x30ce;&#x30fc;&#x30c9;&#x3092;&#x4e2d;&#x592e;&#x3078;" FOLDED="true" ID="ID_1924496837" CREATED="1455910949015" MODIFIED="1455910949015" TEXT_SHORTENED="true">
-<icon BUILTIN="../CenterSelectedNodeAction"/>
+<icon BUILTIN="../MoveSelectedNodeAction.CENTER"/>
 <richcontent TYPE="DETAILS">
 
 <html>
@@ -8902,7 +8891,7 @@
     </p>
     <ul>
       <li>
-        <i>「ファイル > 新規作成」</i>は、"<i>standard.mm"</i> のスタイルを使用します。ユーザは、ユーザマップを "standard.mm" に名称変更して<i>「ツール  > ユ&#1254 [...]
+        <i>「ファイル > 新規作成」</i>は、"<i>standard-1.6.mm"</i> のスタイルを使用します。ユーザは、ユーザマップを "standard-1.6.mm" に名称変更して<i>「ツール  > &#1251 [...]
       </li>
       <li>
         <i>「ツール > 環境設定」</i>で標準マインドマップ[ファイル]を別の名称ものもに指定することもできます。
@@ -8966,7 +8955,6 @@
 <attribute NAME="Chapter" VALUE="4"/>
 <cloud COLOR="#f0f0f0" SHAPE="ARC"/>
 <node TEXT="&#x30b9;&#x30bf;&#x30a4;&#x30eb;&#xff08;&#x53ca;&#x3073;&#x30ce;&#x30fc;&#x30c9;&#x30c6;&#x30f3;&#x30d7;&#x30ec;&#x30fc;&#x30c8;)" ID="ID_402718478" CREATED="1455910949024" MODIFIED="1455910949024" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="117.0 pt"/>
 <attribute NAME="Chapter" VALUE="4"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Definition" LAST="false"/>
@@ -10552,7 +10540,6 @@
   </body>
 </html>
 </richcontent>
-<attribute_layout NAME_WIDTH="61.5 pt" VALUE_WIDTH="117.0 pt"/>
 <attribute NAME="Chapter" VALUE="1,2"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Definition" LAST="false"/>
@@ -11120,7 +11107,6 @@
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="Method" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="51.0 pt" VALUE_WIDTH="51.0 pt"/>
 <attribute NAME="Chapter" VALUE="9"/>
 </node>
 <node TEXT="&#x8a72;&#x5f53;&#x30ce;&#x30fc;&#x30c9;&#x3092;&#x5168;&#x3066;&#x9078;&#x629e;" ID="ID_738746195" CREATED="1455910949064" MODIFIED="1455910949064" TEXT_SHORTENED="true">
@@ -11665,7 +11651,6 @@
 </node>
 </node>
 <node TEXT="&#x30c4; &#x30fc; &#x30eb;" STYLE_REF="MainMenu" FOLDED="true" ID="ID_210475551" CREATED="1455910949077" MODIFIED="1455910949077" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="27.75 pt" VALUE_WIDTH="57.75 pt"/>
 <attribute NAME="Chapter" VALUE="3,6,7,8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MainMenu" LAST="false"/>
@@ -12946,7 +12931,7 @@
 </hook>
 </node>
 <node TEXT="&#x6a19;&#x6e96;&#x30c6;&#x30f3;&#x30d7;&#x30ec;&#x30fc;&#x30c8;&#x30d5;&#x30a1;&#x30a4;&#x30eb;" FOLDED="true" ID="ID_1199778737" CREATED="1455910949099" MODIFIED="1455910949099" TEXT_SHORTENED="true">
-<node TEXT="standard.mm" ID="ID_95697114" CREATED="1455910949099" MODIFIED="1455910949099" TEXT_SHORTENED="true">
+<node TEXT="standard-1.6.mm" ID="ID_95697114" CREATED="1455910949099" MODIFIED="1455910949099" TEXT_SHORTENED="true">
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="OptionalValue" LAST="false"/>
 </hook>
@@ -13627,7 +13612,6 @@
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
 </hook>
-<attribute_layout NAME_WIDTH="34.5 pt" VALUE_WIDTH="34.5 pt"/>
 <attribute NAME="Chapter" VALUE="3,8"/>
 </node>
 </node>
@@ -13738,7 +13722,6 @@
 <node TEXT="" ID="ID_990360666" CREATED="1455910949183" MODIFIED="1455910949183">
 <hook NAME="SummaryNode"/>
 <node TEXT="&#x57fa;&#x672c;&#x52d5;&#x4f5c;" ID="ID_155279064" CREATED="1455910949103" MODIFIED="1455910949103" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="54.75 pt" VALUE_WIDTH="77.25 pt"/>
 <attribute NAME="Chapter" VALUE="8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
@@ -13806,7 +13789,6 @@
 <node TEXT="" ID="ID_247415093" CREATED="1455910949184" MODIFIED="1455910949184">
 <hook NAME="SummaryNode"/>
 <node TEXT="&#x30c7;&#x30fc;&#x30bf;&#x66f8;&#x5f0f;&#x306e;&#x8a2d;&#x5b9a;&#x3068;&#x89e3;&#x6790;" ID="ID_713876240" CREATED="1455910949104" MODIFIED="1455910949104" TEXT_SHORTENED="true">
-<attribute_layout NAME_WIDTH="34.5 pt" VALUE_WIDTH="111.75 pt"/>
 <attribute NAME="Chapter" VALUE="4,8"/>
 <hook NAME="NodeConditionalStyles">
     <conditional_style ACTIVE="true" STYLE_REF="MenuGroupLabel" LAST="false"/>
@@ -17848,7 +17830,6 @@
 <node TEXT="&#x5236;&#x9650;&#x4e8b;&#x9805;&#x3068;&#x65e2;&#x77e5;&#x306e;&#x30d0;&#x30b0;" FOLDED="true" ID="ID_1288924719" CREATED="1455910949150" MODIFIED="1455910949150">
 <edge STYLE="horizontal"/>
 <node TEXT="&#x30ce;&#x30fc;&#x30c9;&#x304c;&#x4ed6;&#x306e;&#x30ce;&#x30fc;&#x30c9;&#x306e;&#x30c6;&#x30ad;&#x30b9;&#x30c8;&#x306b;&#x91cd;&#x8907;&#x8868;&#x793a;" ID="ID_416103426" CREATED="1455910949150" MODIFIED="1455910949150" LINK="https://sourceforge.net/apps/mantisbt/freeplane/view.php?id=1210" TEXT_SHORTENED="true"/>
-<node TEXT="Flash player &#x306b;&#x3064;&#x3044;&#x3066;" ID="ID_470970220" CREATED="1455910949150" MODIFIED="1455910949150" LINK="https://sourceforge.net/projects/freeplane/forums/forum/758437/topic/4668966" TEXT_SHORTENED="true"/>
 </node>
 <node TEXT="&#x30de;&#x30c3;&#x30d7;&#xff0f;&#x30ce;&#x30fc;&#x30c9;&#x304c;&#x7de8;&#x96c6;&#x3067;&#x304d;&#x306a;&#x3044;" ID="ID_138844829" CREATED="1455910949150" MODIFIED="1455910949150" TEXT_SHORTENED="true"><richcontent TYPE="DETAILS">
 
diff --git a/freeplane/doc/freeplane_ru.mm b/freeplane/doc/freeplane_ru.mm
index 550ae51..ba837b1 100644
--- a/freeplane/doc/freeplane_ru.mm
+++ b/freeplane/doc/freeplane_ru.mm
@@ -227,14 +227,6 @@
 <edge WIDTH="thin"/>
 </node>
 </node>
-<node TEXT="David Butt" FOLDED="true" ID="ID_583760673" CREATED="1465678964149" MODIFIED="1465678964149" COLOR="#996600">
-<font NAME="SansSerif" SIZE="12"/>
-<edge WIDTH="thin"/>
-<node TEXT="&#x420;&#x443;&#x43a;&#x43e;&#x432;&#x43e;&#x434;&#x441;&#x442;&#x432;&#x43e; &#x43f;&#x43e; flash" ID="ID_1034653997" CREATED="1465678964149" MODIFIED="1465678964149" COLOR="#999999">
-<font NAME="Dialog" SIZE="10"/>
-<edge WIDTH="thin"/>
-</node>
-</node>
 <node TEXT="David Low" FOLDED="true" ID="ID_318141163" CREATED="1465678964149" MODIFIED="1465678964149" COLOR="#996600">
 <font NAME="SansSerif" SIZE="12"/>
 <edge WIDTH="thin"/>
diff --git a/freeplane/doc/freeplane_vi.mm b/freeplane/doc/freeplane_vi.mm
index 935a938..5b66f89 100644
--- a/freeplane/doc/freeplane_vi.mm
+++ b/freeplane/doc/freeplane_vi.mm
@@ -230,14 +230,6 @@
 <edge WIDTH="thin"/>
 </node>
 </node>
-<node TEXT="David Butt" FOLDED="true" ID="Freeplane_Link_1024053399" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#996600">
-<font NAME="Dialog" SIZE="12"/>
-<edge WIDTH="thin"/>
-<node TEXT="Tutorial flash" ID="ID_1916228448" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#999999">
-<font NAME="Dialog" SIZE="10"/>
-<edge WIDTH="thin"/>
-</node>
-</node>
 <node TEXT="David Low" FOLDED="true" ID="Freeplane_Link_226818637" CREATED="1124560950701" MODIFIED="1124560950701" COLOR="#996600">
 <font NAME="Dialog" SIZE="12"/>
 <edge WIDTH="thin"/>
diff --git a/freeplane/doc/history_en.txt b/freeplane/doc/history_en.txt
index 81d294d..fc7a1e1 100644
--- a/freeplane/doc/history_en.txt
+++ b/freeplane/doc/history_en.txt
@@ -1,4 +1,87 @@
 ===============================
+1.6.6
+===============================
+Bug fixes
+
+===============================
+1.6.5
+===============================
+Bug fix for edge color configuration
+Allow use of java9 in launcher
+
+===============================
+1.6.4
+===============================
+Bug fixes
+
+===============================
+1.6.3
+===============================
+Bug fixes
+Java 9 support
+REmoved broken export to flash 
+
+===============================
+1.6.2
+===============================
+Multi-columns icons tool bar
+"Close all maps" and "close all other maps" actions added to file menu
+Options to hide icons and connectors
+Option note icon in notes tool-tip
+Aligning current node on the left side, on the right side or on the center, hot keys alt+W (west), alt+E (east), alt+C (center)
+Option to move aligned node smoothly
+Option to define spotlight background color
+Copy single slides and complete presentations
+
+===============================
+1.6.1
+===============================
+SVG icons for map and UI
+Configurable map icon size
+Configurable UI icon size
+Paint clone node markers only on selected nodes
+Image in node without black border (no border)
+Option to hide connectors when filtering hides other connector end
+Independent presentation mode for different map views
+Configurable clone marks
+Configurable standard cloud shape
+Action for showing next presentation item without folding other nodes
+Improved presentation panel
+Optional presentation automatics "processesUpDownKeys", "switchToFullScreen", "switchToPresentationMode"
+Increased sensitive area for image scaling
+No special treatment for white space nodes when content is copied to text
+Option to paste images from files
+Dragged and dropped files are copied into directory mindmap_files/ if CONTROL key is pressed
+
+===============================
+1.6.0
+===============================
+Configurable node border widths
+Configurable node border colors
+Configurable edge line type
+Configurable node border line type
+Configurable standard for connector arrows
+Configurable standard for connector line types 
+Presentations
+Export for java web start
+Editor dialog for automatic edge colors
+
+===============================
+1.5.21
+===============================
+MacOS version with embedded Java 1.8.0_121
+Workaround for Windows 10 "Creators update" bug
+
+===============================
+1.5.20
+===============================
+Bug fixes
+Export for java web start
+Security fix related to scripts and formulas
+Security fix related to loading of mind map files
+Change short cuts for MacOS to avoid collisions
+
+===============================
 1.5.18
 ===============================
 Bug fixes
@@ -54,6 +137,7 @@ Restore old default map template
 1.5.10
 ===============================
 Stable release
+
 ===============================
 1.5.9
 ===============================
diff --git a/freeplane/doc/whatsNew-1.5.x.mm b/freeplane/doc/whatsNew-1.5.x.mm
index b182fdb..0b3475f 100644
--- a/freeplane/doc/whatsNew-1.5.x.mm
+++ b/freeplane/doc/whatsNew-1.5.x.mm
@@ -233,7 +233,7 @@
       even <i>centered</i> can be set at
     </p>
     <p>
-      <i>Properties panel→"Format"-Tab→ </i>
+      <i>Tool panel→"Format"-Tab→ </i>
     </p>
     <p>
       <i>Font of whole core→Text Alignment</i>
@@ -267,7 +267,7 @@
 </node>
 </node>
 <node TEXT="Make data formatting, formula processing and&#xa;LaTeX rendering independently configurable" LOCALIZED_STYLE_REF="AutomaticLayout.level,2" ID="ID_856820716" CREATED="1462715833432" MODIFIED="1463415982669"/>
-<node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      Distance between child nodes can be set in&#xa;    </p>&#xa;    <p>&#xa;      <i>Properties panel</i>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="AutomaticLayout.level,2" FOLDED="true" ID="ID_1931822867" CREATED="1462715833364" MODIFIED="1464625570007" VGAP_QUANTITY="1.0 pt">
+<node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      Distance between child nodes can be set in&#xa;    </p>&#xa;    <p>&#xa;      <i>Tool panel</i>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="AutomaticLayout.level,2" FOLDED="true" ID="ID_1931822867" CREATED="1462715833364" MODIFIED="1464625570007" VGAP_QUANTITY="1.0 pt">
 <edge WIDTH="1"/>
 <node TEXT="child 1" ID="ID_701167941" CREATED="1462806840153" MODIFIED="1464625618545"/>
 <node LOCALIZED_STYLE_REF="AutomaticLayout.level,3" ID="ID_1372995988" CREATED="1462806854891" MODIFIED="1463594171391" VGAP_QUANTITY="20.0 pt"><richcontent TYPE="NODE">
@@ -281,7 +281,7 @@
       the gap between childs can be set at
     </p>
     <p>
-      <i>Properties panel→Node shape→Child gap</i>
+      <i>Tool panel→Node shape→Child gap</i>
     </p>
     <p>
       
@@ -374,7 +374,7 @@
   </head>
   <body>
     <p>
-      Freeplane now offers several options to automate the edge coloring! See the <i>Properties panel</i> for more!
+      Freeplane now offers several options to automate the edge coloring! See the <i>Tool panel</i> for more!
     </p>
   </body>
 </html>
@@ -383,7 +383,7 @@
 </node>
 </node>
 <node TEXT="Column based edge colors" LOCALIZED_STYLE_REF="AutomaticLayout.level,2" FOLDED="true" ID="ID_1357352160" CREATED="1462715833408" MODIFIED="1463415941407">
-<node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      ...can be set in the <i>Properties panel</i>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="AutomaticLayout.level,3" ID="ID_520840991" CREATED="1462807191385" MODIFIED="1463594294193">
+<node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      ...can be set in the <i>Tool panel</i>&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="AutomaticLayout.level,3" ID="ID_520840991" CREATED="1462807191385" MODIFIED="1463594294193">
 <hook NAME="AlwaysUnfoldedNode"/>
 <node TEXT="Every column (count of shapes and distance from root) can have its own colors.&#xa; &#xa;Try it out:&#xa;Play with the different options offered. You also can manually change it, like it did happen for this node." LOCALIZED_STYLE_REF="AutomaticLayout.level,3" ID="ID_1808930284" CREATED="1462807205113" MODIFIED="1463413022153" TEXT_ALIGN="LEFT" MAX_WIDTH="216.0 pt" MIN_WIDTH="216.0 pt">
 <edge WIDTH="13"/>
@@ -401,7 +401,7 @@
       New Node shapes can be set in the
     </p>
     <p>
-      <i>Properties panel</i>
+      <i>Tool panel</i>
     </p>
   </body>
 </html>
@@ -427,7 +427,7 @@
       To get in size uniformly shaped nodes, switch ON "<i>Uniform</i>" option on the 
     </p>
     <p>
-      <i>Properties panel→Node shape</i> section
+      <i>Tool panel→Node shape</i> section
     </p>
     <p>
       
@@ -449,7 +449,6 @@
 </node>
 </node>
 <node TEXT="<html>&#xa;  <head>&#xa;    &#xa;  </head>&#xa;  <body>&#xa;    <p>&#xa;      Use new style &quot;<i>attributes</i>&quot; for&#xa;    </p>&#xa;    <p>&#xa;      attribute formatting&#xa;    </p>&#xa;  </body>&#xa;</html>" LOCALIZED_STYLE_REF="AutomaticLayout.level,2" FOLDED="true" ID="ID_698058179" CREATED="1462715806875" MODIFIED="1463594352254">
-<attribute_layout NAME_WIDTH="58.8 pt" VALUE_WIDTH="58.8 pt"/>
 <node LOCALIZED_STYLE_REF="AutomaticLayout.level,3" ID="ID_574796375" CREATED="1462715723949" MODIFIED="1464026364006" TEXT_ALIGN="LEFT"><richcontent TYPE="NODE">
 
 <html>
@@ -467,13 +466,12 @@
       To edit the "<i>attribute</i>"-style, press CTRL+F11 or head to the <i>Format→Manage styles</i> menu and click on <i>Edit styles</i>.
     </p>
     <p>
-      There, choose the node "<i>attributes</i>" and adjust this style as you like in the <i>Properties panel</i>
+      There, choose the node "<i>attributes</i>" and adjust this style as you like in the <i>Tool panel</i>
     </p>
   </body>
 </html>
 
 </richcontent>
-<attribute_layout NAME_WIDTH="108.6 pt" VALUE_WIDTH="151.79999999999998 pt"/>
 <attribute NAME="Edge Color is set to" VALUE="808080" OBJECT="org.freeplane.features.format.FormattedNumber|808080"/>
 <attribute NAME="Text Color is set to" VALUE="CCCCCC"/>
 </node>
@@ -505,7 +503,7 @@
   </head>
   <body>
     <p>
-      When you define a custom Node style for a single node and then create a sibling, the new sibling will have the Node style which is defined at <i>Properties panel</i> and not your freshly defined one.
+      When you define a custom Node style for a single node and then create a sibling, the new sibling will have the Node style which is defined at <i>Tool panel</i> and not your freshly defined one.
     </p>
     <p>
       
diff --git a/freeplane/external-resources/templates/BigMap.mm b/freeplane/external-resources/templates/BigMap.mm
index b118ef9..b3c57d2 100644
--- a/freeplane/external-resources/templates/BigMap.mm
+++ b/freeplane/external-resources/templates/BigMap.mm
@@ -1,14 +1,15 @@
-<map version="freeplane 1.5.3">
+<map version="freeplane 1.6.0">
 <!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
 <node LOCALIZED_TEXT="new_mindmap">
 <hook NAME="MapStyle">
+<properties edgeColorConfiguration="#808080ff,#000000ff,#ff0033ff,#009933ff,#3333ffff,#ff6600ff,#cc00ccff,#ffbf00ff,#00ff99ff,#0099ffff,#996600ff,#000000ff,#cc0066ff,#33ff00ff,#ff9999ff,#0000ccff,#cccc00ff,#0099ccff,#006600ff,#ff00ccff,#00cc00ff,#0066ccff,#00ffffff"/>
 <map_styles>
 <stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" UNIFORM_SHAPE="true" VGAP_QUANTITY="24 pt"  TEXT_SHORTENED="true">
 <font SIZE="24"/>
 <richcontent TYPE="DETAILS" LOCALIZED_HTML="styles_background_html"/>
 <stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
 <font SIZE="9"/>
-<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="bubble" SHAPE_VERTICAL_MARGIN="0.0 pt" TEXT_ALIGN="CENTER" MAX_WIDTH_QUANTITY="120.0 pt" MIN_WIDTH_QUANTITY="120.0 pt">
+<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="bubble" SHAPE_VERTICAL_MARGIN="0.0 pt" TEXT_ALIGN="CENTER" MAX_WIDTH_QUANTITY="120.0 pt" MIN_WIDTH_QUANTITY="120.0 pt" ICON_SIZE="12.0 pt">
 <font NAME="Arial" SIZE="9" BOLD="true" ITALIC="false"/>
 <edge STYLE="bezier" WIDTH="3"/>
 </stylenode>
@@ -38,72 +39,6 @@
 <font SIZE="24" ITALIC="true"/>
 <edge STYLE="bezier" WIDTH="3"/>
 </stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1">
-<edge COLOR="#000000"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2">
-<edge COLOR="#ff0033"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3">
-<edge COLOR="#009933"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4">
-<edge COLOR="#3333ff"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,5">
-<edge COLOR="#ff6600"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,6">
-<edge COLOR="#cc00cc"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,7">
-<edge COLOR="#ffbf00"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,8">
-<edge COLOR="#00ff99"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,9">
-<edge COLOR="#0099ff"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,10">
-<edge COLOR="#996600"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,11">
-<edge COLOR="#000000"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,12">
-<edge COLOR="#cc0066"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,13">
-<edge COLOR="#33ff00"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,14">
-<edge COLOR="#ff9999"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,15">
-<edge COLOR="#0000cc"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,16">
-<edge COLOR="#cccc00"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,17">
-<edge COLOR="#0099cc"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,18">
-<edge COLOR="#006600"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,19">
-<edge COLOR="#ff00cc"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,20">
-<edge COLOR="#00cc00"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,21">
-<edge COLOR="#0066cc"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,22">
-<edge COLOR="#00ffff"/>
-</stylenode>
 </stylenode>
 </stylenode>
 </map_styles>
diff --git a/freeplane/external-resources/templates/conceptMap.mm b/freeplane/external-resources/templates/conceptMap.mm
index 4f36b90..243d7da 100644
--- a/freeplane/external-resources/templates/conceptMap.mm
+++ b/freeplane/external-resources/templates/conceptMap.mm
@@ -2,6 +2,7 @@
 <!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
 <node TEXT="New Concept Map" STYLE="oval">
 <hook NAME="MapStyle" max_node_width="600">
+<properties edgeColorConfiguration="#808080ff,#ff0000ff,#0000ffff,#00ff00ff,#ff00ffff,#00ffffff,#7c0000ff,#00007cff,#007c00ff,#7c007cff,#007c7cff,#7c7c00ff"/>
     <conditional_styles>
         <conditional_style ACTIVE="true" LOCALIZED_STYLE_REF="styles.connection">
             <node_periodic_level_condition PERIOD="2" REMAINDER="1"/>
@@ -19,7 +20,7 @@
 	<map_styles>
 		<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="circle" >
 		<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
-		<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork">
+		<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork" ICON_SIZE="12.0 pt">
 		<font NAME="Arial" SIZE="10" BOLD="false" ITALIC="false"/>
 		</stylenode>
 		<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
diff --git a/freeplane/external-resources/templates/essay.mm b/freeplane/external-resources/templates/essay.mm
index a8e73aa..3b0566a 100644
--- a/freeplane/external-resources/templates/essay.mm
+++ b/freeplane/external-resources/templates/essay.mm
@@ -2,10 +2,11 @@
 <!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
 <node LOCALIZED_TEXT="new_mindmap" STYLE="oval" ID="ID_1723255651" CREATED="1283093380553" MODIFIED="1283093380553">
 <hook NAME="MapStyle" max_node_width="600">
+<properties edgeColorConfiguration="#808080ff,#ff0000ff,#0000ffff,#00ff00ff,#ff00ffff,#00ffffff,#7c0000ff,#00007cff,#007c00ff,#7c007cff,#007c7cff,#7c7c00ff"/>
 <map_styles>
 <stylenode LOCALIZED_TEXT="styles.root_node" STYLE="circle" >
 <stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
-<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork">
+<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork" ICON_SIZE="12.0 pt">
 <font NAME="SansSerif" SIZE="10" BOLD="false" ITALIC="false"/>
 </stylenode>
 <stylenode LOCALIZED_TEXT="defaultstyle.details"/>
diff --git a/freeplane/external-resources/templates/standard-1.6-noEdgeColor.mm b/freeplane/external-resources/templates/standard-1.6-noEdgeColor.mm
new file mode 100644
index 0000000..2b90be4
--- /dev/null
+++ b/freeplane/external-resources/templates/standard-1.6-noEdgeColor.mm
@@ -0,0 +1,69 @@
+<map version="freeplane 1.6.0">
+<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
+<node LOCALIZED_TEXT="new_mindmap" STYLE="oval">
+<font SIZE="18"/>
+<hook NAME="MapStyle">
+<properties edgeColorConfiguration="#808080ff,#ff0000ff,#0000ffff,#00ff00ff,#ff00ffff,#00ffffff,#7c0000ff,#00007cff,#007c00ff,#7c007cff,#007c7cff,#7c7c00ff"/>
+<map_styles>
+<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" SHAPE_VERTICAL_MARGIN="12.0 pt" SHAPE_HORIZONTAL_MARGIN="6.0 pt" >
+<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
+<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork">
+<font NAME="SansSerif" SIZE="10" BOLD="false" ITALIC="false"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.note" COLOR="#000000" BACKGROUND_COLOR="#ffffff" TEXT_ALIGN="LEFT" />
+<stylenode LOCALIZED_TEXT="defaultstyle.floating">
+<edge STYLE="hide_edge"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right">
+<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.important">
+<icon BUILTIN="yes"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right">
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000" STYLE="oval" SHAPE_VERTICAL_MARGIN="10.0 pt" SHAPE_HORIZONTAL_MARGIN="10.0 pt" >
+<font SIZE="18"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
+<font SIZE="16"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
+<font SIZE="14"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
+<font SIZE="12"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
+<font SIZE="10"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,5">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,6">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,7">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,8">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,9">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,10">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,11">
+</stylenode>
+</stylenode>
+</stylenode>
+</map_styles>
+</hook>
+</node>
+</map>
diff --git a/freeplane/external-resources/templates/standard-1.6.mm b/freeplane/external-resources/templates/standard-1.6.mm
new file mode 100644
index 0000000..2512973
--- /dev/null
+++ b/freeplane/external-resources/templates/standard-1.6.mm
@@ -0,0 +1,70 @@
+<map version="freeplane 1.6.0">
+<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
+<node LOCALIZED_TEXT="new_mindmap" STYLE="oval">
+<font SIZE="18"/>
+<hook NAME="MapStyle">
+<properties edgeColorConfiguration="#808080ff,#ff0000ff,#0000ffff,#00ff00ff,#ff00ffff,#00ffffff,#7c0000ff,#00007cff,#007c00ff,#7c007cff,#007c7cff,#7c7c00ff"/>
+<map_styles>
+<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" SHAPE_VERTICAL_MARGIN="12.0 pt" SHAPE_HORIZONTAL_MARGIN="6.0 pt" >
+<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
+<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork" ICON_SIZE="12.0 pt">
+<font NAME="SansSerif" SIZE="10" BOLD="false" ITALIC="false"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
+<stylenode LOCALIZED_TEXT="defaultstyle.note" COLOR="#000000" BACKGROUND_COLOR="#ffffff" TEXT_ALIGN="LEFT" />
+<stylenode LOCALIZED_TEXT="defaultstyle.floating">
+<edge STYLE="hide_edge"/>
+<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right">
+<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
+<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.important">
+<icon BUILTIN="yes"/>
+</stylenode>
+</stylenode>
+<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right">
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000" STYLE="oval" SHAPE_VERTICAL_MARGIN="10.0 pt" SHAPE_HORIZONTAL_MARGIN="10.0 pt" >
+<font SIZE="18"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
+<font SIZE="16"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
+<font SIZE="14"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
+<font SIZE="12"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
+<font SIZE="10"/>
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,5">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,6">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,7">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,8">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,9">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,10">
+</stylenode>
+<stylenode LOCALIZED_TEXT="AutomaticLayout.level,11">
+</stylenode>
+</stylenode>
+</stylenode>
+</map_styles>
+</hook>
+<hook NAME="AutomaticEdgeColor"  COUNTER="0" RULE="ON_BRANCH_CREATION"/>
+</node>
+</map>
diff --git a/freeplane/external-resources/templates/standard.mm b/freeplane/external-resources/templates/standard.mm
deleted file mode 100644
index 64a1ffc..0000000
--- a/freeplane/external-resources/templates/standard.mm
+++ /dev/null
@@ -1,80 +0,0 @@
-<map version="freeplane 1.5.3">
-<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
-<node LOCALIZED_TEXT="new_mindmap" STYLE="oval">
-<font SIZE="18"/>
-<hook NAME="MapStyle">
-<map_styles>
-<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval" SHAPE_VERTICAL_MARGIN="12.0 pt" SHAPE_HORIZONTAL_MARGIN="6.0 pt" >
-<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
-<stylenode LOCALIZED_TEXT="default" COLOR="#000000" STYLE="fork">
-<font NAME="SansSerif" SIZE="10" BOLD="false" ITALIC="false"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="defaultstyle.details"/>
-<stylenode LOCALIZED_TEXT="defaultstyle.note" COLOR="#000000" BACKGROUND_COLOR="#ffffff" TEXT_ALIGN="LEFT" />
-<stylenode LOCALIZED_TEXT="defaultstyle.floating">
-<edge STYLE="hide_edge"/>
-<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
-</stylenode>
-</stylenode>
-<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right">
-<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
-<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
-<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
-<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="styles.important">
-<icon BUILTIN="yes"/>
-</stylenode>
-</stylenode>
-<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right">
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root" COLOR="#000000" STYLE="oval" SHAPE_VERTICAL_MARGIN="10.0 pt" SHAPE_HORIZONTAL_MARGIN="10.0 pt" >
-<font SIZE="18"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1" COLOR="#0033ff">
-<font SIZE="16"/>
-<edge COLOR="#ff0000"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
-<font SIZE="14"/>
-<edge COLOR="#0000ff"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
-<font SIZE="12"/>
-<edge COLOR="#00ff00"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
-<font SIZE="10"/>
-<edge COLOR="#ff00ff"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,5">
-<edge COLOR="#00ffff"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,6">
-<edge COLOR="#7c0000"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,7">
-<edge COLOR="#00007c"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,8">
-<edge COLOR="#007c00"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,9">
-<edge COLOR="#7c007c"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,10">
-<edge COLOR="#007c7c"/>
-</stylenode>
-<stylenode LOCALIZED_TEXT="AutomaticLayout.level,11">
-<edge COLOR="#7c7c00"/>
-</stylenode>
-</stylenode>
-</stylenode>
-</map_styles>
-</hook>
-<hook NAME="AutomaticEdgeColor"  COUNTER="0" RULE="ON_BRANCH_CREATION"/>
-</node>
-</map>
diff --git a/freeplane/external-resources/xml/browsemodemenu.xml b/freeplane/external-resources/xml/browsemodemenu.xml
deleted file mode 100644
index 5ff3207..0000000
--- a/freeplane/external-resources/xml/browsemodemenu.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<FreeplaneUIEntries>
-	<Entry builder="main_menu">
-		<Entry name="file">
-			<Entry name="lastOpenedMaps">
-				<Entry builder="lastOpenedMaps" />
-			</Entry>
-			<Entry name="PageAction" />
-			<Entry name="PrintPreviewAction" />
-			<Entry accelerator="control P" name="PrintAction" />
-			<Entry name="FilePropertiesAction" />
-			<Entry accelerator="control W" name="CloseAction" />
-			<Entry accelerator="control Q" name="QuitAction" builder="MB_QuitAction" />
-		</Entry>
-		<Entry name="edit">
-			<Entry name="menu_extensions">
-				<Entry name="SetShortenerStateAction" />
-			</Entry>
-			<Entry name="menu_copy">
-				<Entry accelerator="control C" name="CopyAction" />
-				<Entry accelerator="control shift C" name="CopySingleAction" />
-			</Entry>
-			<Entry name="find">
-				<Entry accelerator="control G" name="FindAction" />
-				<Entry name="FindNextAction"  accelerator="control shift G" />
-				<Entry name="FindPreviousAction" />
-			</Entry>
-		</Entry>
-		<Entry name="view">
-			<Entry name="toolbars">
-				<Entry name="ToggleMenubarAction" builder="MB_ToggleMenubarAction" />
-				<Entry name="ToggleToolbarAction" />
-				<Entry name="ShowFilterToolbarAction" accelerator="control F" />
-				<Entry name="ToggleScrollbarsAction" />
-			</Entry>
-			<Entry name="zoom">
-				<Entry accelerator="alt UP" name="ZoomInAction" />
-				<Entry accelerator="alt DOWN" name="ZoomOutAction" />
-				<Entry accelerator="alt C" name="CenterSelectedNodeAction" />
-			</Entry>
-			<Entry name="menu_viewmode">
-				<Entry name="ViewLayoutTypeAction.OUTLINE" />
-				<Entry name="ShowSelectionAsRectangleAction" />
-			</Entry>
-			<Entry name="menu_hoverView">
-				<Entry accelerator="alt F2" name="ToggleDetailsAction" />
-				<Entry name="SetBooleanPropertyAction.show_node_tooltips" />
-			</Entry>
-			<Entry builder="radio_button_group" name="menu_displayAttributes">
-				<Entry name="ShowSelectedAttributesAction" />
-				<Entry name="ShowAllAttributesAction" />
-				<Entry name="HideAllAttributesAction" />
-				<Entry name="SetBooleanMapPropertyAction.show_icon_for_attributes" />
-			</Entry>
-		</Entry>
-		<Entry name="navigate">
-			<Entry name="navigate">
-				<Entry accelerator="control shift TAB" name="NavigationPreviousMapAction" />
-				<Entry accelerator="control TAB" name="NavigationNextMapAction" />
-				<Entry name="fold">
-					<Entry accelerator="SPACE" name="ToggleFoldedAction" />
-					<Entry name="ShowNextChildAction" accelerator="shift SPACE" />
-					<Entry accelerator="control SPACE" name="ToggleChildrenFoldedAction" />
-					<Entry accelerator="alt PAGE_DOWN" name="UnfoldOneLevelAction" />
-					<Entry accelerator="alt PAGE_UP" name="FoldOneLevelAction" />
-					<Entry accelerator="alt END" name="UnfoldAllAction" />
-					<Entry accelerator="alt HOME" name="FoldAllAction" />
-				</Entry>
-			</Entry>
-			<Entry accelerator="ESCAPE" name="MoveToRootAction" />
-			<Entry name="GotoNodeAction" />
-			<Entry accelerator="control alt LEFT" name="NextNodeAction.BACK" />
-			<Entry accelerator="control alt RIGHT" name="NextNodeAction.FORWARD" />
-			<Entry accelerator="control alt shift LEFT" name="NextNodeAction.BACK_N_FOLD" />
-			<Entry accelerator="control alt shift RIGHT" name="NextNodeAction.FORWARD_N_FOLD" />
-			<Entry name="NextPresentationItemAction" />
-			<Entry name="links">
-				<Entry accelerator="control ENTER" name="FollowLinkAction" />
-			</Entry>
-		</Entry>
-		<Entry name="filter">
-			<Entry name="UndoFilterAction" />
-			<Entry name="RedoFilterAction" />
-			<Entry name="ReapplyFilterAction" />
-			<Entry name="QuickFilterAction" />
-			<Entry name="ApplySelectedViewConditionAction" />
-			<Entry name="QuickFindAllAction" />
-			<Entry name="ApplyNoFilteringAction" />
-			<Entry name="EditFilterAction" />
-			<Entry builder="separator" />
-			<Entry name="ShowAncestorsAction" />
-			<Entry name="ShowDescendantsAction" />
-			<Entry name="ApplyToVisibleAction" />
-			<Entry builder="separator" />
-			<Entry name="QuickHighlightAction" />
-			<Entry name="QuickFindAction.BACK" />
-			<Entry name="QuickFindAction.FORWARD" />
-		</Entry>
-		<Entry name="extras">
-			<Entry name="EnterPassword" />
-		</Entry>
-		<Entry name="mindmaps">
-			<Entry name="modes" builder="navigate_modes,radio_button_group" />
-			<Entry builder="separator" />
-			<Entry name="maps" processOnPopup="true">
-				<Entry builder="navigate_maps,radio_button_group" />
-			</Entry>
-			<Entry builder="separator" />
-		</Entry>
-		<Entry name="help">
-			<Entry name="web_resources">
-				<Entry name="OpenFreeplaneSiteAction" />
-				<Entry name="AskForHelp" />
-				<Entry name="ReportBugAction" />
-				<Entry name="RequestFeatureAction" />
-			</Entry>
-			<Entry name="AboutAction"/>
-			<Entry name="GettingStartedAction" />
-			<Entry accelerator="F1" name="DocumentationAction" />
-		</Entry>
-	</Entry>
-	<Entry name="map_popup" builder="map_popup" processOnPopup="true">
-		<Entry builder="navigate_maps,radio_button_group" />
-		<Entry builder="separator" />
-		<Entry name="ToggleMenubarAction" />
-		<Entry name="ToggleToolbarAction" />
-		<Entry name="ShowFilterToolbarAction" />
-		<Entry name="ToggleScrollbarsAction" />
-		<Entry name="ViewLayoutTypeAction.OUTLINE" />
-		<Entry name="SetBooleanPropertyAction.presentation_mode" />
-		<Entry name="CenterSelectedNodeAction" />
-		<Entry name="MoveToRootAction" accelerator="ESCAPE" />
-		<Entry name="GotoNodeAction" />
-	</Entry>
-	<Entry name="node_popup" builder="node_popup">
-		<Entry name="SetShortenerStateAction" />
-		<Entry name="EnterPassword" />
-		<Entry name="CopyAction" accelerator="control C" />
-		<Entry name="CopySingleAction" accelerator="control shift C" />
-	</Entry>
-	<Entry name="main_toolbar" builder="toolbar,ignore">
-		<Entry name="main">
-			<Entry name="NavigationPreviousMapAction" />
-			<Entry name="NavigationNextMapAction" />
-		</Entry>
-		<Entry builder="main_toolbar_zoom" name="zoom" />
-		<Entry name="open">
-			<Entry name="PrintAction" />
-			<Entry name="CloseAction" />
-		</Entry>
-		<Entry name="paste">
-			<Entry name="CopyAction" />
-		</Entry>
-		<Entry name="folding">
-			<Entry name="UnfoldOneLevelAction" />
-			<Entry name="FoldOneLevelAction" />
-			<Entry name="UnfoldAllAction" />
-			<Entry name="FoldAllAction" />
-		</Entry>
-		<Entry name="url" builder="main_toolbar_url" />
-	</Entry>
-</FreeplaneUIEntries>
diff --git a/freeplane/external-resources/xml/filemodemenu.xml b/freeplane/external-resources/xml/filemodemenu.xml
index 9012a95..492aa26 100644
--- a/freeplane/external-resources/xml/filemodemenu.xml
+++ b/freeplane/external-resources/xml/filemodemenu.xml
@@ -20,21 +20,28 @@
 			</Entry>
 		</Entry>
 		<Entry name="view">
-			<Entry name="toolbars">
+			<Entry name="controls">
 				<Entry name="ToggleMenubarAction" builder="MB_ToggleMenubarAction" />
 				<Entry name="ToggleToolbarAction" />
 				<Entry name="ShowFilterToolbarAction" accelerator="control F" />
 				<Entry name="ToggleScrollbarsAction" />
-				<Entry name="SetBooleanPropertyAction.presentation_mode" />
+				<Entry name="SetBooleanPropertyAction.spotlight" />
 			</Entry>
 			<Entry name="zoom">
 				<Entry accelerator="alt UP" name="ZoomInAction" />
 				<Entry accelerator="alt DOWN" name="ZoomOutAction" />
-				<Entry accelerator="alt C" name="CenterSelectedNodeAction" />
 			</Entry>
 			<Entry name="menu_viewmode">
 				<Entry name="ViewLayoutTypeAction.OUTLINE" />
 				<Entry name="ShowSelectionAsRectangleAction" />
+				<Entry name="SetBooleanPropertyAction.show_icons" />
+				<Entry name="SetBooleanPropertyAction.show_connectors" />
+				<Entry name="SetBooleanPropertyAction.hide_single_end_connectors" />
+				<Entry name="SetBooleanPropertyAction.show_note_icon_in_tooltip" />
+				<Entry accelerator="alt W" name="MoveSelectedNodeAction.WEST" />
+				<Entry accelerator="alt C" name="MoveSelectedNodeAction.CENTER" />
+				<Entry accelerator="alt E" name="MoveSelectedNodeAction.EAST" />
+				<Entry name="SetBooleanPropertyAction.slow_scroll_selected_node" />
 			</Entry>
 		</Entry>
 		<Entry name="navigate">
@@ -97,7 +104,6 @@
 		<Entry name="ShowFilterToolbarAction" />
 		<Entry name="ToggleScrollbarsAction" />
 		<Entry name="ViewLayoutTypeAction.OUTLINE" />
-		<Entry name="CenterSelectedNodeAction" />
 		<Entry accelerator="ESCAPE" name="MoveToRootAction" />
 	</Entry>
 	<Entry name="node_popup" builder="node_popup">
diff --git a/freeplane/external-resources/xml/mindmapmodemenu.xml b/freeplane/external-resources/xml/mindmapmodemenu.xml
index ce0037c..0c75691 100644
--- a/freeplane/external-resources/xml/mindmapmodemenu.xml
+++ b/freeplane/external-resources/xml/mindmapmodemenu.xml
@@ -28,9 +28,9 @@
 		</Entry>
 		<Entry builder="separator" />
 		<Entry name="font">
-			<Entry name="toolbar_styles" builder="main_toolbar_style" />
-			<Entry name="toolbar_fonts" builder="main_toolbar_font_name" />
-			<Entry name="toolbar_fonts" builder="main_toolbar_font_size" />
+			<Entry builder="main_toolbar_style" />
+			<Entry builder="main_toolbar_font_name" />
+			<Entry builder="main_toolbar_font_size" />
 			<Entry name="BoldAction" />
 			<Entry name="ItalicAction" />
 		</Entry>
@@ -95,6 +95,8 @@
 			<Entry builder="separator" />
 			<Entry name="FilePropertiesAction" />
 			<Entry builder="separator" />
+			<Entry name="CloseAllMapsAction" />
+			<Entry name="CloseAllOtherMapsAction" />
 			<Entry name="CloseAction" accelerator="control W" />
 			<Entry builder="separator" />
 			<Entry name="QuitAction" accelerator="control Q" builder="removeOnMac" />
@@ -140,7 +142,7 @@
 			</Entry>
 			<Entry name="icons">
 				<Entry name="IconSelectionPlugin" accelerator="control F2" />
-				<Entry name="icons">
+				<Entry name="menu_iconByCategory">
 					<Entry builder="icon_actions" />
 				</Entry>
 				<Entry name="progress">
@@ -232,7 +234,7 @@
 		</Entry>
 		<Entry name="view">
 			<Entry name="NewMapViewAction" />
-			<Entry name="toolbars">
+			<Entry name="controls">
 				<Entry name="ToggleMenubarAction" builder="removeOnMac" />
 				<Entry name="ToggleToolbarAction" />
 				<Entry name="ShowFilterToolbarAction" accelerator="control F" />
@@ -251,10 +253,17 @@
 			<Entry name="menu_viewmode">
 				<Entry name="ViewLayoutTypeAction.OUTLINE" />
 				<Entry name="ToggleFullScreenAction" accelerator="F11" />
-				<Entry name="SetBooleanPropertyAction.presentation_mode" />
+				<Entry name="SetBooleanMapViewPropertyAction.spotlight" />
+				<Entry name="SetBooleanPropertyAction.show_icons" />
+				<Entry name="SetBooleanPropertyAction.show_connectors" />
+				<Entry name="SetBooleanPropertyAction.hide_single_end_connectors" />
+				<Entry name="SetBooleanPropertyAction.show_note_icon_in_tooltip" />
 				<Entry name="ShowSelectionAsRectangleAction" />
 				<Entry name="SetBooleanPropertyAction.highlight_formulas" />
-				<Entry name="CenterSelectedNodeAction" accelerator="alt C" />
+				<Entry accelerator="alt W" name="MoveSelectedNodeAction.WEST" />
+				<Entry accelerator="alt C" name="MoveSelectedNodeAction.CENTER" />
+				<Entry accelerator="alt E" name="MoveSelectedNodeAction.EAST" />
+				<Entry name="SetBooleanPropertyAction.slow_scroll_selected_node" />
 				<Entry name="SetBooleanPropertyAction.center_selected_node" />
 			</Entry>
 			<Entry builder="separator" />
@@ -384,6 +393,17 @@
 				<Entry name="RemoveAllAlwaysUnfoldedNodeFlagsAction" />
 				<Entry name="AlwaysUnfoldedNodeAction" />
 			</Entry>
+			<Entry name="presentation">
+				<Entry name="StartPresentationOrShowNextSlideAction" accelerator="F5"/>
+				<Entry name="ShowFirstSlideAndStartPresentationAction"/>
+				<Entry name="StartPresentationAction" />
+				<Entry name="StopPresentationAction" accelerator="shift F5" />
+				<Entry name="ShowFirstSlideAction"/>
+				<Entry name="ShowPreviousSlideAction" accelerator="control F5"/>
+				<Entry name="ShowNextSlideAction" />
+				<Entry name="ShowLastSlideAction"/>
+				<Entry name="ShowLastSlideAction"/>
+			</Entry>
 			<Entry builder="separator" />
 			<Entry name="SelectAllAction" accelerator="control A" />
 			<Entry name="SelectBranchAction" accelerator="control shift A" />
@@ -394,6 +414,7 @@
 			<Entry name="NextNodeAction.FORWARD" accelerator="control alt RIGHT" />
 			<Entry name="NextNodeAction.BACK_N_FOLD" accelerator="control shift LEFT" />
 			<Entry name="NextNodeAction.FORWARD_N_FOLD" accelerator="control shift RIGHT" />
+			<Entry name="NotFoldingNextPresentationItemAction" accelerator="control alt SPACE" />
 			<Entry name="NextPresentationItemAction" accelerator="control shift SPACE" />
 			<Entry name="BackAction" accelerator="alt LEFT" />
 			<Entry name="ForwardAction" accelerator="alt RIGHT" />
@@ -471,7 +492,6 @@
 			<Entry builder="separator" />
 			<Entry name="web_resources">
 				<Entry name="OpenFreeplaneSiteAction" />
-				<Entry name="WebDocuAction" />
 				<Entry name="AskForHelp" />
 				<Entry name="ReportBugAction" />
 				<Entry name="RequestFeatureAction" />
@@ -482,7 +502,6 @@
 			<Entry name="GettingStartedAction" accelerator="F1" />
 			<Entry name="WhatsNewAction" />
 			<Entry name="DocumentationAction" />
-			<Entry name="OnlineReference" />
 			<Entry name="HotKeyInfoAction" />
 			<Entry builder="separator" />
 		</Entry>
@@ -506,7 +525,7 @@
 		<Entry builder="separator" />
 		<Entry name="ViewLayoutTypeAction.OUTLINE" />
 		<Entry name="FitToPage" />
-		<Entry name="CenterSelectedNodeAction" />
+		<Entry name="MoveSelectedNodeAction.CENTER" />
 		<Entry name="MoveToRootAction" accelerator="ESCAPE" />
 		<Entry name="GotoNodeAction" />
 	</Entry>
diff --git a/freeplane/external-resources/xml/preferences.xml b/freeplane/external-resources/xml/preferences.xml
index e5937a6..7297374 100644
--- a/freeplane/external-resources/xml/preferences.xml
+++ b/freeplane/external-resources/xml/preferences.xml
@@ -82,11 +82,13 @@
 		<tab name="Appearance">
 			<separator name="look_and_feel">
 				<group name="lookandfeel" />
-				<number name="user_defined_screen_resolution" min="36" max="1200" />
+				<number name="monitor_size_inches" min="1" max="200" step="0.1" />
 				<boolean name="lookandfeel.scaleuifonts" />
 				<boolean name="resources_use_default_font_for_notes_too" />
 				<boolean name="resources_use_margin_top_zero_for_notes" />
 				<number name="max_menu_item_count" min="10" />
+				<number name="menuItemFontSize" min="3" />
+				<length name="toolbar_icon_height" defaultUnit = "pt" min="0" max = "1000" step = "0.1"/>
 			</separator>
 			<separator name="status">
 				<boolean name="display_node_id" />
@@ -94,8 +96,6 @@
 			<separator name="default_colors">
 				<color name="revision_color" />
 				<boolean name="printonwhitebackground" />
-				<color name="standardcloudcolor" />
-				<number name="presentation_dimmer_transparency" min="0" max="255" />
 			</separator>
 			<separator name="selection_colors">
 				<boolean name="standarddrawrectangleforselection" />
@@ -112,6 +112,10 @@
 					<choice value="antialias_none" />
 				</combo>
 			</separator>
+			<separator name="svg_icons">
+				<boolean name="use_svg_icons" />
+				<boolean name="antialias_svg" />
+			</separator>
 			<separator name="size_limits">
 				<number name="max_shortened_text_length" />
 				<number name="max_image_width" />
@@ -124,6 +128,8 @@
 				
 			</separator>
 			<separator name="connectors">
+				<combo name="connector_arrows" enum="org.freeplane.features.link.ConnectorArrows"/>
+				<combo name="connector_dash" enum="org.freeplane.features.DashVariant"/>
 				<color name="standardlinkcolor" />
 				<number name="connector_alpha" text="edit_transparency_label"
 					min="20" max="255" />
@@ -137,8 +143,13 @@
 					max="32" />
 				<font name="label_font_family" />
 				<number name="label_font_size" min="4" max="216" />
+				<boolean name="show_connectors" />
 				<boolean name="paint_connectors_behind" />
 			</separator>
+			<separator name="clones">
+				<boolean name="markClones"/>
+				<boolean name="markSelectedClones"/>
+			</separator>
 			<separator name="edit_long_node_window">
 				<boolean name="el__buttons_above" />
 				<boolean name="el__position_window_below_node" />
@@ -153,13 +164,14 @@
 			</separator>
 			<separator name="icon_properties">
 				<boolean name="structured_icon_toolbar" />
+				<boolean name="show_icons" />
 			</separator>
 		</tab>
-		<tab name="Keystrokes"
-			layout="right:max(40dlu;p), 4dlu, 80dlu, 7dlu,right:max(40dlu;p), 4dlu, 80dlu, 7dlu">
-			<separator name="commands_for_the_program" />
-			<text name="use_ctrl_key" />
-			<separator name="icons" />
+		<tab name="Defaults">
+			<separator name="cloud">
+				<color name="standardcloudcolor" />
+				<combo name="standardcloudshape" enum="org.freeplane.features.cloud.CloudModel$Shape"/>
+			</separator>				
 		</tab>
 		<tab name="Behaviour">
 			<separator name="behaviour">
@@ -184,6 +196,7 @@
 				<boolean name="copyFormatToNewSiblingIncludesIcons"/>
 				<boolean name="scrollOnUnfold"/>
 				<boolean name="shouldCenterSmallMaps"/>
+				<boolean name="pasteImagesFromFiles"/>
 			</separator>
 			<separator name="reminderOptions">
 				<boolean name="remindersBlink" />
@@ -254,6 +267,7 @@
 				<boolean name="show_node_tooltips" />
 				<number name="toolTipManager.initialDelay" min="0" />
 				<boolean name="show_styles_in_tooltip" />
+				<boolean name="show_note_icon_in_tooltip" />
 			</separator>
 			<separator name="undo">
 				<number name="undo_levels" />
@@ -283,8 +297,31 @@
 			</separator>
 			<separator name="html_import">
 				<boolean name="structured_html_import" />
+				<boolean name="cut_out_pictures_when_pasting_html"/>
 			</separator>
 		</tab>
+		<tab name="Presentation">
+			<separator name="presentation">
+				<boolean name="presentation.slideDisplaysAllNodes"/>
+				<boolean name="presentation.processesNavigationKeys"/>
+				<boolean name="presentation.processesEscapeKey"/>
+				<boolean name="presentation.switchToFullScreen"/>
+				<boolean name="presentation.switchToSpotlight"/>
+				<boolean name="presentation.zoom"/>
+				<boolean name="presentation.combineAll"/>
+				<color name= "spotlight_background_color"/>
+				<boolean name="presentation.slowMotion"/>
+				<number name="presentation.maxDropBoxRowCount" min="3" max="999" /> 
+				<string name="presentation.exportDirectory" />
+			</separator>
+			
+		</tab>
+		<tab name="Keystrokes"
+			layout="right:max(40dlu;p), 4dlu, 80dlu, 7dlu,right:max(40dlu;p), 4dlu, 80dlu, 7dlu">
+			<separator name="commands_for_the_program" />
+			<text name="use_ctrl_key" />
+			<separator name="icons" />
+		</tab>
 		<tab name="plugins" />
 	</tabbed_pane>
 </preferences_structure>
diff --git a/freeplane/external-resources/xml/stylemodemenu.xml b/freeplane/external-resources/xml/stylemodemenu.xml
index a2731b3..d3560fe 100644
--- a/freeplane/external-resources/xml/stylemodemenu.xml
+++ b/freeplane/external-resources/xml/stylemodemenu.xml
@@ -44,7 +44,7 @@
 			</Entry>
 		</Entry>
 		<Entry name="view">
-			<Entry name="toolbars">
+			<Entry name="controls">
 				<Entry name="ToggleMenubarAction" builder="MB_ToggleMenubarAction" />
 				<Entry name="ToggleToolbarAction" />
 				<Entry name="ToggleLeftToolbarAction" />
@@ -56,6 +56,10 @@
 			<Entry name="menu_viewmode">
 				<Entry name="ViewLayoutTypeAction.OUTLINE" />
 				<Entry name="ShowSelectionAsRectangleAction" />
+				<Entry name="SetBooleanPropertyAction.show_icons" />
+				<Entry name="SetBooleanPropertyAction.show_connectors" />
+				<Entry name="SetBooleanPropertyAction.hide_single_end_connectors" />
+				<Entry name="SetBooleanPropertyAction.show_note_icon_in_tooltip" />
 			</Entry>
 			<Entry name="menu_hoverView">
 				<Entry accelerator="alt F2" name="ToggleDetailsAction" />
@@ -137,8 +141,6 @@
 		<Entry name="ToggleMenubarAction" builder="MP_ToggleMenubarAction" />
 		<Entry name="ToggleToolbarAction" />
 		<Entry name="ToggleLeftToolbarAction" />
-		<Entry name="ViewLayoutTypeAction.OUTLINE" />
-		<Entry name="CenterSelectedNodeAction" />
 	</Entry>
 	<Entry name="node_popup"  builder="node_popup">
 		<Entry accelerator="alt shift C" name="FormatCopy" />
diff --git a/freeplane/format_translation.gradle b/freeplane/format_translation.gradle
index a847da4..89f6b16 100644
--- a/freeplane/format_translation.gradle
+++ b/freeplane/format_translation.gradle
@@ -6,63 +6,75 @@ dependencies {
     ant_tasks project(':freeplane_ant')
 }
 
-task format_translation(dependsOn: configurations.ant_tasks) << {
-    ant.taskdef(
-        name: "format_translation",
-        classname: "org.freeplane.ant.FormatTranslation",
-        classpath: configurations.ant_tasks.asPath,
-        onerror: "report"
-    )
+task format_translation(dependsOn: configurations.ant_tasks) {
+    doLast {
+        ant.taskdef(
+            name: "format_translation",
+            classname: "org.freeplane.ant.FormatTranslation",
+            classpath: configurations.ant_tasks.asPath,
+            onerror: "report"
+        )
 
-    ant.format_translation(
-        dir: file("./resources/translations"),
-        includes: "*.properties",
-        eolstyle: "unix"
-    )
-    ant.format_translation(
-        dir: file("./viewer-resources/translations"),
-        includes: "*.properties",
-        eolstyle: "unix"
-    )
+        ant.format_translation(
+            dir: file("./resources/translations"),
+            includes: "*.properties",
+            eolstyle: "unix"
+        )
+        ant.format_translation(
+            dir: file("./viewer-resources/translations"),
+            includes: "*.properties",
+            eolstyle: "unix"
+        )
+    }
 }
 
-task check_translation(dependsOn: configurations.ant_tasks) << {
-    ant.taskdef(
-        name: "check_translation",
-        classname: "org.freeplane.ant.FormatTranslationCheck",
-        classpath: configurations.ant_tasks.asPath,
-        onerror: "report"
-    )
+task check_translation(dependsOn: configurations.ant_tasks) {
+    doLast {
+        ant.taskdef(
+            name: "check_translation",
+            classname: "org.freeplane.ant.FormatTranslationCheck",
+            classpath: configurations.ant_tasks.asPath,
+            onerror: "report"
+        )
 
-    ant.check_translation(
-        dir: file('./resources/translations'),
-        includes: '*.properties',
-        eolstyle: 'unix'
-    )
-    ant.check_translation(
-        dir: file('./viewer-resources/translations'),
-        includes: '*.properties',
-        eolstyle: 'unix'
-    )
+        ant.check_translation(
+            dir: file('./resources/translations'),
+            includes: '*.properties',
+            eolstyle: 'unix'
+        )
+        ant.check_translation(
+            dir: file('./viewer-resources/translations'),
+            includes: '*.properties',
+            eolstyle: 'unix'
+        )
+    }
 }
 
-task update_translation << {
-	fileTree(dir: './resources/translations', include: 'Resources_*.properties').each{ File resourceFile ->
-		 def userFile = file('../User' + resourceFile.name)
-		 if (userFile.exists()) {
-			Properties properties = new Properties()
-			resourceFile.withInputStream {
-				properties.load(it)
-			}
-			
-			userFile.withInputStream {
-				properties.load(it)
-			}
-			
-			
-			properties.store(resourceFile.newWriter(), null)
-		 }
-	}
+void update(File resourceFile){
+   def userFile = file('../User' + resourceFile.name)
+   if (userFile.exists()) {
+	  Properties properties = new Properties()
+	  resourceFile.withInputStream {
+		  properties.load(it)
+	  }
+	  
+	  userFile.withInputStream {
+		  properties.load(it)
+	  }
+	  
+	  properties.store(resourceFile.newOutputStream(), null)
+   }
+}
+
+task update_translation {
+    doLast {
+        fileTree(dir: './viewer-resources/translations', include: 'Resources_*.properties').each{
+            File resourceFile -> update(resourceFile)
+        }
+        fileTree(dir: './resources/translations', include: 'Resources_*.properties').each{
+            File resourceFile -> update(resourceFile)
+        }
+    }
 }
 
 update_translation.finalizedBy format_translation
diff --git a/freeplane/git.gradle b/freeplane/git.gradle
index 9dc59d6..a8f03eb 100644
--- a/freeplane/git.gradle
+++ b/freeplane/git.gradle
@@ -6,7 +6,7 @@ task copyGitTxt(type: Copy) {
     from(rootDir) {
         include('gitinfo.txt')
     }
-    into(globalBuild)
+    into(globalBin)
 }
 
 // copy gitinfo.properties from root (necessary when building from
@@ -17,30 +17,55 @@ task copyGitProperty(type: Copy) {
     from(rootDir) {
         include('gitinfo.properties')
     }
-    into(globalBuild + '/resources')
+    into(globalBin + '/resources')
 }
 
-task createGitProperty(type: Exec) {
+
+task createGitProperty {
     // for src/srcpure tarballs, /gitinfo.txt exists, so we don't call git
     // (which is not available)
-    onlyIf { !new File(rootDir, 'gitinfo.txt').exists() }
+	def gitInfoFile = new File(rootDir, 'gitinfo.txt')
+    onlyIf { !gitInfoFile.exists() }
 
-    ignoreExitValue = true
 
-    commandLine 'git', 'log', '--pretty=format:git-revision=%H %cn %ci', '-n1'
+	doLast {
+		def whoami
+		def revisionHash
+		def execResult
+		new ByteArrayOutputStream().withStream { os ->
+			execResult = exec {
+				commandLine  'git', 'config', 'user.name'
+				standardOutput = os
+				ignoreExitValue = true
+			}
+			whoami = os.toString().trim()
+		}
+		 if(execResult.exitValue != 0)
+		 	return
+		
+		new ByteArrayOutputStream().withStream { os ->
+			execResult = exec {
+				commandLine 'git', 'log', '--pretty=format:%H', '-n1'
+				standardOutput = os
+				ignoreExitValue = true
+			}
+			revisionHash = os.toString().trim()
+		}
 
-    doFirst {
-        standardOutput = new FileOutputStream(new File(globalBuild, 'gitinfo.txt'))
-    }
-    doLast {
+		 if(execResult.exitValue != 0)
+		 	return
+			 
+		def timestamp=new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC"))
+		new File(globalBin, 'gitinfo.txt').write "git-revision=$revisionHash $whoami $timestamp"
+			 
         // create gitinfo.properties!
         copy {
-            from(globalBuild) {
+            from(globalBin) {
                 include('gitinfo.txt')
                 rename('gitinfo.txt', 'gitinfo.properties')
                 filter(org.apache.tools.ant.filters.EscapeUnicode)
             }
-            into(globalBuild + '/resources')
+            into(globalBin + '/resources')
         }
     }
 }
diff --git a/freeplane/resources/fonts/listcontrols-license.txt b/freeplane/resources/fonts/listcontrols-license.txt
new file mode 100644
index 0000000..1fcaa5c
--- /dev/null
+++ b/freeplane/resources/fonts/listcontrols-license.txt
@@ -0,0 +1,2 @@
+The listcontrols font is created by Daniel Bruce and licensed under the  CC BY-SA 4.0. 
+http://www.entypo.com/
\ No newline at end of file
diff --git a/freeplane/resources/fonts/listcontrols.ttf b/freeplane/resources/fonts/listcontrols.ttf
new file mode 100644
index 0000000..26dac11
Binary files /dev/null and b/freeplane/resources/fonts/listcontrols.ttf differ
diff --git a/freeplane/resources/html/freeplane_applet.jnlp b/freeplane/resources/html/freeplane_applet.jnlp
index 5d3dda9..440e86c 100644
--- a/freeplane/resources/html/freeplane_applet.jnlp
+++ b/freeplane/resources/html/freeplane_applet.jnlp
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <jnlp spec="1.0+" codebase="" href="">
     <information>
diff --git a/freeplane/resources/html/freeplanebrowser.html b/freeplane/resources/html/freeplanebrowser.html
deleted file mode 100644
index 19a9c69..0000000
--- a/freeplane/resources/html/freeplanebrowser.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<!-- Launcher tested with Mozilla 1.6 under Linux -->
-<!-- Launcher tested with Konqueror 3.1.1 under Linux -->
-<head>
-<meta name="generator" content=
-"HTML Tidy for Linux/x86 (vers 1st March 2004), see www.w3.org">
-<title>Mind Map</title>
-<!--   ^ Put the name of your mind map here -->
-<style type="text/css">
-body { margin-left:0px; margin-right:0px; margin-top:0px; margin-bottom:0px }
-</style>
-</head>
-<body>
-<applet code="freeplane.main.FreeplaneApplet.class"
-	archive="freeplaneviewer.jar" width="100%" height="100%">
-	<param name="type" value="application/x-java-applet;version=1.4">
-	<param name="scriptable" value="false">
-	<param name="modes" value="freeplane.modes.browsemode.BrowseMode">
-	<param name="browsemode_initial_map"
-		value="./freeplane.mm">
-	<!--          ^ Put the path to your map here, if it starts with a dot, 	
-	the file is searched in the filesystem from the path, the html resides in. .  -->
-	<param name="initial_mode" value="Browse">
-	<param name="selection_method" value="selection_method_direct">
-</applet>
-
-</body>
-</html>
diff --git a/freeplane/resources/html/freeplanebrowser.xhtml b/freeplane/resources/html/freeplanebrowser.xhtml
deleted file mode 100644
index 22bc9a3..0000000
--- a/freeplane/resources/html/freeplanebrowser.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!-- Launcher tested with Mozilla 1.6 under Linux -->
-<!-- Launcher tested with Konqueror 3.1.1 under Linux -->
-
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st March 2004), see www.w3.org" />
-
-  <title>Mind Map</title>
-  <!--   ^ Put the name of your mind map here -->
-
-<style type="text/css">
-/*<![CDATA[*/
-body { margin-left:0px; margin-right:0px; margin-top:0px; margin-bottom:0px; height:100% }
-html { height:100% }
-/*]]>*/
-</style>
-</head>
-
-<body>
-  <applet code="freemind.main.FreeMindApplet.class" archive=
-  "freemindbrowser.jar" width="100%" height="100%">
-    <param name="type" value=
-    "application/x-java-applet;version=1.4" />
-    <param name="scriptable" value="false" />
-    <param name="modes" value=
-    "freemind.modes.browsemode.BrowseMode" />
-    <param name="browsemode_initial_map" value=
-    "./freemind.mm" />
-    <!--          ^ Put the path to your map here  -->
-    <param name="initial_mode" value="Browse" />
-    <param name="selection_method" value=
-    "selection_method_direct" />
-  </applet>
-</body>
-</html>
diff --git a/freeplane/resources/images/1leftarrow.svg b/freeplane/resources/images/1leftarrow.svg
new file mode 100644
index 0000000..b5d4f97
--- /dev/null
+++ b/freeplane/resources/images/1leftarrow.svg
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17219"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs17221">
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7241-2-2-7"
+       id="radialGradient8530"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61352607,0.75941113,-0.64043551,0.51740601,225.9686,-93.219215)"
+       cx="250.79663"
+       cy="201.49139"
+       fx="250.79663"
+       fy="201.49139"
+       r="51.206081" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7241-2-2-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7243-21-3-4" />
+      <stop
+         style="stop-color:#2a7fff;stop-opacity:1"
+         offset="1"
+         id="stop7245-6-2-0" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.54430686"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1213"
+     inkscape:window-height="619"
+     inkscape:window-x="71"
+     inkscape:window-y="39"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17224">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g8522"
+       transform="translate(261.83478,-832.088)"
+       inkscape:export-filename="M:\FreePlane_radna_mapa\images\1leftarrow.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="D:\Freeplane_Radna_mapa\images\1leftarrow.png"
+         id="g8440-9"
+         transform="matrix(-1,0,0,1,-501.38517,-27.718652)">
+        <g
+           id="g7490-4-4"
+           transform="matrix(0.51942304,0,0,0.51942304,-262.96396,387.42711)">
+          <circle
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="C:\Documents and Settings\Designm5\Desktop\4.png"
+             transform="matrix(0.2924774,0,0,0.2924774,-45.620913,860.51393)"
+             id="path3347-5-5-6-88"
+             style="color:#000000;font-size:61.54321671px;display:inline;overflow:visible;visibility:visible;fill:#db71c9;fill-opacity:1;fill-rule:evenodd;stroke:#03319e;stroke-width:2.90677214;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             cx="257.43976"
+             cy="219.911"
+             r="51.206081" />
+          <circle
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="C:\Documents and Settings\Designm5\Desktop\4.png"
+             transform="matrix(0.28375341,0,0,0.28375341,-43.375011,862.43243)"
+             id="path3347-5-1-7-6-2"
+             style="color:#000000;font-size:61.54321671px;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient8530);fill-opacity:1;fill-rule:evenodd;marker:none;enable-background:accumulate"
+             cx="257.43976"
+             cy="219.911"
+             r="51.206081" />
+        </g>
+        <path
+           sodipodi:nodetypes="cccccccc"
+           id="path3846-4"
+           d="m -242.34794,867.81209 -5.1098,-5.20791 -0.0219,3.09004 -5.2732,-0.0941 0,4.34218 5.2732,0.0587 0,3.00811 5.13167,-5.19695 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#002a95;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91625612;marker:none;enable-background:accumulate"
+           inkscape:export-filename="H:\FreeMind_Ikone\forward.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="832.08801"
+         x="-261.83478"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-1"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/1rightarrow.svg b/freeplane/resources/images/1rightarrow.svg
new file mode 100644
index 0000000..835efe4
--- /dev/null
+++ b/freeplane/resources/images/1rightarrow.svg
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17219"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs17221">
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7241-2-2-7"
+       id="radialGradient8530"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61352607,0.75941113,-0.64043551,0.51740601,225.9686,-93.219215)"
+       cx="250.79663"
+       cy="201.49139"
+       fx="250.79663"
+       fy="201.49139"
+       r="51.206081" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7241-2-2-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7243-21-3-4" />
+      <stop
+         style="stop-color:#2a7fff;stop-opacity:1"
+         offset="1"
+         id="stop7245-6-2-0" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.54430686"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1213"
+     inkscape:window-height="619"
+     inkscape:window-x="71"
+     inkscape:window-y="39"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17224">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g8522"
+       transform="matrix(-1,0,0,1,-245.83478,-832.088)"
+       inkscape:export-filename="M:\FreePlane_radna_mapa\images\1leftarrow.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="D:\Freeplane_Radna_mapa\images\1leftarrow.png"
+         id="g8440-9"
+         transform="matrix(-1,0,0,1,-501.38517,-27.718652)">
+        <g
+           id="g7490-4-4"
+           transform="matrix(0.51942304,0,0,0.51942304,-262.96396,387.42711)">
+          <circle
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="C:\Documents and Settings\Designm5\Desktop\4.png"
+             transform="matrix(0.2924774,0,0,0.2924774,-45.620913,860.51393)"
+             id="path3347-5-5-6-88"
+             style="color:#000000;font-size:61.54321671px;display:inline;overflow:visible;visibility:visible;fill:#db71c9;fill-opacity:1;fill-rule:evenodd;stroke:#03319e;stroke-width:2.90677214;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             cx="257.43976"
+             cy="219.911"
+             r="51.206081" />
+          <circle
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="C:\Documents and Settings\Designm5\Desktop\4.png"
+             transform="matrix(0.28375341,0,0,0.28375341,-43.375011,862.43243)"
+             id="path3347-5-1-7-6-2"
+             style="color:#000000;font-size:61.54321671px;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient8530);fill-opacity:1;fill-rule:evenodd;marker:none;enable-background:accumulate"
+             cx="257.43976"
+             cy="219.911"
+             r="51.206081" />
+        </g>
+        <path
+           sodipodi:nodetypes="cccccccc"
+           id="path3846-4"
+           d="m -242.34794,867.81209 -5.1098,-5.20791 -0.0219,3.09004 -5.2732,-0.0941 0,4.34218 5.2732,0.0587 0,3.00811 5.13167,-5.19695 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#002a95;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91625612;marker:none;enable-background:accumulate"
+           inkscape:export-filename="H:\FreeMind_Ikone\forward.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="832.08801"
+         x="-261.83478"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-1"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/AddAttributeAction.png b/freeplane/resources/images/AddAttributeAction.png
new file mode 100644
index 0000000..2e20c6b
Binary files /dev/null and b/freeplane/resources/images/AddAttributeAction.png differ
diff --git a/freeplane/resources/images/AddAttributeAction.svg b/freeplane/resources/images/AddAttributeAction.svg
new file mode 100644
index 0000000..5a1bdbd
--- /dev/null
+++ b/freeplane/resources/images/AddAttributeAction.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="17.066668"
+   height="17.066668"
+   id="svg17560"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   viewBox="0 0 16 16"
+   sodipodi:docname="AddAttributeAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\AddAttributeAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs17562">
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.741014"
+     inkscape:cx="68.330868"
+     inkscape:cy="-14.231256"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17565">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <g
+       id="g4515">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         id="rect10216-0-5"
+         d="M 7.986765,24.971067 H 0.28120531 V 22.230512 H 7.986765 m 0,2.740555 h 7.73203 v -2.740555 h -7.73203 v 2.744724"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#b1b1b1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.21808361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         id="rect10216-8-9-2"
+         d="M 7.986765,28.653906 H 0.29649834 V 25.086829 H 7.986765 m 0,3.567077 h 7.716737 V 25.086829 H 7.986765 v 3.572503"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.2694872;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         y="16.118513"
+         x="0.10266369"
+         height="15.762972"
+         width="15.762972"
+         id="rect6193-0-23-7-8-2-89-0-36-52-9"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+      <path
+         style="fill:#f21313;stroke:#f70808;stroke-width:0.13748306px"
+         inkscape:connector-curvature="0"
+         id="path3153"
+         d="M 3.3271632,17.434228 V 19.63136 H 1.2912741 v 1.532181 h 2.0358891 v 2.197133 H 4.8756448 V 21.163541 H 6.9115342 V 19.63136 H 4.8756448 v -2.197132 z" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/AddMenuItemLinkAction.png b/freeplane/resources/images/AddMenuItemLinkAction.png
new file mode 100644
index 0000000..e92720f
Binary files /dev/null and b/freeplane/resources/images/AddMenuItemLinkAction.png differ
diff --git a/freeplane/resources/images/AddMenuItemLinkAction.svg b/freeplane/resources/images/AddMenuItemLinkAction.svg
new file mode 100644
index 0000000..0474b3a
--- /dev/null
+++ b/freeplane/resources/images/AddMenuItemLinkAction.svg
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg8466"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="AddMenuItemLinkAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\AddMenuItemLinkAction.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <defs
+     id="defs8460">
+    <linearGradient
+       gradientTransform="matrix(0.21562097,0,0,0.21822246,-0.27169639,59.471363)"
+       y2="467.62836"
+       x2="495.90735"
+       y1="504.90591"
+       x1="496.30939"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7430-39"
+       xlink:href="#linearGradient6664-2-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6664-2-2">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="0"
+         id="stop6667-7-4" />
+      <stop
+         id="stop6675-9-6"
+         offset="0.45940343"
+         style="stop-color:#dcdada;stop-opacity:1" />
+      <stop
+         id="stop6673-54-1"
+         offset="0.55800742"
+         style="stop-color:#ececec;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6669-3-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4350-9-0-8">
+      <stop
+         id="stop4352-2-9-2"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-4-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-82-0">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-45-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-5-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-7-4">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-61-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-4-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-3-2">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-2-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-2-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6644-2-2-2-4"
+       x1="20.794617"
+       x2="20.801508"
+       xlink:href="#linearGradient5742-1-8-3-3"
+       y1="42.42244"
+       y2="43.991676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(31.25002,0,0,31.24998,-215.80899,-680.37128)" />
+    <linearGradient
+       id="linearGradient5742-1-8-3-3">
+      <stop
+         id="stop5744-5-6-34-80"
+         offset="0"
+         stop-color="#adadad" />
+      <stop
+         id="stop5746-2-0-1-8"
+         offset="1"
+         stop-color="#f0f0f0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6646-8-2-13-8"
+       x1="20.842991"
+       x2="20.94149"
+       xlink:href="#linearGradient5756-1-4-8-06"
+       y1="42.620281"
+       y2="43.638878"
+       gradientTransform="matrix(31.250134,0,0,31.249867,-215.80618,-680.3658)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5756-1-4-8-06">
+      <stop
+         id="stop5758-7-8-74-8"
+         offset="0"
+         stop-color="#828282" />
+      <stop
+         id="stop5760-1-6-2-1"
+         offset="1"
+         stop-opacity="0.352941"
+         stop-color="#929292" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7452-2-5-7-98"
+       x1="20.464201"
+       x2="20.455572"
+       xlink:href="#linearGradient6506-7-4-09-79-9"
+       y1="52.158787"
+       y2="51.354359"
+       gradientTransform="matrix(35.535962,0,0,27.480963,-227.25446,-725.9174)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6506-7-4-09-79-9">
+      <stop
+         id="stop6508-9-8-00-3-7"
+         offset="0"
+         stop-opacity="0"
+         stop-color="#ffffff" />
+      <stop
+         id="stop6510-3-6-61-1-2"
+         offset="1"
+         stop-opacity="0.87451"
+         stop-color="#ffffff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6644-0-5-6"
+       x1="20.794617"
+       x2="20.801508"
+       xlink:href="#linearGradient5742-1-8-3-3"
+       y1="42.418575"
+       y2="43.987812"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6646-1-0-8"
+       x1="20.842987"
+       x2="20.941488"
+       xlink:href="#linearGradient5756-1-4-8-06"
+       y1="42.616417"
+       y2="43.635014"
+       gradientTransform="scale(1.0000043,0.99999574)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="svg_1-62-8-2"
+       x1="20.873043"
+       y1="43.765972"
+       x2="20.547928"
+       y2="42.610008"
+       gradientTransform="scale(1.0000048,0.99999524)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6606-65-9-5"
+         stop-color="#001c00"
+         stop-opacity="0.972656"
+         offset="0"
+         style="stop-color:#2b7c2b;stop-opacity:1;" />
+      <stop
+         id="stop6608-3-3-5"
+         stop-color="#008200"
+         stop-opacity="0.976563"
+         offset="1"
+         style="stop-color:#02b602;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6650-9-4-3"
+       x1="16.109699"
+       x2="16.106449"
+       xlink:href="#linearGradient6506-7-4-09-79-9"
+       y1="54.954487"
+       y2="54.652622"
+       gradientTransform="scale(1.2775277,0.7827619)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0978168"
+     inkscape:cx="-40.377607"
+     inkscape:cy="35.526197"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata8463">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-99.727034,-169.91368)">
+    <g
+       id="g4583">
+      <g
+         style="stroke-width:0.47698435"
+         transform="matrix(2.3258631,0,0,1.8897639,-132.2244,-135.18304)"
+         id="g4578">
+        <rect
+           ry="1.0691348"
+           y="161.44701"
+           x="99.727036"
+           height="16.933332"
+           width="13.758333"
+           id="rect4519"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.08309682;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7430-39);fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.08309682;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect6662-1-9"
+           width="13.584121"
+           height="8.2924538"
+           x="99.81414"
+           y="161.53412"
+           ry="0.52356797" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/AddSlideContent.svg b/freeplane/resources/images/AddSlideContent.svg
new file mode 100644
index 0000000..6201040
--- /dev/null
+++ b/freeplane/resources/images/AddSlideContent.svg
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.499912"
+   height="31.000242"
+   viewBox="0 0 40.499913 31.000242"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="AddSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         id="stop3775"
+         offset="0.00000000"
+         style="stop-color:#24424c;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3777"
+         offset="1.0000000"
+         style="stop-color:#79dfee;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         id="stop8253"
+         offset="0.00000000"
+         style="stop-color:#000000;stop-opacity:0.25098041;" />
+      <stop
+         id="stop8255"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         id="stop8985"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.37254903;" />
+      <stop
+         id="stop8987"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.094117649;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.318188"
+     inkscape:cx="9.7504427"
+     inkscape:cy="17.519139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.289351,-1194.1475)">
+    <g
+       id="g4546">
+      <rect
+         ry="1.801149"
+         rx="1.7965614"
+         y="1194.4867"
+         x="94.62841"
+         height="30.321701"
+         width="39.821793"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.99607999"
+         d="m 95.11681,1214.3168 c 3.763692,-0.068 4.712154,1.369 6.47668,0.2018 3.73972,-2.726 8.46057,1.9216 11.65023,2.238 -2.59808,0.2885 -7.24837,-4.7393 -10.93295,-1.4334 -3.018404,2.0984 -3.341222,0.076 -7.172428,2.102 z"
+         id="path4779" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.57750005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607999"
+         d="m 95.115973,1209.4886 c 0,0 1.304342,-0.2737 2.588743,-1.9855 2.061828,-2.5353 5.385484,-3.4419 8.779474,-3.5112 -2.79678,0.4738 -5.35044,0.155 -8.457389,3.9663 -1.460534,1.884 -1.420641,3.5886 -2.923602,4.4102 0,0 0.01268,-2.8798 0.01268,-2.8798 z"
+         id="path4783" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717"
+         x="-128.17464"
+         y="1212.0616"
+         width="15.169684"
+         height="8.5063934"
+         ry="1.8758794"
+         rx="1.7153306"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#800080;stroke-width:0.703125;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" />
+      <rect
+         transform="scale(-1)"
+         id="rect4729"
+         x="-115.51771"
+         y="-1205.4816"
+         width="12.526945"
+         height="7.1298895"
+         ry="1.5722989"
+         rx="1.4165199"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" />
+      <rect
+         style="fill:none;fill-rule:evenodd;stroke:#009d00;stroke-width:0.68741626;stroke-linejoin:round;stroke-opacity:1"
+         rx="2.2382195"
+         ry="2.8199263"
+         height="12.787285"
+         width="19.793903"
+         y="1209.921"
+         x="-130.48672"
+         id="rect4792"
+         transform="scale(-1,1)" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4792-6"
+         x="-117.60655"
+         y="1196.3427"
+         width="16.687527"
+         height="11.11136"
+         ry="2.4503417"
+         rx="1.8869616"
+         style="fill:none;fill-rule:evenodd;stroke:#009d00;stroke-width:0.70312494;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         style="fill:#f21313;stroke:none;stroke-width:0.14664862px"
+         inkscape:connector-curvature="0"
+         id="path3153"
+         d="m 124.21083,1196.5318 v 3.9964 h -3.70309 v 2.7869 h 3.70309 v 3.9965 h 2.81655 v -3.9965 h 3.70308 v -2.7869 h -3.70308 v -3.9964 z" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/AllPresentationsToPNG.svg b/freeplane/resources/images/AllPresentationsToPNG.svg
new file mode 100644
index 0000000..0b45f44
--- /dev/null
+++ b/freeplane/resources/images/AllPresentationsToPNG.svg
@@ -0,0 +1,1032 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="107.22745"
+   height="39"
+   viewBox="0 0 107.22745 39"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="AllPresentationToPNG.svg">
+  <svg:defs
+     id="defs5771">
+    <svg:linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <svg:stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <svg:stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6"
+       inkscape:collect="always" />
+    <svg:linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <svg:stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035" />
+      <svg:stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)" />
+    <svg:linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.90504,0,0,0.90504,-531.65,73.301)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-5">
+      <svg:stop
+         id="stop3664"
+         offset="0"
+         stop-color="#8da6d8" />
+      <svg:stop
+         id="stop3666"
+         offset=".25"
+         stop-color="#b4c5e5" />
+      <svg:stop
+         id="stop3668"
+         offset=".5"
+         stop-color="#d8e1f2" />
+      <svg:stop
+         id="stop3670"
+         offset=".75"
+         stop-color="#92aada" />
+      <svg:stop
+         id="stop3672"
+         offset="1"
+         stop-color="#8ea7d8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-5-8"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)"
+       x1="111.93"
+       y1="310.62"
+       x2="112.73"
+       gradientUnits="userSpaceOnUse"
+       y2="298.92001"
+       id="b">
+      <svg:stop
+         id="stop7-2"
+         offset="0"
+         stop-color="#0d2e2e" />
+      <svg:stop
+         id="stop9-1"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#0d2e2e" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="21.933001"
+       x2="21.933001"
+       gradientTransform="matrix(0.7884076,0,0,-0.59745281,363.49212,534.75709)"
+       y1="24.627001"
+       gradientUnits="userSpaceOnUse"
+       y2="7.1090999"
+       id="a-1">
+      <svg:stop
+         id="stop12"
+         offset="0"
+         stop-color="#acf" />
+      <svg:stop
+         id="stop14"
+         offset="1"
+         stop-color="#04a" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)"
+       x1="105.51"
+       y1="302.84"
+       x2="118.52"
+       gradientUnits="userSpaceOnUse"
+       y2="302.84"
+       id="c">
+      <svg:stop
+         id="stop17"
+         offset="0"
+         stop-color="#37c837" />
+      <svg:stop
+         id="stop19"
+         offset="1"
+         stop-color="#165016" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)"
+       x1="112.29"
+       y1="303.64001"
+       x2="112.37"
+       gradientUnits="userSpaceOnUse"
+       y2="300.78"
+       id="d">
+      <svg:stop
+         id="stop22"
+         offset="0"
+         stop-color="#b9d7ff" />
+      <svg:stop
+         id="stop24"
+         offset="1"
+         stop-color="#3c8dff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient4879"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <svg:radialGradient
+       id="a-2"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3222" />
+      <svg:stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3224" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       id="c-0"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       y1="863.29999"
+       x1="348.72">
+      <svg:stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3227" />
+      <svg:stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3229" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="b-48"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       y1="791.28003"
+       x1="333.48999">
+      <svg:stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3232" />
+      <svg:stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3234" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="b-4"
+       y2="563.76"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       y1="563.58"
+       x1="295.32">
+      <svg:stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop4581" />
+      <svg:stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop4583" />
+      <svg:stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop4585" />
+      <svg:stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4587" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-8"
+       y2="557.24"
+       gradientUnits="userSpaceOnUse"
+       x2="290.7"
+       y1="558.21"
+       x1="290.75">
+      <svg:stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop4590" />
+      <svg:stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4592" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd6"
+       id="linearGradient5114"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       x1="24.919374"
+       y1="6.1478682"
+       x2="24.919374"
+       y2="7.4600263" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient5116"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd6"
+       id="linearGradient5160"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       x1="24.919374"
+       y1="6.1478682"
+       x2="24.919374"
+       y2="7.4600263" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient5162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5164"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.8545884"
+     inkscape:cx="35.655505"
+     inkscape:cy="31.265957"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-286.32278,-544.86761)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.84978437"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="4.0960579"
+       x="609.6889"
+       height="0"
+       width="0.85563356" />
+    <svg:g
+       id="g5306">
+      <svg:g
+         transform="matrix(1.3393828,0,0,1.3393828,-136.9547,-132.10939)"
+         id="g4688">
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path36"
+           d="m 367.31231,508.21372 h 27.65589 c 0.42391,0 0.76517,0.35787 0.76517,0.80242 l -0.11328,21.79912 c -0.009,0.68645 -0.53206,0.83973 -1.07808,0.84923 l -27.2306,0.1188 c -0.42389,0 -0.76517,-0.35787 -0.76517,-0.8024 v -21.96488 c 0,-0.44455 0.34128,-0.80242 0.76517,-0.80242 z"
+           style="color:#000000;fill:url(#b);stroke:#0d2e2e;stroke-width:0.69650364;stroke-opacity:0.52548996" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#a-1);stroke-width:1.86655128"
+           id="path38"
+           d="m 368.85544,529.27081 h 24.48495 v -7.76823 h -24.48495 z" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#c);stroke-width:1.86655128"
+           id="path40"
+           d="m 368.85544,510.73978 h 24.48495 v 10.77661 h -24.48495 z" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path42"
+           d="m 369.17535,511.23315 v 10.39277 c 15.18497,0.4954 13.60326,-6.5202 23.88464,-6.5202 v -4.0636 z"
+           style="color:#000000;fill:url(#d);stroke-width:1.86655128" />
+        <svg:path
+           d="m 378.98173,516.20822 c 0,2.26696 -1.77671,4.22479 -4.04694,4.22479 -2.17153,0 -4.04693,-1.85479 -4.04693,-4.22479 0,-2.26695 1.7767,-4.22478 4.04693,-4.22478 2.17153,0 4.04694,1.85478 4.04694,4.22478 z"
+           id="path46"
+           inkscape:connector-curvature="0"
+           style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 378.5869,516.20822 c 0,2.06087 -1.57929,3.81261 -3.65211,3.81261 -1.97411,0 -3.65211,-1.64869 -3.65211,-3.81261 0,-2.06087 1.57929,-3.81261 3.65211,-3.81261 1.97412,0 3.65211,1.6487 3.65211,3.81261 z"
+           id="path48"
+           inkscape:connector-curvature="0"
+           style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 378.19208,516.20822 c 0,1.85479 -1.48059,3.40044 -3.25729,3.40044 -1.7767,0 -3.25729,-1.54565 -3.25729,-3.40044 0,-1.85478 1.48059,-3.40043 3.25729,-3.40043 1.7767,0 3.25729,1.54565 3.25729,3.40043 z"
+           id="path50"
+           inkscape:connector-curvature="0"
+           style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 377.79726,516.20822 c 0,1.6487 -1.28318,2.98827 -2.86247,2.98827 -1.57929,0 -2.86247,-1.33957 -2.86247,-2.98827 0,-1.64869 1.28318,-2.98826 2.86247,-2.98826 1.57929,0 2.86247,1.33957 2.86247,2.98826 z"
+           id="path52"
+           inkscape:connector-curvature="0"
+           style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 377.40243,516.20822 c 0,1.44261 -1.08576,2.57609 -2.46764,2.57609 -1.38188,0 -2.46764,-1.13348 -2.46764,-2.57609 0,-1.44261 1.08576,-2.57609 2.46764,-2.57609 1.38188,0 2.46764,1.13348 2.46764,2.57609 z"
+           id="path54"
+           inkscape:connector-curvature="0"
+           style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 377.00761,516.20822 c 0,1.23653 -0.98706,2.16392 -2.07282,2.16392 -1.08576,0 -2.07282,-1.03044 -2.07282,-2.16392 0,-1.13348 0.98706,-2.16391 2.07282,-2.16391 1.08576,0 2.07282,1.03043 2.07282,2.16391 z"
+           id="path56"
+           inkscape:connector-curvature="0"
+           style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 376.61279,516.20822 c 0,1.03044 -0.78965,1.85479 -1.77671,1.85479 -0.98705,0 -1.7767,-0.82435 -1.7767,-1.85479 0,-1.03043 0.78965,-1.85478 1.7767,-1.85478 0.98706,0 1.77671,0.82435 1.77671,1.85478 z"
+           id="path58"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path60"
+           d="m 368.62961,509.93065 h 24.99118 c 0.0928,0 0.26869,0.0786 0.26869,0.17604 v 19.42363 c -0.002,0.33344 0.0133,0.41763 -0.18255,0.42904 l -25.07773,-0.0377 c -0.093,0 -0.16786,0.0973 -0.16786,0 V 510.1059 c 0,-0.0973 0.0749,-0.17604 0.16786,-0.17604 z"
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.38485551" />
+        <svg:rect
+           id="rect62"
+           x="369.19418"
+           y="511.09503"
+           width="23.847"
+           height="17.876024"
+           style="color:#000000;opacity:0.84658999;fill:none;stroke:#4f4f4f;stroke-width:0.69650364" />
+      </svg:g>
+      <svg:g
+         transform="translate(-2.0424275,-1.8965398)"
+         id="g5226">
+        <svg:g
+           id="g4761"
+           transform="matrix(0.94625306,0,0,0.94625306,6.5301947,75.413187)">
+          <svg:g
+             transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)"
+             id="g4577">
+            <svg:path
+               inkscape:connector-curvature="0"
+               id="path4575"
+               d="m 290.03565,529.06437 v 6.98637"
+               style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+               sodipodi:nodetypes="cc" />
+            <svg:path
+               inkscape:connector-curvature="0"
+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+               d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+               id="path13016"
+               inkscape:r_cx="true"
+               inkscape:r_cy="true" />
+            <svg:g
+               id="g4530"
+               transform="translate(0.26630924)">
+              <svg:rect
+                 ry="1.802771"
+                 rx="1.790844"
+                 inkscape:r_cy="true"
+                 inkscape:r_cx="true"
+                 y="503.24127"
+                 x="270.89679"
+                 height="3.7142279"
+                 width="37.615192"
+                 id="rect9222"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+              <svg:path
+                 sodipodi:nodetypes="czcsccc"
+                 inkscape:connector-curvature="0"
+                 id="path4474"
+                 d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+                 style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+              <svg:path
+                 sodipodi:nodetypes="czcsccc"
+                 inkscape:connector-curvature="0"
+                 id="path4474-7"
+                 d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+                 style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            </svg:g>
+            <svg:path
+               style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+               id="path4535"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <svg:circle
+               style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-renderi [...]
+               id="path4573"
+               cx="290.03564"
+               cy="534.54059"
+               r="1.8556092" />
+          </svg:g>
+          <svg:g
+             transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)"
+             id="g4621">
+            <svg:rect
+               style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+               id="rect4498"
+               width="41.208649"
+               height="31.358326"
+               x="270.47888"
+               y="553.88306"
+               rx="1.8591295"
+               ry="1.862726" />
+            <svg:g
+               id="g4422"
+               transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)">
+              <svg:path
+                 inkscape:connector-curvature="0"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+                 d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+                 id="path4779" />
+              <svg:path
+                 inkscape:connector-curvature="0"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+                 d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+                 id="path4781" />
+              <svg:path
+                 inkscape:connector-curvature="0"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+                 d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+                 id="path4783" />
+              <svg:path
+                 style="font-size:61.54299927px;fill:url(#linearGradient4879);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668"
+                 inkscape:connector-curvature="0"
+                 font-size="61.543px"
+                 d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+                 id="path4743" />
+              <svg:rect
+                 transform="scale(-1,1)"
+                 id="rect4717"
+                 x="-395.90698"
+                 y="714.97345"
+                 width="8.6384783"
+                 height="4.8009052"
+                 ry="1.0587236"
+                 rx="0.97680634"
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+              <svg:rect
+                 id="rect4723"
+                 x="383.33188"
+                 y="722.9632"
+                 width="8.6384134"
+                 height="4.8010173"
+                 ry="1.0587536"
+                 rx="0.9768008"
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+              <svg:rect
+                 transform="scale(-1)"
+                 id="rect4729"
+                 x="-391.7066"
+                 y="-711.94672"
+                 width="8.0499411"
+                 height="4.5706868"
+                 ry="1.007938"
+                 rx="0.91026998"
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+            </svg:g>
+          </svg:g>
+        </svg:g>
+        <svg:g
+           transform="matrix(0.94625306,0,0,0.94625306,10.27555,77.285864)"
+           id="g5112">
+          <svg:g
+             id="g5090"
+             transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)">
+            <svg:path
+               sodipodi:nodetypes="cc"
+               style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 290.03565,529.06437 v 6.98637"
+               id="path5074"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               inkscape:r_cy="true"
+               inkscape:r_cx="true"
+               id="path5076"
+               d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+               inkscape:connector-curvature="0" />
+            <svg:g
+               transform="translate(0.26630924)"
+               id="g5084">
+              <svg:rect
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5114);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+                 id="rect5078"
+                 width="37.615192"
+                 height="3.7142279"
+                 x="270.89679"
+                 y="503.24127"
+                 inkscape:r_cx="true"
+                 inkscape:r_cy="true"
+                 rx="1.790844"
+                 ry="1.802771" />
+              <svg:path
+                 style="opacity:0.65899999;fill:url(#linearGradient5116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+                 d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+                 id="path5080"
+                 inkscape:connector-curvature="0"
+                 sodipodi:nodetypes="czcsccc" />
+              <svg:path
+                 style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+                 d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+                 id="path5082"
+                 inkscape:connector-curvature="0"
+                 sodipodi:nodetypes="czcsccc" />
+            </svg:g>
+            <svg:path
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0"
+               id="path5086"
+               d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+               style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+            <svg:circle
+               r="1.8556092"
+               cy="534.54059"
+               cx="290.03564"
+               id="circle5088"
+               style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-renderi [...]
+          </svg:g>
+          <svg:g
+             id="g5110"
+             transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)">
+            <svg:rect
+               ry="1.862726"
+               rx="1.8591295"
+               y="553.88306"
+               x="270.47888"
+               height="31.358326"
+               width="41.208649"
+               id="rect5092"
+               style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+            <svg:g
+               transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)"
+               id="g5108">
+              <svg:path
+                 id="path5094"
+                 d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+                 inkscape:connector-curvature="0" />
+              <svg:path
+                 id="path5096"
+                 d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+                 inkscape:connector-curvature="0" />
+              <svg:path
+                 id="path5098"
+                 d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+                 inkscape:connector-curvature="0" />
+              <svg:path
+                 id="path5100"
+                 d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+                 font-size="61.543px"
+                 inkscape:connector-curvature="0"
+                 style="font-size:61.54299927px;fill:url(#linearGradient5118);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+              <svg:rect
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+                 rx="0.97680634"
+                 ry="1.0587236"
+                 height="4.8009052"
+                 width="8.6384783"
+                 y="714.97345"
+                 x="-395.90698"
+                 id="rect5102"
+                 transform="scale(-1,1)" />
+              <svg:rect
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+                 rx="0.9768008"
+                 ry="1.0587536"
+                 height="4.8010173"
+                 width="8.6384134"
+                 y="722.9632"
+                 x="383.33188"
+                 id="rect5104" />
+              <svg:rect
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+                 rx="0.91026998"
+                 ry="1.007938"
+                 height="4.5706868"
+                 width="8.0499411"
+                 y="-711.94672"
+                 x="-391.7066"
+                 id="rect5106"
+                 transform="scale(-1)" />
+            </svg:g>
+          </svg:g>
+        </svg:g>
+        <svg:g
+           id="g5158"
+           transform="matrix(0.94625306,0,0,0.94625306,14.020906,79.158542)">
+          <svg:g
+             transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)"
+             id="g5136">
+            <svg:path
+               inkscape:connector-curvature="0"
+               id="path5120"
+               d="m 290.03565,529.06437 v 6.98637"
+               style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+               sodipodi:nodetypes="cc" />
+            <svg:path
+               inkscape:connector-curvature="0"
+               style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+               d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+               id="path5122"
+               inkscape:r_cx="true"
+               inkscape:r_cy="true" />
+            <svg:g
+               id="g5130"
+               transform="translate(0.26630924)">
+              <svg:rect
+                 ry="1.802771"
+                 rx="1.790844"
+                 inkscape:r_cy="true"
+                 inkscape:r_cx="true"
+                 y="503.24127"
+                 x="270.89679"
+                 height="3.7142279"
+                 width="37.615192"
+                 id="rect5124"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5160);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+              <svg:path
+                 sodipodi:nodetypes="czcsccc"
+                 inkscape:connector-curvature="0"
+                 id="path5126"
+                 d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+                 style="opacity:0.65899999;fill:url(#linearGradient5162);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+              <svg:path
+                 sodipodi:nodetypes="czcsccc"
+                 inkscape:connector-curvature="0"
+                 id="path5128"
+                 d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+                 style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            </svg:g>
+            <svg:path
+               style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+               id="path5132"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <svg:circle
+               style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-renderi [...]
+               id="circle5134"
+               cx="290.03564"
+               cy="534.54059"
+               r="1.8556092" />
+          </svg:g>
+          <svg:g
+             transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)"
+             id="g5156">
+            <svg:rect
+               style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+               id="rect5138"
+               width="41.208649"
+               height="31.358326"
+               x="270.47888"
+               y="553.88306"
+               rx="1.8591295"
+               ry="1.862726" />
+            <svg:g
+               id="g5154"
+               transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)">
+              <svg:path
+                 inkscape:connector-curvature="0"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+                 d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+                 id="path5140" />
+              <svg:path
+                 inkscape:connector-curvature="0"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+                 d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+                 id="path5142" />
+              <svg:path
+                 inkscape:connector-curvature="0"
+                 style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+                 d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+                 id="path5144" />
+              <svg:path
+                 style="font-size:61.54299927px;fill:url(#linearGradient5164);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668"
+                 inkscape:connector-curvature="0"
+                 font-size="61.543px"
+                 d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+                 id="path5146" />
+              <svg:rect
+                 transform="scale(-1,1)"
+                 id="rect5148"
+                 x="-395.90698"
+                 y="714.97345"
+                 width="8.6384783"
+                 height="4.8009052"
+                 ry="1.0587236"
+                 rx="0.97680634"
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+              <svg:rect
+                 id="rect5150"
+                 x="383.33188"
+                 y="722.9632"
+                 width="8.6384134"
+                 height="4.8010173"
+                 ry="1.0587536"
+                 rx="0.9768008"
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+              <svg:rect
+                 transform="scale(-1)"
+                 id="rect5152"
+                 x="-391.7066"
+                 y="-711.94672"
+                 width="8.0499411"
+                 height="4.5706868"
+                 ry="1.007938"
+                 rx="0.91026998"
+                 style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+            </svg:g>
+          </svg:g>
+        </svg:g>
+      </svg:g>
+      <svg:g
+         id="g4548"
+         transform="matrix(0,2.122667,2.122667,0,280.02689,596.05949)"
+         style="stroke-width:0.81299937">
+        <svg:path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4544"
+           d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+           inkscape:transform-center-y="2.6604092"
+           inkscape:transform-center-x="0.022858851"
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.60974956;stroke-opacity:1" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path4546"
+           d="m -14.930158,21.808892 v 7.927934"
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.26463759;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/AssignAttributesAction.png b/freeplane/resources/images/AssignAttributesAction.png
new file mode 100644
index 0000000..c66c9a5
Binary files /dev/null and b/freeplane/resources/images/AssignAttributesAction.png differ
diff --git a/freeplane/resources/images/AssignAttributesAction.svg b/freeplane/resources/images/AssignAttributesAction.svg
new file mode 100644
index 0000000..f9a90b1
--- /dev/null
+++ b/freeplane/resources/images/AssignAttributesAction.svg
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 15.854 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="AssignAttributesAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\AssignAttributesAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview58"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-1.5306271"
+     inkscape:cy="8"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       x2="219.96"
+       y1="238.03"
+       x1="268.63">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       x1="-2585.9"
+       y1="-2128.6"
+       gradientTransform="matrix(0.3505,0,0,0.34695,931.94607,742.71776)"
+       x2="-2596.4"
+       gradientUnits="userSpaceOnUse"
+       y2="-2104.9"
+       id="l">
+      <stop
+         id="stop4405"
+         offset="0"
+         stop-color="#dcdcdc" />
+      <stop
+         id="stop4407"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+    <filter
+       x="-.17407"
+       y="-.16576"
+       width="1.3481"
+       height="1.3315"
+       style="color-interpolation-filters:sRGB"
+       id="n">
+      <feGaussianBlur
+         id="feGaussianBlur4410"
+         stdDeviation="0.82320991" />
+    </filter>
+    <linearGradient
+       x1="-2584.4"
+       y1="-2130.1"
+       gradientTransform="matrix(0.31602,0,0,0.31283,842.79607,670.09776)"
+       x2="-2589.3"
+       gradientUnits="userSpaceOnUse"
+       y2="-2125.2"
+       id="m">
+      <stop
+         id="stop4413"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4415"
+         offset="1"
+         stop-color="#dcdcdc" />
+    </linearGradient>
+    <radialGradient
+       r="61.352"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.21"
+       cy="866.01"
+       gradientUnits="userSpaceOnUse"
+       id="e">
+      <stop
+         id="stop4418"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <stop
+         id="stop4420"
+         offset="1"
+         stop-color="#ccc" />
+    </radialGradient>
+    <linearGradient
+       x1="348.72"
+       y1="863.3"
+       gradientTransform="matrix(0.074862,0,0,0.035378,-776.1,471.94)"
+       x2="318.68"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59"
+       id="k">
+      <stop
+         id="stop4423"
+         offset="0"
+         stop-color="#00f" />
+      <stop
+         id="stop4425"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="333.49"
+       y1="791.28"
+       gradientTransform="matrix(0.056864,-0.055812,0.035022,0.03596,-241.08,860.4)"
+       x2="343.89"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="j">
+      <stop
+         id="stop4428"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <stop
+         id="stop4430"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </linearGradient>
+    <linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="446.77"
+       id="d" />
+    <linearGradient
+       id="f">
+      <stop
+         id="stop4434"
+         offset="0"
+         stop-color="#f70000" />
+      <stop
+         id="stop4436"
+         offset="1"
+         stop-color="#780000" />
+    </linearGradient>
+    <linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="449.6"
+       id="c" />
+    <linearGradient
+       id="g">
+      <stop
+         id="stop4440"
+         offset="0"
+         stop-color="#baa492" />
+      <stop
+         id="stop4442"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#i"
+       y2="449.64"
+       id="b-1" />
+    <linearGradient
+       id="i">
+      <stop
+         id="stop4446"
+         offset="0" />
+      <stop
+         id="stop4448"
+         offset="1"
+         stop-color="#7e7e7e" />
+    </linearGradient>
+    <linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="462.65"
+       id="a-0" />
+    <linearGradient
+       id="h">
+      <stop
+         id="stop4452"
+         offset="0"
+         stop-color="#c00000" />
+      <stop
+         id="stop4454"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4706">
+    <g
+       id="g17"
+       transform="matrix(0.9909,0,0,0.9909,-88.710576,-824.44668)">
+      <g
+         id="g19"
+         transform="matrix(0.70605,0,0,0.70605,63.018,229.25)">
+        <rect
+           id="rect21"
+           x="38.700001"
+           y="854.07001"
+           width="20.341999"
+           height="22.160999"
+           style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.70817" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path23"
+           d="m 48.871,858.78 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
+           style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.16711999;stroke-linecap:round;stroke-linejoin:round" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path25"
+           d="m 48.871,863.64 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.35407999;stroke-linecap:round;stroke-linejoin:round" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path27"
+           d="m 48.871,868.5 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.35407999;stroke-linecap:round;stroke-linejoin:round" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path29"
+           d="m 48.871,873.36 -10.122,0 0,-4.6868 10.122,0 m 0,4.6868 10.122,0 0,-4.6868 -10.122,0 -0.03471,4.694"
+           style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.35407999;stroke-linecap:round;stroke-linejoin:round" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path31"
+           d="m 39.023,874.74 0,-1.2365 9.8478,0 9.8478,0 0,1.2365 0,1.2365 -9.8478,0 -9.8478,0 0,-1.2365 z"
+           style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.044161;stroke-linecap:round;stroke-linejoin:round" />
+        <text
+           style="font-style:italic;font-size:2.08349991px;fill:#0000ff"
+           id="text33"
+           x="40.057484"
+           y="861.82092"
+           font-style="italic"
+           font-size="2.0835px"
+           xml:space="preserve"><tspan
+             id="tspan35"
+             x="40.057484"
+             y="861.82092">Predrag</tspan></text>
+        <text
+           style="font-style:italic;font-size:2.08349991px;fill:#ff0000"
+           id="text37"
+           x="40.350864"
+           y="866.51904"
+           font-style="italic"
+           font-size="2.0835px"
+           xml:space="preserve"><tspan
+             id="tspan39"
+             x="40.350864"
+             y="866.51904">Romina</tspan></text>
+        <text
+           style="font-style:italic;font-size:2.08349991px;fill:#008000"
+           id="text41"
+           x="51.055748"
+           y="866.53125"
+           font-style="italic"
+           font-size="2.0835px"
+           xml:space="preserve"><tspan
+             id="tspan43"
+             x="51.055748"
+             y="866.53125">Sara</tspan></text>
+        <text
+           style="font-style:italic;font-size:2.08349991px;fill:#ff6600"
+           id="text45"
+           x="51.055748"
+           y="862.04016"
+           font-style="italic"
+           font-size="2.0835px"
+           xml:space="preserve"><tspan
+             id="tspan47"
+             x="51.055748"
+             y="862.04016">Stela</tspan></text>
+      </g>
+      <rect
+         id="rect49"
+         x="89.523003"
+         y="832.09003"
+         width="16"
+         height="16"
+         style="color:#000000;fill:none" />
+    </g>
+    <g
+       style="stroke-linejoin:round"
+       transform="matrix(1.0352236,0.126026,-0.126026,1.0352236,320.29132,-866.3917)"
+       id="g4484">
+      <rect
+         style="fill:#ffffff;stroke:#7900aa;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
+         ry="0.27803001"
+         rx="0.27803001"
+         transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
+         height="4.4428"
+         width="1.7715"
+         y="500.42999"
+         x="-751.59003"
+         id="rect4486" />
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+         inkscape:connector-curvature="0"
+         d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+         id="path4488" />
+      <g
+         transform="translate(-0.035609,-0.059735)"
+         id="g4490">
+        <path
+           style="fill:url(#e);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-opacity:0.81395"
+           inkscape:connector-curvature="0"
+           d="m 451.11,879.75 a 60.261,57.727 0 0 1 -60.247,57.727 60.261,57.727 0 0 1 -60.275,-57.699 60.261,57.727 0 0 1 60.218,-57.754 60.261,57.727 0 0 1 60.304,57.672"
+           transform="matrix(0.06936,0,0,0.072422,-224.82,802.68)"
+           id="path4492" />
+        <rect
+           style="fill:url(#k);stroke:#000080;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
+           ry="0.27803001"
+           rx="0.27803001"
+           transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
+           height="4.4428"
+           width="1.7715"
+           y="500.42999"
+           x="-751.59003"
+           id="rect4494" />
+        <path
+           style="fill:url(#j);fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+           inkscape:connector-curvature="0"
+           d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+           id="path4496" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/AutomaticEdgeColorHookAction.svg b/freeplane/resources/images/AutomaticEdgeColorHookAction.svg
new file mode 100644
index 0000000..1726cea
--- /dev/null
+++ b/freeplane/resources/images/AutomaticEdgeColorHookAction.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 19.725 16.002" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-86.687 -297.99)">
+<g stroke-linejoin="round" stroke-linecap="round" stroke-opacity=".99608" stroke-width=".72788" transform="matrix(.85116 0 0 .87095 300.59 -80.978)">
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-246.35 442.74c2.887-0.0579 5.5539 2.6669 8.5847 0.2255 2.8686-2.3528 6.8305 1.7352 9.2772 2.0083-2.0453-0.2121-5.56-4.0903-8.3863-1.2373-4.2349 4.2234-6.5108 1.6273-9.4591 1.6863l-0.0165-2.6828z" stroke="#217821" fill="#2ca02c"/>
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-250.92 445.73c2.887 0.0579 5.5539 0.3457 8.5847 2.7871 2.8686 2.3528 6.5436 4.8638 8.9903 4.5906-2.0453 0.2121-5.2731-2.5086-8.0994-5.3617-4.2349-4.2234-6.5108-4.6399-9.4591-4.6989l-0.0165 2.6828h-0.00001z" stroke="#000080" fill="#003380"/>
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-250.94 442.88c2.887-0.0579 5.5539-0.3457 8.5847-2.7871 2.8686-2.3528 6.5436-4.8638 8.9903-4.5906-2.0453-0.2121-5.2731 2.5086-8.0994 5.3617-4.2349 4.2234-6.5108 4.6399-9.4591 4.6989l-0.0165-2.6828h-0.00001z" stroke="#a00" fill="#f00"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/Back24.png b/freeplane/resources/images/Back24.png
new file mode 100644
index 0000000..ac301a5
Binary files /dev/null and b/freeplane/resources/images/Back24.png differ
diff --git a/freeplane/resources/images/Back24.svg b/freeplane/resources/images/Back24.svg
new file mode 100644
index 0000000..3f0d201
--- /dev/null
+++ b/freeplane/resources/images/Back24.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg4447"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 24 24"
+   sodipodi:docname="Back24.svg">
+  <defs
+     id="defs4449">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5033">
+      <stop
+         style="stop-color:#8787ff;stop-opacity:1"
+         offset="0"
+         id="stop5035" />
+      <stop
+         id="stop5039"
+         offset="0.13518728"
+         style="stop-color:#000080;stop-opacity:1" />
+      <stop
+         style="stop-color:#8787ff;stop-opacity:1"
+         offset="1"
+         id="stop5037" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5033"
+       id="linearGradient5015"
+       x1="-96.926437"
+       y1="8.94804"
+       x2="-70.972519"
+       y2="35.749985"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52442207,0,0,0.52442207,-58.402163,4.4469134)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.1475459"
+     inkscape:cx="-37.25382"
+     inkscape:cy="0.47423999"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1234"
+     inkscape:window-height="866"
+     inkscape:window-x="30"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4452">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <g
+       id="g4357">
+      <g
+         transform="matrix(0.85660624,0,0,0.85660624,100.27611,-5.304121)"
+         id="g5067">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path5057"
+           d="m -98.895841,-2.181938 3.81514,3.9109381 -9.078769,8.6693049 9.078769,9.500869 -3.81514,3.814581 -12.941909,-13.31545 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000081;stroke-width:0.52442205;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient5015);fill-opacity:1;fill-rule:nonzero;stroke:#000081;stroke-width:0.52442205;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -98.895847,-2.181938 3.815145,3.9109381 -9.078768,8.6693049 9.078768,9.500869 -3.815145,3.814581 -12.941903,-13.31545 z"
+           id="rect5006"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+      </g>
+      <rect
+         y="-8"
+         x="0"
+         height="24"
+         width="24"
+         id="rect4355"
+         style="opacity:0.8479996;fill:none;stroke:none;stroke-width:4.12423229;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Bold16.gif b/freeplane/resources/images/Bold16.gif
deleted file mode 100644
index 541f053..0000000
Binary files a/freeplane/resources/images/Bold16.gif and /dev/null differ
diff --git a/freeplane/resources/images/Bold16.svg b/freeplane/resources/images/Bold16.svg
new file mode 100644
index 0000000..d22826e
--- /dev/null
+++ b/freeplane/resources/images/Bold16.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-88.111 -328.57)">
+<g transform="translate(-350.8 -376.43)">
+<rect style="color:#000000" height="16" width="16" y="704.99" x="438.91" fill="none"/>
+<g transform="matrix(1.3154 0 0 1.3154 744.22 -505.09)" stroke="#000">
+<path d="m-224.04 925.92c0.3583 0.0782 0.66612 0.18568 0.92346 0.32248 0.25733 0.13681 0.4658 0.29643 0.62542 0.47884 0.1596 0.18241 0.27687 0.38437 0.3518 0.60587 0.0749 0.2215 0.11237 0.45278 0.11238 0.69382-0.00001 0.2215-0.0358 0.43975-0.1075 0.65473-0.0717 0.21499-0.17428 0.41858-0.30782 0.61076-0.13356 0.19219-0.29806 0.36483-0.49349 0.51792-0.19545 0.1531-0.41695 0.27851-0.66451 0.37623-0.46907 0.18242-1.2085 0.27362-2.2183 0.27362h-4.1922v-0.2443h0.33225c0.14984 0 0.28339-0.013 0 [...]
+</g>
+<rect style="color:#000000" height="16" width="16" y="704.99" x="438.91" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/Bold24.gif b/freeplane/resources/images/Bold24.gif
deleted file mode 100644
index ef0aa1a..0000000
Binary files a/freeplane/resources/images/Bold24.gif and /dev/null differ
diff --git a/freeplane/resources/images/Bold_on16.png b/freeplane/resources/images/Bold_on16.png
deleted file mode 100644
index 8570a88..0000000
Binary files a/freeplane/resources/images/Bold_on16.png and /dev/null differ
diff --git a/freeplane/resources/images/CenterSelectedNodeAutomatically.png b/freeplane/resources/images/CenterSelectedNodeAutomatically.png
new file mode 100644
index 0000000..1bda110
Binary files /dev/null and b/freeplane/resources/images/CenterSelectedNodeAutomatically.png differ
diff --git a/freeplane/resources/images/CenterSelectedNodeAutomatically.svg b/freeplane/resources/images/CenterSelectedNodeAutomatically.svg
new file mode 100644
index 0000000..0ba0b89
--- /dev/null
+++ b/freeplane/resources/images/CenterSelectedNodeAutomatically.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="CenterSelectedNodeAutomatically.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\sCenterSelectedNodeAutomatically.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview43"
+     showgrid="false"
+     inkscape:zoom="13.282005"
+     inkscape:cx="-8.8683928"
+     inkscape:cy="-6.1793806"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="169.99"
+       gradientUnits="userSpaceOnUse"
+       x2="233.17"
+       y1="287.9"
+       x1="290.64"
+       gradientTransform="matrix(0.091997,0,0,0.091997,-13.95,-14.738)">
+      <stop
+         stop-color="#dc7fcf"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#a8bef9"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4424">
+    <rect
+       id="rect17"
+       x="0"
+       y="0"
+       width="16"
+       height="16"
+       ry="0.092563003"
+       rx="0.070384003"
+       style="color:#000000;opacity:0.92510998;fill:none" />
+    <rect
+       ry="1.3234673"
+       rx="1.39029"
+       y="0.2249999"
+       x="0.2249999"
+       height="15.55"
+       width="15.55"
+       id="rect4386"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.34999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+    <rect
+       height="6.6856174"
+       rx="1.5440253"
+       ry="1.4743654"
+       width="13.654732"
+       y="4.6571913"
+       x="1.1726341"
+       id="rect21"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.5;stroke-linejoin:round" />
+    <rect
+       id="rect41"
+       x="0"
+       y="0"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+    <g
+       transform="translate(-0.20338975,-0.2105261)"
+       id="g4417">
+      <circle
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-renderi [...]
+         id="path4370"
+         cx="8.2033892"
+         cy="8.2105255"
+         r="2.4735408" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4376"
+         d="M 5.9125532,10.462203 9.9466621,6.359238"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 6.4307366,6.4371411 10.455066,10.501363"
+         id="path4378"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 3.4399745,8.2105259 9.5268305,0"
+         id="path4372"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4374"
+         d="m 8.2033892,3.4471112 0,9.5268298"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Cloud24.gif b/freeplane/resources/images/Cloud24.gif
deleted file mode 100644
index 48dc9e6..0000000
Binary files a/freeplane/resources/images/Cloud24.gif and /dev/null differ
diff --git a/freeplane/resources/images/Cloud24.svg b/freeplane/resources/images/Cloud24.svg
new file mode 100644
index 0000000..8d93855
--- /dev/null
+++ b/freeplane/resources/images/Cloud24.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b" y2="628.06" gradientUnits="userSpaceOnUse" x2="-719.81" gradientTransform="matrix(.12814 0 0 .13053 34.59 763.12)" y1="575.2" x1="-715.75">
+<stop stop-color="#dc71c8" stop-opacity="0.4" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="628.06" gradientUnits="userSpaceOnUse" x2="-719.81" gradientTransform="matrix(.12814 0 0 .14018 34.701 757.07)" y1="575.2" x1="-715.75">
+<stop stop-color="#0cf" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-57.531 -51.661)">
+<g transform="translate(122.17 -781.83)">
+<rect style="color:#000000" height="16" width="16" y="833.49" x="-64.638" fill="none"/>
+<g transform="matrix(.98422 0 0 .98422 -.84932 13.237)">
+<path style="color:#000000" d="m-56.71 835.76c-1.2969 0-2.4275 0.59498-3.0473 1.4806-0.000991-0.00041-0.003 0.00043-0.004 0-0.32527-0.10471-0.67074-0.16207-1.0291-0.16207-1.9187 0-3.4758 1.6156-3.4758 3.6095 0 1.6489 1.0656 3.0418 2.5188 3.4738 0.25327 1.3199 1.6431 2.5441 3.4838 2.9349 2.003 0.42533 3.8499-0.28559 4.3928-1.6076 2.4802 0.28744 4.6396-0.98548 4.8453-2.8736 0.20718-1.9013-1.6459-3.7113-4.1446-4.052-0.13585-1.5675-1.6678-2.8035-3.5399-2.8035z" fill-rule="evenodd" stroke="#d [...]
+<path style="color:#000000" d="m-58.209 840.13c-2.514-0.0229-4.7336 0.49733-6.1828 1.3542 0.1859 1.3328 1.179 2.42 2.4867 2.7819 0.25327 1.2291 1.6431 2.369 3.4838 2.733 2.003 0.39607 3.8499-0.26593 4.3928-1.497 2.1658 0.23372 4.0879-0.63929 4.6771-2.0354-1.0449-1.7114-4.1896-3.0836-7.9768-3.304-0.2961-0.0172-0.59179-0.03-0.88096-0.0326z" fill-rule="evenodd" fill="url(#b)"/>
+<path style="color:#000000" d="m-56.756 835.81c-1.2969 0-2.4275 0.59498-3.0473 1.4806-0.000991-0.00041-0.003 0.00043-0.004 0-0.32527-0.10471-0.67074-0.16207-1.0291-0.16207-1.9187 0-3.4758 1.6156-3.4758 3.6095 0 1.6489 1.0656 3.0418 2.5188 3.4738 0.25327 1.3199 1.6431 2.5441 3.4838 2.9349 2.003 0.42533 3.8499-0.28559 4.3928-1.6076 2.4802 0.28744 4.6396-0.98548 4.8453-2.8736 0.20718-1.9013-1.6459-3.7113-4.1446-4.052-0.13585-1.5675-1.6678-2.8035-3.5399-2.8035z" fill-rule="evenodd" stroke="# [...]
+<path style="color:#000000" d="m-53.158 838.69c-1.5533 0.97885-1.2314 3.1178-1.133 4.2146" stroke-opacity=".97647" stroke="#0855d3" stroke-linecap="round" stroke-width="1px" fill="none"/>
+<path style="color:#000000" d="m-59.82 837.24c-1.0972 1.0775-1.2368 3.4533-0.63446 4.4865" stroke-opacity=".78431" stroke="#1f54d0" stroke-linecap="round" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/Colors24.svg b/freeplane/resources/images/Colors24.svg
new file mode 100644
index 0000000..6e7f5f7
--- /dev/null
+++ b/freeplane/resources/images/Colors24.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b" y2="628.06" gradientUnits="userSpaceOnUse" x2="-719.81" gradientTransform="matrix(.12814 0 0 .13053 34.59 763.12)" y1="575.2" x1="-715.75">
+<stop stop-color="#dc71c8" stop-opacity="0.4" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="628.06" gradientUnits="userSpaceOnUse" x2="-719.81" gradientTransform="matrix(.12814 0 0 .14018 34.701 757.07)" y1="575.2" x1="-715.75">
+<stop stop-color="#33d6ff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-88.407 -264.03)">
+<g transform="translate(133.02 -568.03)">
+<g transform="matrix(.98422 0 0 .98422 19.172 10.196)">
+<path style="color:#000000" d="m-56.71 835.76c-1.2969 0-2.4275 0.59498-3.0473 1.4806-0.000991-0.00041-0.003 0.00043-0.004 0-0.32527-0.10471-0.67074-0.16207-1.0291-0.16207-1.9187 0-3.4758 1.6156-3.4758 3.6095 0 1.6489 1.0656 3.0418 2.5188 3.4738 0.25327 1.3199 1.6431 2.5441 3.4838 2.9349 2.003 0.42533 3.8499-0.28559 4.3928-1.6076 2.4802 0.28744 4.6396-0.98548 4.8453-2.8736 0.20718-1.9013-1.6459-3.7113-4.1446-4.052-0.13585-1.5675-1.6678-2.8035-3.5399-2.8035z" fill-rule="evenodd" stroke="#d [...]
+<path style="color:#000000" d="m-58.209 840.13c-2.514-0.0229-4.7336 0.49733-6.1828 1.3542 0.1859 1.3328 1.179 2.42 2.4867 2.7819 0.25327 1.2291 1.6431 2.369 3.4838 2.733 2.003 0.39607 3.8499-0.26593 4.3928-1.497 2.1658 0.23372 4.0879-0.63929 4.6771-2.0354-1.0449-1.7114-4.1896-3.0836-7.9768-3.304-0.2961-0.0172-0.59179-0.03-0.88096-0.0326z" fill-rule="evenodd" fill="url(#b)"/>
+<path style="color:#000000" d="m-56.756 835.81c-1.2969 0-2.4275 0.59498-3.0473 1.4806-0.000991-0.00041-0.003 0.00043-0.004 0-0.32527-0.10471-0.67074-0.16207-1.0291-0.16207-1.9187 0-3.4758 1.6156-3.4758 3.6095 0 1.6489 1.0656 3.0418 2.5188 3.4738 0.25327 1.3199 1.6431 2.5441 3.4838 2.9349 2.003 0.42533 3.8499-0.28559 4.3928-1.6076 2.4802 0.28744 4.6396-0.98548 4.8453-2.8736 0.20718-1.9013-1.6459-3.7113-4.1446-4.052-0.13585-1.5675-1.6678-2.8035-3.5399-2.8035z" fill-rule="evenodd" stroke="# [...]
+<path style="color:#000000" d="m-53.158 838.69c-1.5533 0.97885-1.2314 3.1178-1.133 4.2146" stroke="#0055d4" stroke-linecap="round" stroke-width="1px" fill="none"/>
+<path style="color:#000000" d="m-59.82 837.24c-1.0972 1.0775-1.2368 3.4533-0.63446 4.4865" stroke="#0855d3" stroke-linecap="round" stroke-width="1px" fill="none"/>
+</g>
+<g fill-rule="evenodd" transform="matrix(1.1561 0 0 1.1561 1.8231 -130)">
+<rect style="color:#000000" height="2.5644" width="2.5644" y="843.19" x="-39.656" fill="#00f"/>
+<rect style="color:#000000" height="2.5644" width="2.5644" y="843.19" x="-37.092" fill="#f00"/>
+<rect style="color:#000000" height="2.5644" width="2.5644" y="843.19" x="-31.971" fill="#55d400"/>
+<rect style="color:#000000" height="2.5644" width="2.5644" y="843.19" x="-29.406" fill="#f60"/>
+<rect style="color:#000000" height="2.5644" width="2.5644" y="843.19" x="-34.527" fill="#ff0"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="832.06" x="-44.617" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/Copy24.gif b/freeplane/resources/images/Copy24.gif
deleted file mode 100644
index c665d07..0000000
Binary files a/freeplane/resources/images/Copy24.gif and /dev/null differ
diff --git a/freeplane/resources/images/CopyPresentation.svg b/freeplane/resources/images/CopyPresentation.svg
new file mode 100644
index 0000000..4f0a420
--- /dev/null
+++ b/freeplane/resources/images/CopyPresentation.svg
@@ -0,0 +1,848 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="57.812138"
+   height="34"
+   viewBox="0 0 54.198877 31.874999"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="CopyPresentation.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="160.7"
+       y1="388.92001"
+       gradientTransform="matrix(-0.1893799,1.3718942e-4,-1.955858e-4,-0.12057819,585.1666,743.59023)"
+       x2="142.38"
+       gradientUnits="userSpaceOnUse"
+       y2="377.60001"
+       id="d">
+      <svg:stop
+         id="stop3285"
+         offset="0"
+         stop-color="#36d200" />
+      <svg:stop
+         id="stop3287"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="-241.17"
+       y1="192.64"
+       x2="-239.53999"
+       gradientUnits="userSpaceOnUse"
+       y2="166.63"
+       id="c">
+      <svg:stop
+         id="stop3290"
+         offset="0"
+         stop-color="#c8e3ee" />
+      <svg:stop
+         id="stop3292"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="-229.32001"
+       y1="173.28"
+       x2="-230.53"
+       gradientUnits="userSpaceOnUse"
+       y2="170.07001"
+       id="b">
+      <svg:stop
+         id="stop3295"
+         offset="0"
+         stop-color="#90c7dc" />
+      <svg:stop
+         id="stop3297"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="-245.55"
+       y1="194.64"
+       x2="-245.73"
+       gradientUnits="userSpaceOnUse"
+       y2="191.92999"
+       id="a-0">
+      <svg:stop
+         id="stop3300"
+         offset="0"
+         stop-color="#64afd2" />
+      <svg:stop
+         id="stop3302"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4484"
+       inkscape:collect="always">
+      <svg:stop
+         id="stop4486"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <svg:stop
+         id="stop4488"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="11.0039"
+       x2="20.945299"
+       y1="25.4727"
+       x1="27.294901"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd5">
+      <svg:stop
+         id="stop13012"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         offset="0" />
+      <svg:stop
+         id="stop13014"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="10.4377"
+       x2="24.6035"
+       y1="9.3432999"
+       x1="24.6035"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd6">
+      <svg:stop
+         id="stop13035"
+         style="stop-color:#87deaa;stop-opacity:1"
+         offset="0" />
+      <svg:stop
+         id="stop13037"
+         style="stop-color:#008033;stop-opacity:1"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-5"
+       y2="39.685001"
+       gradientUnits="userSpaceOnUse"
+       x2="34.534"
+       gradientTransform="matrix(0.90504,0,0,0.90504,-531.65,73.301)"
+       y1="12.285"
+       x1="14.463">
+      <svg:stop
+         stop-color="#8da6d8"
+         offset="0"
+         id="stop3664" />
+      <svg:stop
+         stop-color="#b4c5e5"
+         offset=".25"
+         id="stop3666" />
+      <svg:stop
+         stop-color="#d8e1f2"
+         offset=".5"
+         id="stop3668" />
+      <svg:stop
+         stop-color="#92aada"
+         offset=".75"
+         id="stop3670" />
+      <svg:stop
+         stop-color="#8ea7d8"
+         offset="1"
+         id="stop3672" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5-8">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)"
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-4">
+      <svg:stop
+         id="stop7"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="b-3"
+       y2="298.92001"
+       gradientUnits="userSpaceOnUse"
+       x2="112.73"
+       y1="310.62"
+       x1="111.93"
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)">
+      <svg:stop
+         stop-color="#0d2e2e"
+         offset="0"
+         id="stop7-2" />
+      <svg:stop
+         stop-color="#0d2e2e"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-1"
+       y2="7.1090999"
+       gradientUnits="userSpaceOnUse"
+       y1="24.627001"
+       gradientTransform="matrix(0.7884076,0,0,-0.59745281,363.49212,534.75709)"
+       x2="21.933001"
+       x1="21.933001">
+      <svg:stop
+         stop-color="#acf"
+         offset="0"
+         id="stop12" />
+      <svg:stop
+         stop-color="#04a"
+         offset="1"
+         id="stop14" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="c-08"
+       y2="302.84"
+       gradientUnits="userSpaceOnUse"
+       x2="118.52"
+       y1="302.84"
+       x1="105.51"
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)">
+      <svg:stop
+         stop-color="#37c837"
+         offset="0"
+         id="stop17" />
+      <svg:stop
+         stop-color="#165016"
+         offset="1"
+         id="stop19" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="d-2"
+       y2="300.78"
+       gradientUnits="userSpaceOnUse"
+       x2="112.37"
+       y1="303.64001"
+       x1="112.29"
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)">
+      <svg:stop
+         stop-color="#b9d7ff"
+         offset="0"
+         id="stop22" />
+      <svg:stop
+         stop-color="#3c8dff"
+         offset="1"
+         id="stop24" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c-0">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b-48">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd6"
+       id="linearGradient5053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       x1="24.919374"
+       y1="6.1478682"
+       x2="24.919374"
+       y2="7.4600263" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient5055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5057"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd6"
+       id="linearGradient5059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       x1="24.919374"
+       y1="6.1478682"
+       x2="24.919374"
+       y2="7.4600263" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient5061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5063"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.471017"
+     inkscape:cx="97.096995"
+     inkscape:cy="34.23944"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-360.07903,-702.29018)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.79667282"
+       id="rect234"
+       transform="matrix(0.50024976,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="-40.043659"
+       x="815.5351"
+       height="0"
+       width="0.80215645" />
+    <svg:g
+       id="g5405"
+       transform="matrix(0.98333559,0,0,0.98333559,6.9832791,11.703253)">
+      <svg:g
+         transform="matrix(0.76507934,0,0,0.76507934,130.75767,320.9502)"
+         id="g4761">
+        <svg:g
+           id="g4577"
+           transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)">
+          <svg:path
+             sodipodi:nodetypes="cc"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 290.03565,529.06437 v 6.98637"
+             id="path4575"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             id="path13016"
+             d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+             style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:g
+             transform="translate(0.26630924)"
+             id="g4530">
+            <svg:rect
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5053);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+               id="rect9222"
+               width="37.615192"
+               height="3.7142279"
+               x="270.89679"
+               y="503.24127"
+               inkscape:r_cx="true"
+               inkscape:r_cy="true"
+               rx="1.790844"
+               ry="1.802771" />
+            <svg:path
+               style="opacity:0.65899999;fill:url(#linearGradient5055);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+               id="path4474"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="czcsccc" />
+            <svg:path
+               style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+               id="path4474-7"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="czcsccc" />
+          </svg:g>
+          <svg:path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4535-5"
+             d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <svg:circle
+             r="1.8556092"
+             cy="534.54059"
+             cx="290.03564"
+             id="path4573"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering [...]
+        </svg:g>
+        <svg:g
+           id="g4621"
+           transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)">
+          <svg:rect
+             ry="1.862726"
+             rx="1.8591295"
+             y="553.88306"
+             x="270.47888"
+             height="31.358326"
+             width="41.208649"
+             id="rect4498-4"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+          <svg:g
+             transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)"
+             id="g4422-4">
+            <svg:path
+               id="path4779-0"
+               d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               id="path4781-8"
+               d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               id="path4783-2"
+               d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               id="path4743-1"
+               d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+               font-size="61.543px"
+               inkscape:connector-curvature="0"
+               style="font-size:61.54299927px;fill:url(#linearGradient5057);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+            <svg:rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+               rx="0.97680634"
+               ry="1.0587236"
+               height="4.8009052"
+               width="8.6384783"
+               y="714.97345"
+               x="-395.90698"
+               id="rect4717-2"
+               transform="scale(-1,1)" />
+            <svg:rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+               rx="0.9768008"
+               ry="1.0587536"
+               height="4.8010173"
+               width="8.6384134"
+               y="722.9632"
+               x="383.33188"
+               id="rect4723-6" />
+            <svg:rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+               rx="0.91026998"
+               ry="1.007938"
+               height="4.5706868"
+               width="8.0499411"
+               y="-711.94672"
+               x="-391.7066"
+               id="rect4729-2"
+               transform="scale(-1)" />
+          </svg:g>
+        </svg:g>
+      </svg:g>
+      <svg:g
+         id="g5112"
+         transform="matrix(0.76507934,0,0,0.76507934,153.82716,325.16526)">
+        <svg:g
+           transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)"
+           id="g5090">
+          <svg:path
+             inkscape:connector-curvature="0"
+             id="path5074"
+             d="m 290.03565,529.06437 v 6.98637"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             sodipodi:nodetypes="cc" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+             d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+             id="path5076"
+             inkscape:r_cx="true"
+             inkscape:r_cy="true" />
+          <svg:g
+             id="g5084"
+             transform="translate(0.26630924)">
+            <svg:rect
+               ry="1.802771"
+               rx="1.790844"
+               inkscape:r_cy="true"
+               inkscape:r_cx="true"
+               y="503.24127"
+               x="270.89679"
+               height="3.7142279"
+               width="37.615192"
+               id="rect5078"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5059);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+            <svg:path
+               sodipodi:nodetypes="czcsccc"
+               inkscape:connector-curvature="0"
+               id="path5080"
+               d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+               style="opacity:0.65899999;fill:url(#linearGradient5061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            <svg:path
+               sodipodi:nodetypes="czcsccc"
+               inkscape:connector-curvature="0"
+               id="path5082"
+               d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+               style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          </svg:g>
+          <svg:path
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+             id="path5086"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cc" />
+          <svg:circle
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering [...]
+             id="circle5088"
+             cx="290.03564"
+             cy="534.54059"
+             r="1.8556092" />
+        </svg:g>
+        <svg:g
+           transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)"
+           id="g5110">
+          <svg:rect
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+             id="rect5092"
+             width="41.208649"
+             height="31.358326"
+             x="270.47888"
+             y="553.88306"
+             rx="1.8591295"
+             ry="1.862726" />
+          <svg:g
+             id="g5108"
+             transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)">
+            <svg:path
+               inkscape:connector-curvature="0"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+               id="path5094" />
+            <svg:path
+               inkscape:connector-curvature="0"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+               d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+               id="path5096" />
+            <svg:path
+               inkscape:connector-curvature="0"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+               id="path5098" />
+            <svg:path
+               style="font-size:61.54299927px;fill:url(#linearGradient5063);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668"
+               inkscape:connector-curvature="0"
+               font-size="61.543px"
+               d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+               id="path5100" />
+            <svg:rect
+               transform="scale(-1,1)"
+               id="rect5102"
+               x="-395.90698"
+               y="714.97345"
+               width="8.6384783"
+               height="4.8009052"
+               ry="1.0587236"
+               rx="0.97680634"
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+            <svg:rect
+               id="rect5104"
+               x="383.33188"
+               y="722.9632"
+               width="8.6384134"
+               height="4.8010173"
+               ry="1.0587536"
+               rx="0.9768008"
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+            <svg:rect
+               transform="scale(-1)"
+               id="rect5106"
+               x="-391.7066"
+               y="-711.94672"
+               width="8.0499411"
+               height="4.5706868"
+               ry="1.007938"
+               rx="0.91026998"
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+          </svg:g>
+        </svg:g>
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/CopySlide.svg b/freeplane/resources/images/CopySlide.svg
new file mode 100644
index 0000000..a08d820
--- /dev/null
+++ b/freeplane/resources/images/CopySlide.svg
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="59.944252"
+   height="34.000004"
+   viewBox="0 0 56.197734 31.875003"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="CopySlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient4549"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       x1="160.7"
+       y1="388.92001"
+       gradientTransform="matrix(-0.1893799,1.3718942e-4,-1.955858e-4,-0.12057819,585.1666,743.59023)"
+       x2="142.38"
+       gradientUnits="userSpaceOnUse"
+       y2="377.60001"
+       id="d">
+      <stop
+         id="stop3285"
+         offset="0"
+         stop-color="#36d200" />
+      <stop
+         id="stop3287"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="-241.17"
+       y1="192.64"
+       x2="-239.53999"
+       gradientUnits="userSpaceOnUse"
+       y2="166.63"
+       id="c">
+      <stop
+         id="stop3290"
+         offset="0"
+         stop-color="#c8e3ee" />
+      <stop
+         id="stop3292"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="-229.32001"
+       y1="173.28"
+       x2="-230.53"
+       gradientUnits="userSpaceOnUse"
+       y2="170.07001"
+       id="b">
+      <stop
+         id="stop3295"
+         offset="0"
+         stop-color="#90c7dc" />
+      <stop
+         id="stop3297"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="-245.55"
+       y1="194.64"
+       x2="-245.73"
+       gradientUnits="userSpaceOnUse"
+       y2="191.92999"
+       id="a-0">
+      <stop
+         id="stop3300"
+         offset="0"
+         stop-color="#64afd2" />
+      <stop
+         id="stop3302"
+         offset="1"
+         stop-color="#fff" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.471017"
+     inkscape:cx="98.163053"
+     inkscape:cy="34.239442"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-359.0796,-702.29018)">
+    <g
+       id="g4742">
+      <g
+         transform="matrix(0.8509738,0,0,0.8509738,53.654931,104.79459)"
+         id="g4516">
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+           id="rect4498"
+           width="41.208649"
+           height="31.358326"
+           x="359.28696"
+           y="702.50659"
+           rx="1.8591295"
+           ry="1.862726" />
+        <g
+           id="g4422"
+           transform="matrix(1.1553698,0,0,1.1553698,-63.311011,-111.41725)">
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+             d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+             id="path4779" />
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+             d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+             id="path4781" />
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+             d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+             id="path4783" />
+          <path
+             style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668"
+             inkscape:connector-curvature="0"
+             font-size="61.543px"
+             d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+             id="path4743" />
+          <rect
+             transform="scale(-1,1)"
+             id="rect4717"
+             x="-395.90698"
+             y="714.97345"
+             width="8.6384783"
+             height="4.8009052"
+             ry="1.0587236"
+             rx="0.97680634"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+          <rect
+             id="rect4723"
+             x="383.33188"
+             y="722.9632"
+             width="8.6384134"
+             height="4.8010173"
+             ry="1.0587536"
+             rx="0.9768008"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+          <rect
+             transform="scale(-1)"
+             id="rect4729"
+             x="-391.7066"
+             y="-711.94672"
+             width="8.0499411"
+             height="4.5706868"
+             ry="1.007938"
+             rx="0.91026998"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0.8509738,0,0,0.8509738,74.146956,109.34625)"
+         id="g4547">
+        <rect
+           ry="1.862726"
+           rx="1.8591295"
+           y="702.50659"
+           x="359.28696"
+           height="31.358326"
+           width="41.208649"
+           id="rect4529"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+        <g
+           transform="matrix(1.1553698,0,0,1.1553698,-63.311011,-111.41725)"
+           id="g4545">
+          <path
+             id="path4531"
+             d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path4533"
+             d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path4535"
+             d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path4537"
+             d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+             font-size="61.543px"
+             inkscape:connector-curvature="0"
+             style="font-size:61.54299927px;fill:url(#linearGradient4549);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+          <rect
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+             rx="0.97680634"
+             ry="1.0587236"
+             height="4.8009052"
+             width="8.6384783"
+             y="714.97345"
+             x="-395.90698"
+             id="rect4539"
+             transform="scale(-1,1)" />
+          <rect
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+             rx="0.9768008"
+             ry="1.0587536"
+             height="4.8010173"
+             width="8.6384134"
+             y="722.9632"
+             x="383.33188"
+             id="rect4541" />
+          <rect
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+             rx="0.91026998"
+             ry="1.007938"
+             height="4.5706868"
+             width="8.0499411"
+             y="-711.94672"
+             x="-391.7066"
+             id="rect4543"
+             transform="scale(-1)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Cut24.gif b/freeplane/resources/images/Cut24.gif
deleted file mode 100644
index 5c37d3a..0000000
Binary files a/freeplane/resources/images/Cut24.gif and /dev/null differ
diff --git a/freeplane/resources/images/DecreaseNodeFontAction.svg b/freeplane/resources/images/DecreaseNodeFontAction.svg
new file mode 100644
index 0000000..b882556
--- /dev/null
+++ b/freeplane/resources/images/DecreaseNodeFontAction.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-86.531 -394.26)">
+<g transform="translate(278.68 188.41)">
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Arial" font-size="14.724px" stroke="#000000" line-height="125%" y="221.62601" x="-189.05687" stroke-width=".46013" xml:space="preserve" fill="#000000"><tspan y="221.62601" x="-189.05687" stroke-width=".46013">A</tspan></text>
+<rect style="color:#000000" height="16" width="16" y="205.86" x="-192.15" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/DeleteDetailsAction.svg b/freeplane/resources/images/DeleteDetailsAction.svg
new file mode 100644
index 0000000..7634409
--- /dev/null
+++ b/freeplane/resources/images/DeleteDetailsAction.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="396.55" gradientUnits="userSpaceOnUse" y1="381.33" x2="307.79" x1="301.2">
+<stop stop-color="#000080" offset="0"/>
+<stop stop-color="#000080" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-83.21 -164.72)">
+<g transform="translate(468.62 -267.6)">
+<rect style="color:#000000" height="16" width="16" y="432.32" x="-385.4" fill="none"/>
+<rect stroke-linejoin="round" height="6.0403" stroke="#000080" stroke-width=".65393" fill="#fff" fill-rule="evenodd" rx="1.4879" ry="1.5167" width="12.752" y="433.65" x="-383.78"/>
+<path stroke-linejoin="round" d="m301.17 397-9.5008-16.456h19.002z" transform="matrix(.22528 0 0 .22528 -448.21 349.45)" stroke="#000" stroke-linecap="round" stroke-width="1.3" fill="url(#a)"/>
+<rect style="color:#000000" height="13.217" width="14.214" y="433.81" x="-384.51" fill="none"/>
+<g transform="matrix(.88810 0 0 .93325 -627.77 74.151)">
+<g transform="matrix(1.0027 0 0 .86533 -.77761 53.664)" stroke="#000" stroke-dasharray="1.43526771, 1.43526771" stroke-width="1.4353" fill="none">
+<path d="m274.64 399.35h14.565"/>
+<path d="m274.64 393.64h14.565"/>
+<path d="m274.64 396.5h14.565"/>
+</g>
+</g>
+<g transform="matrix(.65234 0 0 .68443 -276.25 -161.68)" fill="#f00">
+<path style="color:#000000" d="m-161.28 889.17c0.59165-6.8804 5.7208-14.856 13.736-16l1.3818 2.3683c-7.776 1.6244-12.057 5.7928-15.118 13.632z"/>
+<path style="color:#000000" d="m-164.97 874.34c6.9053 0.0759 15.242 4.5947 16.982 12.502l-2.2584 1.555c-2.2009-7.6329-6.6776-11.591-14.723-14.057z"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/DeletePresentation.svg b/freeplane/resources/images/DeletePresentation.svg
new file mode 100644
index 0000000..ffa8e55
--- /dev/null
+++ b/freeplane/resources/images/DeletePresentation.svg
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.821814mm"
+   height="10.402451mm"
+   viewBox="0 0 41.888317 36.859077"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="DeletePresentation.svg">
+  <defs
+     id="defs5771">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </linearGradient>
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035" />
+      <stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024,0)" />
+    <linearGradient
+       y2="10.4377"
+       x2="24.6035"
+       y1="9.3432999"
+       x1="24.6035"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd6-7">
+      <stop
+         id="stop13035-6"
+         style="stop-color:#F0F0F0"
+         offset="0" />
+      <stop
+         id="stop13037-5"
+         style="stop-color:#686868"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="a-5"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.2"
+     inkscape:cx="26"
+     inkscape:cy="-3.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-298.42909,-498.43194)">
+    <g
+       id="g4577"
+       transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)">
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 290.03565,529.06437 0,6.98637"
+         id="path4575"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path13016"
+         d="m 306.58353,530.38279 -33.22567,0 0,-23.55079 33.22567,0 0,23.55079 0,0 z"
+         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="translate(0.26630924,0)"
+         id="g4530">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           id="rect9222"
+           width="37.615192"
+           height="3.7142279"
+           x="270.89679"
+           y="503.24127"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           rx="1.790844"
+           ry="1.802771" />
+        <path
+           style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+           id="path4474"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcsccc" />
+        <path
+           style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+           id="path4474-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcsccc" />
+      </g>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4535"
+         d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+         style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <circle
+         r="1.8556092"
+         cy="534.54059"
+         cx="290.03564"
+         id="path4573"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:aut [...]
+    </g>
+    <g
+       id="g4621"
+       transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)">
+      <rect
+         ry="1.862726"
+         rx="1.8591295"
+         y="553.88306"
+         x="270.47888"
+         height="31.358326"
+         width="41.208649"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+      <g
+         transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)"
+         id="g4422">
+        <path
+           id="path4779"
+           d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4781"
+           d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4783"
+           d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4743"
+           d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+           font-size="61.543px"
+           inkscape:connector-curvature="0"
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.97680634"
+           ry="1.0587236"
+           height="4.8009052"
+           width="8.6384783"
+           y="714.97345"
+           x="-395.90698"
+           id="rect4717"
+           transform="scale(-1,1)" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+           rx="0.9768008"
+           ry="1.0587536"
+           height="4.8010173"
+           width="8.6384134"
+           y="722.9632"
+           x="383.33188"
+           id="rect4723" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.91026998"
+           ry="1.007938"
+           height="4.5706868"
+           width="8.0499411"
+           y="-711.94672"
+           x="-391.7066"
+           id="rect4729"
+           transform="scale(-1,-1)" />
+      </g>
+    </g>
+    <g
+       id="g4483"
+       transform="matrix(0.47868937,0,0,0.47868937,70.905591,228.92701)">
+      <path
+         style="color:#000000;fill:#ff0000"
+         d="m 485.54327,611.61627 c 1.33669,-16.30925 12.92478,-35.21456 31.03321,-37.92629 l 3.12185,5.6138 c -17.56802,3.85047 -27.23992,13.73121 -34.15551,32.3132 z"
+         id="path3736"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ff0000"
+         d="m 477.20659,576.46334 c 15.60088,0.17991 34.43566,10.89124 38.36678,29.63465 l -5.10232,3.68596 c -4.97241,-18.09297 -15.08644,-27.47522 -33.2631,-33.32061 z"
+         id="path3738"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/DeleteSlide.svg b/freeplane/resources/images/DeleteSlide.svg
new file mode 100644
index 0000000..cf9f64a
--- /dev/null
+++ b/freeplane/resources/images/DeleteSlide.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.841663mm"
+   height="9.0616827mm"
+   viewBox="0 0 41.958647 32.108325"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="DeleteSlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.4768858"
+     inkscape:cx="41.731219"
+     inkscape:cy="112.48981"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-92.194145,-1192.5381)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+       id="rect4498"
+       width="41.208649"
+       height="31.358326"
+       x="92.569145"
+       y="1192.9131"
+       rx="1.8591295"
+       ry="1.862726" />
+    <g
+       id="g4422"
+       transform="matrix(1.0997216,0,0,1.0997216,-303.70497,419.4563)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+         id="path4779" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+         d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+         id="path4781" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+         id="path4783" />
+      <path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+         id="path4743" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717"
+         x="-395.90698"
+         y="714.97345"
+         width="8.6384783"
+         height="4.8009052"
+         ry="1.0587236"
+         rx="0.97680634"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         id="rect4723"
+         x="383.33188"
+         y="722.9632"
+         width="8.6384134"
+         height="4.8010173"
+         ry="1.0587536"
+         rx="0.9768008"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+      <rect
+         transform="scale(-1,-1)"
+         id="rect4729"
+         x="-391.7066"
+         y="-711.94672"
+         width="8.0499411"
+         height="4.5706868"
+         ry="1.007938"
+         rx="0.91026998"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4483"
+       transform="matrix(0.6574603,0,0,0.6574603,-221.38222,817.70946)">
+      <path
+         style="color:#000000;fill:#ff0000"
+         d="m 485.54327,611.61627 c 1.33669,-16.30925 12.92478,-35.21456 31.03321,-37.92629 l 3.12185,5.6138 c -17.56802,3.85047 -27.23992,13.73121 -34.15551,32.3132 z"
+         id="path3736"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ff0000"
+         d="m 477.20659,576.46334 c 15.60088,0.17991 34.43566,10.89124 38.36678,29.63465 l -5.10232,3.68596 c -4.97241,-18.09297 -15.08644,-27.47522 -33.2631,-33.32061 z"
+         id="path3738"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/DownPresentation.svg b/freeplane/resources/images/DownPresentation.svg
new file mode 100644
index 0000000..7c8d958
--- /dev/null
+++ b/freeplane/resources/images/DownPresentation.svg
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.821814mm"
+   height="10.402451mm"
+   viewBox="0 0 41.888316 36.859076"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="DownPresentation.svg">
+  <defs
+     id="defs5771">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop13035" />
+      <stop
+         offset="1"
+         style="stop-color:#686868"
+         id="stop13037" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="aigrd6-0"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035-8" />
+      <stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,698.86599)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.3745636"
+     inkscape:cx="-59.232947"
+     inkscape:cy="37.136288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(169.64294,-201.26699)">
+    <g
+       id="g4541"
+       transform="translate(59.891688,32.003192)">
+      <g
+         transform="matrix(1.0895892,0,0,1.0895892,-524.58242,-378.65386)"
+         id="g4577">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4575"
+           d="m 290.03565,529.06437 0,6.98637"
+           style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           d="m 306.58353,530.38279 -33.22567,0 0,-23.55079 33.22567,0 0,23.55079 0,0 z"
+           id="path13016"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true" />
+        <g
+           id="g4530"
+           transform="translate(0.26630924,0)">
+          <rect
+             ry="1.802771"
+             rx="1.790844"
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             y="503.24127"
+             x="270.89679"
+             height="3.7142279"
+             width="37.615192"
+             id="rect9222"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+          <path
+             sodipodi:nodetypes="czcsccc"
+             inkscape:connector-curvature="0"
+             id="path4474"
+             d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+             style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="czcsccc"
+             inkscape:connector-curvature="0"
+             id="path4474-7"
+             d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+             style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <path
+           style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+           id="path4535"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:a [...]
+           id="path4573"
+           cx="290.03564"
+           cy="534.54059"
+           r="1.8556092" />
+      </g>
+      <rect
+         ry="1.1366593"
+         rx="1.1344646"
+         y="176.43253"
+         x="-221.29385"
+         height="19.135252"
+         width="25.146044"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.4576596;stroke-opacity:1" />
+      <g
+         transform="matrix(0.66694017,0,0,0.66694017,-462.08529,-292.90472)"
+         id="g4422">
+        <path
+           id="path4779"
+           d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4781"
+           d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4783"
+           d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4743"
+           d="m 376.89205,717.35258 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+           font-size="61.543px"
+           inkscape:connector-curvature="0"
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.97680634"
+           ry="1.0587236"
+           height="4.8009052"
+           width="8.6384783"
+           y="714.97345"
+           x="-395.90698"
+           id="rect4717"
+           transform="scale(-1,1)" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+           rx="0.9768008"
+           ry="1.0587536"
+           height="4.8010173"
+           width="8.6384134"
+           y="722.9632"
+           x="383.33188"
+           id="rect4723" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.91026998"
+           ry="1.007938"
+           height="4.5706868"
+           width="8.0499411"
+           y="-711.94672"
+           x="-391.7066"
+           id="rect4729"
+           transform="scale(-1,-1)" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="H:\FreeMind_Ikone\forward.png"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.21000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91625612;marker:none;enable-background:accumulate"
+         d="m -220.3682,196.03916 5.00041,-6.32261 -2.96694,-0.0323 0.0902,-8.97336 -4.16918,0 -0.0564,8.97336 -2.88829,0 4.98988,6.35481 z"
+         id="path3846-4"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/DownSlide.svg b/freeplane/resources/images/DownSlide.svg
new file mode 100644
index 0000000..0a7a63e
--- /dev/null
+++ b/freeplane/resources/images/DownSlide.svg
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.841663mm"
+   height="9.0616827mm"
+   viewBox="0 0 41.958647 32.108324"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="DownSlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         id="stop12498-6"
+         offset="0"
+         style="stop-color:#dcdcdc;stop-opacity:1" />
+      <stop
+         id="stop12500-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         id="stop15518-1-5"
+         offset="0"
+         style="stop-color:#dc7fcf;stop-opacity:1" />
+      <stop
+         id="stop15520-5-0"
+         offset="1"
+         style="stop-color:#a8bef9;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         id="stop20604-5"
+         offset="0"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+      <stop
+         id="stop20606-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop20576-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20578-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         style="stop-color:#a6a6c6;stop-opacity:1"
+         offset="0"
+         id="stop20586-8" />
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="1"
+         id="stop20588-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         style="stop-color:#2aa200;stop-opacity:1"
+         offset="0"
+         id="stop20411-3" />
+      <stop
+         style="stop-color:#5ffb57;stop-opacity:1"
+         offset="1"
+         id="stop20413-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         style="stop-color:#f1d103;stop-opacity:1;"
+         offset="0"
+         id="stop13708-7" />
+      <stop
+         style="stop-color:#f7cd03;stop-opacity:1"
+         offset="1"
+         id="stop13710-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06975472,0,0,0.06997719,354.27516,702.66026)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.079175"
+     inkscape:cx="-4.3084896"
+     inkscape:cy="12.249084"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-171.60686,-751.41864)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+       id="rect4498-7"
+       width="41.208649"
+       height="31.358326"
+       x="171.98186"
+       y="751.79364"
+       rx="1.8591295"
+       ry="1.862726" />
+    <g
+       id="g4422-5"
+       transform="matrix(1.1550017,0,0,1.0988222,-247.14393,-23.46542)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+         id="path4779-9" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+         d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+         id="path4781-3" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+         id="path4783-6" />
+      <path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069-2);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.75391054;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 375.80496,718.04895 a 3.5718604,3.5832522 0 0 1 -3.57213,3.58354 3.5718604,3.5832522 0 0 1 -3.57216,-3.58354 3.5718604,3.5832522 0 0 1 3.57216,-3.58353 3.5718604,3.5832522 0 0 1 3.57213,3.58353 z"
+         id="path4743-2" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717-9"
+         x="-395.90698"
+         y="714.97345"
+         width="8.6384783"
+         height="4.8009052"
+         ry="1.0587236"
+         rx="0.97680634"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         id="rect4723-6"
+         x="383.33188"
+         y="722.9632"
+         width="8.6384134"
+         height="4.8010173"
+         ry="1.0587536"
+         rx="0.9768008"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+      <rect
+         transform="scale(-1,-1)"
+         id="rect4729-7"
+         x="-391.7066"
+         y="-711.94672"
+         width="8.0499411"
+         height="4.5706868"
+         ry="1.007938"
+         rx="0.91026998"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="H:\FreeMind_Ikone\forward.png"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.21000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91625612;marker:none;enable-background:accumulate"
+       d="m 180.47081,778.0404 5.00041,-6.32261 -2.96694,-0.0323 0.0902,-9.89085 -4.16918,0 -0.0564,9.89085 -2.88829,0 4.98988,6.35481 z"
+       id="path3846-4"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/EditAttributesAction.svg b/freeplane/resources/images/EditAttributesAction.svg
new file mode 100644
index 0000000..450853d
--- /dev/null
+++ b/freeplane/resources/images/EditAttributesAction.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.854 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b" y2="124.52" gradientUnits="userSpaceOnUse" x2="219.96" y1="238.03" x1="268.63">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".99225" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-106.07 -164.72)">
+<g transform="matrix(.99090 0 0 .99090 62.595 98.074)">
+<g transform="translate(-45.651 -764.76)">
+<g transform="matrix(.70605 0 0 .70605 63.018 229.25)">
+<rect opacity=".93720" style="color:#000000" fill-rule="evenodd" height="22.161" width="20.342" stroke="#000" y="854.07" x="38.7" stroke-width=".70817" fill="#fff"/>
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 858.78h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".16712" fill="#b1b1b1"/>
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 863.64h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" stroke="#000" stroke-linecap="round" stroke-width=".35408" fill="none"/>
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 868.5h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" stroke="#000" stroke-linecap="round" stroke-width=".35408" fill="none"/>
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m48.871 873.36h-10.122v-4.6868h10.122m0 4.6868h10.122v-4.6868h-10.122l-0.03471 4.694" stroke="#000" stroke-linecap="round" stroke-width=".35408" fill="none"/>
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m39.023 874.74v-1.2365h9.8478 9.8478v1.2365 1.2365h-9.8478-9.8478v-1.2365z" stroke="#000" stroke-linecap="round" stroke-width=".044161" fill="#ccc"/>
+<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="861.82092" x="40.057484" fill="#0000ff"><tspan y="861.82092" x="40.057484">Predrag</tspan></text>
+<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="866.51904" x="40.350864" fill="#ff0000"><tspan y="866.51904" x="40.350864">Romina</tspan></text>
+<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="866.53125" x="51.055748" fill="#008000"><tspan y="866.53125" x="51.055748">Sara</tspan></text>
+<text xml:space="preserve" font-size="2.0835px" font-style="italic" y="862.04016" x="51.055748" fill="#ff6600"><tspan y="862.04016" x="51.055748">Stela</tspan></text>
+</g>
+<rect style="color:#000000" height="16" width="16" y="832.09" x="89.523" fill="none"/>
+</g>
+<g transform="matrix(1.2007 0 0 1.2007 -9.4542 -14.007)" fill-rule="evenodd">
+<circle cy="219.91" transform="matrix(.082981 0 0 .080136 28.09 54.515)" cx="257.44" r="51.206" fill="url(#b)"/>
+<path style="color:#000000" d="m49.021 69.232a0.32535 0.32535 0 0 0 -0.32617 0.32617v1.8223h-1.8223a0.32535 0.32535 0 0 0 -0.32617 0.32617v0.86133a0.32535 0.32535 0 0 0 0.32617 0.32617h1.8223v1.8223a0.32535 0.32535 0 0 0 0.32617 0.32617h0.86328a0.32535 0.32535 0 0 0 0.32617 -0.32617v-1.8223h1.8223a0.32535 0.32535 0 0 0 0.32617 -0.32617v-0.86133a0.32535 0.32535 0 0 0 -0.32617 -0.32617h-1.8223v-1.8223a0.32535 0.32535 0 0 0 -0.32617 -0.32617h-0.86328z" xlink:href="#a" transform="translate(- [...]
+<path id="a" style="color:#000000" d="m49.022 69.558v2.1488h-2.1488v0.86196h2.1488v2.1488h0.86196v-2.1488h2.1488v-0.86196h-2.1488v-2.1488h-0.86196z" fill-rule="evenodd" stroke="#000" stroke-width=".038849" fill="#00f"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/EditDetailsInDialogAction.svg b/freeplane/resources/images/EditDetailsInDialogAction.svg
new file mode 100644
index 0000000..d2c2504
--- /dev/null
+++ b/freeplane/resources/images/EditDetailsInDialogAction.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-60.426 -164.72)">
+<g transform="translate(440.12 -268.54)">
+<rect style="color:#000000" height="16" width="16" y="433.26" x="-379.7" fill="none"/>
+<g transform="translate(22.539 1.3372)">
+<g transform="matrix(1 0 0 1.0508 0 -22.774)">
+<g transform="matrix(.84096 0 0 .84096 -631.31 111.66)">
+<rect style="color:#000000" height="14.163" width="16.005" y="385.38" x="273.91" fill="none"/>
+<rect stroke-linejoin="round" height="6.4723" stroke="#000080" stroke-width=".71830" fill="#fff" fill-rule="evenodd" rx="1.6754" ry="1.6252" width="14.359" y="385.22" x="274.73"/>
+<g transform="matrix(1.0027 0 0 .86533 -.77761 53.664)" stroke="#000" stroke-dasharray="1.43526771, 1.43526771" stroke-width="1.4353" fill="none">
+<path d="m274.64 399.35h14.565"/>
+<path d="m274.64 393.64h14.565"/>
+<path d="m274.64 396.5h14.565"/>
+</g>
+</g>
+<path d="m-397.78 432.77v2.4467h-2.2894v1.7062h2.2894v2.4467h1.7413v-2.4467h2.2894v-1.7062h-2.2894v-2.4467h-1.7413z" stroke="#000" stroke-width=".15385px" fill="#f21313"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/EditNoteInDialogAction.svg b/freeplane/resources/images/EditNoteInDialogAction.svg
new file mode 100644
index 0000000..9642fd5
--- /dev/null
+++ b/freeplane/resources/images/EditNoteInDialogAction.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.313 16.368" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19981 .17870 -.15894 .16574 241.58 572.22)" r="6.9383"/>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#b9150a" offset="1"/>
+</linearGradient>
+<radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19981 .17871 -.14353 .14931 230.51 584.03)" r="6.9383"/>
+<radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19980 .17871 -.15040 .15662 235.45 578.78)" r="6.9383"/>
+<filter id="j" style="color-interpolation-filters:sRGB">
+<feGaussianBlur stdDeviation="0.61377733"/>
+</filter>
+<linearGradient id="d" y2="29.408" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="32.888" y1="22.38" x1="35.687"/>
+<linearGradient id="c">
+<stop stop-color="#fffffd" stop-opacity="0" offset="0"/>
+<stop stop-color="#fffab3" stop-opacity=".84375" offset=".31646"/>
+<stop stop-color="#fffbfb" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="i" y2="43.595" gradientUnits="userSpaceOnUse" x2="48.452" gradientTransform="translate(-.75 6.25)" y1="52.405" x1="43.549">
+<stop stop-color="#2b2b2b" stop-opacity=".67188" offset="0"/>
+<stop stop-opacity=".58594" offset=".28481"/>
+<stop stop-color="#333" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="h" y2="43.97" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="46.986" gradientTransform="translate(-.75 6.25)" y1="39.783" x1="53.164"/>
+<linearGradient id="g" y2="8.8007" gradientUnits="userSpaceOnUse" x2="14.143" y1="14.623" x1="14.069">
+<stop stop-opacity=".52344" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".78039" offset="1"/>
+</linearGradient>
+<filter id="k" style="color-interpolation-filters:sRGB" height="1.4931" width="1.8416" y="-.24656" x="-.42079">
+<feGaussianBlur stdDeviation="0.56224844"/>
+</filter>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-62.731 -187.56)">
+<g transform="matrix(1.014 0 0 1.014 573.05 -510.25)">
+<g transform="matrix(.45725 .044646 0 .42579 -263.86 413.93)">
+<rect transform="matrix(.92114 -.38924 0 1 0 0)" height="29.416" width="24.606" stroke="#d40000" y="485.68" x="-567.88" fill="#ff0"/>
+<g>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 266.93)" cy="721.26" r="2.962" fill="url(#f)"/>
+<rect ry=".18629" rx=".12231" transform="matrix(.92114 -.38924 0 1 0 0)" height="2.0194" width="13.971" y="490.23" x="-560.16"/>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 278.47)" cy="721.26" r="2.962" fill="url(#b)"/>
+<rect ry=".18629" rx=".12231" transform="matrix(.92114 -.38924 0 1 0 0)" height="2.0194" width="13.971" y="501.77" x="-560.16"/>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 272.7)" cy="721.26" r="2.962" fill="url(#e)"/>
+<g transform="matrix(1 -.42257 0 1 -640.34 117.66)">
+<rect rx=".11266" ry=".18629" height="2.0194" width="12.869" y="648.93" x="124.36"/>
+</g>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 284.24)" cy="721.26" r="2.962" fill="url(#b)"/>
+<rect ry=".18629" rx=".12231" transform="matrix(.92114 -.38924 0 1 0 0)" height="2.0194" width="13.971" y="507.54" x="-560.16"/>
+</g>
+</g>
+<g transform="matrix(.42479 .029187 -.029187 .42479 -272.81 414.06)">
+<g transform="matrix(-.44660 0 0 .44660 -455.25 672.13)">
+<path d="m11.077 24.893-3.3765 3.3765 24.851 24.851 2.1609 2.1609 0.10129 0.03376 2.1947 0.50647 2.4986-2.4986-28.43-28.43z" fill-opacity=".80328" fill-rule="evenodd" fill="#ff3434"/>
+<path opacity="0.98" d="m20.031 16.562c-0.011 0.01-0.022 0.02-0.031 0.032-0.0104-0.00091-0.02085-0.00091-0.03125 0-0.01167 0.0091-0.02216 0.01958-0.03125 0.03125l-3.876 3.875 26.376 26.375 3.874-3.875c0.01167-0.0091 0.02216-0.01958 0.03125-0.03125 0.000909-0.0104 0.00091-0.02085 0-0.03125 0.01442-0.01858 0.02504-0.03982 0.03125-0.0625 0.000909-0.0104 0.00091-0.02085 0-0.03125-0.0091-0.01167-0.01958-0.02216-0.03125-0.03125 0.000909-0.0104 0.00091-0.02085 0-0.03125-0.008-0.011-0.019-0.022- [...]
+<path d="m26.781 6.25c-2.1767-0.12554-5.3918 1.4855-8.1875 4.2812-3.7276 3.7276-5.3019 8.1981-3.5312 9.9688 0.41629 0.41629 0.98692 0.6267 1.6562 0.6875l-0.343-0.344c0.01319-0.01781 0.01566-0.04691 0.03125-0.0625 0.06872-0.06872 0.17023-0.10215 0.28125-0.125 0.3463-0.07127 0.91745 0.06928 1.625 0.40625 2.0167-0.44579 4.5001-1.9064 6.7188-4.125 3.728-3.728 5.302-8.1986 3.531-9.9692-0.442-0.4427-1.055-0.677-1.781-0.7188z" fill-rule="evenodd" transform="translate(-7.3614 7.7812)" fill="#860000"/>
+<g fill-rule="evenodd" transform="matrix(1.0805 1.0805 -1.0805 1.0805 36.873 -11.707)" fill="#ed0000">
+<path d="m28.562 6.9688-13.5 13.531 27 27l13.532-13.5-27.032-27.031zm-11.875 13.688c1.6653-0.3427 7.9461 4.3524 14.625 11.031 7.1241 7.1241 12.006 13.807 10.906 14.906-0.01559 0.01559-0.04469 0.01806-0.0625 0.03125l-25.78-25.781c0.01319-0.01781 0.01566-0.04691 0.03125-0.0625 0.06872-0.06872 0.17023-0.10215 0.28125-0.125z" transform="matrix(.46276 -.46276 .46276 .46276 -11.451 29.489)"/>
+<path d="m52.875 31.312-11.844 11.844c1.1274 1.7746 1.6093 3.0157 1.1875 3.4375-0.01559 0.01559-0.04469 0.01806-0.0625 0.03125l-2.2812-2.3125-0.5 0.5 2.7188 2.6875 8.75 2.0312 6.7812-6.75-2.031-8.781-2.719-2.688z" transform="matrix(.46276 -.46276 .46276 .46276 -11.451 29.489)"/>
+</g>
+<g transform="matrix(1.0805 1.0805 -1.0389 1.0389 35.543 -10.378)" fill="#860000">
+<path d="m13.728 10.978v-7.4452l5.3994 3.1173c0.43545 0.25651 0.47055 0.91841 0.04141 1.1866l-5.44 3.1413z" fill-rule="evenodd" transform="matrix(.61897 0 0 .69686 27.512 20.444)" fill="#860000"/>
+</g>
+<path d="m21.206 14.764-3.3765 3.3765 28.16 28.16 2.6674-2.6674-0.43894-1.857-2.2622-2.2622-24.749-24.749z" fill-opacity=".52459" fill-rule="evenodd" fill="#fff"/>
+<path d="m11.062 24.906-3.375 3.375 24.875 24.844 2.1562 2.1562 0.09375 0.03125 2.1875 0.5 2.5-2.5-28.438-28.406z" fill-opacity=".41569" fill-rule="evenodd"/>
+<path d="m48.218 41.776c0.1303 1.3034-0.95477 2.8686-3.4777 3.2752-1.0677 4.2832-3.2545 6.2819-6.7191 6.7867-0.67928 2.9521-1.4937 3.5518-3.2752 3.4778l11.311 2.5999c0.12148-0.72099 1.1594-1.8865 2.0218-2.7489s2.1354-1.9122 2.7728-2.0457l-2.634-11.345z" fill-rule="evenodd" fill="#fd5"/>
+</g>
+<g transform="matrix(-.44660 0 0 .44660 -455.25 672.13)">
+<g transform="matrix(1.0805 1.0805 -1.0389 1.0389 35.543 -10.378)" fill="url(#d)">
+<path d="m13.728 10.978v-7.4452l5.3994 3.1173c0.43545 0.25651 0.47055 0.91841 0.04141 1.1866l-5.44 3.1413z" fill-rule="evenodd" transform="matrix(.61897 0 0 .69686 27.512 20.444)" fill="url(#d)"/>
+</g>
+<path d="m48.218 41.776c0.1303 1.3034-0.95477 2.8686-3.4777 3.2752-1.0677 4.2832-3.2545 6.2819-6.7191 6.7867-0.67928 2.9521-1.4937 3.5518-3.2752 3.4778l11.311 2.5999c0.12148-0.72099 1.1594-1.8865 2.0218-2.7489s2.1354-1.9122 2.7728-2.0457l-2.634-11.345z" fill-rule="evenodd" fill="url(#i)"/>
+<path opacity=".75709" d="m48.218 41.776c0.1303 1.3034-0.95477 2.8686-3.4777 3.2752-1.0677 4.2832-3.2545 6.2819-6.7191 6.7867-0.67928 2.9521-1.4937 3.5518-3.2752 3.4778l11.311 2.5999c0.12148-0.72099 1.1594-1.8865 2.0218-2.7489s2.1354-1.9122 2.7728-2.0457l-2.634-11.345z" fill-rule="evenodd" fill="url(#h)"/>
+<path d="m14.71 14.575c-1.848 0-3.3461-1.3285-3.3461-2.9673s1.4981-2.9673 3.3461-2.9673v2.9673 2.9673z" fill-rule="evenodd" transform="matrix(.95861 .95861 -2.2758 2.2758 26.768 -19)" fill="url(#g)"/>
+<path d="m50.573 53.21c0.08255 0.0163 0.65806 2.6441 0.65806 2.6441 0.76266 2.8865 0.91389 2.9662 0.17278 2.7427-0.723-0.35663-1.71-1.5192-2.1711-2.1768-0.44044-0.67086-1.0193-1.7389 0.08043-2.5723 0.38412-0.35825 0.92033-0.70483 1.2598-0.63777z" fill-rule="evenodd" fill-opacity=".29918" filter="url(#k)" fill="#fff"/>
+<path d="m19.438 14.031c-2.8856 0.006-5.4077 1.8076-7.5 3.625 1.3408-0.52693 2.6436-1.1997 4.1174-0.92456 1.4089 0.26309 1.033 0.97828 1.7811 1.3779 0.81-0.81 2.572-2.549 3.383-3.359-0.466-0.472-1.132-0.685-1.781-0.719z" fill-opacity=".18443" fill-rule="evenodd" fill="#fff"/>
+</g>
+<g fill-rule="evenodd" transform="matrix(-.44660 0 0 .44660 -451.96 675.6)">
+<path d="m25.206 10.353 26.908 26.908" stroke="#f24e4e" stroke-width=".30037" fill="#b9b9b9"/>
+<path d="m18.442 17.107 26.941 26.941" stroke="#b80000" stroke-width=".30073" fill="#fff"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/ExecuteScriptForAllNodes.svg b/freeplane/resources/images/ExecuteScriptForAllNodes.svg
new file mode 100644
index 0000000..26009a8
--- /dev/null
+++ b/freeplane/resources/images/ExecuteScriptForAllNodes.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="15.989544"
+   width="16.889978"
+   version="1.1"
+   viewBox="0 0 16.889979 15.989544"
+   id="svg3280"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="executescriptforallnodes.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3318"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="343.57227"
+     inkscape:cy="-333.62489"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3280" />
+  <defs
+     id="defs3282">
+    <linearGradient
+       id="d"
+       y2="377.60001"
+       gradientUnits="userSpaceOnUse"
+       x2="142.38"
+       gradientTransform="matrix(-0.41624,3.0153e-4,-4.2988e-4,-0.26502,-294.04,377.08)"
+       y1="388.92001"
+       x1="160.7">
+      <stop
+         stop-color="#36d200"
+         offset="0"
+         id="stop3285" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3287" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="166.63"
+       gradientUnits="userSpaceOnUse"
+       x2="-239.53999"
+       y1="192.64"
+       x1="-241.17">
+      <stop
+         stop-color="#c8e3ee"
+         offset="0"
+         id="stop3290" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3292" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="170.07001"
+       gradientUnits="userSpaceOnUse"
+       x2="-230.53"
+       y1="173.28"
+       x1="-229.32001">
+      <stop
+         stop-color="#90c7dc"
+         offset="0"
+         id="stop3295" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3297" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="191.92999"
+       gradientUnits="userSpaceOnUse"
+       x2="-245.73"
+       y1="194.64"
+       x1="-245.55">
+      <stop
+         stop-color="#64afd2"
+         offset="0"
+         id="stop3300" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3302" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3304">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.0548,0,0,1.0548,388.00503,-281.27667)"
+     id="g3306">
+    <g
+       transform="matrix(0.55109,0,0,0.57877,-227.09,168.51)"
+       id="g3308"
+       style="stroke-width:1px;stroke-linejoin:round">
+      <path
+         d="m -234.63,195.29 -17.922,-0.12801 c 8.8005,-1.9328 -0.41555,-23.448 5.7606,-24.963 l 18.07,-0.0756 c -6.9699,0.86566 0.94577,25.241 -5.9087,25.166 z"
+         id="path3310"
+         inkscape:connector-curvature="0"
+         style="fill:url(#c);stroke:#0073b3" />
+      <path
+         d="m -231.5,173.78 4.6146,0.0567 c 0.13634,-1.7956 -0.74159,-3.7591 -1.9593,-3.7557 -1.9505,0.50173 -2.2545,2.4591 -2.6554,3.699 z"
+         id="path3312"
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);stroke:#0073b3" />
+      <path
+         d="m -252.62,195.16 c -2.0319,-0.87677 -2.019,-2.4351 -2.2929,-3.8979 h 18.458 c 0.17074,1.9039 0.56722,3.7897 1.9776,3.9266 z"
+         id="path3314"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);stroke:#0072af" />
+    </g>
+    <path
+       d="m -352.04,274.86 -4.8217,3.2912 -0.0239,-1.9507 -4.9813,0.0631 -0.004,-2.7412 4.9813,-0.0406 -0.003,-1.899 4.853,3.2773 z"
+       id="path3316"
+       inkscape:connector-curvature="0"
+       style="fill:url(#d);fill-rule:evenodd;stroke:#005200;stroke-width:0.33213001px" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ExecuteScriptForSelectionAction.svg b/freeplane/resources/images/ExecuteScriptForSelectionAction.svg
new file mode 100644
index 0000000..36efc97
--- /dev/null
+++ b/freeplane/resources/images/ExecuteScriptForSelectionAction.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="15.989544"
+   width="16.889978"
+   version="1.1"
+   viewBox="0 0 16.889979 15.989544"
+   id="svg3320"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="executescriptforselectionaction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3368"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="343.58056"
+     inkscape:cy="-353.21465"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3320" />
+  <defs
+     id="defs3322">
+    <linearGradient
+       id="d"
+       y2="166.63"
+       gradientUnits="userSpaceOnUse"
+       x2="-239.53999"
+       y1="192.64"
+       x1="-241.17">
+      <stop
+         stop-color="#c8e3ee"
+         offset="0"
+         id="stop3325" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3327" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="170.07001"
+       gradientUnits="userSpaceOnUse"
+       x2="-230.53"
+       y1="173.28"
+       x1="-229.32001">
+      <stop
+         stop-color="#90c7dc"
+         offset="0"
+         id="stop3330" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3332" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="191.92999"
+       gradientUnits="userSpaceOnUse"
+       x2="-245.73"
+       y1="194.64"
+       x1="-245.55">
+      <stop
+         stop-color="#64afd2"
+         offset="0"
+         id="stop3335" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3337" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="377.60001"
+       gradientUnits="userSpaceOnUse"
+       x2="142.38"
+       gradientTransform="matrix(-0.3029,2.1942e-4,-3.1283e-4,-0.19286,-348.14,341.34)"
+       y1="388.92001"
+       x1="160.7">
+      <stop
+         stop-color="#36d200"
+         offset="0"
+         id="stop3340" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3342" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3344">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.0548,0,0,1.0548,428.39332,-274.73691)"
+     id="g3346">
+    <g
+       transform="matrix(0.55109,0,0,0.57877,-265.38,162.31)"
+       id="g3348"
+       style="stroke-width:1px;stroke-linejoin:round">
+      <path
+         d="m -234.63,195.29 -17.922,-0.12801 c 8.8005,-1.9328 -0.41555,-23.448 5.7606,-24.963 l 18.07,-0.0756 c -6.9699,0.86566 0.94577,25.241 -5.9087,25.166 z"
+         id="path3350"
+         inkscape:connector-curvature="0"
+         style="fill:url(#d);stroke:#0073b3" />
+      <path
+         d="m -231.5,173.78 4.6146,0.0567 c 0.13634,-1.7956 -0.74159,-3.7591 -1.9593,-3.7557 -1.9505,0.50173 -2.2545,2.4591 -2.6554,3.699 z"
+         id="path3352"
+         inkscape:connector-curvature="0"
+         style="fill:url(#c);stroke:#0073b3" />
+      <path
+         d="m -252.62,195.16 c -2.0319,-0.87677 -2.019,-2.4351 -2.2929,-3.8979 h 18.458 c 0.17074,1.9039 0.56722,3.7897 1.9776,3.9266 z"
+         id="path3354"
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);stroke:#0072af" />
+    </g>
+    <path
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.17577;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+       d="m -404.76,267.01 c 0.68916,0.0141 1.3258,0.0845 2.0493,0.6808 0.68479,0.57469 1.5621,1.188 2.1461,1.1213 -0.48823,0.0517 -1.2588,-0.61277 -1.9334,-1.3097 -1.0109,-1.0316 -1.5542,-1.1334 -2.258,-1.1478 l -0.004,0.65533 v 0 z"
+       id="path3356"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.39283,0,0,0.39283,-296.78,-72.13)"
+       id="g3358">
+      <rect
+         height="7.3909001"
+         rx="1.7122"
+         ry="1.6299"
+         width="15.142"
+         y="864.46002"
+         x="-264.92999"
+         id="rect3360"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.85776001;stroke-linejoin:round" />
+    </g>
+    <path
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.17577;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+       d="m -404.41,266.34 c 0.68916,-0.0141 1.3258,-0.0845 2.0493,-0.68079 0.68479,-0.57469 1.5621,-1.1881 2.1461,-1.1213 -0.48824,-0.0517 -1.2588,0.61278 -1.9334,1.3097 -1.0109,1.0316 -1.5542,1.1334 -2.258,1.1478 l -0.004,-0.65534 h -2e-5 z"
+       id="path3362"
+       inkscape:connector-curvature="0" />
+    <rect
+       height="2.9033"
+       rx="0.67260998"
+       ry="0.64025998"
+       width="5.9482999"
+       y="262.35001"
+       x="-401.67001"
+       id="rect3364"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.33695;stroke-linejoin:round" />
+    <path
+       d="m -390.35,266.95 -3.5088,2.3951 -0.0174,-1.4196 -3.6249,0.0459 -0.003,-1.9948 3.6249,-0.0295 -0.002,-1.3819 3.5316,2.3849 z"
+       id="path3366"
+       inkscape:connector-curvature="0"
+       style="fill:url(#a);fill-rule:evenodd;stroke:#005200;stroke-width:0.24169999px" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ExecuteScripts.svg b/freeplane/resources/images/ExecuteScripts.svg
new file mode 100644
index 0000000..7dfcfd2
--- /dev/null
+++ b/freeplane/resources/images/ExecuteScripts.svg
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4738-4">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740-8" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742-6" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient6993-9">
+      <svg:stop
+         style="stop-color:#f70000;stop-opacity:1;"
+         offset="0"
+         id="stop6995-1" />
+      <svg:stop
+         style="stop-color:#780000;stop-opacity:1;"
+         offset="1"
+         id="stop6997-3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient6985-7">
+      <svg:stop
+         style="stop-color:#baa492;stop-opacity:1;"
+         offset="0"
+         id="stop6987-4" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6989-6" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient6959-6">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6961-5" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6963-2" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient6977-1">
+      <svg:stop
+         style="stop-color:#c00000;stop-opacity:1;"
+         offset="0"
+         id="stop6979-03" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop6981-1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient12496-4-7-2">
+      <svg:stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6-4-8" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2-0-2" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient20409-9-8-8">
+      <svg:stop
+         id="stop20411-3-6-8"
+         offset="0"
+         style="stop-color:#289c00;stop-opacity:1;" />
+      <svg:stop
+         id="stop20413-4-5-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34093-3-5"
+       id="linearGradient34993-0-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-241.17238"
+       y1="192.64099"
+       x2="-239.54391"
+       y2="166.62758" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       id="linearGradient34093-3-5">
+      <svg:stop
+         style="stop-color:#c8e3ee;stop-opacity:1;"
+         offset="0"
+         id="stop34095-5-7" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop34097-6-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34109-6-8"
+       id="linearGradient34995-6-5"
+       gradientUnits="userSpaceOnUse"
+       x1="-229.31961"
+       y1="173.27782"
+       x2="-230.5291"
+       y2="170.07458" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       id="linearGradient34109-6-8">
+      <svg:stop
+         style="stop-color:#90c7dc;stop-opacity:1"
+         offset="0"
+         id="stop34111-7-3" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop34113-6-2" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="191.93051"
+       x2="-245.73305"
+       y1="194.64276"
+       x1="-245.54755"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient35433"
+       xlink:href="#linearGradient34101-7-1"
+       inkscape:collect="always" />
+    <svg:linearGradient
+       id="linearGradient34101-7-1">
+      <svg:stop
+         style="stop-color:#64afd2;stop-opacity:1;"
+         offset="0"
+         id="stop34103-1-1" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop34105-9-5" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.728598"
+     inkscape:cx="16.253989"
+     inkscape:cy="20.67126"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1310"
+     inkscape:window-height="912"
+     inkscape:window-x="506"
+     inkscape:window-y="90"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g42702">
+      <svg:g
+         id="g42625"
+         transform="matrix(0.99916496,0,0,1.0480098,368.47131,-284.82485)">
+        <svg:g
+           id="g34117-3-9"
+           transform="matrix(0.55109442,0,0,0.57877152,-228.0188,188.9445)">
+          <svg:path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path34075-2-5"
+             d="m -234.62621,195.28978 -17.92185,-0.12801 c 8.80047,-1.93281 -0.41555,-23.4484 5.7606,-24.96258 l 18.06992,-0.0756 c -6.96989,0.86566 0.94577,25.24121 -5.90867,25.16622 z"
+             style="fill:url(#linearGradient34993-0-1);fill-opacity:1;stroke:#0073b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+          <svg:path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="path34077-4-1"
+             d="m -231.5034,173.77927 4.61462,0.0567 c 0.13634,-1.79555 -0.74159,-3.75912 -1.95927,-3.75568 -1.95054,0.50173 -2.25446,2.45911 -2.65535,3.69899 z"
+             style="fill:url(#linearGradient34995-6-5);fill-opacity:1;stroke:#0073b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+          <svg:path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path34079-4-0"
+             d="m -252.61507,195.1636 c -2.0319,-0.87677 -2.01904,-2.43512 -2.29289,-3.8979 l 18.45771,0 c 0.17074,1.90393 0.56722,3.78971 1.97761,3.92657 z"
+             style="fill:url(#linearGradient35433);fill-opacity:1;stroke:#0072af;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        </svg:g>
+        <svg:text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07662249px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0.42305186px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:#d40000;stroke-width:0.5;stroke-opacity:1"
+           x="-364.69794"
+           y="295.6214"
+           id="text34089-4"
+           sodipodi:linespacing="125%"><svg:tspan
+             sodipodi:role="line"
+             id="tspan34091-2"
+             x="-364.69794"
+             y="295.6214"
+             style="stroke-width:0.5"></></svg:tspan></svg:text>
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/ExternalImageAddAction.png b/freeplane/resources/images/ExternalImageAddAction.png
index f39ee5f..3d7eba1 100644
Binary files a/freeplane/resources/images/ExternalImageAddAction.png and b/freeplane/resources/images/ExternalImageAddAction.png differ
diff --git a/freeplane/resources/images/ExternalImageAddAction.svg b/freeplane/resources/images/ExternalImageAddAction.svg
new file mode 100644
index 0000000..d08c664
--- /dev/null
+++ b/freeplane/resources/images/ExternalImageAddAction.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 32 32"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExternalImageAddAction.svg"
+   width="32"
+   height="32">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1371"
+     inkscape:window-height="937"
+     id="namedview66"
+     showgrid="false"
+     inkscape:zoom="5.2849379"
+     inkscape:cx="-39.88457"
+     inkscape:cy="46.357089"
+     inkscape:window-x="211"
+     inkscape:window-y="43"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b"
+       y2="298.92001"
+       gradientUnits="userSpaceOnUse"
+       x2="112.73"
+       y1="310.62"
+       x1="111.93"
+       gradientTransform="matrix(1.0082046,0,0,1.0572894,-104.94637,-312.96782)">
+      <stop
+         stop-color="#0d2e2e"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#0d2e2e"
+         stop-opacity="0"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="7.1090999"
+       gradientUnits="userSpaceOnUse"
+       y1="24.627001"
+       gradientTransform="matrix(0.42238732,0,0,-0.32008379,-1.4440858,17.202514)"
+       x2="21.933001"
+       x1="21.933001">
+      <stop
+         stop-color="#acf"
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#04a"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="302.84"
+       gradientUnits="userSpaceOnUse"
+       x2="118.52"
+       y1="302.84"
+       x1="105.51"
+       gradientTransform="matrix(1.0082046,0,0,1.0572894,-104.94637,-312.96782)">
+      <stop
+         stop-color="#37c837"
+         offset="0"
+         id="stop17" />
+      <stop
+         stop-color="#165016"
+         offset="1"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="300.78"
+       gradientUnits="userSpaceOnUse"
+       x2="112.37"
+       y1="303.64001"
+       x1="112.29"
+       gradientTransform="matrix(1.0082046,0,0,1.0572894,-104.94637,-312.96782)">
+      <stop
+         stop-color="#b9d7ff"
+         offset="0"
+         id="stop22" />
+      <stop
+         stop-color="#3c8dff"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4606"
+     transform="matrix(1.990988,0,0,1.990988,0.05095803,0.55058877)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path36"
+       d="m 0.60256957,2.9819714 14.81657443,0 c 0.227109,0 0.409936,0.1917289 0.409936,0.4298939 L 15.76839,15.090684 c -0.005,0.367768 -0.285049,0.449887 -0.57758,0.454973 l -14.58872036,0.06365 c -0.22709809,0 -0.40993599,-0.191729 -0.40993599,-0.429884 l 0,-11.7676307 c 0,-0.238165 0.1828379,-0.4298939 0.40993599,-0.4298939 z"
+       style="color:#000000;fill:url(#b);stroke:#0d2e2e;stroke-width:0.37315002;stroke-opacity:0.52548996" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#a)"
+       id="path38"
+       d="m 1.4292973,14.263249 13.1177497,0 0,-4.161808 -13.1177497,0 0,4.161808 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#c)"
+       id="path40"
+       d="m 1.4292973,4.3353018 13.1177497,0 0,5.7735402 -13.1177497,0 0,-5.7735402 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path42"
+       d="m 1.6006921,4.5996242 0,5.5678978 C 9.7359959,10.432933 8.8885999,6.6743432 14.396825,6.6743432 l 0,-2.1770646 z"
+       style="color:#000000;fill:url(#d)" />
+    <path
+       d="m 6.8544301,7.2650043 c 0,1.2145168 -0.9518641,2.2634177 -2.1681349,2.2634177 -1.1633895,0 -2.1681349,-0.9936956 -2.1681349,-2.2634177 0,-1.2145168 0.9518641,-2.2634177 2.1681349,-2.2634177 1.1633894,0 2.1681349,0.9936956 2.1681349,2.2634177 z"
+       id="path46"
+       inkscape:connector-curvature="0"
+       style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:0.62465048" />
+    <path
+       d="m 6.6429047,7.2650043 c 0,1.1041062 -0.8461014,2.0425964 -1.9566095,2.0425964 -1.0576268,0 -1.9566096,-0.8832849 -1.9566096,-2.0425964 0,-1.1041062 0.8461015,-2.0425964 1.9566096,-2.0425964 1.0576268,0 1.9566095,0.8832849 1.9566095,2.0425964 z"
+       id="path48"
+       inkscape:connector-curvature="0"
+       style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:0.62465048" />
+    <path
+       d="m 6.4313794,7.2650043 c 0,0.9936955 -0.7932201,1.8217752 -1.7450842,1.8217752 -0.9518641,0 -1.7450842,-0.8280797 -1.7450842,-1.8217752 0,-0.9936956 0.7932201,-1.8217752 1.7450842,-1.8217752 0.9518641,0 1.7450842,0.8280796 1.7450842,1.8217752 z"
+       id="path50"
+       inkscape:connector-curvature="0"
+       style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:0.62465048" />
+    <path
+       d="m 6.219854,7.2650043 c 0,0.8832849 -0.6874574,1.6009539 -1.5335588,1.6009539 -0.8461014,0 -1.5335589,-0.717669 -1.5335589,-1.6009539 0,-0.883285 0.6874575,-1.600954 1.5335589,-1.600954 0.8461014,0 1.5335588,0.717669 1.5335588,1.600954 z"
+       id="path52"
+       inkscape:connector-curvature="0"
+       style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:0.62465048" />
+    <path
+       d="m 6.0083287,7.2650043 c 0,0.7728743 -0.5816948,1.3801327 -1.3220335,1.3801327 -0.7403388,0 -1.3220335,-0.6072584 -1.3220335,-1.3801327 0,-0.7728743 0.5816947,-1.3801327 1.3220335,-1.3801327 0.7403387,0 1.3220335,0.6072584 1.3220335,1.3801327 z"
+       id="path54"
+       inkscape:connector-curvature="0"
+       style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:0.62465048" />
+    <path
+       d="m 5.7968033,7.2650043 c 0,0.6624637 -0.5288134,1.1593115 -1.1105081,1.1593115 -0.5816948,0 -1.1105081,-0.5520531 -1.1105081,-1.1593115 0,-0.6072584 0.5288133,-1.1593115 1.1105081,-1.1593115 0.5816947,0 1.1105081,0.5520531 1.1105081,1.1593115 z"
+       id="path56"
+       inkscape:connector-curvature="0"
+       style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:0.62465048" />
+    <path
+       d="m 5.5852779,7.2650043 c 0,0.5520531 -0.4230507,0.9936955 -0.9518641,0.9936955 -0.5288134,0 -0.9518641,-0.4416424 -0.9518641,-0.9936955 0,-0.5520531 0.4230507,-0.9936956 0.9518641,-0.9936956 0.5288134,0 0.9518641,0.4416425 0.9518641,0.9936956 z"
+       id="path58"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke:none;stroke-width:0.62465048" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path60"
+       d="m 1.3083128,3.9018132 13.3889572,0 c 0.0497,0 0.143951,0.04208 0.143951,0.09431 l 0,10.4061598 c -9.17e-4,0.178639 0.0071,0.223743 -0.0978,0.229855 l -13.43533,-0.02019 c -0.049805,0 -0.089932,0.05213 -0.089932,0 l 0,-10.6162425 c 0,-0.052124 0.040127,-0.09431 0.089932,-0.09431 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:0.74193275" />
+    <rect
+       id="rect62"
+       x="1.6107767"
+       y="4.5256228"
+       width="12.775969"
+       height="9.577033"
+       style="color:#000000;opacity:0.84658999;fill:none;stroke:#4f4f4f;stroke-width:0.37315002" />
+    <path
+       style="fill:#f21313;stroke:#000000;stroke-width:0.15119718px"
+       inkscape:connector-curvature="0"
+       id="path64"
+       d="m 4.9997933,-0.20094204 0,2.46492344 -2.1948565,0 0,1.718956 2.1948565,0 0,2.4649233 1.669391,0 0,-2.4649233 2.1948565,0 0,-1.718956 -2.1948565,0 0,-2.46492344 -1.669391,0 z" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ExternalImageRemoveAction.png b/freeplane/resources/images/ExternalImageRemoveAction.png
new file mode 100644
index 0000000..48e6752
Binary files /dev/null and b/freeplane/resources/images/ExternalImageRemoveAction.png differ
diff --git a/freeplane/resources/images/ExternalImageRemoveAction.svg b/freeplane/resources/images/ExternalImageRemoveAction.svg
new file mode 100644
index 0000000..a323569
--- /dev/null
+++ b/freeplane/resources/images/ExternalImageRemoveAction.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 32 32"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExternalImageAddAction.svg"
+   width="32"
+   height="32">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1371"
+     inkscape:window-height="937"
+     id="namedview66"
+     showgrid="false"
+     inkscape:zoom="5.2849379"
+     inkscape:cx="9.9741048"
+     inkscape:cy="29.895212"
+     inkscape:window-x="211"
+     inkscape:window-y="43"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b"
+       y2="298.92001"
+       gradientUnits="userSpaceOnUse"
+       x2="112.73"
+       y1="310.62"
+       x1="111.93"
+       gradientTransform="matrix(2.0073233,0,0,2.1050505,-208.89601,-622.56459)">
+      <stop
+         stop-color="#0d2e2e"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#0d2e2e"
+         stop-opacity="0"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="7.1090999"
+       gradientUnits="userSpaceOnUse"
+       y1="24.627001"
+       gradientTransform="matrix(0.84096809,0,0,-0.63728298,-2.8241995,34.800588)"
+       x2="21.933001"
+       x1="21.933001">
+      <stop
+         stop-color="#acf"
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#04a"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="302.84"
+       gradientUnits="userSpaceOnUse"
+       x2="118.52"
+       y1="302.84"
+       x1="105.51"
+       gradientTransform="matrix(2.0073233,0,0,2.1050505,-208.89601,-622.56459)">
+      <stop
+         stop-color="#37c837"
+         offset="0"
+         id="stop17" />
+      <stop
+         stop-color="#165016"
+         offset="1"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="300.78"
+       gradientUnits="userSpaceOnUse"
+       x2="112.37"
+       y1="303.64001"
+       x1="112.29"
+       gradientTransform="matrix(2.0073233,0,0,2.1050505,-208.89601,-622.56459)">
+      <stop
+         stop-color="#b9d7ff"
+         offset="0"
+         id="stop22" />
+      <stop
+         stop-color="#3c8dff"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g17594">
+    <g
+       transform="translate(0,-6.1160441)"
+       id="g4484">
+      <path
+         style="color:#000000;fill:url(#b);stroke:#0d2e2e;stroke-width:0.74293721;stroke-opacity:0.52548996"
+         d="m 1.2506668,6.487658 29.4996222,0 c 0.452171,0 0.816177,0.38173 0.816177,0.8559136 L 31.445633,30.59596 c -0.01,0.732221 -0.567529,0.895719 -1.149955,0.905845 L 1.2497113,31.628532 c -0.45214959,0 -0.81617766,-0.38173 -0.81617766,-0.855894 l 0,-23.4292117 c 0,-0.4741837 0.36402807,-0.8559136 0.81617766,-0.8559136 z"
+         id="path36"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 2.8966718,28.948546 26.1172822,0 0,-8.286109 -26.1172822,0 0,8.286109 z"
+         id="path38"
+         style="fill:url(#a)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 2.8966718,9.1821226 26.1172822,0 0,11.4950494 -26.1172822,0 0,-11.4950494 z"
+         id="path40"
+         style="fill:url(#c)"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#d)"
+         d="m 3.2379168,9.7083854 0,11.0856176 C 19.435209,21.322433 17.748054,13.839126 28.714864,13.839126 l 0,-4.3345095 z"
+         id="path42"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path46"
+         d="m 13.698046,15.015125 c 0,2.418089 -1.89515,4.506438 -4.3167305,4.506438 -2.3162945,0 -4.3167305,-1.978436 -4.3167305,-4.506438 0,-2.418088 1.89515,-4.506437 4.3167305,-4.506437 2.3162945,0 4.3167305,1.978436 4.3167305,4.506437 z" />
+      <path
+         style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path48"
+         d="m 13.276902,15.015125 c 0,2.198262 -1.684578,4.066785 -3.8955865,4.066785 -2.1057222,0 -3.8955862,-1.75861 -3.8955862,-4.066785 0,-2.198262 1.6845779,-4.066785 3.8955862,-4.066785 2.1057225,0 3.8955865,1.75861 3.8955865,4.066785 z" />
+      <path
+         style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path50"
+         d="m 12.855757,15.015125 c 0,1.978436 -1.579291,3.627133 -3.4744415,3.627133 -1.89515,0 -3.4744417,-1.648697 -3.4744417,-3.627133 0,-1.978436 1.5792917,-3.627132 3.4744417,-3.627132 1.8951505,0 3.4744415,1.648696 3.4744415,3.627132 z" />
+      <path
+         style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path52"
+         d="m 12.434613,15.015125 c 0,1.75861 -1.36872,3.18748 -3.0532975,3.18748 -1.6845777,0 -3.0532973,-1.42887 -3.0532973,-3.18748 0,-1.75861 1.3687196,-3.18748 3.0532973,-3.18748 1.6845775,0 3.0532975,1.42887 3.0532975,3.18748 z" />
+      <path
+         style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path54"
+         d="m 12.013468,15.015125 c 0,1.538784 -1.158147,2.747828 -2.6321525,2.747828 -1.4740056,0 -2.6321528,-1.209044 -2.6321528,-2.747828 0,-1.538783 1.1581472,-2.747827 2.6321528,-2.747827 1.4740055,0 2.6321525,1.209044 2.6321525,2.747827 z" />
+      <path
+         style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path56"
+         d="m 11.592324,15.015125 c 0,1.318957 -1.052861,2.308175 -2.2110085,2.308175 -1.1581473,0 -2.2110083,-1.099131 -2.2110083,-2.308175 0,-1.209044 1.052861,-2.308175 2.2110083,-2.308175 1.1581475,0 2.2110085,1.099131 2.2110085,2.308175 z" />
+      <path
+         style="fill:#ffffff;stroke:none;stroke-width:0.62465048"
+         inkscape:connector-curvature="0"
+         id="path58"
+         d="m 11.171179,15.015125 c 0,1.099131 -0.842289,1.978436 -1.8951497,1.978436 -1.0528611,0 -1.89515,-0.879305 -1.89515,-1.978436 0,-1.099131 0.8422889,-1.978436 1.89515,-1.978436 1.0528607,0 1.8951497,0.879305 1.8951497,1.978436 z" />
+      <path
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.47717917"
+         d="m 2.6557931,8.319052 26.6572529,0 c 0.09895,0 0.286605,0.083781 0.286605,0.1877701 l 0,20.7185389 c -0.0018,0.355669 0.01414,0.44547 -0.194719,0.457639 L 2.6553515,29.6428 c -0.099161,0 -0.1790535,0.10379 -0.1790535,0 l 0,-21.1368115 c 0,-0.1037783 0.079892,-0.1877701 0.1790535,-0.1877701 z"
+         id="path60"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;opacity:0.84658999;fill:none;stroke:#4f4f4f;stroke-width:0.74293721"
+         height="19.067759"
+         width="25.4368"
+         y="9.5610495"
+         x="3.2579951"
+         id="rect62" />
+    </g>
+    <g
+       transform="translate(-0.37843396,-0.75686792)"
+       id="g17590">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;marker:none;enable-background:accumulate"
+         d="m 13.894467,32.658404 c 0.697249,-9.353952 6.7419,-20.19747 16.187582,-21.752238 l 1.628463,3.219698 c -9.16393,2.208369 -14.209075,7.875425 -17.816045,18.53254 z"
+         id="path6973"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;marker:none;enable-background:accumulate"
+         d="m 9.5388056,12.496608 c 8.1378134,0.103187 17.9628374,6.246509 20.0126664,16.996519 l -2.661486,2.113978 C 24.296252,21.230037 19.020537,15.849634 9.5388056,12.496608 Z"
+         id="path6973-1"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ExtractLinkFromTextAction.png b/freeplane/resources/images/ExtractLinkFromTextAction.png
index 8f31a2b..31c994f 100644
Binary files a/freeplane/resources/images/ExtractLinkFromTextAction.png and b/freeplane/resources/images/ExtractLinkFromTextAction.png differ
diff --git a/freeplane/resources/images/ExtractLinkFromTextAction.svg b/freeplane/resources/images/ExtractLinkFromTextAction.svg
new file mode 100644
index 0000000..08784fe
--- /dev/null
+++ b/freeplane/resources/images/ExtractLinkFromTextAction.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExtractLinkFromTextAction.svg"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1113"
+     inkscape:window-height="480"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-1.1346272"
+     inkscape:cy="8"
+     inkscape:window-x="720"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4446">
+    <g
+       transform="matrix(0.053575,0,0,0.053575,-11.37,-14.262)"
+       id="g31">
+      <path
+         d="m 361.52,266.24 c -26.481,0 -51.311,6.9656 -72.882,19.078 -0.0135,0.008 -0.0407,-0.008 -0.0541,0 -13.958,7.8431 -26.446,17.93 -37.17,29.67 -24.263,26.559 -39.223,61.789 -39.223,100.58 0,82.436 66.919,149.32 149.33,149.32 2.5937,0 5.1106,-0.2475 7.6718,-0.37835 4.1212,-0.21072 8.1835,-0.54189 12.21,-1.081 37.336,-4.9964 70.315,-23.697 93.628,-51.017 22.259,-26.086 35.766,-59.887 35.766,-96.846 0,-18.861 -3.6075,-36.83 -9.9949,-53.449 -3.1327,-8.1514 -7.0048,-15.955 -11.454,-23 [...]
+         id="path33"
+         style="fill:url(#a)"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 340.38,270.95 c -0.53748,0 -1.3878,0.0981 -1.7524,0.58444 -0.35197,0.46939 -0.68987,1.0794 -1.0708,1.4603 -0.22822,0.22827 -0.4672,0.87639 -1.0709,0.87639 -0.3483,0 -1.5018,-0.18792 -1.7523,0 -0.46412,0.34834 -1.1189,0.67898 -1.2656,1.2658 -0.18838,0.75367 -0.82657,0.63186 -1.3628,1.1683 -0.30271,0.30282 -1.0106,0.86135 -1.4603,0.97381 -0.58787,0.14689 -1.1038,0.29187 -1.7524,0.29202 -0.49352,0 -1.1789,-0.11892 -1.655,0 -0.7773,0.19439 -1.1842,0.90474 -1.8496,1.071 -0.60493 [...]
+         id="path35"
+         style="fill:url(#b)"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#c)"
+         d="m 485.93,359.96 c 0,0 -39.081,-3.7873 -65.969,15.659 -26.888,19.447 -41.584,62.128 -72.815,75.064 -62.462,25.872 -111.06,12.767 -111.06,12.767 -28.563,-68.958 4.2207,-148.1 73.178,-176.67 68.958,-28.563 148.1,4.2207 176.67,73.178 z"
+         id="path37"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       id="rect41"
+       x="0.097712204"
+       y="5.0480108"
+       width="15.816"
+       height="5.9103999"
+       style="color:#000000;fill:#ffffff;stroke:#ffffff;stroke-width:0.18358;stroke-linecap:square;stroke-dasharray:0.55075116, 0.55075116" />
+    <g
+       transform="matrix(0.95036157,0,0,1,0.00938134,0)"
+       id="text43"
+       style="font-size:5.69980001px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000">
+      <path
+         id="path4420"
+         d="m 5.3126907,5.8986262 -1.0770618,4.1440438 -0.6206326,0 -0.871112,-3.4399181 -0.8516302,3.4399181 -0.606717,0 -1.0965436,-4.1440438 0.56497041,0 0.87111199,3.4454846 0.8571965,-3.4454846 0.5594042,0 0.8655458,3.4788818 0.8655458,-3.4788818 0.5399225,0 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4422"
+         d="m 10.945696,5.8986262 -1.0770615,4.1440438 -0.6206325,0 -0.8711121,-3.4399181 -0.8516302,3.4399181 -0.606717,0 -1.0965436,-4.1440438 0.5649704,0 0.871112,3.4454846 0.8571965,-3.4454846 0.5594042,0 0.8655458,3.4788818 0.865546,-3.4788818 0.539922,0 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4424"
+         d="m 16.578702,5.8986262 -1.077062,4.1440438 -0.620632,0 -0.871112,-3.4399181 -0.851631,3.4399181 -0.606717,0 -1.096543,-4.1440438 0.56497,0 0.871112,3.4454846 0.857197,-3.4454846 0.559404,0 0.865546,3.4788818 0.865545,-3.4788818 0.539923,0 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Find16.gif b/freeplane/resources/images/Find16.gif
deleted file mode 100644
index abafbe2..0000000
Binary files a/freeplane/resources/images/Find16.gif and /dev/null differ
diff --git a/freeplane/resources/images/FirstSlide.svg b/freeplane/resources/images/FirstSlide.svg
new file mode 100644
index 0000000..71230de
--- /dev/null
+++ b/freeplane/resources/images/FirstSlide.svg
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="First.svg">
+  <defs
+     id="defs8391">
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         offset="0"
+         id="stop2942-8-2-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2944-9-5-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         id="stop3158"
+         offset="0"
+         style="stop-color:#d40000;stop-opacity:1" />
+      <stop
+         id="stop3160"
+         offset="1"
+         style="stop-color:#f3fbfb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4350-9-7-3"
+       id="linearGradient7743"
+       gradientUnits="userSpaceOnUse"
+       x1="182.54036"
+       y1="229.78313"
+       x2="182.6501"
+       y2="211.30733"
+       gradientTransform="matrix(1.2508606,0,0,1.2508606,179.40892,433.79278)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4332-7-3-3"
+       id="linearGradient7745"
+       gradientUnits="userSpaceOnUse"
+       x1="184.5444"
+       y1="207.34468"
+       x2="184.58699"
+       y2="224.56676"
+       gradientTransform="matrix(1.3422813,0,0,1.3422813,159.47538,416.62701)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2940-9-4-2"
+       id="linearGradient7747"
+       gradientUnits="userSpaceOnUse"
+       x1="184.15109"
+       y1="226.48277"
+       x2="184.2887"
+       y2="210.23618"
+       gradientTransform="matrix(1.3877987,0,0,1.3877987,151.27746,403.97651)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient7749"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-79.75824"
+       y2="329.53061" />
+    <linearGradient
+       id="linearGradient2960-9-8">
+      <stop
+         style="stop-color:#8739af;stop-opacity:1;"
+         offset="0"
+         id="stop2962-6-5" />
+      <stop
+         style="stop-color:#e0c5ea;stop-opacity:1;"
+         offset="1"
+         id="stop2964-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-4-1"
+       id="linearGradient7751"
+       gradientUnits="userSpaceOnUse"
+       x1="-79.75824"
+       y1="329.53061"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       id="linearGradient2968-4-1">
+      <stop
+         style="stop-color:#8f379a;stop-opacity:1;"
+         offset="0"
+         id="stop2970-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-4-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9269"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,684.58173,135.61469)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9275"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,684.58173,135.61469)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9483"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9485"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.4320266"
+     inkscape:cx="50.658611"
+     inkscape:cy="-9.8366753"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-391.12787,-691.06306)">
+    <g
+       id="g9510"
+       transform="matrix(-1,0,0,1,814.25574,0)">
+      <circle
+         id="path4326-5-9"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ff00ff;stroke:#800080;stroke-width:0.96188784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06305"
+         r="15.519055" />
+      <circle
+         id="path4340-4-2"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7743);stroke-width:2.95701718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06311"
+         r="13.798415" />
+      <circle
+         id="path4356-3-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7745);stroke-width:1.29703701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06311"
+         r="12.193909" />
+      <circle
+         id="path4368-2-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06305"
+         r="11.606822" />
+      <path
+         inkscape:transform-center-x="1.7243515"
+         inkscape:transform-center-y="0.075110753"
+         transform="matrix(-0.2114708,-0.36889765,-0.36889763,0.21147081,515.89207,608.48529)"
+         d="m -53.23773,345.69211 -23.767219,13.72201 0,-27.44402 z"
+         inkscape:randomized="0"
+         inkscape:rounded="2.5777991e-015"
+         inkscape:flatsided="true"
+         sodipodi:arg2="1.0471976"
+         sodipodi:arg1="0"
+         sodipodi:r2="7.2885256"
+         sodipodi:r1="15.844812"
+         sodipodi:cy="345.69211"
+         sodipodi:cx="-69.082542"
+         sodipodi:sides="3"
+         id="path2956-3"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7749);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7751);stroke-width:1.18207157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         sodipodi:type="star" />
+      <rect
+         ry="0"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient9269);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9275);stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker [...]
+         id="rect3105-3-2-1"
+         width="2.8179185"
+         height="11.303813"
+         x="410.59793"
+         y="701.44983" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/FitToPage.svg b/freeplane/resources/images/FitToPage.svg
new file mode 100644
index 0000000..cea9eef
--- /dev/null
+++ b/freeplane/resources/images/FitToPage.svg
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003187"
+   width="16"
+   version="1.1"
+   id="svg3001"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="fittopage.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3091"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="341.54501"
+     inkscape:cy="-413.28941"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3001" />
+  <defs
+     id="defs3003">
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cy="37.571999"
+       cx="64.597"
+       gradientTransform="matrix(1.3174,0,0,1.3174,-20.58,-12.043)"
+       r="9.25">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3006" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".49804"
+         offset=".55952"
+         id="stop3008" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3010" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       gradientUnits="userSpaceOnUse"
+       cy="10.902"
+       cx="59.786999"
+       gradientTransform="matrix(0,-1.6866,1.6634,0,41.654,111.74)"
+       r="10.556">
+      <stop
+         stop-color="#fbfbfa"
+         offset="0"
+         id="stop3013" />
+      <stop
+         stop-color="#d3d7cf"
+         offset="1"
+         id="stop3015" />
+    </radialGradient>
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="-2.6937001"
+       cx="45.095001"
+       gradientTransform="matrix(0,1.9259,-2.1007,-2.103e-6,39.436,-89.543)"
+       r="10.498">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3018" />
+      <stop
+         stop-color="#eeeeec"
+         offset="1"
+         id="stop3020" />
+    </radialGradient>
+    <linearGradient
+       id="i"
+       y2="4.5"
+       gradientUnits="userSpaceOnUse"
+       x2="62.955002"
+       y1="4.5"
+       x1="42.044998">
+      <stop
+         stop-color="#8c8b83"
+         offset="0"
+         id="stop3023" />
+      <stop
+         stop-color="#24221b"
+         offset="1"
+         id="stop3025" />
+    </linearGradient>
+    <linearGradient
+       id="h"
+       y2="35.411999"
+       gradientUnits="userSpaceOnUse"
+       x2="-19.562"
+       y1="32"
+       x1="-19.562">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3028" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3030" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       y2="-2104.8999"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.3999"
+       gradientTransform="matrix(0.35401,0,0,0.35044,1142.3,1477)"
+       y1="-2128.6001"
+       x1="-2585.8999">
+      <stop
+         stop-color="#dcdcdc"
+         offset="0"
+         id="stop3033" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3035" />
+    </linearGradient>
+    <filter
+       id="j"
+       height="1.3315001"
+       width="1.3480999"
+       y="-0.16576"
+       x="-0.17407"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur3038" />
+    </filter>
+    <linearGradient
+       id="f"
+       y2="-2125.2"
+       gradientUnits="userSpaceOnUse"
+       x2="-2589.3"
+       gradientTransform="matrix(0.3192,0,0,0.31597,1052.3,1403.6)"
+       y1="-2130.1001"
+       x1="-2584.3999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3041" />
+      <stop
+         stop-color="#dcdcdc"
+         offset="1"
+         id="stop3043" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-698.25,360.62)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3046" />
+      <stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3048" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,264.43,726.53)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3051" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3053" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3055">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-185.07001,-728.73741)"
+     id="g3057">
+    <g
+       transform="matrix(0.96062,0,0,0.96062,7.2953,29.329)"
+       id="g3059">
+      <path
+         style="color:#000000;fill:url(#c)"
+         d="M 76,39.75 C 76,44.859 71.859,49 66.75,49 61.641,49 57.5,44.859 57.5,39.75 c 0,-5.1086 4.1414,-9.25 9.25,-9.25 5.1086,0 9.25,4.1414 9.25,9.25 z"
+         transform="matrix(0.44719,0,0,0.44701,161.83,716.75)"
+         id="path3061"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#b);stroke-width:2.56769991;stroke-linecap:round"
+         d="m 62.5,4.5 c 0,5.5228 -4.4772,10 -10,10 -5.5228,0 -10,-4.4772 -10,-10 0,-5.5228 4.4772,-10 10,-10 5.5228,0 10,4.4772 10,10 z"
+         transform="matrix(0.5369,0,0,0.53745,163.5,732.11)"
+         id="path3063"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#a);stroke-width:0.99800998;stroke-linecap:round"
+         d="m 62.5,4.5 c 0,5.5228 -4.4772,10 -10,10 -5.5228,0 -10,-4.4772 -10,-10 0,-5.5228 4.4772,-10 10,-10 5.5228,0 10,4.4772 10,10 z"
+         transform="matrix(0.55352,0,0,0.55213,162.62,732.04)"
+         id="path3065"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#i);stroke-width:1.23790002;stroke-linecap:round"
+         d="m 62.5,4.5 c 0,5.5228 -4.4772,10 -10,10 -5.5228,0 -10,-4.4772 -10,-10 0,-5.5228 4.4772,-10 10,-10 5.5228,0 10,4.4772 10,10 z"
+         transform="matrix(0.60609,0,0,0.60568,159.86,731.79)"
+         id="path3067"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ffffff"
+         d="m 67.5,37.5 c 0,1.3807 -1.3431,2.5 -3,2.5 -1.6569,0 -3,-1.1193 -3,-2.5 0,-1.3807 1.3431,-2.5 3,-2.5 1.6569,0 3,1.1193 3,2.5 z"
+         transform="matrix(0.27556,0,0,0.33055,172.25,720.5)"
+         id="path3069"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.19215997;color:#000000;fill:#ffffff"
+         d="m 197.98,739.74 c 0.14863,0.14892 0.028,0.51153 -0.26927,0.80939 -0.29728,0.29786 -0.66586,0.4117 -0.80782,0.2698 l -0.39722,-1.4945 1.4743,0.41532 z"
+         id="path3071"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.8;color:#000000;fill:url(#h)"
+         d="m -14,34.25 c 0,1.2426 -2.4624,2.25 -5.5,2.25 -3.0376,0 -5.5,-1.0074 -5.5,-2.25 0,-1.2426 2.4624,-2.25 5.5,-2.25 3.0376,0 5.5,1.0074 5.5,2.25 z"
+         transform="matrix(0.55113,0,0,0.9794,202.43,699.62)"
+         id="path3073"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.51045,0,0,0.51045,77.771,358.65)"
+         id="g3075"
+         style="fill-rule:evenodd;stroke:#666666">
+        <path
+           d="m 217.54,729.07 h 7.4607 l 3.7543,3.9023 -0.0848,10.715 h -11.13 v -14.617 z"
+           id="path3077"
+           inkscape:connector-curvature="0"
+           style="fill:url(#g);stroke-width:0.51007003" />
+        <path
+           d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z"
+           transform="matrix(0.3192,0,0,0.31597,1128.1,1307.3)"
+           id="path3079"
+           inkscape:connector-curvature="0"
+           style="fill:#d3d3d3;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#j)" />
+        <path
+           d="m 225.23,729.31 c 0.34102,1.514 0.12249,2.6984 -0.0191,3.4407 0.84096,-0.20682 1.8321,-0.43775 3.3038,0.009 -1.5864,-1.7532 -2.2335,-2.2928 -3.2847,-3.4501 z"
+           id="path3081"
+           inkscape:connector-curvature="0"
+           style="fill:url(#f);stroke-width:0.51007003;stroke-linejoin:round" />
+      </g>
+      <g
+         transform="matrix(0,-1,1,0,-541.64,948.69)"
+         id="g3083"
+         style="stroke-linejoin:round">
+        <rect
+           transform="matrix(-0.7273,-0.68632,-0.70389,0.7103,0,0)"
+           rx="0.32876"
+           ry="0.32876"
+           height="5.2533002"
+           width="2.0947001"
+           y="394.31"
+           x="-669.27002"
+           id="rect3085"
+           style="fill:url(#e);stroke:#a05a2c;stroke-width:0.33790001;stroke-linecap:round;stroke-opacity:0.90697997" />
+        <path
+           d="m 210.01,737.75 -0.78603,1.5437 -1.4082,-1.3724 1.4643,-0.87188 0.72987,0.70049 z"
+           id="path3087"
+           inkscape:connector-curvature="0"
+           style="fill:url(#d);fill-rule:evenodd;stroke:#333333;stroke-width:0.20107;stroke-opacity:0.88372001" />
+      </g>
+    </g>
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="728.73999"
+       x="185.07001"
+       id="rect3089" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Folded.png b/freeplane/resources/images/Folded.png
deleted file mode 100644
index 621fb7f..0000000
Binary files a/freeplane/resources/images/Folded.png and /dev/null differ
diff --git a/freeplane/resources/images/Forward24.png b/freeplane/resources/images/Forward24.png
new file mode 100644
index 0000000..388d011
Binary files /dev/null and b/freeplane/resources/images/Forward24.png differ
diff --git a/freeplane/resources/images/Forward24.svg b/freeplane/resources/images/Forward24.svg
new file mode 100644
index 0000000..3e3f8db
--- /dev/null
+++ b/freeplane/resources/images/Forward24.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg4447"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 24 24"
+   sodipodi:docname="Forward24.svg">
+  <defs
+     id="defs4449">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5033">
+      <stop
+         style="stop-color:#8787ff;stop-opacity:1"
+         offset="0"
+         id="stop5035" />
+      <stop
+         id="stop5039"
+         offset="0.13518728"
+         style="stop-color:#000080;stop-opacity:1" />
+      <stop
+         style="stop-color:#8787ff;stop-opacity:1"
+         offset="1"
+         id="stop5037" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5033"
+       id="linearGradient5015"
+       x1="-96.926437"
+       y1="8.94804"
+       x2="-70.972519"
+       y2="35.749985"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52442207,0,0,0.52442207,-58.402163,4.4469134)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.1475459"
+     inkscape:cx="-37.25382"
+     inkscape:cy="0.47423999"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1234"
+     inkscape:window-height="742"
+     inkscape:window-x="30"
+     inkscape:window-y="149"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4452">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <g
+       id="g4367">
+      <g
+         transform="matrix(-0.85660624,0,0,0.85660624,-76.623818,-5.2221443)"
+         id="g5067">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path5057"
+           d="m -98.895841,-2.181938 3.81514,3.9109381 -9.078769,8.6693049 9.078769,9.500869 -3.81514,3.814581 -12.941909,-13.31545 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000081;stroke-width:0.52442205;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient5015);fill-opacity:1;fill-rule:nonzero;stroke:#000081;stroke-width:0.52442205;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -98.895847,-2.181938 3.815145,3.9109381 -9.078768,8.6693049 9.078768,9.500869 -3.815145,3.814581 -12.941903,-13.31545 z"
+           id="rect5006"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+      </g>
+      <rect
+         y="-8"
+         x="0"
+         height="24"
+         width="24"
+         id="rect4355"
+         style="opacity:0.8479996;fill:none;stroke:none;stroke-width:4.12423229;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/HierarchicalIconsAction.svg b/freeplane/resources/images/HierarchicalIconsAction.svg
new file mode 100644
index 0000000..0700f50
--- /dev/null
+++ b/freeplane/resources/images/HierarchicalIconsAction.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="e" gradientUnits="userSpaceOnUse" cy="530.67" cx="279.99" gradientTransform="matrix(-.29528 .29528 -.25590 -.25590 -197.94 200.87)" r="263.68">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#f90909" offset="1"/>
+</radialGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="530.67" cx="279.99" gradientTransform="matrix(-.25965 .25965 -.22502 -.22502 -224.3 192.6)" r="263.68">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#ff8207" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="530.67" cx="279.99" gradientTransform="matrix(-.22329 .22329 -.19352 -.19352 -251.2 184.17)" r="263.68">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fefc04" offset="1"/>
+</radialGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="530.67" cx="279.99" gradientTransform="matrix(-.18403 .18403 -.15949 -.15949 -280.25 175.06)" r="263.68">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#18fe04" offset="1"/>
+</radialGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="439.52" cx="334.29" gradientTransform="matrix(-.073462 .073462 -.074846 -.074846 -358.96 154.75)" r="262.47">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#807eed" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-59.239 -140.8)">
+<g transform="translate(247.1 -233.2)">
+<g stroke-linejoin="round" transform="matrix(.19082 0 0 .19082 -100.41 349.82)" stroke="#000">
+<path d="m-416.42 132.54 41.732 72.282h-83.464l41.732-72.282z" stroke-width=".38552" fill="url(#e)"/>
+<path d="m-416.42 132.52 36.697 63.561h-73.394l36.697-63.561z" stroke-width=".38552" fill="url(#d)"/>
+<path d="m-416.42 132.5 31.559 54.661h-63.118l31.559-54.661z" stroke-width=".38552" fill="url(#c)"/>
+<path d="m-416.42 132.47 26.01 45.05h-52.019l26.01-45.05z" stroke-width=".38552" fill="url(#b)"/>
+<path d="m-416.42 132.44 19.227 33.303h-38.455l19.227-33.303z" stroke-width=".38552" fill="url(#a)"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="374" x="-187.86" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/IncreaseNodeFontAction.svg b/freeplane/resources/images/IncreaseNodeFontAction.svg
new file mode 100644
index 0000000..f59f448
--- /dev/null
+++ b/freeplane/resources/images/IncreaseNodeFontAction.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExtractLinkFromTextAction.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="J:\Freeplane\editor\images\ExtractLinkFromTextAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1113"
+     inkscape:window-height="843"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.759182"
+     inkscape:cy="8"
+     inkscape:window-x="720"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.41699409px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.66928107;stroke-opacity:1"
+     x="0.85751611"
+     y="15.665359"
+     id="text14029"
+     sodipodi:linespacing="125%"
+     inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"><tspan
+       sodipodi:role="line"
+       id="tspan14031"
+       x="0.85751611"
+       y="15.665359"
+       style="stroke-width:0.66928107">A</tspan></text>
+</svg>
diff --git a/freeplane/resources/images/Italic16.gif b/freeplane/resources/images/Italic16.gif
deleted file mode 100644
index a896944..0000000
Binary files a/freeplane/resources/images/Italic16.gif and /dev/null differ
diff --git a/freeplane/resources/images/Italic16.svg b/freeplane/resources/images/Italic16.svg
new file mode 100644
index 0000000..4f270d5
--- /dev/null
+++ b/freeplane/resources/images/Italic16.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-87.539 -350.14)">
+<g transform="translate(-371.22 -354.88)">
+<g transform="matrix(1.4797 0 -.26840 1.4227 1024.7 -604.28)" stroke="#000" stroke-width=".25">
+<path d="m-208.61 930.14-0.0831 0.2443h-3.8014l0.0831-0.2443h0.31271c0.15635 0 0.29866-0.0114 0.42692-0.0342 0.12825-0.0228 0.24644-0.0782 0.35454-0.16612 0.1081-0.0879 0.21377-0.2215 0.31699-0.40066 0.10321-0.17916 0.20673-0.42183 0.31057-0.72802l1.9495-5.7362c0.0688-0.20195 0.12102-0.3697 0.15666-0.50326 0.0356-0.13355 0.0564-0.24267 0.0623-0.32737 0.006-0.0847-0.006-0.15146-0.0345-0.20033-0.0289-0.0489-0.0747-0.0961-0.13742-0.14169-0.16003-0.10423-0.34427-0.15635-0.55274-0.15636h-0.31 [...]
+</g>
+<rect style="color:#000000" height="16" width="16" y="705.02" x="458.76" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/Italic24.gif b/freeplane/resources/images/Italic24.gif
deleted file mode 100644
index 069c6b9..0000000
Binary files a/freeplane/resources/images/Italic24.gif and /dev/null differ
diff --git a/freeplane/resources/images/Italic_on16.png b/freeplane/resources/images/Italic_on16.png
deleted file mode 100644
index 0a3b305..0000000
Binary files a/freeplane/resources/images/Italic_on16.png and /dev/null differ
diff --git a/freeplane/resources/images/JoinNodesAction.svg b/freeplane/resources/images/JoinNodesAction.svg
new file mode 100644
index 0000000..437c450
--- /dev/null
+++ b/freeplane/resources/images/JoinNodesAction.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="JoinNodesAction.svg">
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1185"
+     inkscape:window-height="827"
+     id="namedview36"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-2.3050847"
+     inkscape:cy="7.9322034"
+     inkscape:window-x="722"
+     inkscape:window-y="186"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4541">
+    <rect
+       style="color:#000000;opacity:0.92510998;fill:none"
+       rx="0.070384003"
+       ry="0.092563003"
+       height="16"
+       width="16"
+       y="-0.0040146485"
+       x="0.0048000002"
+       id="rect12" />
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.67567474;stroke-linejoin:round"
+       id="rect16"
+       x="3.7401462"
+       y="9.7584486"
+       width="11.927656"
+       ry="1.2839048"
+       rx="1.3487343"
+       height="5.82196" />
+    <g
+       id="text18"
+       style="font-style:italic;font-size:4.04557228px;fill:#000000">
+      <path
+         id="path4533"
+         style=""
+         d="m 5.4771731,11.147873 0.5373025,0 0.8138554,2.528482 0.4938443,-2.528482 0.3891493,0 -0.5748348,2.949238 -0.5392779,0 -0.81188,-2.544286 -0.4938443,2.544286 -0.3891493,0 0.5748348,-2.949238 z" />
+      <path
+         id="path4535"
+         style=""
+         d="m 8.8471665,14.154397 q -0.3891493,0 -0.6163177,-0.239021 -0.225193,-0.240996 -0.225193,-0.655825 0,-0.240996 0.07704,-0.489894 0.079015,-0.250873 0.2034639,-0.420755 0.1955623,-0.264701 0.4365583,-0.391125 0.240996,-0.126424 0.5452041,-0.126424 0.377297,0 0.6084161,0.23507 0.2330941,0.23507 0.2330941,0.614342 0,0.262726 -0.07704,0.523475 -0.07704,0.26075 -0.2014888,0.432608 -0.1935869,0.2647 -0.4345829,0.391125 -0.240996,0.126424 -0.5491548,0.126424 z M 8.3829528,13.247699 q [...]
+      <path
+         id="path4537"
+         style=""
+         d="m 11.984065,13.765247 q -0.146178,0.191612 -0.345691,0.290381 -0.199513,0.09877 -0.442484,0.09877 -0.331864,0 -0.525451,-0.225193 -0.191611,-0.227169 -0.191611,-0.620269 0,-0.327912 0.116547,-0.624219 0.116547,-0.298282 0.337789,-0.533352 0.146178,-0.156054 0.329888,-0.237045 0.183711,-0.08297 0.385199,-0.08297 0.213341,0 0.375322,0.10272 0.163956,0.102719 0.252848,0.294331 l 0.237045,-1.20498 0.365445,0 -0.598539,3.073687 -0.365445,0 0.06914,-0.331864 z m -1.12794,-0.521499  [...]
+      <path
+         id="path4539"
+         style=""
+         d="m 14.806879,12.793362 q 0.0059,-0.03161 0.0079,-0.06519 0.0039,-0.03358 0.0039,-0.06716 0,-0.240996 -0.142227,-0.381248 -0.140252,-0.140252 -0.383223,-0.140252 -0.270627,0 -0.478041,0.171858 -0.207415,0.169882 -0.314085,0.483967 l 1.305724,-0.002 z m 0.31606,0.284454 -1.690922,0 q -0.01185,0.07506 -0.0158,0.118523 -0.004,0.04346 -0.004,0.07506 0,0.274578 0.167907,0.424706 0.169882,0.150129 0.478041,0.150129 0.237045,0 0.448411,-0.05333 0.211365,-0.05334 0.3931,-0.156055 l -0. [...]
+    </g>
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.67567474;stroke-linejoin:round"
+       id="rect26"
+       x="0.34314618"
+       y="1.1684486"
+       width="11.927656"
+       ry="1.2839048"
+       rx="1.3487343"
+       height="5.82196" />
+    <g
+       id="text28"
+       style="font-style:italic;font-size:4.04557228px;fill:#000000">
+      <path
+         id="path4524"
+         style=""
+         d="m 2.0801733,2.5578726 0.5373026,0 0.8138554,2.5284827 0.4938442,-2.5284827 0.3891493,0 -0.5748347,2.949238 -0.5392779,0 -0.81188,-2.5442857 -0.4938443,2.5442857 -0.3891493,0 0.5748347,-2.949238 z" />
+      <path
+         id="path4526"
+         style=""
+         d="m 5.4501667,5.5643965 q -0.3891492,0 -0.6163176,-0.2390206 -0.225193,-0.240996 -0.225193,-0.6558252 0,-0.240996 0.07704,-0.4898935 Q 4.7647109,3.9287843 4.8891596,3.7589019 5.084722,3.4942013 5.325718,3.3677772 5.566714,3.2413531 5.8709221,3.2413531 q 0.377297,0 0.6084161,0.2350698 0.2330945,0.2350699 0.2330945,0.6143423 0,0.2627252 -0.07704,0.523475 Q 6.5583533,4.8749899 6.4339045,5.0468477 6.2403176,5.3115483 5.9993216,5.4379724 5.7583256,5.5643965 5.4501667,5.5643965 Z M 4 [...]
+      <path
+         id="path4528"
+         style=""
+         d="m 8.5870654,5.1752472 q -0.1461779,0.1916116 -0.345691,0.2903805 -0.1995131,0.098769 -0.4424845,0.098769 -0.3318633,0 -0.5254503,-0.225193 Q 7.081828,5.1120352 7.081828,4.7189351 q 0,-0.3279126 0.1165473,-0.6242191 0.1165472,-0.298282 0.3377895,-0.5333518 0.1461779,-0.1560548 0.329888,-0.2370453 0.18371,-0.082966 0.3851985,-0.082966 0.2133407,0 0.3753216,0.1027196 0.1639563,0.1027196 0.2528483,0.2943312 l 0.2370453,-1.2049801 0.3654447,0 -0.5985392,3.0736868 -0.3654448,0 0.06 [...]
+      <path
+         id="path4530"
+         style=""
+         d="m 11.409879,4.2033617 q 0.0059,-0.031606 0.0079,-0.065187 0.004,-0.033581 0.004,-0.067163 0,-0.2409961 -0.142228,-0.3812478 -0.140251,-0.1402518 -0.383223,-0.1402518 -0.270626,0 -0.478041,0.1718578 -0.207415,0.1698824 -0.314085,0.4839674 l 1.305724,-0.00198 z m 0.316061,0.2844543 -1.690923,0 q -0.01185,0.075064 -0.0158,0.1185226 -0.004,0.043458 -0.004,0.075064 0,0.2745774 0.167907,0.424706 0.169883,0.1501287 0.478041,0.1501287 0.237046,0 0.448411,-0.053335 0.211365,-0.053335  [...]
+    </g>
+    <path
+       style="fill:#f21313;stroke:#f70808;stroke-width:0.24259px"
+       inkscape:connector-curvature="0"
+       id="path34"
+       d="m 9.556,0.12 0,3.8769 -3.5925,0 0,2.7036 3.5925,0 0,3.8769 2.7324,0 0,-3.8769 3.5925,0 0,-2.7036 -3.5925,0 0,-3.8769 -2.7324,0 z" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/LastSlide.svg b/freeplane/resources/images/LastSlide.svg
new file mode 100644
index 0000000..928121b
--- /dev/null
+++ b/freeplane/resources/images/LastSlide.svg
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Last.svg">
+  <defs
+     id="defs8391">
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         offset="0"
+         id="stop2942-8-2-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2944-9-5-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         id="stop3158"
+         offset="0"
+         style="stop-color:#d40000;stop-opacity:1" />
+      <stop
+         id="stop3160"
+         offset="1"
+         style="stop-color:#f3fbfb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4350-9-7-3"
+       id="linearGradient7743"
+       gradientUnits="userSpaceOnUse"
+       x1="182.54036"
+       y1="229.78313"
+       x2="182.6501"
+       y2="211.30733"
+       gradientTransform="matrix(1.2508606,0,0,1.2508606,179.40892,433.79278)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4332-7-3-3"
+       id="linearGradient7745"
+       gradientUnits="userSpaceOnUse"
+       x1="184.5444"
+       y1="207.34468"
+       x2="184.58699"
+       y2="224.56676"
+       gradientTransform="matrix(1.3422813,0,0,1.3422813,159.47538,416.62701)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2940-9-4-2"
+       id="linearGradient7747"
+       gradientUnits="userSpaceOnUse"
+       x1="184.15109"
+       y1="226.48277"
+       x2="184.2887"
+       y2="210.23618"
+       gradientTransform="matrix(1.3877987,0,0,1.3877987,151.27746,403.97651)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient7749"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-79.75824"
+       y2="329.53061" />
+    <linearGradient
+       id="linearGradient2960-9-8">
+      <stop
+         style="stop-color:#8739af;stop-opacity:1;"
+         offset="0"
+         id="stop2962-6-5" />
+      <stop
+         style="stop-color:#e0c5ea;stop-opacity:1;"
+         offset="1"
+         id="stop2964-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-4-1"
+       id="linearGradient7751"
+       gradientUnits="userSpaceOnUse"
+       x1="-79.75824"
+       y1="329.53061"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       id="linearGradient2968-4-1">
+      <stop
+         style="stop-color:#8f379a;stop-opacity:1;"
+         offset="0"
+         id="stop2970-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-4-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9269"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,684.58173,135.61469)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9275"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,684.58173,135.61469)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9483"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9485"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.4320266"
+     inkscape:cx="50.658611"
+     inkscape:cy="-9.8366753"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-391.12787,-691.06306)">
+    <g
+       id="g9510">
+      <circle
+         id="path4326-5-9"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ff00ff;stroke:#800080;stroke-width:0.96188784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06305"
+         r="15.519055" />
+      <circle
+         id="path4340-4-2"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7743);stroke-width:2.95701718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06311"
+         r="13.798415" />
+      <circle
+         id="path4356-3-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7745);stroke-width:1.29703701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06311"
+         r="12.193909" />
+      <circle
+         id="path4368-2-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+         cx="407.12787"
+         cy="707.06305"
+         r="11.606822" />
+      <path
+         inkscape:transform-center-x="1.7243515"
+         inkscape:transform-center-y="0.075110753"
+         transform="matrix(-0.2114708,-0.36889765,-0.36889763,0.21147081,515.89207,608.48529)"
+         d="m -53.23773,345.69211 -23.767219,13.72201 0,-27.44402 z"
+         inkscape:randomized="0"
+         inkscape:rounded="2.5777991e-015"
+         inkscape:flatsided="true"
+         sodipodi:arg2="1.0471976"
+         sodipodi:arg1="0"
+         sodipodi:r2="7.2885256"
+         sodipodi:r1="15.844812"
+         sodipodi:cy="345.69211"
+         sodipodi:cx="-69.082542"
+         sodipodi:sides="3"
+         id="path2956-3"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7749);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7751);stroke-width:1.18207157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         sodipodi:type="star" />
+      <rect
+         ry="0"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient9269);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9275);stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker [...]
+         id="rect3105-3-2-1"
+         width="2.8179185"
+         height="11.303813"
+         x="410.59793"
+         y="701.44983" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Mail.svg b/freeplane/resources/images/Mail.svg
new file mode 100644
index 0000000..8d169d9
--- /dev/null
+++ b/freeplane/resources/images/Mail.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="27.482" width="34.173" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 34.173484 27.482118" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#e3e2db" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="520.48" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="520.48" gradientTransform="translate(156.8,-180.92)" x2="165.42" x1="154.03"/>
+<linearGradient id="c" y2="515.51" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="529.35" gradientTransform="translate(156.8,-180.92)" x2="150.34" x1="150.19"/>
+<linearGradient id="d" y2="516.19" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="507.6" gradientTransform="translate(156.8,-180.92)" x2="150.24" x1="150.19"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-383.19 -341.75)">
+<g fill-rule="evenodd" transform="translate(93.131,15.788)">
+<rect stroke-linejoin="round" height="26.202" width="32" stroke="#313231" stroke-linecap="round" y="326.46" x="291.64" fill="url(#b)"/>
+<path d="m291.76 352.5-0.13898-4.5105 15.793-11.308 16.311 11.611-0.16425 4.4095-31.801-0.20215z" stroke="#333" stroke-width="1px" fill="url(#c)"/>
+<path d="m291.76 326.5-0.0379 6.3299 15.692 8.3767 16.311-9.4886-0.16425-5.2181h-31.801z" stroke="#333" stroke-width="1px" fill="url(#d)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/MapBackgroundClearAction.png b/freeplane/resources/images/MapBackgroundClearAction.png
index 0711270..245b22c 100644
Binary files a/freeplane/resources/images/MapBackgroundClearAction.png and b/freeplane/resources/images/MapBackgroundClearAction.png differ
diff --git a/freeplane/resources/images/MapBackgroundClearAction.svg b/freeplane/resources/images/MapBackgroundClearAction.svg
new file mode 100644
index 0000000..a4f13bd
--- /dev/null
+++ b/freeplane/resources/images/MapBackgroundClearAction.svg
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16.093"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MapBackgroundClearAction.svg"
+   inkscape:export-filename="I:\Freeplane\editor\images\MapBackgroundClearAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1526"
+     inkscape:window-height="850"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="14.664761"
+     inkscape:cx="-13.004407"
+     inkscape:cy="7.910119"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="-2104.9"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.4"
+       gradientTransform="matrix(0.37028,0,0,0.36654,1011.7,985.36)"
+       y1="-2128.6"
+       x1="-2585.9">
+      <stop
+         stop-color="#5fbcd3"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d5f6ff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="b"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315"
+       width="1.3481"
+       y="-.16576"
+       x="-.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="c">
+      <stop
+         id="stop3693"
+         offset="0"
+         stop-color="#fefdb7" />
+      <stop
+         id="stop3695"
+         offset="1"
+         stop-color="#f5f06c" />
+    </linearGradient>
+    <linearGradient
+       x1="41.688999"
+       y1="340.63"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x2="463.22"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#c"
+       y2="-130.78999"
+       id="a-9" />
+    <filter
+       color-interpolation-filters="sRGB"
+       x="-0.17994"
+       y="-0.17925"
+       width="1.3599"
+       height="1.3585"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur3699"
+         stdDeviation="18.47879" />
+    </filter>
+    <linearGradient
+       x1="351.57999"
+       y1="584.52002"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       x2="690.78998"
+       gradientUnits="userSpaceOnUse"
+       y2="354.38"
+       id="b-3">
+      <stop
+         id="stop3702"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop3704"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="-2585.8999"
+       y1="-2128.6001"
+       gradientTransform="matrix(0.37028,0,0,0.36654,1011.7,985.36)"
+       x2="-2587.1121"
+       gradientUnits="userSpaceOnUse"
+       y2="-2118.8816"
+       id="a-7">
+      <stop
+         id="stop7-63"
+         offset="0"
+         stop-color="#5fbcd3" />
+      <stop
+         id="stop9-5"
+         offset="1"
+         stop-color="#d5f6ff" />
+    </linearGradient>
+    <filter
+       x="-0.17407"
+       y="-0.16576"
+       width="1.3480999"
+       height="1.3315001"
+       style="color-interpolation-filters:sRGB"
+       id="b-2">
+      <feGaussianBlur
+         id="feGaussianBlur12-8"
+         stdDeviation="0.82320991" />
+    </filter>
+    <linearGradient
+       id="linearGradient4522"
+       y2="-130.78999"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="463.22"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       y1="340.63"
+       x1="41.688999" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="d-8"
+       height="1.3585"
+       width="1.3599"
+       y="-0.17925"
+       x="-0.17994">
+      <feGaussianBlur
+         stdDeviation="18.47879"
+         id="feGaussianBlur3699-7" />
+    </filter>
+    <linearGradient
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)"
+       x1="111.93"
+       x2="112.73"
+       y1="310.62"
+       gradientUnits="userSpaceOnUse"
+       y2="298.92001"
+       id="a-6">
+      <stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#0d2e2e" />
+      <stop
+         id="stop9-7"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#0d2e2e" />
+    </linearGradient>
+    <linearGradient
+       y2="7.1090999"
+       x2="21.933001"
+       y1="24.627001"
+       x1="21.933001"
+       gradientTransform="matrix(0.42960343,0,0,-0.3255716,-0.26432726,18.989658)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4549"
+       xlink:href="#b-6"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="21.933001"
+       x2="21.933001"
+       gradientTransform="matrix(0.84426804,0,0,-0.63982192,-2.908368,28.807686)"
+       y1="24.627001"
+       gradientUnits="userSpaceOnUse"
+       y2="7.1090999"
+       id="b-6">
+      <stop
+         id="stop12"
+         offset="0"
+         stop-color="#acf" />
+      <stop
+         id="stop14"
+         offset="1"
+         stop-color="#04a" />
+    </linearGradient>
+    <linearGradient
+       y2="302.84"
+       x2="118.52"
+       y1="302.84"
+       x1="105.51"
+       gradientTransform="matrix(1.0254289,0,0,1.0754165,-105.53485,-316.8414)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4551"
+       xlink:href="#c-6"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)"
+       x1="105.51"
+       x2="118.52"
+       y1="302.84"
+       gradientUnits="userSpaceOnUse"
+       y2="302.84"
+       id="c-6">
+      <stop
+         id="stop17"
+         offset="0"
+         stop-color="#37c837" />
+      <stop
+         id="stop19"
+         offset="1"
+         stop-color="#165016" />
+    </linearGradient>
+    <linearGradient
+       y2="300.78"
+       x2="112.37"
+       y1="303.64001"
+       x1="112.29"
+       gradientTransform="matrix(1.0522926,0,0,1.1176904,-108.57837,-329.76195)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4553"
+       xlink:href="#d-4"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)"
+       x1="112.29"
+       x2="112.37"
+       y1="303.64001"
+       gradientUnits="userSpaceOnUse"
+       y2="300.78"
+       id="d-4">
+      <stop
+         id="stop22"
+         offset="0"
+         stop-color="#b9d7ff" />
+      <stop
+         id="stop24"
+         offset="1"
+         stop-color="#3c8dff" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4567">
+    <g
+       transform="translate(3.3410329e-7,0.09301262)"
+       id="g4825">
+      <g
+         style="fill-rule:evenodd"
+         id="g20-3"
+         transform="matrix(1.0112431,0,0,1.0112431,-44.710946,-205.11372)">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#a-7);stroke:#006680;stroke-width:0.53351003"
+           id="path22-3"
+           d="m 44.481,203.1 7.8035,0 3.9268,4.0816 -0.0887,11.207 -11.642,0 0,-15.288 z" />
+        <path
+           style="fill:#d3d3d3;stroke:#666666;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#b-2)"
+           inkscape:connector-curvature="0"
+           id="path24-9"
+           transform="matrix(0.33386,0,0,0.33049,996.91,807.89)"
+           d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z" />
+        <path
+           style="fill:#aaeeff;stroke:#006680;stroke-width:0.53351003;stroke-linejoin:round"
+           inkscape:connector-curvature="0"
+           id="path26-8"
+           d="m 52.517,203.34 c 0.35669,1.5836 0.12812,2.8224 -0.02,3.5988 0.8796,-0.21633 1.9163,-0.45787 3.4556,0.009 -1.6593,-1.8338 -2.3361,-2.3982 -3.4356,-3.6086 z" />
+      </g>
+      <rect
+         id="rect28-2"
+         x="0.0030073242"
+         y="-0.093012616"
+         width="16"
+         height="16"
+         style="color:#000000;fill:none" />
+      <g
+         transform="matrix(0.95410475,0,0,0.95410475,0.73432407,0.73432407)"
+         id="g4776">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4549)"
+           id="path36-0"
+           d="M 2.658145,16 16,16 l 0,-4.233162 -13.341855,0 0,4.233162 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4551)"
+           id="path38-7"
+           d="m 2.658145,5.9018391 13.341855,0 0,5.8725269 -13.341855,0 0,-5.8725269 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path40-9"
+           d="m 2.6278959,5.9475338 0,5.8859812 C 11.118948,12.11409 10.234499,8.1407775 15.983592,8.1407775 l 0,-2.3014362 z"
+           style="color:#000000;fill:url(#linearGradient4553)" />
+        <g
+           id="g4767"
+           transform="matrix(1.2961948,0,0,1.2961948,-1.768516,-2.6307347)">
+          <path
+             style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path44-7"
+             d="m 8.1759618,8.881771 c 0,1.235339 -0.968126,2.302224 -2.2051757,2.302224 -1.1832649,0 -2.2051757,-1.010733 -2.2051757,-2.302224 0,-1.2353395 0.9681259,-2.3022237 2.2051757,-2.3022237 1.1832651,0 2.2051757,1.0107324 2.2051757,2.3022237 z" />
+          <path
+             style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path46-6"
+             d="m 7.9608228,8.881771 c 0,1.123036 -0.8605562,2.077616 -1.9900367,2.077616 -1.0756953,0 -1.9900365,-0.898428 -1.9900365,-2.077616 0,-1.1230359 0.8605563,-2.0776165 1.9900365,-2.0776165 1.0756953,0 1.9900367,0.8984287 1.9900367,2.0776165 z" />
+          <path
+             style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path48-2"
+             d="m 7.7456838,8.881771 c 0,1.0107324 -0.8067716,1.85301 -1.7748977,1.85301 -0.9681259,0 -1.7748974,-0.8422776 -1.7748974,-1.85301 0,-1.0107323 0.8067715,-1.8530093 1.7748974,-1.8530093 0.9681261,0 1.7748977,0.842277 1.7748977,1.8530093 z" />
+          <path
+             style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path50-9"
+             d="m 7.5305446,8.881771 c 0,0.8984287 -0.6992023,1.628402 -1.5597585,1.628402 -0.8605563,0 -1.5597584,-0.7299733 -1.5597584,-1.628402 0,-0.8984288 0.6992021,-1.6284021 1.5597584,-1.6284021 0.8605562,0 1.5597585,0.7299733 1.5597585,1.6284021 z" />
+          <path
+             style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path52-3"
+             d="m 7.3154056,8.881771 c 0,0.7861252 -0.5916326,1.403795 -1.3446195,1.403795 -0.7529867,0 -1.3446192,-0.6176698 -1.3446192,-1.403795 0,-0.7861251 0.5916325,-1.403795 1.3446192,-1.403795 0.7529869,0 1.3446195,0.6176699 1.3446195,1.403795 z" />
+          <path
+             style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path54-8"
+             d="m 7.1002666,8.881771 c 0,0.6738215 -0.537848,1.179188 -1.1294805,1.179188 -0.5916324,0 -1.1294802,-0.5615183 -1.1294802,-1.179188 0,-0.6176698 0.5378478,-1.1791878 1.1294802,-1.1791878 0.5916325,0 1.1294805,0.561518 1.1294805,1.1791878 z" />
+          <path
+             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.24858904"
+             inkscape:connector-curvature="0"
+             id="path56-3"
+             d="m 6.8851274,8.881771 c 0,0.561518 -0.430278,1.0107324 -0.968126,1.0107324 -0.5378477,0 -0.9681259,-0.4492144 -0.9681259,-1.0107324 0,-0.5615179 0.4302782,-1.0107323 0.9681259,-1.0107323 0.537848,0 0.968126,0.4492144 0.968126,1.0107323 z" />
+        </g>
+      </g>
+    </g>
+    <g
+       style="fill:#ff0000"
+       id="g3734"
+       transform="matrix(0.67297285,0,0,0.70607592,114.10008,-611.94879)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3736"
+         d="m -161.28,889.17 c 0.59165,-6.8804 5.7208,-14.856 13.736,-16 l 1.3818,2.3683 c -7.776,1.6244 -12.057,5.7928 -15.118,13.632 z"
+         style="color:#000000" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3738"
+         d="m -164.97,874.34 c 6.9053,0.0759 15.242,4.5947 16.982,12.502 l -2.2584,1.555 c -2.2009,-7.6329 -6.6776,-11.591 -14.723,-14.057 z"
+         style="color:#000000" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MapBackgroundColorAction.png b/freeplane/resources/images/MapBackgroundColorAction.png
index 7f52f0b..4bd803d 100644
Binary files a/freeplane/resources/images/MapBackgroundColorAction.png and b/freeplane/resources/images/MapBackgroundColorAction.png differ
diff --git a/freeplane/resources/images/MapBackgroundColorAction.svg b/freeplane/resources/images/MapBackgroundColorAction.svg
new file mode 100644
index 0000000..b30cb71
--- /dev/null
+++ b/freeplane/resources/images/MapBackgroundColorAction.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MapBackgroundColorAction.svg"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1383"
+     inkscape:window-height="942"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="14.664761"
+     inkscape:cx="-2.3649833"
+     inkscape:cy="7.9783095"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="-2104.8999"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.3999"
+       gradientTransform="matrix(0.37028,0,0,0.36654,1011.7,985.36)"
+       y1="-2128.6001"
+       x1="-2585.8999">
+      <stop
+         stop-color="#5fbcd3"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d5f6ff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="b"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315001"
+       width="1.3480999"
+       y="-0.16576"
+       x="-0.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4480"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <g
+       style="fill-rule:evenodd"
+       id="g20"
+       transform="matrix(1.0112431,0,0,1.0112431,-44.710946,-205.11137)">
+      <path
+         style="fill:url(#a);stroke:#006680;stroke-width:0.53351003"
+         inkscape:connector-curvature="0"
+         id="path22"
+         d="m 44.481,203.1 7.8035,0 3.9268,4.0816 -0.0887,11.207 -11.642,0 0,-15.288 z" />
+      <path
+         style="fill:#d3d3d3;stroke:#666666;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#b)"
+         inkscape:connector-curvature="0"
+         id="path24"
+         transform="matrix(0.33386,0,0,0.33049,996.91,807.89)"
+         d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z" />
+      <path
+         style="fill:#aaeeff;stroke:#006680;stroke-width:0.53351003;stroke-linejoin:round"
+         inkscape:connector-curvature="0"
+         id="path26"
+         d="m 52.517,203.34 c 0.35669,1.5836 0.12812,2.8224 -0.02,3.5988 0.8796,-0.21633 1.9163,-0.45787 3.4556,0.009 -1.6593,-1.8338 -2.3361,-2.3982 -3.4356,-3.6086 z" />
+    </g>
+    <rect
+       id="rect28"
+       x="0.0030073242"
+       y="-0.093012206"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MapBackgroundImageAction.png b/freeplane/resources/images/MapBackgroundImageAction.png
index bc38937..0206f9e 100644
Binary files a/freeplane/resources/images/MapBackgroundImageAction.png and b/freeplane/resources/images/MapBackgroundImageAction.png differ
diff --git a/freeplane/resources/images/MapBackgroundImageAction.svg b/freeplane/resources/images/MapBackgroundImageAction.svg
new file mode 100644
index 0000000..60591a7
--- /dev/null
+++ b/freeplane/resources/images/MapBackgroundImageAction.svg
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MapBackgroundImageAction.svg"
+   inkscape:export-filename="I:\Freeplane\editor\images\MapBackgroundImageAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1526"
+     inkscape:window-height="850"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="14.664761"
+     inkscape:cx="-2.3649833"
+     inkscape:cy="7.9783095"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="-2118.8816"
+       gradientUnits="userSpaceOnUse"
+       x2="-2587.1121"
+       gradientTransform="matrix(0.37028,0,0,0.36654,1011.7,985.36)"
+       y1="-2128.6001"
+       x1="-2585.8999">
+      <stop
+         stop-color="#5fbcd3"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d5f6ff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="b"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315001"
+       width="1.3480999"
+       y="-0.16576"
+       x="-0.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="c">
+      <stop
+         id="stop3693"
+         offset="0"
+         stop-color="#fefdb7" />
+      <stop
+         id="stop3695"
+         offset="1"
+         stop-color="#f5f06c" />
+    </linearGradient>
+    <linearGradient
+       x1="41.688999"
+       y1="340.63"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x2="463.22"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#c"
+       y2="-130.78999"
+       id="a-9" />
+    <filter
+       x="-0.17994"
+       y="-0.17925"
+       width="1.3599"
+       height="1.3585"
+       id="d"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3699"
+         stdDeviation="18.47879" />
+    </filter>
+    <linearGradient
+       x1="351.57999"
+       y1="584.52002"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       x2="690.78998"
+       gradientUnits="userSpaceOnUse"
+       y2="354.38"
+       id="b-3">
+      <stop
+         id="stop3702"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop3704"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="a-6"
+       y2="298.92001"
+       gradientUnits="userSpaceOnUse"
+       y1="310.62"
+       x2="112.73"
+       x1="111.93"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#0d2e2e"
+         offset="0"
+         id="stop7-6" />
+      <stop
+         stop-color="#0d2e2e"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b-6"
+       id="linearGradient4549"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42960343,0,0,-0.3255716,-0.26432726,18.989658)"
+       x1="21.933001"
+       y1="24.627001"
+       x2="21.933001"
+       y2="7.1090999" />
+    <linearGradient
+       id="b-6"
+       y2="7.1090999"
+       gradientUnits="userSpaceOnUse"
+       y1="24.627001"
+       gradientTransform="matrix(0.84426804,0,0,-0.63982192,-2.908368,28.807686)"
+       x2="21.933001"
+       x1="21.933001">
+      <stop
+         stop-color="#acf"
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#04a"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#c-6"
+       id="linearGradient4551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0254289,0,0,1.0754165,-105.53485,-316.8414)"
+       x1="105.51"
+       y1="302.84"
+       x2="118.52"
+       y2="302.84" />
+    <linearGradient
+       id="c-6"
+       y2="302.84"
+       gradientUnits="userSpaceOnUse"
+       y1="302.84"
+       x2="118.52"
+       x1="105.51"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#37c837"
+         offset="0"
+         id="stop17" />
+      <stop
+         stop-color="#165016"
+         offset="1"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d-4"
+       id="linearGradient4553"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0522926,0,0,1.1176904,-108.57837,-329.76195)"
+       x1="112.29"
+       y1="303.64001"
+       x2="112.37"
+       y2="300.78" />
+    <linearGradient
+       id="d-4"
+       y2="300.78"
+       gradientUnits="userSpaceOnUse"
+       y1="303.64001"
+       x2="112.37"
+       x1="112.29"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#b9d7ff"
+         offset="0"
+         id="stop22" />
+      <stop
+         stop-color="#3c8dff"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4825">
+    <g
+       style="fill-rule:evenodd"
+       id="g20"
+       transform="matrix(1.0112431,0,0,1.0112431,-44.710946,-205.11372)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);stroke:#006680;stroke-width:0.53351003"
+         id="path22"
+         d="m 44.481,203.1 7.8035,0 3.9268,4.0816 -0.0887,11.207 -11.642,0 0,-15.288 z" />
+      <path
+         style="fill:#d3d3d3;stroke:#666666;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#b)"
+         inkscape:connector-curvature="0"
+         id="path24"
+         transform="matrix(0.33386,0,0,0.33049,996.91,807.89)"
+         d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z" />
+      <path
+         style="fill:#aaeeff;stroke:#006680;stroke-width:0.53351003;stroke-linejoin:round"
+         inkscape:connector-curvature="0"
+         id="path26"
+         d="m 52.517,203.34 c 0.35669,1.5836 0.12812,2.8224 -0.02,3.5988 0.8796,-0.21633 1.9163,-0.45787 3.4556,0.009 -1.6593,-1.8338 -2.3361,-2.3982 -3.4356,-3.6086 z" />
+    </g>
+    <rect
+       id="rect28"
+       x="0.0030073242"
+       y="-0.093012616"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+    <g
+       transform="matrix(0.95410475,0,0,0.95410475,0.73432407,0.73432407)"
+       id="g4776">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4549)"
+         id="path36-0"
+         d="M 2.658145,16 16,16 l 0,-4.233162 -13.341855,0 0,4.233162 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4551)"
+         id="path38-7"
+         d="m 2.658145,5.9018391 13.341855,0 0,5.8725269 -13.341855,0 0,-5.8725269 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path40-9"
+         d="m 2.6278959,5.9475338 0,5.8859812 C 11.118948,12.11409 10.234499,8.1407775 15.983592,8.1407775 l 0,-2.3014362 z"
+         style="color:#000000;fill:url(#linearGradient4553)" />
+      <g
+         id="g4767"
+         transform="matrix(1.2961948,0,0,1.2961948,-1.768516,-2.6307347)">
+        <path
+           style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path44-7"
+           d="m 8.1759618,8.881771 c 0,1.235339 -0.968126,2.302224 -2.2051757,2.302224 -1.1832649,0 -2.2051757,-1.010733 -2.2051757,-2.302224 0,-1.2353395 0.9681259,-2.3022237 2.2051757,-2.3022237 1.1832651,0 2.2051757,1.0107324 2.2051757,2.3022237 z" />
+        <path
+           style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path46-6"
+           d="m 7.9608228,8.881771 c 0,1.123036 -0.8605562,2.077616 -1.9900367,2.077616 -1.0756953,0 -1.9900365,-0.898428 -1.9900365,-2.077616 0,-1.1230359 0.8605563,-2.0776165 1.9900365,-2.0776165 1.0756953,0 1.9900367,0.8984287 1.9900367,2.0776165 z" />
+        <path
+           style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path48-2"
+           d="m 7.7456838,8.881771 c 0,1.0107324 -0.8067716,1.85301 -1.7748977,1.85301 -0.9681259,0 -1.7748974,-0.8422776 -1.7748974,-1.85301 0,-1.0107323 0.8067715,-1.8530093 1.7748974,-1.8530093 0.9681261,0 1.7748977,0.842277 1.7748977,1.8530093 z" />
+        <path
+           style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path50-9"
+           d="m 7.5305446,8.881771 c 0,0.8984287 -0.6992023,1.628402 -1.5597585,1.628402 -0.8605563,0 -1.5597584,-0.7299733 -1.5597584,-1.628402 0,-0.8984288 0.6992021,-1.6284021 1.5597584,-1.6284021 0.8605562,0 1.5597585,0.7299733 1.5597585,1.6284021 z" />
+        <path
+           style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path52-3"
+           d="m 7.3154056,8.881771 c 0,0.7861252 -0.5916326,1.403795 -1.3446195,1.403795 -0.7529867,0 -1.3446192,-0.6176698 -1.3446192,-1.403795 0,-0.7861251 0.5916325,-1.403795 1.3446192,-1.403795 0.7529869,0 1.3446195,0.6176699 1.3446195,1.403795 z" />
+        <path
+           style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path54-8"
+           d="m 7.1002666,8.881771 c 0,0.6738215 -0.537848,1.179188 -1.1294805,1.179188 -0.5916324,0 -1.1294802,-0.5615183 -1.1294802,-1.179188 0,-0.6176698 0.5378478,-1.1791878 1.1294802,-1.1791878 0.5916325,0 1.1294805,0.561518 1.1294805,1.1791878 z" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path56-3"
+           d="m 6.8851274,8.881771 c 0,0.561518 -0.430278,1.0107324 -0.968126,1.0107324 -0.5378477,0 -0.9681259,-0.4492144 -0.9681259,-1.0107324 0,-0.5615179 0.4302782,-1.0107323 0.9681259,-1.0107323 0.537848,0 0.968126,0.4492144 0.968126,1.0107323 z" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MapBackgroundImageSize.png b/freeplane/resources/images/MapBackgroundImageSize.png
new file mode 100644
index 0000000..a116447
Binary files /dev/null and b/freeplane/resources/images/MapBackgroundImageSize.png differ
diff --git a/freeplane/resources/images/MapBackgroundImageSize.svg b/freeplane/resources/images/MapBackgroundImageSize.svg
new file mode 100644
index 0000000..26e096e
--- /dev/null
+++ b/freeplane/resources/images/MapBackgroundImageSize.svg
@@ -0,0 +1,536 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MapBackgroundImageAction.svg"
+   inkscape:export-filename="I:\Freeplane\editor\images\MapBackgroundImageAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="702"
+     inkscape:window-height="850"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="5.5695465"
+     inkscape:cx="9.2205202"
+     inkscape:cy="30.297436"
+     inkscape:window-x="855"
+     inkscape:window-y="104"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker7202"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path7204" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker7192"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path7194" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker7080"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path7082" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7028"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="TriangleOutM">
+      <path
+         transform="scale(0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path7030" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker6850"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="TriangleOutM">
+      <path
+         transform="scale(0.4)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path6852" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker6800"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mend">
+      <path
+         transform="scale(0.4) rotate(180) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path6802" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker6790"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mend">
+      <path
+         transform="scale(0.4) rotate(180) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path6792" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path4540"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker6211"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mend">
+      <path
+         transform="scale(0.4) rotate(180) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path6213" />
+    </marker>
+    <marker
+       inkscape:stockid="EmptyTriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleOutM"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4676"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="scale(0.4) translate(-4.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutM"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4658"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.4)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Send"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4528"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.2) rotate(180) translate(6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4522"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4534"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <linearGradient
+       id="a"
+       y2="-2118.8816"
+       gradientUnits="userSpaceOnUse"
+       x2="-2587.1121"
+       gradientTransform="matrix(0.37028,0,0,0.36654,1011.7,985.36)"
+       y1="-2128.6001"
+       x1="-2585.8999">
+      <stop
+         stop-color="#5fbcd3"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d5f6ff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="b"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315001"
+       width="1.3480999"
+       y="-0.16576"
+       x="-0.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="c">
+      <stop
+         id="stop3693"
+         offset="0"
+         stop-color="#fefdb7" />
+      <stop
+         id="stop3695"
+         offset="1"
+         stop-color="#f5f06c" />
+    </linearGradient>
+    <linearGradient
+       x1="41.688999"
+       y1="340.63"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x2="463.22"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#c"
+       y2="-130.78999"
+       id="a-9" />
+    <filter
+       x="-0.17994"
+       y="-0.17925"
+       width="1.3599"
+       height="1.3585"
+       id="d"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur3699"
+         stdDeviation="18.47879" />
+    </filter>
+    <linearGradient
+       x1="351.57999"
+       y1="584.52002"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       x2="690.78998"
+       gradientUnits="userSpaceOnUse"
+       y2="354.38"
+       id="b-3">
+      <stop
+         id="stop3702"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop3704"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="a-6"
+       y2="298.92001"
+       gradientUnits="userSpaceOnUse"
+       y1="310.62"
+       x2="112.73"
+       x1="111.93"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#0d2e2e"
+         offset="0"
+         id="stop7-6" />
+      <stop
+         stop-color="#0d2e2e"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b-6"
+       id="linearGradient4549"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.39231792,0,0,-0.31062941,-0.68620983,15.699613)"
+       x1="21.933001"
+       y1="24.627001"
+       x2="21.933001"
+       y2="7.1090999" />
+    <linearGradient
+       id="b-6"
+       y2="7.1090999"
+       gradientUnits="userSpaceOnUse"
+       y1="24.627001"
+       gradientTransform="matrix(0.84426804,0,0,-0.63982192,-2.908368,28.807686)"
+       x2="21.933001"
+       x1="21.933001">
+      <stop
+         stop-color="#acf"
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#04a"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#c-6"
+       id="linearGradient4551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93643138,0,0,1.02606,-96.820248,-304.71839)"
+       x1="105.51"
+       y1="302.84"
+       x2="118.52"
+       y2="302.84" />
+    <linearGradient
+       id="c-6"
+       y2="302.84"
+       gradientUnits="userSpaceOnUse"
+       y1="302.84"
+       x2="118.52"
+       x1="105.51"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#37c837"
+         offset="0"
+         id="stop17" />
+      <stop
+         stop-color="#165016"
+         offset="1"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d-4"
+       id="linearGradient4553"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96096357,0,0,1.0663937,-99.599619,-317.04595)"
+       x1="112.29"
+       y1="303.64001"
+       x2="112.37"
+       y2="300.78" />
+    <linearGradient
+       id="d-4"
+       y2="300.78"
+       gradientUnits="userSpaceOnUse"
+       y1="303.64001"
+       x2="112.37"
+       x1="112.29"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#b9d7ff"
+         offset="0"
+         id="stop22" />
+      <stop
+         stop-color="#3c8dff"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g7648"
+     transform="translate(-0.01152594,0.02922447)">
+    <rect
+       id="rect28"
+       x="0.0030073242"
+       y="-0.093012616"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4507"
+       d="M 2.1086292,12.609199 0.40729962,15.434622"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7192)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="M 2.1148041,3.4257401 0.41347403,0.60031713"
+       id="path6209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path5951"
+       d="m 13.927433,3.4257401 1.70133,-2.82542297"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7080)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker7202)"
+       d="m 13.970162,12.682309 1.70133,2.825423"
+       id="path5639"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       transform="matrix(0.96105454,0,0,0.96105454,0.31195667,0.31198309)"
+       id="g7350">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4549)"
+         id="path36-0"
+         d="m 1.9826195,12.847166 12.1839085,0 0,-4.0388796 -12.1839085,0 0,4.0388796 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4551)"
+         id="path38-7"
+         d="m 1.9826195,3.2124631 12.1839085,0 0,5.6030058 -12.1839085,0 0,-5.6030058 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path40-9"
+         d="m 1.9549958,3.2560606 0,5.6158427 C 9.7091049,9.1396012 8.9014177,5.3486449 14.151544,5.3486449 l 0,-2.1958112 z"
+         style="color:#000000;fill:url(#linearGradient4553)" />
+      <g
+         id="g4767"
+         transform="matrix(1.1836974,0,0,1.1443313,-2.0902301,-4.1080591)">
+        <path
+           style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path44-7"
+           d="m 8.1759618,8.881771 c 0,1.235339 -0.968126,2.302224 -2.2051757,2.302224 -1.1832649,0 -2.2051757,-1.010733 -2.2051757,-2.302224 0,-1.2353395 0.9681259,-2.3022237 2.2051757,-2.3022237 1.1832651,0 2.2051757,1.0107324 2.2051757,2.3022237 z" />
+        <path
+           style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path46-6"
+           d="m 7.9608228,8.881771 c 0,1.123036 -0.8605562,2.077616 -1.9900367,2.077616 -1.0756953,0 -1.9900365,-0.898428 -1.9900365,-2.077616 0,-1.1230359 0.8605563,-2.0776165 1.9900365,-2.0776165 1.0756953,0 1.9900367,0.8984287 1.9900367,2.0776165 z" />
+        <path
+           style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path48-2"
+           d="m 7.7456838,8.881771 c 0,1.0107324 -0.8067716,1.85301 -1.7748977,1.85301 -0.9681259,0 -1.7748974,-0.8422776 -1.7748974,-1.85301 0,-1.0107323 0.8067715,-1.8530093 1.7748974,-1.8530093 0.9681261,0 1.7748977,0.842277 1.7748977,1.8530093 z" />
+        <path
+           style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path50-9"
+           d="m 7.5305446,8.881771 c 0,0.8984287 -0.6992023,1.628402 -1.5597585,1.628402 -0.8605563,0 -1.5597584,-0.7299733 -1.5597584,-1.628402 0,-0.8984288 0.6992021,-1.6284021 1.5597584,-1.6284021 0.8605562,0 1.5597585,0.7299733 1.5597585,1.6284021 z" />
+        <path
+           style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path52-3"
+           d="m 7.3154056,8.881771 c 0,0.7861252 -0.5916326,1.403795 -1.3446195,1.403795 -0.7529867,0 -1.3446192,-0.6176698 -1.3446192,-1.403795 0,-0.7861251 0.5916325,-1.403795 1.3446192,-1.403795 0.7529869,0 1.3446195,0.6176699 1.3446195,1.403795 z" />
+        <path
+           style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path54-8"
+           d="m 7.1002666,8.881771 c 0,0.6738215 -0.537848,1.179188 -1.1294805,1.179188 -0.5916324,0 -1.1294802,-0.5615183 -1.1294802,-1.179188 0,-0.6176698 0.5378478,-1.1791878 1.1294802,-1.1791878 0.5916325,0 1.1294805,0.561518 1.1294805,1.1791878 z" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.24858904"
+           inkscape:connector-curvature="0"
+           id="path56-3"
+           d="m 6.8851274,8.881771 c 0,0.561518 -0.430278,1.0107324 -0.968126,1.0107324 -0.5378477,0 -0.9681259,-0.4492144 -0.9681259,-1.0107324 0,-0.5615179 0.4302782,-1.0107323 0.9681259,-1.0107323 0.537848,0 0.968126,0.4492144 0.968126,1.0107323 z" />
+      </g>
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         id="rect7332"
+         width="12.348889"
+         height="9.7205782"
+         x="1.8356458"
+         y="3.1504798" />
+    </g>
+    <rect
+       y="0.10803509"
+       x="0.10803509"
+       height="15.78393"
+       width="15.78393"
+       id="rect7646"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.21607004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.86428016, 0.86428016;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MovePresentation.svg b/freeplane/resources/images/MovePresentation.svg
new file mode 100644
index 0000000..3508b29
--- /dev/null
+++ b/freeplane/resources/images/MovePresentation.svg
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.821814mm"
+   height="10.402451mm"
+   viewBox="0 0 41.888317 36.859077"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MovePresentation.svg">
+  <defs
+     id="defs5771">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </linearGradient>
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035" />
+      <stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024,0)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.7618519"
+     inkscape:cx="-14.034776"
+     inkscape:cy="18.723049"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-298.42909,-498.43194)">
+    <g
+       id="g4387">
+      <g
+         id="g4450">
+        <g
+           id="g4577"
+           transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)">
+          <path
+             sodipodi:nodetypes="cc"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 290.03565,529.06437 0,6.98637"
+             id="path4575"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             id="path13016"
+             d="m 306.58353,530.38279 -33.22567,0 0,-23.55079 33.22567,0 0,23.55079 0,0 z"
+             style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <g
+             transform="translate(0.26630924,0)"
+             id="g4530">
+            <rect
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+               id="rect9222"
+               width="37.615192"
+               height="3.7142279"
+               x="270.89679"
+               y="503.24127"
+               inkscape:r_cx="true"
+               inkscape:r_cy="true"
+               rx="1.790844"
+               ry="1.802771" />
+            <path
+               style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+               id="path4474"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="czcsccc" />
+            <path
+               style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+               id="path4474-7"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="czcsccc" />
+          </g>
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4535"
+             d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <circle
+             r="1.8556092"
+             cy="534.54059"
+             cx="290.03564"
+             id="path4573"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering [...]
+        </g>
+        <g
+           id="g4621"
+           transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)">
+          <rect
+             ry="1.862726"
+             rx="1.8591295"
+             y="553.88306"
+             x="270.47888"
+             height="31.358326"
+             width="41.208649"
+             id="rect4498"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+          <g
+             transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)"
+             id="g4422">
+            <path
+               id="path4779"
+               d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path4781"
+               d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path4783"
+               d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path4743"
+               d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+               font-size="61.543px"
+               inkscape:connector-curvature="0"
+               style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+            <rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+               rx="0.97680634"
+               ry="1.0587236"
+               height="4.8009052"
+               width="8.6384783"
+               y="714.97345"
+               x="-395.90698"
+               id="rect4717"
+               transform="scale(-1,1)" />
+            <rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+               rx="0.9768008"
+               ry="1.0587536"
+               height="4.8010173"
+               width="8.6384134"
+               y="722.9632"
+               x="383.33188"
+               id="rect4723" />
+            <rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+               rx="0.91026998"
+               ry="1.007938"
+               height="4.5706868"
+               width="8.0499411"
+               y="-711.94672"
+               x="-391.7066"
+               id="rect4729"
+               transform="scale(-1,-1)" />
+          </g>
+        </g>
+        <g
+           id="g4460"
+           transform="matrix(1.2041583,0,0,1.2399907,93.885275,-435.60703)">
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="path4414"
+             d="m 179.41642,754.47127 c 3.47223,0.5429 6.88355,1.4563 8.81647,2.47363 -2.65996,2.82382 -3.87843,5.23304 -4.64553,7.91954 -1.07104,-2.9452 -2.58691,-6.38429 -4.17094,-10.39317 z"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path4408"
+             d="m 181.22848,757.55728 c -9.1956,3.71724 -10.83007,14.26065 0.17084,18.24732 -7.40619,-2.2636 -5.47253,-12.18771 1.34542,-14.6362"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00004649;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MoveSlide.svg b/freeplane/resources/images/MoveSlide.svg
new file mode 100644
index 0000000..d75f4a1
--- /dev/null
+++ b/freeplane/resources/images/MoveSlide.svg
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.841663mm"
+   height="9.0616827mm"
+   viewBox="0 0 41.958647 32.108324"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MoveSlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       y2="124.52"
+       x2="219.96001"
+       y1="238.03"
+       x1="268.63"
+       gradientTransform="matrix(0.08056682,0,0,0.07689249,162.04448,750.42163)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5069"
+       xlink:href="#a"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         id="stop12498-6"
+         offset="0"
+         style="stop-color:#dcdcdc;stop-opacity:1" />
+      <stop
+         id="stop12500-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         id="stop15518-1-5"
+         offset="0"
+         style="stop-color:#dc7fcf;stop-opacity:1" />
+      <stop
+         id="stop15520-5-0"
+         offset="1"
+         style="stop-color:#a8bef9;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         id="stop20604-5"
+         offset="0"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+      <stop
+         id="stop20606-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop20576-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20578-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         style="stop-color:#a6a6c6;stop-opacity:1"
+         offset="0"
+         id="stop20586-8" />
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="1"
+         id="stop20588-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         style="stop-color:#2aa200;stop-opacity:1"
+         offset="0"
+         id="stop20411-3" />
+      <stop
+         style="stop-color:#5ffb57;stop-opacity:1"
+         offset="1"
+         id="stop20413-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         style="stop-color:#f1d103;stop-opacity:1;"
+         offset="0"
+         id="stop13708-7" />
+      <stop
+         style="stop-color:#f7cd03;stop-opacity:1"
+         offset="1"
+         id="stop13710-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         id="stop4712-0"
+         offset="0"
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;" />
+      <stop
+         id="stop4714-1"
+         offset="1"
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         id="stop4730-4"
+         offset="0"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4732-2"
+         offset="1"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         id="stop4752-1"
+         offset="0"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0.5"
+         id="stop4758-4" />
+      <stop
+         id="stop4754-8"
+         offset="1"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         id="stop33869-3"
+         offset="0"
+         style="stop-color:#8da6d8;stop-opacity:1" />
+      <stop
+         style="stop-color:#b4c5e5;stop-opacity:1"
+         offset="0.25"
+         id="stop33871-5" />
+      <stop
+         style="stop-color:#d8e1f2;stop-opacity:1"
+         offset="0.5"
+         id="stop33873-5" />
+      <stop
+         id="stop33875-2"
+         offset="0.75"
+         style="stop-color:#92aada;stop-opacity:1" />
+      <stop
+         id="stop33877-6"
+         offset="1"
+         style="stop-color:#8ea7d8;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.047365"
+     inkscape:cx="13.80796"
+     inkscape:cy="18.708564"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:object-nodes="true"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-171.60686,-751.41864)">
+    <g
+       id="g4464">
+      <rect
+         ry="1.862726"
+         rx="1.8591295"
+         y="751.79364"
+         x="171.98186"
+         height="31.358326"
+         width="41.208649"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+      <g
+         transform="matrix(0.98082522,0,0,1.0003255,4.5676121,-0.24956977)"
+         id="g4451">
+        <path
+           id="path4779"
+           d="m 186.88872,765.18969 c 2.44197,-0.0477 4.69776,2.19395 7.26136,0.18552 2.4264,-1.93556 5.77756,1.42748 7.8471,1.65214 -1.73002,-0.17448 -4.70291,-3.36492 -7.09353,-1.01787 -3.58208,3.47442 -5.50716,1.33871 -8.00097,1.38725 l -0.014,-2.20704 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.65383023;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4781"
+           d="m 183.02321,767.64944 c 2.44195,0.0477 4.69773,0.2844 7.26134,2.29283 2.42641,1.93556 5.53488,4.00127 7.60444,3.7765 -1.73002,0.1745 -4.46026,-2.06371 -6.85087,-4.41085 -3.58209,-3.47441 -5.50715,-3.81705 -8.00096,-3.86559 l -0.014,2.20703 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.65383023;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4783"
+           d="m 183.00627,765.30487 c 2.44198,-0.0477 4.69776,-0.2844 7.26137,-2.29283 2.42638,-1.93556 5.53489,-4.00126 7.60442,-3.77651 -1.73001,-0.17449 -4.46024,2.06372 -6.85086,4.41086 -3.58209,3.47442 -5.50715,3.81705 -8.00096,3.86559 l -0.014,-2.20703 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.65383023;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4743"
+           d="m 186.91144,767.33107 a 4.1255048,3.9373571 0 0 1 -4.12582,3.93767 4.1255048,3.9373571 0 0 1 -4.12585,-3.93767 4.1255048,3.9373571 0 0 1 4.12585,-3.93767 4.1255048,3.9373571 0 0 1 4.12582,3.93767 z"
+           font-size="61.543px"
+           inkscape:connector-curvature="0"
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.84932685;stroke-opacity:0.99738668" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.75449556;stroke-linejoin:round;stroke-opacity:1"
+           rx="1.1282129"
+           ry="1.1633489"
+           height="5.275341"
+           width="9.977457"
+           y="763.95166"
+           x="-210.1293"
+           id="rect4717"
+           transform="scale(-1,1)" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.75448358;stroke-linejoin:round;stroke-opacity:0.99738668"
+           rx="1.1282066"
+           ry="1.1633819"
+           height="5.2754645"
+           width="9.9773827"
+           y="772.73096"
+           x="195.60504"
+           id="rect4723" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.7189818;stroke-linejoin:round;stroke-opacity:1"
+           rx="1.0513633"
+           ry="1.1075447"
+           height="5.0223722"
+           width="9.2976952"
+           y="-760.62579"
+           x="-205.27786"
+           id="rect4729"
+           transform="scale(-1,-1)" />
+      </g>
+      <g
+         transform="matrix(1.2053031,0,0,1.2053031,-35.16681,-154.56342)"
+         id="g4460">
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="m 179.41642,754.47127 c 3.47223,0.5429 6.88355,1.4563 8.81647,2.47363 -2.65996,2.82382 -3.87843,5.23304 -4.64553,7.91954 -1.07104,-2.9452 -2.58691,-6.38429 -4.17094,-10.39317 z"
+           id="path4414"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99974853;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 181.18355,757.28817 c -9.02527,4.06416 -10.93537,14.80751 0.21577,18.51643 -7.40619,-2.2636 -5.50529,-12.32017 1.31266,-14.76866"
+           id="path4408"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MoveToRootAction.png b/freeplane/resources/images/MoveToRootAction.png
new file mode 100644
index 0000000..b1fe50b
Binary files /dev/null and b/freeplane/resources/images/MoveToRootAction.png differ
diff --git a/freeplane/resources/images/MoveToRootAction.svg b/freeplane/resources/images/MoveToRootAction.svg
new file mode 100644
index 0000000..ae761e2
--- /dev/null
+++ b/freeplane/resources/images/MoveToRootAction.svg
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 32.000244 32.000332"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="MoveToRootAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\MoveToRootAction.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1222"
+     inkscape:window-height="830"
+     id="namedview55"
+     showgrid="false"
+     inkscape:zoom="10.809612"
+     inkscape:cx="7.6279904"
+     inkscape:cy="11.755111"
+     inkscape:window-x="497"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <svg:defs
+     id="defs4">
+    <svg:linearGradient
+       id="a"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+  </svg:defs>
+  <svg:metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:rect
+     style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90644604"
+     id="rect234"
+     transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+     y="16.045546"
+     x="9.1682196"
+     height="0"
+     width="0.91268528" />
+  <svg:g
+     id="g4490"
+     transform="matrix(1.0567728,0,0,1.0567728,-1.1000732,0.62134203)">
+    <svg:g
+       id="g4477">
+      <svg:path
+         inkscape:connector-curvature="0"
+         id="path19"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 17.307869,15.04005 c 1.825638,-0.582481 2.801966,-1.398483 3.644403,-2.52993 0.842433,-1.131413 1.739701,-1.922978 3.330409,-2.270789 -1.327567,0.298021 -2.301756,1.392962 -3.06712,2.641286 -0.779232,1.27377 -1.67023,2.776006 -3.534667,3.370877 l -0.372339,-1.211713 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#ff6600;stroke:#ff6600;stroke-width:0.48450235" />
+      <svg:rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff6600;stroke-width:0.61622119;stroke-linejoin:round"
+         id="rect21"
+         x="23.005928"
+         y="6.8296099"
+         width="6.9702287"
+         height="3.9080865"
+         ry="0.86183417"
+         rx="0.788167"
+         transform="matrix(0.99991921,0.01271147,-0.01271148,0.99991921,0,0)" />
+      <svg:g
+         transform="matrix(-2.0041377,0,0,-1.9239564,387.77993,698.85332)"
+         id="g35">
+        <svg:path
+           style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#ff0000"
+           d="m 185.44,355.37 c 1.394,0.0397 2.2445,0.763 3.0672,1.9818 0.82275,1.2188 1.613,1.9415 2.7944,1.7538 -0.98756,0.14576 -1.8946,-0.96653 -2.6879,-2.3806 -0.80833,-1.4436 -1.7421,-3.158 -3.1657,-3.1985 l -0.008,1.8435 z"
+           line-height="normal"
+           font-size="xx-small"
+           id="path37"
+           inkscape:connector-curvature="0" />
+        <svg:rect
+           rx="0.36471"
+           ry="0.40876001"
+           height="1.8536"
+           width="3.2253001"
+           y="357.38"
+           x="188.87"
+           id="rect39"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.27259001;stroke-linejoin:round" />
+      </svg:g>
+      <svg:path
+         inkscape:connector-curvature="0"
+         id="path43"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 16.549274,19.209053 c 2.485381,0.05842 4.00182,1.119675 5.468596,2.908182 1.466894,1.788589 2.875908,2.849148 4.982329,2.573661 -1.760769,0.213892 -3.377931,-1.418362 -4.79245,-3.493588 -1.441226,-2.118413 -3.106077,-4.634272 -5.644313,-4.693715 l -0.01397,2.705256 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#008000;stroke:#008000;stroke-width:0.19058546" />
+      <svg:rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#008000;stroke-width:0.63906389;stroke-linejoin:round"
+         id="rect45"
+         x="23.265255"
+         y="-26.738615"
+         width="7.3123703"
+         height="4.1000438"
+         ry="0.9041701"
+         rx="0.82685649"
+         transform="scale(1,-1)" />
+      <svg:g
+         transform="matrix(1.9984482,0,0,1.9403252,-355.13366,-669.16044)"
+         id="g47">
+        <svg:path
+           style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#d400aa"
+           d="m 185.76,355.22 c -1.5092,0.0318 -2.4299,0.61046 -3.3206,1.5856 -0.89073,0.97513 -1.7463,1.5533 -3.0253,1.4032 1.0692,0.11661 2.0512,-0.77329 2.91,-1.9046 0.87511,-1.155 1.886,-2.5266 3.4273,-2.559 l 0.008,1.4749 z"
+           line-height="normal"
+           font-size="xx-small"
+           id="path49"
+           inkscape:connector-curvature="0" />
+        <svg:rect
+           ry="0.40876001"
+           rx="0.36471"
+           transform="scale(-1,1)"
+           height="1.8536"
+           width="3.2253001"
+           y="356.48001"
+           x="-181.85001"
+           id="rect51"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#d400aa;stroke-width:0.27259001;stroke-linejoin:round" />
+      </svg:g>
+      <svg:rect
+         style="fill:#b0ffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:0.57731026;stroke-linejoin:round"
+         id="rect33"
+         x="10.215945"
+         y="14.286035"
+         width="11.745936"
+         height="6.5859432"
+         ry="1.452378"
+         rx="1.3281881" />
+    </svg:g>
+    <svg:g
+       transform="matrix(0.87309154,0,0,0.87309154,29.267113,-17.037267)"
+       id="g4473">
+      <svg:path
+         style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1"
+         inkscape:transform-center-x="0.022858851"
+         inkscape:transform-center-y="2.6604092"
+         d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+         id="path19166"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <svg:path
+         style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.55552113;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -14.930158,21.808892 0,7.927934"
+         id="path19168"
+         inkscape:connector-curvature="0" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/MoveTo_NextMM.svg b/freeplane/resources/images/MoveTo_NextMM.svg
new file mode 100644
index 0000000..5303abf
--- /dev/null
+++ b/freeplane/resources/images/MoveTo_NextMM.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003561"
+   width="16.023281"
+   version="1.1"
+   viewBox="0 0 16.023281 16.003561"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="moveto_nextmm.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="335.5183"
+     inkscape:cy="-476.45806"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(-1,0,0,1,733.14106,-451.26947)"
+     id="g13">
+    <rect
+       style="color:#000000;fill:none"
+       transform="scale(-1,1)"
+       height="16"
+       width="16"
+       y="451.26999"
+       x="-733.14001"
+       id="rect15" />
+    <g
+       transform="matrix(0.96232,0,0,0.99737,41.509,12.905)"
+       id="g17">
+      <rect
+         height="15.009"
+         width="11.009"
+         y="440.04001"
+         x="702.58002"
+         id="rect19"
+         style="fill:#f9f9f9;stroke:#000000;stroke-width:1.01129997;stroke-linecap:round" />
+      <ellipse
+         rx="2.7407"
+         ry="0.96296"
+         transform="matrix(1.0181,0,0,1.0803,701.73,438.91)"
+         cy="7.9851999"
+         cx="4.2814999"
+         id="ellipse21"
+         d="m 7.0221999,7.9851999 c 0,0.5318282 -1.2270532,0.96296 -2.7407,0.96296 -1.5136469,0 -2.7407,-0.4311318 -2.7407,-0.96296 0,-0.5318281 1.2270531,-0.96296 2.7407,-0.96296 1.5136468,0 2.7407,0.4311319 2.7407,0.96296 z"
+         sodipodi:cx="4.2814999"
+         sodipodi:cy="7.9851999"
+         sodipodi:rx="2.7407"
+         sodipodi:ry="0.96296"
+         style="fill-opacity:0.37726004;stroke:#000000;stroke-width:0.40829;stroke-linecap:round" />
+      <ellipse
+         rx="2.7407"
+         ry="0.96296"
+         transform="matrix(1.3914,0,0,1.1043,702.13,433.97)"
+         cy="7.9851999"
+         cx="4.2814999"
+         id="ellipse23"
+         d="m 7.0221999,7.9851999 c 0,0.5318282 -1.2270532,0.96296 -2.7407,0.96296 -1.5136469,0 -2.7407,-0.4311318 -2.7407,-0.96296 0,-0.5318281 1.2270531,-0.96296 2.7407,-0.96296 1.5136468,0 2.7407,0.4311319 2.7407,0.96296 z"
+         sodipodi:cx="4.2814999"
+         sodipodi:cy="7.9851999"
+         sodipodi:rx="2.7407"
+         sodipodi:ry="0.96296"
+         style="fill-opacity:0.37726004;stroke:#000000;stroke-width:0.30728;stroke-linecap:round" />
+      <ellipse
+         rx="2.7407"
+         ry="0.96296"
+         transform="matrix(1.3914,0,0,1.1043,702.13,443.47)"
+         cy="7.9851999"
+         cx="4.2814999"
+         id="ellipse25"
+         d="m 7.0221999,7.9851999 c 0,0.5318282 -1.2270532,0.96296 -2.7407,0.96296 -1.5136469,0 -2.7407,-0.4311318 -2.7407,-0.96296 0,-0.5318281 1.2270531,-0.96296 2.7407,-0.96296 1.5136468,0 2.7407,0.4311319 2.7407,0.96296 z"
+         sodipodi:cx="4.2814999"
+         sodipodi:cy="7.9851999"
+         sodipodi:rx="2.7407"
+         sodipodi:ry="0.96296"
+         style="fill-opacity:0.37726004;stroke:#000000;stroke-width:0.30728;stroke-linecap:round" />
+      <path
+         d="m 706.24,448.65 2.5167,2.4574"
+         id="path27"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:0.51037002;stroke-linecap:round" />
+      <path
+         d="m 706.19,446.43 1.7876,-2.4394"
+         id="path29"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:0.51037002;stroke-linecap:round" />
+      <g
+         transform="matrix(-1,0,0,1,1443.4,-11.729)"
+         id="g31"
+         style="fill-rule:evenodd">
+        <path
+           style="color:#000000;fill:#00aad4;stroke:#0044aa;stroke-width:1.09809995;stroke-linejoin:round"
+           d="m 735.54,459.12 -10.263,-7.3107 -0.0314,14.924 z"
+           id="path33"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#a)"
+           d="m 725.28,451.81 c 0,0 -0.0314,10.499 -0.0314,14.924 l 10.113,-7.5231 z"
+           id="path35"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MoveTo_NextNode.svg b/freeplane/resources/images/MoveTo_NextNode.svg
new file mode 100644
index 0000000..3fad111
--- /dev/null
+++ b/freeplane/resources/images/MoveTo_NextNode.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003561"
+   width="16"
+   version="1.1"
+   viewBox="0 0 16 16.003561"
+   id="svg3014"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="moveto_nextnode.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3041"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.2685914"
+     inkscape:cx="-77.61609"
+     inkscape:cy="-6.9952274"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3014" />
+  <defs
+     id="defs3016">
+    <linearGradient
+       id="a"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient3228"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x1="56.425999"
+       y1="834.12"
+       x2="56.047001"
+       y2="838.97998" />
+  </defs>
+  <metadata
+     id="metadata3023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     id="rect3027"
+     x="-72.907997"
+     y="22.933369"
+     width="16"
+     height="16"
+     ry="0.092563003"
+     rx="0.070384003"
+     style="opacity:0.92510998;color:#000000;fill:none"
+     transform="scale(-1,1)" />
+  <rect
+     id="rect3029"
+     x="-72.907997"
+     y="22.933369"
+     width="16"
+     height="16"
+     style="color:#000000;fill:none"
+     transform="scale(-1,1)" />
+  <g
+     style="fill-rule:evenodd"
+     id="g3031"
+     transform="matrix(-1,0,0,1,693.75,-485.16262)">
+    <rect
+       style="fill:#ffffff;stroke:#000080;stroke-width:0.85776001;stroke-linejoin:round"
+       id="rect3033"
+       x="678.17999"
+       y="489.47"
+       width="15.142"
+       ry="1.6299"
+       rx="1.7122"
+       height="7.3909001" />
+    <g
+       id="g3035"
+       transform="matrix(-0.96232,0,0,0.99737,1391.1,35.1)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3037"
+         d="m 735.54,459.12 -10.263,-7.3107 -0.0314,14.924 z"
+         style="color:#000000;fill:#00aad4;stroke:#0044aa;stroke-width:1.09809995;stroke-linejoin:round" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3039"
+         d="m 725.28,451.81 c 0,0 -0.0314,10.499 -0.0314,14.924 l 10.113,-7.5231 z"
+         style="color:#000000;fill:url(#linearGradient3228)" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MoveTo_PrevMM.svg b/freeplane/resources/images/MoveTo_PrevMM.svg
new file mode 100644
index 0000000..843c928
--- /dev/null
+++ b/freeplane/resources/images/MoveTo_PrevMM.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003561"
+   width="16.023281"
+   version="1.1"
+   viewBox="0 0 16.023281 16.003561"
+   id="svg3043"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="moveto_prevmm.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3078"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.2685914"
+     inkscape:cx="-130.06761"
+     inkscape:cy="-55.283629"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3043" />
+  <defs
+     id="defs3045">
+    <linearGradient
+       id="a"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3048" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3050" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3052">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-717.11779,-451.26947)"
+     id="g3054">
+    <rect
+       style="color:#000000;fill:none"
+       transform="scale(-1,1)"
+       height="16"
+       width="16"
+       y="451.26999"
+       x="-733.14001"
+       id="rect3056" />
+    <g
+       transform="matrix(0.96232,0,0,0.99737,41.509,12.905)"
+       id="g3058">
+      <rect
+         height="15.009"
+         width="11.009"
+         y="440.04001"
+         x="702.58002"
+         id="rect3060"
+         style="fill:#f9f9f9;stroke:#000000;stroke-width:1.01129997;stroke-linecap:round" />
+      <ellipse
+         rx="2.7407"
+         ry="0.96296"
+         transform="matrix(1.0181,0,0,1.0803,701.73,438.91)"
+         cy="7.9851999"
+         cx="4.2814999"
+         id="ellipse3062"
+         d="m 7.0221999,7.9851999 c 0,0.5318282 -1.2270532,0.96296 -2.7407,0.96296 -1.5136469,0 -2.7407,-0.4311318 -2.7407,-0.96296 0,-0.5318281 1.2270531,-0.96296 2.7407,-0.96296 1.5136468,0 2.7407,0.4311319 2.7407,0.96296 z"
+         sodipodi:cx="4.2814999"
+         sodipodi:cy="7.9851999"
+         sodipodi:rx="2.7407"
+         sodipodi:ry="0.96296"
+         style="fill-opacity:0.37726004;stroke:#000000;stroke-width:0.40829;stroke-linecap:round" />
+      <ellipse
+         rx="2.7407"
+         ry="0.96296"
+         transform="matrix(1.3914,0,0,1.1043,702.13,433.97)"
+         cy="7.9851999"
+         cx="4.2814999"
+         id="ellipse3064"
+         d="m 7.0221999,7.9851999 c 0,0.5318282 -1.2270532,0.96296 -2.7407,0.96296 -1.5136469,0 -2.7407,-0.4311318 -2.7407,-0.96296 0,-0.5318281 1.2270531,-0.96296 2.7407,-0.96296 1.5136468,0 2.7407,0.4311319 2.7407,0.96296 z"
+         sodipodi:cx="4.2814999"
+         sodipodi:cy="7.9851999"
+         sodipodi:rx="2.7407"
+         sodipodi:ry="0.96296"
+         style="fill-opacity:0.37726004;stroke:#000000;stroke-width:0.30728;stroke-linecap:round" />
+      <ellipse
+         rx="2.7407"
+         ry="0.96296"
+         transform="matrix(1.3914,0,0,1.1043,702.13,443.47)"
+         cy="7.9851999"
+         cx="4.2814999"
+         id="ellipse3066"
+         d="m 7.0221999,7.9851999 c 0,0.5318282 -1.2270532,0.96296 -2.7407,0.96296 -1.5136469,0 -2.7407,-0.4311318 -2.7407,-0.96296 0,-0.5318281 1.2270531,-0.96296 2.7407,-0.96296 1.5136468,0 2.7407,0.4311319 2.7407,0.96296 z"
+         sodipodi:cx="4.2814999"
+         sodipodi:cy="7.9851999"
+         sodipodi:rx="2.7407"
+         sodipodi:ry="0.96296"
+         style="fill-opacity:0.37726004;stroke:#000000;stroke-width:0.30728;stroke-linecap:round" />
+      <path
+         d="m 706.24,448.65 2.5167,2.4574"
+         id="path3068"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:0.51037002;stroke-linecap:round" />
+      <path
+         d="m 706.19,446.43 1.7876,-2.4394"
+         id="path3070"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:0.51037002;stroke-linecap:round" />
+      <g
+         transform="matrix(-1,0,0,1,1443.4,-11.729)"
+         id="g3072"
+         style="fill-rule:evenodd">
+        <path
+           style="color:#000000;fill:#00aad4;stroke:#0044aa;stroke-width:1.09809995;stroke-linejoin:round"
+           d="m 735.54,459.12 -10.263,-7.3107 -0.0314,14.924 z"
+           id="path3074"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#a)"
+           d="m 725.28,451.81 c 0,0 -0.0314,10.499 -0.0314,14.924 l 10.113,-7.5231 z"
+           id="path3076"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/MoveTo_PrevNode.svg b/freeplane/resources/images/MoveTo_PrevNode.svg
new file mode 100644
index 0000000..21f2fa3
--- /dev/null
+++ b/freeplane/resources/images/MoveTo_PrevNode.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.006804"
+   width="16.007999"
+   version="1.1"
+   viewBox="0 0 16.008 16.006804"
+   id="svg3080"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="moveto_prevnode.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3107"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="335.53524"
+     inkscape:cy="-451.7743"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3080" />
+  <defs
+     id="defs3082">
+    <linearGradient
+       id="a"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3085" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3087" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3089">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-654.992,-485.98999)"
+     id="g3091">
+    <rect
+       style="opacity:0.92510998;color:#000000;fill:none"
+       rx="0.070384003"
+       ry="0.092563003"
+       height="16"
+       width="16"
+       y="485.98999"
+       x="655"
+       id="rect3093" />
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="485.98999"
+       x="655"
+       id="rect3095" />
+    <g
+       transform="translate(-22.758,0.83061)"
+       id="g3097"
+       style="fill-rule:evenodd">
+      <rect
+         height="7.3909001"
+         rx="1.7122"
+         ry="1.6299"
+         width="15.142"
+         y="489.47"
+         x="678.17999"
+         id="rect3099"
+         style="fill:#ffffff;stroke:#000080;stroke-width:0.85776001;stroke-linejoin:round" />
+      <g
+         transform="matrix(-0.96232,0,0,0.99737,1391.1,35.1)"
+         id="g3101">
+        <path
+           style="color:#000000;fill:#00aad4;stroke:#0044aa;stroke-width:1.09809995;stroke-linejoin:round"
+           d="m 735.54,459.12 -10.263,-7.3107 -0.0314,14.924 z"
+           id="path3103"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#a)"
+           d="m 725.28,451.81 c 0,0 -0.0314,10.499 -0.0314,14.924 l 10.113,-7.5231 z"
+           id="path3105"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/New24.gif b/freeplane/resources/images/New24.gif
deleted file mode 100644
index 1cc488d..0000000
Binary files a/freeplane/resources/images/New24.gif and /dev/null differ
diff --git a/freeplane/resources/images/NewPresentation.svg b/freeplane/resources/images/NewPresentation.svg
new file mode 100644
index 0000000..6e149b7
--- /dev/null
+++ b/freeplane/resources/images/NewPresentation.svg
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.821814mm"
+   height="10.402451mm"
+   viewBox="0 0 41.888317 36.859077"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="NewPresentation.svg">
+  <defs
+     id="defs5771">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </linearGradient>
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035" />
+      <stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024,0)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.6081216"
+     inkscape:cx="-13.365064"
+     inkscape:cy="16.695042"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-298.42909,-498.43194)">
+    <g
+       id="g4654"
+       transform="translate(-3.6102158,6.7390695)">
+      <g
+         transform="matrix(1.0895892,0,0,1.0895892,6.9915163,-56.224788)"
+         id="g4577">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4575"
+           d="m 290.03565,529.06437 0,6.98637"
+           style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           d="m 306.58353,530.38279 -33.22567,0 0,-23.55079 33.22567,0 0,23.55079 0,0 z"
+           id="path13016"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true" />
+        <g
+           id="g4530"
+           transform="translate(0.26630924,0)">
+          <rect
+             ry="1.802771"
+             rx="1.790844"
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             y="503.24127"
+             x="270.89679"
+             height="3.7142279"
+             width="37.615192"
+             id="rect9222"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+          <path
+             sodipodi:nodetypes="czcsccc"
+             inkscape:connector-curvature="0"
+             id="path4474"
+             d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+             style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="czcsccc"
+             inkscape:connector-curvature="0"
+             id="path4474-7"
+             d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+             style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <path
+           style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+           id="path4535"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:a [...]
+           id="path4573"
+           cx="290.03564"
+           cy="534.54059"
+           r="1.8556092" />
+      </g>
+      <g
+         transform="matrix(0.61021279,0,0,0.61021279,145.23041,160.87507)"
+         id="g4621">
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+           id="rect4498"
+           width="41.208649"
+           height="31.358326"
+           x="270.47888"
+           y="553.88306"
+           rx="1.8591295"
+           ry="1.862726" />
+        <g
+           id="g4422"
+           transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)">
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+             d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+             id="path4779" />
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+             d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+             id="path4781" />
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+             d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+             id="path4783" />
+          <path
+             style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668"
+             inkscape:connector-curvature="0"
+             font-size="61.543px"
+             d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+             id="path4743" />
+          <rect
+             transform="scale(-1,1)"
+             id="rect4717"
+             x="-395.90698"
+             y="714.97345"
+             width="8.6384783"
+             height="4.8009052"
+             ry="1.0587236"
+             rx="0.97680634"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+          <rect
+             id="rect4723"
+             x="383.33188"
+             y="722.9632"
+             width="8.6384134"
+             height="4.8010173"
+             ry="1.0587536"
+             rx="0.9768008"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+          <rect
+             transform="scale(-1,-1)"
+             id="rect4729"
+             x="-391.7066"
+             y="-711.94672"
+             width="8.0499411"
+             height="4.5706868"
+             ry="1.007938"
+             rx="0.91026998"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+        </g>
+      </g>
+      <path
+         transform="matrix(0.30912726,0,0,0.30902132,247.38285,344.93898)"
+         inkscape:transform-center-y="-0.025988708"
+         inkscape:transform-center-x="-0.17179119"
+         d="m 211.81305,520.78506 c -0.56886,0.11377 -4.56777,-13.47361 -5.14123,-13.56127 -0.57347,-0.0876 -8.44849,11.68488 -8.95739,11.40638 -0.50891,-0.2785 5.16155,-13.2575 4.77859,-13.69326 -0.38295,-0.43576 -13.98281,3.52055 -14.19363,2.98009 -0.21082,-0.54046 12.47573,-6.83804 12.46247,-7.41802 -0.0133,-0.57997 -12.97442,-6.29108 -12.78852,-6.84061 0.1859,-0.54953 13.95238,2.781 14.31502,2.32819 0.36264,-0.45281 -5.89515,-13.15904 -5.39951,-13.46051 0.49564,-0.30147 8.90055,11.09 [...]
+         inkscape:randomized="0"
+         inkscape:rounded="0.04"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.7224667"
+         sodipodi:arg1="1.3734008"
+         sodipodi:r2="6.9639573"
+         sodipodi:r1="20.850172"
+         sodipodi:cy="500.33978"
+         sodipodi:cx="207.724"
+         sodipodi:sides="9"
+         id="path4845"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.12508535;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto [...]
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/NewSiblingAction.svg b/freeplane/resources/images/NewSiblingAction.svg
new file mode 100644
index 0000000..b6bbabc
--- /dev/null
+++ b/freeplane/resources/images/NewSiblingAction.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 19.711 15.823" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="e" style="color-interpolation-filters:sRGB" height="1.2261" width="1.2447" y="-.11307" x="-.12234">
+<feGaussianBlur stdDeviation="0.60443961"/>
+</filter>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="555.96" cx="590.35" gradientTransform="matrix(.12749 .047352 -.064075 .11244 -340.5 748.45)" r="70.341">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="537.34" cx="591.23" gradientTransform="matrix(.17318 -.016340 .016702 .11537 -412.38 784.42)" r="65.043">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<linearGradient id="d" y2="666.84" gradientUnits="userSpaceOnUse" x2="447.56" gradientTransform="matrix(.081945 0 0 .066156 -335.48 802.37)" y1="665.36" x1="410.6">
+<stop stop-color="#6c5353" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="287.59" gradientUnits="userSpaceOnUse" x2="265.33" gradientTransform="matrix(.62121 .023096 -.028608 .50151 -459.05 685.68)" y1="284.45" x1="261.9">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-76.608 -21.875)">
+<g transform="matrix(1.242 0 0 1.242 308.82 -542.32)">
+<path stroke-linejoin="round" style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-186.84 461.8c1.0184 0.0209 1.9591 0.12478 3.0282 1.006 1.0119 0.84921 2.3082 1.7556 3.1712 1.657-0.72145 0.0765-1.86-0.90548-2.857-1.9353-1.4938-1.5244-2.2966-1.6747-3.3366-1.696l-0.006 0.96836h-0.00001z" stroke-opacity=".99608" stroke="#000080" stroke-linecap="round" stroke-width=".25972" fill="#003380"/>
+<g transform="matrix(.58047 0 0 .58047 -27.274 -39.33)">
+<rect stroke-linejoin="round" height="7.3909" stroke="#000080" stroke-width=".85776" fill="#fff" fill-rule="evenodd" rx="1.7122" ry="1.6299" width="15.142" y="864.46" x="-264.93"/>
+</g>
+<path stroke-linejoin="round" style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-186.32 460.81c1.0184-0.0209 1.9591-0.12478 3.0282-1.006 1.0119-0.84921 2.3082-1.7556 3.1712-1.657-0.72145-0.0765-1.86 0.90548-2.857 1.9353-1.4938 1.5244-2.2966 1.6747-3.3366 1.696l-0.006-0.96836h-0.00001z" stroke-opacity=".99608" stroke="#000080" stroke-linecap="round" stroke-width=".25972" fill="#003380"/>
+<rect stroke-linejoin="round" height="4.2902" stroke="#000080" stroke-width=".49791" fill="#fff" fill-rule="evenodd" rx=".99390" ry=".94610" width="8.7896" y="454.92" x="-182.27"/>
+<g transform="matrix(.51765 0 0 .51765 -19.155 24.075)">
+<path d="m-300.91 845.32c-0.42273 0.001-1.0078 0.001-2.1785 0.006-0.24821 0.0001-0.29435-0.0265-0.48508-0.22126-0.004-0.004-0.009-0.009-0.0143-0.0134-0.0197-0.0182-0.11426-0.25226-0.13491-0.55203-0.0206-0.29978-0.0114-0.65439-0.0689-0.97893-0.001-0.008-0.003-0.0149-0.005-0.0224-0.70607-2.5828-1.8342-3.18-2.7325-5.1628-0.54052-1.299-0.36817-2.5103 0.69747-3.8039 0.002-0.002 0.007-0.006 0.009-0.009 0.63139-0.65129 2.0613-2.0955 4.9024-2.0652 2.841-0.0303 4.3141 1.4139 4.9455 2.0652l0.009 0 [...]
+<path d="m-300.86 845.15c-0.64976 0.002-0.65487 0.001-1.9539 0.008-0.32517 0.00012-0.53162-0.10587-0.74008-0.32665-0.29239-0.27901-0.17925-1.0487-0.26888-1.5733-0.637-2.3161-1.4152-2.6518-2.42-4.7219-0.52629-1.2926-0.34819-2.5494 0.67349-3.8247 0.57482-0.61349 1.7417-2.0028 4.7093-2.0343 2.9676 0.0315 4.1345 1.4208 4.7093 2.0343 1.0217 1.2752 1.1972 2.5321 0.67093 3.8247-0.94544 1.9096-1.7943 2.3643-2.42 4.7219-0.0896 0.52457 0.0235 1.2943-0.26888 1.5733-0.20845 0.22078-0.41234 0.32677-0 [...]
+<path d="m-300.87 844.84c-0.37716 0.001-0.89912 0.00099-1.9436 0.006-0.22145 0.00009-0.26262-0.0245-0.43278-0.20467-0.004-0.004-0.008-0.008-0.0128-0.0124-0.0176-0.0168-0.10193-0.23335-0.12036-0.51064-0.0184-0.2773-0.0102-0.60531-0.0615-0.90552-0.001-0.007-0.003-0.0138-0.005-0.0207-0.62994-2.3891-1.6365-2.9415-2.4379-4.7756-0.48224-1.2016-0.32847-2.3221 0.62227-3.5187l0.008-0.008c0.56331-0.60245 1.8391-1.9383 4.3738-1.9103 2.5347-0.028 3.849 1.3079 4.4123 1.9103l0.008 0.008c0.95074 1.1966 [...]
+<path stroke-linejoin="round" d="m438.47 693.53a17.278 5.7594 0 0 1 -8.6446 4.9888 17.278 5.7594 0 0 1 -17.284 -0.003 17.278 5.7594 0 0 1 -8.628 -4.992" stroke-opacity=".87209" transform="matrix(.080389 0 0 .11896 -334.78 765.22)" stroke="#999" stroke-linecap="round" stroke-width="2" fill="#1a1a1a"/>
+<path stroke-linejoin="round" d="m-302.96 845.33c-0.38448 0.22695-0.51893 0.46629-0.0312 0.78125-0.23444 0.19835-0.65215 0.37239 0 0.78125-0.49312 0.27224-0.40474 0.52188 0.0312 0.75h4.0938c0.656-0.39 0.24242-0.56192 0-0.78125 0.61238-0.44625 0.14675-0.54889 0-0.75 0.50095-0.34704 0.27715-0.56488-0.0312-0.78125h-4.0625z" stroke-opacity=".99419" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".15462" fill="url(#d)"/>
+<path d="m-305.52 838.44c-0.28295-0.93186-0.11376-2.0911 0.70683-3.2786 1.2602-1.7258 3.1092-1.5548 4.2483-1.5732-1.6976 1.5867-3.1571 3.0467-4.9552 4.8518z" fill-rule="evenodd" fill="url(#c)"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/NewSlide.svg b/freeplane/resources/images/NewSlide.svg
new file mode 100644
index 0000000..f0ab068
--- /dev/null
+++ b/freeplane/resources/images/NewSlide.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.771108mm"
+   height="8.991128mm"
+   viewBox="0 0 41.708649 31.858327"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="NewSlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8262448"
+     inkscape:cx="-91.263086"
+     inkscape:cy="-20.698844"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-359.03696,-702.25659)">
+    <g
+       id="g4433">
+      <rect
+         ry="1.862726"
+         rx="1.8591295"
+         y="702.50659"
+         x="359.28696"
+         height="31.358326"
+         width="41.208649"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+      <g
+         transform="matrix(1.0997216,0,0,1.0997216,-37.390895,-70.142687)"
+         id="g4422">
+        <path
+           id="path4779"
+           d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4781"
+           d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4783"
+           d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4743"
+           d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+           font-size="61.543px"
+           inkscape:connector-curvature="0"
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.97680634"
+           ry="1.0587236"
+           height="4.8009052"
+           width="8.6384783"
+           y="714.97345"
+           x="-395.90698"
+           id="rect4717"
+           transform="scale(-1,1)" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+           rx="0.9768008"
+           ry="1.0587536"
+           height="4.8010173"
+           width="8.6384134"
+           y="722.9632"
+           x="383.33188"
+           id="rect4723" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.91026998"
+           ry="1.007938"
+           height="4.5706868"
+           width="8.0499411"
+           y="-711.94672"
+           x="-391.7066"
+           id="rect4729"
+           transform="scale(-1,-1)" />
+      </g>
+      <path
+         transform="matrix(0.33204721,0,0,0.33193342,297.4941,543.71302)"
+         inkscape:transform-center-y="-0.027916623"
+         inkscape:transform-center-x="-0.18453026"
+         d="m 211.81305,520.78506 c -0.56886,0.11377 -4.56777,-13.47361 -5.14123,-13.56127 -0.57347,-0.0876 -8.44849,11.68488 -8.95739,11.40638 -0.50891,-0.2785 5.16155,-13.2575 4.77859,-13.69326 -0.38295,-0.43576 -13.98281,3.52055 -14.19363,2.98009 -0.21082,-0.54046 12.47573,-6.83804 12.46247,-7.41802 -0.0133,-0.57997 -12.97442,-6.29108 -12.78852,-6.84061 0.1859,-0.54953 13.95238,2.781 14.31502,2.32819 0.36264,-0.45281 -5.89515,-13.15904 -5.39951,-13.46051 0.49564,-0.30147 8.90055,11.09 [...]
+         inkscape:randomized="0"
+         inkscape:rounded="0.04"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.7224667"
+         sodipodi:arg1="1.3734008"
+         sodipodi:r2="6.9639573"
+         sodipodi:r1="20.850172"
+         sodipodi:cy="500.33978"
+         sodipodi:cx="207.724"
+         sodipodi:sides="9"
+         id="path4845"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.12508535;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto [...]
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/NewSummary.png b/freeplane/resources/images/NewSummary.png
new file mode 100644
index 0000000..9e28340
Binary files /dev/null and b/freeplane/resources/images/NewSummary.png differ
diff --git a/freeplane/resources/images/NewSummary.svg b/freeplane/resources/images/NewSummary.svg
new file mode 100644
index 0000000..7379984
--- /dev/null
+++ b/freeplane/resources/images/NewSummary.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="NewSummary.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\NewSummary.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5651475"
+     inkscape:cx="-13.351633"
+     inkscape:cy="27.477274"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g4418">
+      <g
+         transform="matrix(1.0554764,0,0,1.1956679,-1.5574974,-203.02544)"
+         id="g4414">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#800000;stroke-width:1.66999412;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 8.8428453,1024.6532 c 2.0034297,-0.044 3.8666017,-0.3426 3.8439667,1.8659 -0.170125,16.6001 5.327937,8.8769 15.159483,9.4063"
+           id="path4371"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#800000;stroke-width:1.66999412;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 16.227635,1037.2851 c -7.1334037,0.1568 -0.338944,10.5143 -7.3847897,10.5588"
+           id="path4373"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <rect
+         ry="2.1284521"
+         y="1033.3606"
+         x="18.475914"
+         height="6.8712158"
+         width="12.772408"
+         id="rect4375"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.42051864;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image- [...]
+      <path
+         inkscape:connector-curvature="0"
+         id="path4377"
+         d="m 0.76235913,1027.4521 8.33183657,0"
+         style="fill:none;fill-rule:evenodd;stroke:#800000;stroke-width:0.83499706;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4377-8"
+         d="m 0.76235913,1035.7155 8.33183657,0"
+         style="fill:none;fill-rule:evenodd;stroke:#800000;stroke-width:0.83499706;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4377-7"
+         d="m 0.76235913,1043.9788 8.33183657,0"
+         style="fill:#aa0000;fill-rule:evenodd;stroke:#800000;stroke-width:0.83499706;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/NextSlide.svg b/freeplane/resources/images/NextSlide.svg
new file mode 100644
index 0000000..c7bf8ba
--- /dev/null
+++ b/freeplane/resources/images/NextSlide.svg
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Next.svg">
+  <defs
+     id="defs8391">
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         offset="0"
+         id="stop2942-8-2-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2944-9-5-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         id="stop3158"
+         offset="0"
+         style="stop-color:#d40000;stop-opacity:1" />
+      <stop
+         id="stop3160"
+         offset="1"
+         style="stop-color:#f3fbfb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4350-9-7-3"
+       id="linearGradient7743"
+       gradientUnits="userSpaceOnUse"
+       x1="182.54036"
+       y1="229.78313"
+       x2="182.6501"
+       y2="211.30733"
+       gradientTransform="matrix(1.2508606,0,0,1.2508606,-581.78526,295.08159)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4332-7-3-3"
+       id="linearGradient7745"
+       gradientUnits="userSpaceOnUse"
+       x1="184.5444"
+       y1="207.34468"
+       x2="184.58699"
+       y2="224.56676"
+       gradientTransform="matrix(1.3422813,0,0,1.3422813,-601.7188,277.91582)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2940-9-4-2"
+       id="linearGradient7747"
+       gradientUnits="userSpaceOnUse"
+       x1="184.15109"
+       y1="226.48277"
+       x2="184.2887"
+       y2="210.23618"
+       gradientTransform="matrix(1.3877987,0,0,1.3877987,-609.91672,265.26532)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient7749"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-79.75824"
+       y2="329.53061" />
+    <linearGradient
+       id="linearGradient2960-9-8">
+      <stop
+         style="stop-color:#8739af;stop-opacity:1;"
+         offset="0"
+         id="stop2962-6-5" />
+      <stop
+         style="stop-color:#e0c5ea;stop-opacity:1;"
+         offset="1"
+         id="stop2964-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-4-1"
+       id="linearGradient7751"
+       gradientUnits="userSpaceOnUse"
+       x1="-79.75824"
+       y1="329.53061"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       id="linearGradient2968-4-1">
+      <stop
+         style="stop-color:#8f379a;stop-opacity:1;"
+         offset="0"
+         id="stop2970-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-4-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9269"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9275"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9483"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9485"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0377796"
+     inkscape:cx="9.6068307"
+     inkscape:cy="44.465383"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-391.12787,-691.06306)">
+    <g
+       transform="matrix(-1,0,0,1,761.19418,138.71119)"
+       id="g9277">
+      <circle
+         transform="scale(-1,1)"
+         id="path4326-5-9"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ff00ff;stroke:#800080;stroke-width:0.96188784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35187"
+         r="15.519055" />
+      <circle
+         transform="scale(-1,1)"
+         id="path4340-4-2"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7743);stroke-width:2.95701718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35193"
+         r="13.798415" />
+      <circle
+         transform="scale(-1,1)"
+         id="path4356-3-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7745);stroke-width:1.29703701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35193"
+         r="12.193909" />
+      <circle
+         transform="scale(-1,1)"
+         id="path4368-2-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35187"
+         r="11.606822" />
+      <path
+         inkscape:transform-center-x="1.7243515"
+         inkscape:transform-center-y="0.075110753"
+         transform="matrix(0.2114708,-0.36889765,0.36889763,0.21147081,239.30211,469.7741)"
+         d="m -53.23773,345.69211 -23.767219,13.72201 0,-27.44402 z"
+         inkscape:randomized="0"
+         inkscape:rounded="2.5777991e-015"
+         inkscape:flatsided="true"
+         sodipodi:arg2="1.0471976"
+         sodipodi:arg1="0"
+         sodipodi:r2="7.2885256"
+         sodipodi:r1="15.844812"
+         sodipodi:cy="345.69211"
+         sodipodi:cx="-69.082542"
+         sodipodi:sides="3"
+         id="path2956-3"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7749);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7751);stroke-width:1.18207157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         sodipodi:type="star" />
+      <rect
+         ry="0"
+         transform="scale(-1,1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient9269);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9275);stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker [...]
+         id="rect3105-3-2-1"
+         width="2.8179185"
+         height="11.303813"
+         x="-360.08038"
+         y="562.73865" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/NodeBackgroundColorAction.svg b/freeplane/resources/images/NodeBackgroundColorAction.svg
new file mode 100644
index 0000000..1a10d71
--- /dev/null
+++ b/freeplane/resources/images/NodeBackgroundColorAction.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d" y2="23.743" gradientUnits="userSpaceOnUse" x2="33.437" gradientTransform="translate(-166.44 731.01)" y1="18.868" x1="28.059">
+<stop stop-color="#6e3d09" offset="0"/>
+<stop stop-color="#ea8113" offset=".24242"/>
+<stop stop-color="#5c3307" offset=".62121"/>
+<stop stop-color="#e07c12" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="33.439" gradientUnits="userSpaceOnUse" x2="23.109" gradientTransform="translate(-166.44 731.01)" y1="30.001" x1="19.395">
+<stop stop-color="#bdbdbd" offset="0"/>
+<stop stop-color="#e2e2e2" offset=".33333"/>
+<stop stop-color="#a3a3a3" offset=".66667"/>
+<stop stop-color="#ddd" offset="1"/>
+</linearGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="35.357" cx="15.415" gradientTransform="matrix(.99466 0 0 .96932 -167.12 732.98)" r="7.5792">
+<stop stop-color="#696969" offset="0"/>
+<stop offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="42.282" gradientUnits="userSpaceOnUse" x2="7.7521" gradientTransform="matrix(.85230 0 0 .85230 -164.21 736.57)" y1="37.752" x1="13.236">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-88.922 -511.08)">
+<g transform="translate(277.54 186.14)">
+<g transform="matrix(1.0025 0 0 1.0025 64.951 -21.662)">
+<path stroke-linejoin="round" d="m-244.57 353.48h-6.2188c-0.94645 0-1.7188 0.73281-1.7188 1.625v4.0625c0 0.89219 0.7723 1.625 1.7188 1.625h10.281c-0.21214-0.62542-0.538-1.2073-0.9375-1.7188-0.41375-0.52973-0.88429-1.0169-1.3438-1.5-0.45946-0.4831-0.90278-0.95537-1.25-1.4688-0.34722-0.51338-0.61048-1.0669-0.6875-1.6875-0.0344-0.27726 0.11391-0.62773 0.15625-0.9375z" fill-rule="evenodd" stroke="#ff7575" stroke-width=".85168" fill="#ff7575"/>
+<rect stroke-linejoin="round" rx="1.7084" ry="1.6105" height="7.3028" width="15.108" stroke="#000080" y="353.49" x="-252.51" stroke-width=".85168" fill="none"/>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Sans" transform="scale(1.0049 .99514)" line-height="125%" stroke="#000000" xml:space="preserve" font-size="5.6944px" y="360.94196" x="-249.31416" stroke-width=".26599" fill="#000000"><tspan y="360.94196" x="-249.31416" stroke-width=".26599">N</tspan></text>
+</g>
+<g transform="matrix(.27632 -.061625 .061625 .27632 -185.09 115.31)">
+<path style="color:#000000" d="m-142.88 755.4 4.0659 3.8007c7.1875-7.0625 17.783-23.977 17.783-23.977 0.42949-1.2244-1.0872-1.9959-1.8464-1.1705 0 0-13.69 14.097-20.003 21.347z" stroke="#673907" stroke-linecap="round" fill="url(#d)"/>
+<path style="color:#000000" d="m-150.48 765.63 2.2463 1.9338 8.4928-7.367 0.27506-0.70583 1.0944-0.0178c-0.4375-1.5625-2.9415-4.3834-4.8165-4.3834l0.082 1.0901-0.66999 0.38002-6.7041 9.0702z" stroke="#888a85" stroke-linecap="round" fill="url(#c)"/>
+<path style="color:#000000" d="m-160.78 773.54c6.6053 0 11.618 0.7866 12.567-4.0191 0.7648-3.8727-4.5603-5.7284-7.1991-2.271-2.542 3.3305-5.3681 6.2901-5.3681 6.2901z" fill="url(#a)"/>
+<circle opacity=".52778" style="color:#000000" transform="matrix(.85230 0 0 .85230 -158.8 735.39)" cy="37.75" cx="7.625" r="1.25" fill="#fff"/>
+<circle style="color:#000000" transform="matrix(.78787 0 0 .78787 -148.27 728.09)" cy="37.75" cx="7.625" r="1.25" fill="#fff"/>
+<path stroke-linejoin="round" style="color:#000000" d="m-143.59 759.21-5.3033 6.143" stroke="#fff" stroke-linecap="round" fill="none"/>
+<path opacity=".42778" style="color:#000000" d="m-159.46 772.88s3.3411-1.6418 4.7648-4.0868c0.5037-0.86504 1.6444-0.12684 0.94166 0.7345-1.5178 1.8604-5.7065 3.3523-5.7065 3.3523z" fill="url(#b)"/>
+<circle opacity=".53333" style="color:#000000" transform="matrix(.23787 0 0 .23787 -124.1 725.71)" cy="37.75" cx="7.625" r="1.25" fill="#fff"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="324.94" x="-188.62" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/NodeCenter.svg b/freeplane/resources/images/NodeCenter.svg
new file mode 100644
index 0000000..93a172c
--- /dev/null
+++ b/freeplane/resources/images/NodeCenter.svg
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.710093mm"
+   height="8.1957636mm"
+   viewBox="0 0 37.949148 29.040108"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="NodeCenter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)"
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-4">
+      <svg:stop
+         id="stop7"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.7776558"
+     inkscape:cx="9.327092"
+     inkscape:cy="10.438936"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1194.0722)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.84978437"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="574.09357"
+       x="1071.823"
+       height="0"
+       width="0.85563356" />
+    <svg:g
+       id="g4590">
+      <svg:rect
+         ry="1.6847268"
+         rx="1.6814741"
+         y="1194.4114"
+         x="94.538063"
+         height="28.361774"
+         width="37.270817"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <svg:rect
+         transform="scale(-1,1)"
+         id="rect4717-4"
+         x="-123.28261"
+         y="1202.8621"
+         width="20.218273"
+         height="11.454068"
+         ry="2.5259175"
+         rx="2.286206"
+         style="fill:#b0ffff;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.65917969;stroke-linejoin:round;stroke-opacity:1" />
+      <svg:g
+         style="stroke-width:0.50719601"
+         transform="matrix(1.427875,0,0,1.4278625,-6.2272611,-505.12154)"
+         id="g4543-5">
+        <svg:ellipse
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.05117218;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           id="path4523-5"
+           cx="83.603951"
+           cy="1200.1965"
+           rx="5.1542387"
+           ry="5.1644287" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path12-4"
+           d="m 83.61744,1195.0272 c -2.84549,0 -5.16802,2.3226 -5.16802,5.1681 0,2.8454 2.32253,5.168 5.16802,5.168 2.84548,0 5.1475,-2.3226 5.1475,-5.168 0,-2.8455 -2.30212,-5.1681 -5.1475,-5.1681 z m 0,0.9805 c 2.31555,0 4.16703,1.8719 4.16703,4.1875 0,2.3155 -1.85148,4.1874 -4.16703,4.1874 -2.31556,0 -4.18745,-1.8719 -4.18745,-4.1874 0,-2.3156 1.87189,-4.1875 4.18745,-4.1875 z"
+           style="color:#000000;text-indent:0;text-transform:none;fill:#d40000;stroke:#000000;stroke-width:0.04754962" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path14-5"
+           d="m 83.61744,1197.1489 c -1.67656,0 -3.04492,1.3684 -3.04492,3.045 0,1.6765 1.36846,3.0449 3.04492,3.0449 1.67645,0 3.03285,-1.3684 3.03285,-3.0449 0,-1.6766 -1.3564,-3.045 -3.03285,-3.045 z m 0,0.5777 c 1.36427,0 2.45521,1.1029 2.45521,2.4673 0,1.3643 -1.09094,2.4673 -2.45521,2.4673 -1.36428,0 -2.46727,-1.1029 -2.46727,-2.4673 0,-1.3643 1.1029,-2.4673 2.46727,-2.4673 z"
+           style="color:#000000;text-indent:0;text-transform:none;fill:#d40000;stroke:#000000;stroke-width:0.04883384" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path16-4"
+           d="m 83.32857,1201.3027 c -0.22934,-0.062 -0.37094,-0.1426 -0.53213,-0.3038 -0.43889,-0.4389 -0.43716,-1.1647 0.004,-1.6057 0.44912,-0.4491 1.16206,-0.4475 1.61321,0 0.43434,0.4344 0.43442,1.168 1.8e-4,1.6022 -0.16489,0.1649 -0.303,0.2422 -0.54494,0.3053 -0.2085,0.054 -0.33427,0.054 -0.5402,-10e-4 h 1e-5 z"
+           style="color:#000000;fill:#d40000;fill-rule:evenodd;stroke:#000000;stroke-width:0.00379063;stroke-dasharray:0.04548763, 0.04548763" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/NodeColorAction.svg b/freeplane/resources/images/NodeColorAction.svg
new file mode 100644
index 0000000..27b22b6
--- /dev/null
+++ b/freeplane/resources/images/NodeColorAction.svg
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg18792"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs18794">
+    <linearGradient
+       id="linearGradient19965">
+      <stop
+         id="stop19967"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.95686275" />
+      <stop
+         id="stop19969"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         style="stop-color:#dc7fcf;stop-opacity:1"
+         offset="0"
+         id="stop15518-1-5" />
+      <stop
+         style="stop-color:#a8bef9;stop-opacity:1"
+         offset="1"
+         id="stop15520-5-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="0"
+         id="stop20604-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20606-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         id="stop20576-6"
+         offset="0"
+         style="stop-color:#cccccc;stop-opacity:1" />
+      <stop
+         id="stop20578-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         id="stop20586-8"
+         offset="0"
+         style="stop-color:#a6a6c6;stop-opacity:1" />
+      <stop
+         id="stop20588-6"
+         offset="1"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         id="stop20411-3"
+         offset="0"
+         style="stop-color:#36d200;stop-opacity:1;" />
+      <stop
+         id="stop20413-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         id="stop13708-7"
+         offset="0"
+         style="stop-color:#f1d103;stop-opacity:1;" />
+      <stop
+         id="stop13710-8"
+         offset="1"
+         style="stop-color:#f7cd03;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4318-5">
+      <stop
+         id="stop4320-98"
+         offset="0"
+         style="stop-color:#ff9e3b;stop-opacity:1" />
+      <stop
+         id="stop4322-4"
+         offset="1"
+         style="stop-color:#e47800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4738">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742" />
+    </linearGradient>
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-179.17645,-209.24803)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468-5"
+       xlink:href="#linearGradient4738"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.822941"
+     inkscape:cx="-4.0594994"
+     inkscape:cy="8.212591"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1394"
+     inkscape:window-height="818"
+     inkscape:window-x="403"
+     inkscape:window-y="46"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g20107">
+      <text
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\NodeColorAction.png"
+         transform="scale(1.0221259,0.97835306)"
+         sodipodi:linespacing="125%"
+         id="text14062-8"
+         y="6.0857263"
+         x="0.25157377"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.20244217px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.10355683;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="letter-spacing:0px;word-spacing:0px;stroke-width:0.10355683"
+           dy="0"
+           y="6.0857263"
+           x="0.25157377"
+           id="tspan14064-6"
+           sodipodi:role="line"><tspan
+             id="tspan14066-3"
+             style="letter-spacing:0px;word-spacing:0px;fill:#aa0000;stroke:#aa0000;stroke-width:0.25889206;stroke-opacity:1">A</tspan></tspan></text>
+      <text
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\NodeColorAction.png"
+         transform="scale(1.0221259,0.97835306)"
+         sodipodi:linespacing="125%"
+         id="text14062-9"
+         y="5.9665341"
+         x="5.5980692"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.20244217px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.10355683;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="letter-spacing:0px;word-spacing:0px;stroke-width:0.10355683"
+           dy="5.1265259"
+           y="5.9665341"
+           x="5.5980692"
+           id="tspan14064-8"
+           sodipodi:role="line"><tspan
+             id="tspan14068-2"
+             style="letter-spacing:0px;word-spacing:0px;fill:#0000ff;stroke:#0000ff;stroke-width:0.25889206;stroke-opacity:1">B</tspan></tspan></text>
+      <text
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\NodeColorAction.png"
+         transform="scale(1.0221259,0.97835306)"
+         sodipodi:linespacing="125%"
+         id="text14062-4"
+         y="10.973868"
+         x="10.974933"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.20244217px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.10355683;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="letter-spacing:0px;word-spacing:0px;stroke-width:0.10355683"
+           dy="5.1265259"
+           y="10.973868"
+           x="10.974933"
+           id="tspan14064-7"
+           sodipodi:role="line"><tspan
+             dx="-1.0436587"
+             id="tspan14070-8"
+             style="letter-spacing:0px;word-spacing:0px;fill:#005500;stroke:#005500;stroke-width:0.25889206;stroke-opacity:1">C</tspan></tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/NodeColorBlendAction.svg b/freeplane/resources/images/NodeColorBlendAction.svg
new file mode 100644
index 0000000..5a67ca4
--- /dev/null
+++ b/freeplane/resources/images/NodeColorBlendAction.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-86.418 -461.41)">
+<g transform="matrix(.029754 0 0 .029754 112.19 460.91)">
+<path d="m-430.08 17.019z" stroke="#000" stroke-width="1px" fill="none"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="16.644" x="-866" stroke-width=".25" fill="#250"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="16.644" x="-686.75" stroke-width=".25" fill="#338000"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="16.644" x="-507.5" stroke-width=".25" fill="#4a0"/>
+<path d="m-430.08 196.27z" stroke="#000" stroke-width="1px" fill="none"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="195.89" x="-866" stroke-width=".25" fill="#55d400"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="195.89" x="-686.75" stroke-width=".25" fill="#6f0"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="195.89" x="-507.5" stroke-width=".25" fill="#9f5"/>
+<path d="m-430.08 375.52z" stroke="#000" stroke-width="1px" fill="none"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="375.14" x="-866" stroke-width=".25" fill="#b3ff80"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="375.14" x="-686.75" stroke-width=".25" fill="#cfa"/>
+<rect stroke-linejoin="round" style="color:#000000" fill-rule="evenodd" stroke-dashoffset="4.503" height="179" width="179" stroke="#050" stroke-linecap="round" y="375.14" x="-507.5" stroke-width=".25" fill="#e5ffd5"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/NodeLeft.svg b/freeplane/resources/images/NodeLeft.svg
new file mode 100644
index 0000000..0419137
--- /dev/null
+++ b/freeplane/resources/images/NodeLeft.svg
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.710093mm"
+   height="8.1957636mm"
+   viewBox="0 0 37.949148 29.040108"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="NodeLeft.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)"
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-4">
+      <svg:stop
+         id="stop7"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.7776558"
+     inkscape:cx="-8.8265436"
+     inkscape:cy="10.438936"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1194.0722)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.84978437"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="574.09357"
+       x="1071.823"
+       height="0"
+       width="0.85563356" />
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="37.270817"
+       height="28.361774"
+       x="94.538063"
+       y="1194.4114"
+       rx="1.6814741"
+       ry="1.6847268" />
+    <svg:rect
+       style="fill:#b0ffff;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.65917969;stroke-linejoin:round;stroke-opacity:1"
+       rx="2.0126066"
+       ry="2.2163281"
+       height="10.050199"
+       width="17.798672"
+       y="1203.5671"
+       x="-113.99753"
+       id="rect4717-4"
+       transform="scale(-1,1)" />
+    <svg:g
+       style="stroke-width:0.81299937"
+       transform="matrix(0,1.0639421,-1.0639421,0,151.51054,1224.4771)"
+       id="g4548">
+      <svg:path
+         style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.60974956;stroke-opacity:1"
+         inkscape:transform-center-x="0.022858851"
+         inkscape:transform-center-y="2.6604092"
+         d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+         id="path4544"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <svg:path
+         style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.26463759;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -14.930158,21.808892 v 7.927934"
+         id="path4546"
+         inkscape:connector-curvature="0" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/NodeListAction.svg b/freeplane/resources/images/NodeListAction.svg
new file mode 100644
index 0000000..f9dce07
--- /dev/null
+++ b/freeplane/resources/images/NodeListAction.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.002 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="l" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35050 0 0 .34695 723.95 867.18)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="n" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="m" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.31602 0 0 .31283 634.8 794.56)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<radialGradient id="e" gradientUnits="userSpaceOnUse" cy="866.01" cx="386.21" gradientTransform="matrix(1.1453 1.179 -.80701 .78396 653.16 -270.77)" r="61.352">
+<stop stop-color="#fff" stop-opacity=".92035" offset="0"/>
+<stop stop-color="#ccc" offset="1"/>
+</radialGradient>
+<linearGradient id="k" y2="864.59" gradientUnits="userSpaceOnUse" x2="318.68" gradientTransform="matrix(.074862 0 0 .035378 -776.1 471.94)" y1="863.3" x1="348.72">
+<stop stop-color="#00f" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="j" y2="791.12" gradientUnits="userSpaceOnUse" x2="343.89" gradientTransform="matrix(.056864 -.055812 .035022 .035960 -241.08 860.4)" y1="791.28" x1="333.49">
+<stop stop-color="#3c3c3c" stop-opacity=".99608" offset="0"/>
+<stop stop-color="#b3b3b3" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="446.77" xlink:href="#f" gradientUnits="userSpaceOnUse" x2="215.36" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="440.75" x1="209.71"/>
+<linearGradient id="f">
+<stop stop-color="#f70000" offset="0"/>
+<stop stop-color="#780000" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="449.6" xlink:href="#g" gradientUnits="userSpaceOnUse" x2="194.27" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="456.24" x1="202.53"/>
+<linearGradient id="g">
+<stop stop-color="#baa492" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="449.64" xlink:href="#i" gradientUnits="userSpaceOnUse" x2="193.04" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="457.89" x1="203.5"/>
+<linearGradient id="i">
+<stop offset="0"/>
+<stop stop-color="#7e7e7e" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="462.65" xlink:href="#h" gradientUnits="userSpaceOnUse" x2="196.75" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="458.87" x1="193.01"/>
+<linearGradient id="h">
+<stop stop-color="#c00000" offset="0"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-39.09 -344.74)">
+<g transform="translate(231.02 218.38)">
+<rect style="color:#000000" height="16" width="16" y="126.35" x="-191.93" fill="none"/>
+<path d="m-191.63 126.71h7.3865l3.717 3.8635-0.084 10.608h-11.02v-14.472z" fill-rule="evenodd" stroke="#666" stroke-width="0.505" fill="url(#l)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" fill-rule="evenodd" transform="matrix(.31602 0 0 .31283 709.9 699.18)" filter="url(#n)" stroke="#666" stroke-width="1.6061" fill="#d3d3d3"/>
+<g transform="matrix(.81407 0 0 -.81407 -70.474 857.73)">
+<path d="m-136.67 894.82v-7.2898c0-0.27565-0.2203-0.48099-0.4916-0.48099h-9.9595c-0.2713 0-0.49161 0.20534-0.49161 0.48099v7.2898h10.943z" stroke="#000" stroke-width=".088094" fill="#fff"/>
+<rect transform="scale(-1)" height="1.0284" width="10.824" y="-894.73" x="136.73" fill="#ffee4f"/>
+<path d="m-137.52 892.5h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+<path d="m-137.52 891.14h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+<path d="m-137.52 889.79h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+<path d="m-137.52 888.44h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+</g>
+<path stroke-linejoin="round" d="m-184.02 126.94c0.33762 1.499 0.12126 2.6716-0.0189 3.4065 0.83261-0.20477 1.8139-0.43341 3.271 0.009-1.5706-1.7358-2.2113-2.27-3.252-3.4158z" fill-rule="evenodd" stroke="#666" stroke-width="0.505" fill="url(#m)"/>
+<g stroke-linejoin="round" transform="matrix(1.0011 -.14964 .14964 1.0011 -118.08 -761.8)">
+<rect ry=".27803" stroke-opacity=".90698" rx=".27803" transform="matrix(.72730 -.68632 .70389 .71030 0 0)" height="4.4428" width="1.7715" stroke="#7900aa" stroke-linecap="round" y="500.43" x="-751.59" stroke-width=".28577" fill="#fff"/>
+<path d="m-195.06 869.88 0.66476 1.3056 1.1909-1.1606-1.2384-0.73736-0.61726 0.59241z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".17005" fill="#fff"/>
+<g transform="translate(-.035609 -.059735)">
+<path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(.069360 0 0 .072422 -224.82 802.68)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#e)"/>
+<rect ry=".27803" stroke-opacity=".90698" rx=".27803" transform="matrix(.72730 -.68632 .70389 .71030 0 0)" height="4.4428" width="1.7715" stroke="#000080" stroke-linecap="round" y="500.43" x="-751.59" stroke-width=".28577" fill="url(#k)"/>
+<path d="m-195.06 869.88 0.66476 1.3056 1.1909-1.1606-1.2384-0.73736-0.61726 0.59241z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".17005" fill="url(#j)"/>
+</g>
+</g>
+<g transform="matrix(1.0797 -.11730 .11798 1.0735 -355.42 -263.27)">
+<g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+<path stroke-linejoin="round" d="m340.34 304.7 10.562-10.6 1.2706-8.9948-8.9644-0.60659-12.355 11.644" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+<path d="m335.35 297.57-6.1721 7.7077" stroke="#000" stroke-width=".40004" fill="none"/>
+<path d="m338.29 300.98c-0.2939 0.11951-8.1706 5.5567-8.1706 5.5567" stroke="#000" stroke-width=".40004" fill="none"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+<path d="m351.02 294.19-10.31 10.57" stroke="#000" stroke-width=".46147" fill="none"/>
+</g>
+<g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+<path stroke-linejoin="round" d="m340.34 304.7 10.878-10.924 1.2315-8.9383-8.9253-0.66307-12.671 11.968" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+<path d="m351.01 294.5-10.3 10.26" stroke="#000" stroke-width=".46147" fill="none"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/NodeRight.svg b/freeplane/resources/images/NodeRight.svg
new file mode 100644
index 0000000..f5dd6ee
--- /dev/null
+++ b/freeplane/resources/images/NodeRight.svg
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.710093mm"
+   height="8.1957636mm"
+   viewBox="0 0 37.949148 29.040108"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="NodeRight.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)"
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-4">
+      <svg:stop
+         id="stop7"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.7776558"
+     inkscape:cx="-8.8265436"
+     inkscape:cy="10.438936"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1194.0722)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.84978437"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="574.09357"
+       x="1071.823"
+       height="0"
+       width="0.85563356" />
+    <svg:g
+       id="g4568"
+       transform="matrix(-1,0,0,1,226.34694,0)">
+      <svg:rect
+         ry="1.6847268"
+         rx="1.6814741"
+         y="1194.4114"
+         x="94.538063"
+         height="28.361774"
+         width="37.270817"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <svg:rect
+         transform="scale(-1,1)"
+         id="rect4717-4"
+         x="-113.99753"
+         y="1203.5671"
+         width="17.798672"
+         height="10.050199"
+         ry="2.2163281"
+         rx="2.0126066"
+         style="fill:#b0ffff;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.65917969;stroke-linejoin:round;stroke-opacity:1" />
+      <svg:g
+         id="g4548"
+         transform="matrix(0,1.0639421,-1.0639421,0,151.51054,1224.4771)"
+         style="stroke-width:0.81299937">
+        <svg:path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4544"
+           d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+           inkscape:transform-center-y="2.6604092"
+           inkscape:transform-center-x="0.022858851"
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.60974956;stroke-opacity:1" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path4546"
+           d="m -14.930158,21.808892 v 7.927934"
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.26463759;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/Normal24.gif b/freeplane/resources/images/Normal24.gif
deleted file mode 100644
index 7764baa..0000000
Binary files a/freeplane/resources/images/Normal24.gif and /dev/null differ
diff --git a/freeplane/resources/images/Open24.gif b/freeplane/resources/images/Open24.gif
deleted file mode 100644
index 2086bc2..0000000
Binary files a/freeplane/resources/images/Open24.gif and /dev/null differ
diff --git a/freeplane/resources/images/OpenUserDirAction.svg b/freeplane/resources/images/OpenUserDirAction.svg
new file mode 100644
index 0000000..2cd0939
--- /dev/null
+++ b/freeplane/resources/images/OpenUserDirAction.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="15.995137"
+   width="15.623865"
+   version="1.1"
+   viewBox="0 0 15.623865 15.995137"
+   id="svg3604"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="openuserdiraction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3657"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="342.93484"
+     inkscape:cy="-210.16643"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3604" />
+  <defs
+     id="defs3606">
+    <linearGradient
+       id="e"
+       y2="909.21002"
+       gradientUnits="userSpaceOnUse"
+       x2="-290.82999"
+       gradientTransform="matrix(0.57369,-0.035034,0.037105,0.54167,-218.47,-255.9)"
+       y1="915.10999"
+       x1="-290.09">
+      <stop
+         stop-color="#ffd700"
+         offset="0"
+         id="stop3609" />
+      <stop
+         stop-color="#f5f6c2"
+         offset="1"
+         id="stop3611" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="903.79999"
+       gradientUnits="userSpaceOnUse"
+       x2="-298.56"
+       gradientTransform="matrix(0.57369,-0.035034,0.037105,0.54167,-218.47,-255.9)"
+       y1="912.77002"
+       x1="-290.82999">
+      <stop
+         stop-color="#ebc600"
+         offset="0"
+         id="stop3614" />
+      <stop
+         stop-color="#f5f6c2"
+         offset="1"
+         id="stop3616" />
+    </linearGradient>
+    <radialGradient
+       id="b"
+       gradientUnits="userSpaceOnUse"
+       cy="613.34003"
+       cx="131.66"
+       gradientTransform="matrix(1.1987,0.55359,-0.33581,0.72715,179.8,95.034)"
+       r="9.493">
+      <stop
+         stop-color="#7ff44c"
+         offset="0"
+         id="stop3619" />
+      <stop
+         stop-color="#35981b"
+         offset="1"
+         id="stop3621" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="596.5"
+       gradientUnits="userSpaceOnUse"
+       x2="34.084999"
+       y1="591.89001"
+       x1="28.851">
+      <stop
+         stop-color="#fcc362"
+         offset="0"
+         id="stop3624" />
+      <stop
+         stop-color="#cb923a"
+         offset="1"
+         id="stop3626" />
+    </linearGradient>
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="587.32001"
+       cx="48.061001"
+       gradientTransform="matrix(-0.21675,1.1894,-0.81691,-0.1393,621.01,623.86)"
+       r="9.2658997">
+      <stop
+         stop-color="#636363"
+         offset="0"
+         id="stop3629" />
+      <stop
+         stop-color="#0e0d0c"
+         offset="1"
+         id="stop3631" />
+    </radialGradient>
+  </defs>
+  <metadata
+     id="metadata3633">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.97056,0,0,0.97056,355.2076,-217.64253)"
+     id="g3635">
+    <g
+       transform="translate(-5.5117,-13.435)"
+       id="g3637"
+       style="stroke:#554400;stroke-width:0.58789998;stroke-linecap:round;stroke-linejoin:round">
+      <path
+         style="color:#000000;fill:url(#e)"
+         d="m -346.24,249.74 -0.77313,-11.286 -7.1602,2.1065 -1.1362,-1.6438 -4.8616,1.7026 c 0.1757,2.306 0.61915,8.7721 0.79276,11.194 0.20377,2.8426 1.4238,2.0111 1.9748,1.654 5.0215,-1.6767 6.853,-2.5102 11.163,-3.7269 h -2e-5 2e-5 z"
+         id="path3639"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#d)"
+         d="m -358.37,253.87 c 2.1756,-0.52176 11.974,-3.2924 12.997,-4.3821 1.0732,-1.1442 0.64811,-6.4068 0.58462,-9.804 l -3.1314,0.98194 -5.0927,1.6764 -1.0065,1.2906 -3.2948,0.90478 c 0.17508,3.8324 0.16969,8.8699 -1.0557,9.3324 z"
+         id="path3641"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.36595,0,0,0.36595,-363.81,35.48)"
+       id="g3643">
+      <g
+         transform="matrix(1,0,0,1.0597,-113.08,-113.24)"
+         id="g3645">
+        <path
+           d="m 139.18,617.54 -7.7588,-8.0132 c 7.7008,-0.66485 7.1398,-0.17854 10.684,-0.38158 l -1.6535,1.2719 c 0.55907,2.4637 0.0334,4.8287 -1.2719,7.1229 z"
+           id="path3647"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;fill-rule:evenodd" />
+        <path
+           d="m 139.23,617.64 c -1.2321,-2.1074 -3.4345,-5.2685 -7.8591,-8.1614 -1.8954,1.1506 -3.364,2.304 -3.854,4.7608 l 0.0756,6.65 c 2.732,2.1497 6.5631,2.358 9.8995,2.4182 5.0237,-0.61895 6.362,-2.1462 7.9347,-3.6273 0.0861,-2.0983 0.23606,-3.4857 -0.45341,-6.5744 -0.46374,-1.5638 -1.9521,-3.4539 -2.796,-4.0051 -1.2035,0.84618 -1.2922,0.81697 -1.6625,1.2846 -0.16577,2.5852 -0.72557,5.2594 -1.2847,7.2546 z"
+           id="path3649"
+           inkscape:connector-curvature="0"
+           style="fill:url(#b);fill-rule:evenodd;stroke:#196616;stroke-width:1px" />
+        <path
+           transform="matrix(1.0913,0,0,1.0614,102.35,-23.922)"
+           d="m 37.935,591.89 a 6.6122,6.6122 0 0 1 -6.6107,6.6122 6.6122,6.6122 0 0 1 -6.6138,-6.6091 6.6122,6.6122 0 0 1 6.6075,-6.6154 6.6122,6.6122 0 0 1 6.6169,6.606"
+           id="path3651"
+           inkscape:connector-curvature="0"
+           style="fill:url(#c);stroke:#62340a;stroke-opacity:0.72673998" />
+        <path
+           d="m 144.58,603.22 -1.5186,-2.6026 -1.7262,2.0843 c -3.8382,1.0955 -6.5335,0.90128 -9.3442,0.83735 l -1.266,-1.3777 c -0.56495,2.4766 0.95041,5.213 -1.4143,5.6888 -1.4958,-1.5569 -1.78,-3.2859 -2.0882,-5.2819 0.0285,-2.7803 0.29214,-3.9009 2.0783,-5.9941 1.5178,-1.3282 3.1044,-2.1723 6.3298,-2.4492 5.2391,-0.13522 9.1222,3.0967 8.9494,9.095 z"
+           id="path3653"
+           inkscape:connector-curvature="0"
+           style="fill:url(#a);fill-rule:evenodd;stroke:#000000;stroke-width:1.02980006px;stroke-linecap:round;stroke-linejoin:round" />
+      </g>
+      <path
+         d="m 26.203,540.85 c -0.119,1.985 -0.21962,3.9701 0.21018,5.9551"
+         id="path3655"
+         inkscape:connector-curvature="0"
+         style="fill-rule:evenodd;stroke:#196616;stroke-width:1px" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Paste24.gif b/freeplane/resources/images/Paste24.gif
deleted file mode 100644
index 26cc4c5..0000000
Binary files a/freeplane/resources/images/Paste24.gif and /dev/null differ
diff --git a/freeplane/resources/images/PlaceSelectedNodeOnSlide.svg b/freeplane/resources/images/PlaceSelectedNodeOnSlide.svg
new file mode 100644
index 0000000..b1781dd
--- /dev/null
+++ b/freeplane/resources/images/PlaceSelectedNodeOnSlide.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.499912"
+   height="31.000242"
+   viewBox="0 0 40.499913 31.000242"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="PlaceSelectedNodeOnSlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         id="stop3775"
+         offset="0.00000000"
+         style="stop-color:#24424c;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3777"
+         offset="1.0000000"
+         style="stop-color:#79dfee;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         id="stop8253"
+         offset="0.00000000"
+         style="stop-color:#000000;stop-opacity:0.25098041;" />
+      <stop
+         id="stop8255"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         id="stop8985"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.37254903;" />
+      <stop
+         id="stop8987"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.094117649;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.2960607"
+     inkscape:cx="-24.573198"
+     inkscape:cy="20.801546"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.289351,-1194.1475)">
+    <g
+       id="g4473"
+       transform="matrix(0.92264982,0,0,0.92264982,128.31467,1176.5119)" />
+    <g
+       id="g4537">
+      <rect
+         ry="1.801149"
+         rx="1.7965614"
+         y="1194.4867"
+         x="94.62841"
+         height="30.321701"
+         width="39.821793"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717"
+         x="-123.62695"
+         y="1204.3972"
+         width="18.174753"
+         height="10.246805"
+         ry="2.259685"
+         rx="2.0551324"
+         style="fill:#b0ffff;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.703125;stroke-linejoin:round;stroke-opacity:1" />
+      <g
+         id="g4548"
+         transform="matrix(0,0.93209074,-0.93209074,0,127.20151,1223.437)"
+         style="stroke-width:0.98987126">
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4544"
+           d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+           inkscape:transform-center-y="2.6604092"
+           inkscape:transform-center-x="0.022858851"
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.74240345;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4546"
+           d="m -14.930158,21.808892 v 7.927934"
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.5397656;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         transform="matrix(0,0.93209074,0.93209074,0,101.8296,1223.437)"
+         id="g4554"
+         style="stroke-width:0.98987126">
+        <path
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.74240345;stroke-opacity:1"
+           inkscape:transform-center-x="0.022858851"
+           inkscape:transform-center-y="2.6604092"
+           d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+           id="path4550"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.5397656;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -14.930158,21.808892 v 7.927934"
+           id="path4552"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="stroke-width:0.58955842"
+         transform="matrix(1.3102902,0,0,1.3102808,4.9898773,-362.94528)"
+         id="g4543-5">
+        <ellipse
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.05948192;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           id="path4523-5"
+           cx="83.603951"
+           cy="1200.1965"
+           rx="5.1542387"
+           ry="5.1644287" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path12-4"
+           d="m 83.61744,1195.0272 c -2.84549,0 -5.16802,2.3226 -5.16802,5.1681 0,2.8454 2.32253,5.168 5.16802,5.168 2.84548,0 5.1475,-2.3226 5.1475,-5.168 0,-2.8455 -2.30212,-5.1681 -5.1475,-5.1681 z m 0,0.9805 c 2.31555,0 4.16703,1.8719 4.16703,4.1875 0,2.3155 -1.85148,4.1874 -4.16703,4.1874 -2.31556,0 -4.18745,-1.8719 -4.18745,-4.1874 0,-2.3156 1.87189,-4.1875 4.18745,-4.1875 z"
+           style="color:#000000;text-indent:0;text-transform:none;fill:#d40000;stroke:#000000;stroke-width:0.0552711" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path14-5"
+           d="m 83.61744,1197.1489 c -1.67656,0 -3.04492,1.3684 -3.04492,3.045 0,1.6765 1.36846,3.0449 3.04492,3.0449 1.67645,0 3.03285,-1.3684 3.03285,-3.0449 0,-1.6766 -1.3564,-3.045 -3.03285,-3.045 z m 0,0.5777 c 1.36427,0 2.45521,1.1029 2.45521,2.4673 0,1.3643 -1.09094,2.4673 -2.45521,2.4673 -1.36428,0 -2.46727,-1.1029 -2.46727,-2.4673 0,-1.3643 1.1029,-2.4673 2.46727,-2.4673 z"
+           style="color:#000000;text-indent:0;text-transform:none;fill:#d40000;stroke:#000000;stroke-width:0.05676387" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16-4"
+           d="m 83.32857,1201.3027 c -0.22934,-0.062 -0.37094,-0.1426 -0.53213,-0.3038 -0.43889,-0.4389 -0.43716,-1.1647 0.004,-1.6057 0.44912,-0.4491 1.16206,-0.4475 1.61321,0 0.43434,0.4344 0.43442,1.168 1.8e-4,1.6022 -0.16489,0.1649 -0.303,0.2422 -0.54494,0.3053 -0.2085,0.054 -0.33427,0.054 -0.5402,-10e-4 h 1e-5 z"
+           style="color:#000000;fill:#d40000;fill-rule:evenodd;stroke:#000000;stroke-width:0.00440618;stroke-dasharray:0.05287427, 0.05287427" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/PresentationPreference.svg b/freeplane/resources/images/PresentationPreference.svg
new file mode 100644
index 0000000..cd993c1
--- /dev/null
+++ b/freeplane/resources/images/PresentationPreference.svg
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.821814mm"
+   height="10.402451mm"
+   viewBox="0 0 41.888317 36.859077"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="PresentationPreference.svg">
+  <defs
+     id="defs5771">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </linearGradient>
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035" />
+      <stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)" />
+    <linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.90504,0,0,0.90504,-531.65,73.301)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-5">
+      <stop
+         id="stop3664"
+         offset="0"
+         stop-color="#8da6d8" />
+      <stop
+         id="stop3666"
+         offset=".25"
+         stop-color="#b4c5e5" />
+      <stop
+         id="stop3668"
+         offset=".5"
+         stop-color="#d8e1f2" />
+      <stop
+         id="stop3670"
+         offset=".75"
+         stop-color="#92aada" />
+      <stop
+         id="stop3672"
+         offset="1"
+         stop-color="#8ea7d8" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.6081216"
+     inkscape:cx="-39.847628"
+     inkscape:cy="16.695042"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-298.42909,-498.43194)">
+    <g
+       id="g4577"
+       transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)">
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 290.03565,529.06437 v 6.98637"
+         id="path4575"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path13016"
+         d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="translate(0.26630924)"
+         id="g4530">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           id="rect9222"
+           width="37.615192"
+           height="3.7142279"
+           x="270.89679"
+           y="503.24127"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           rx="1.790844"
+           ry="1.802771" />
+        <path
+           style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+           id="path4474"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcsccc" />
+        <path
+           style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+           id="path4474-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcsccc" />
+      </g>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4535"
+         d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+         style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <circle
+         r="1.8556092"
+         cy="534.54059"
+         cx="290.03564"
+         id="path4573"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:aut [...]
+    </g>
+    <g
+       id="g4621"
+       transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)">
+      <rect
+         ry="1.862726"
+         rx="1.8591295"
+         y="553.88306"
+         x="270.47888"
+         height="31.358326"
+         width="41.208649"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+      <g
+         transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)"
+         id="g4422">
+        <path
+           id="path4779"
+           d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4781"
+           d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4783"
+           d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4743"
+           d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+           font-size="61.543px"
+           inkscape:connector-curvature="0"
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.97680634"
+           ry="1.0587236"
+           height="4.8009052"
+           width="8.6384783"
+           y="714.97345"
+           x="-395.90698"
+           id="rect4717"
+           transform="scale(-1,1)" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+           rx="0.9768008"
+           ry="1.0587536"
+           height="4.8010173"
+           width="8.6384134"
+           y="722.9632"
+           x="383.33188"
+           id="rect4723" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.91026998"
+           ry="1.007938"
+           height="4.5706868"
+           width="8.0499411"
+           y="-711.94672"
+           x="-391.7066"
+           id="rect4729"
+           transform="scale(-1)" />
+      </g>
+    </g>
+    <g
+       id="g3676"
+       transform="matrix(0.60076327,0,0,0.60076327,618.43159,459.04373)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3678"
+         d="m -511.05,78.896 c -0.33917,0.02321 -0.66885,0.07574 -1.002,0.11386 h -0.0228 l -0.79705,4.3496 c -1.2991,0.29586 -2.5213,0.79795 -3.6209,1.4802 l -3.5753,-2.5733 c -0.9665,0.75036 -1.846,1.6255 -2.6189,2.5733 l 2.4822,3.6209 c -0.75367,1.1518 -1.3204,2.4669 -1.6396,3.8486 -6e-5,0.0066 -5e-5,0.02164 0,0.02277 l -4.3268,0.68318 c -0.0791,0.64612 -0.11386,1.3139 -0.11386,1.9812 0,0.54604 0.0151,1.0848 0.0683,1.6169 l 4.3268,0.77427 c 0.30773,1.5026 0.8923,2.9058 1.708,4.1446 l  [...]
+         style="color:#000000;fill:url(#a-5);stroke:#003380;stroke-width:1.19809997" />
+      <g
+         style="fill:none;stroke:#ffffff"
+         id="g3680">
+        <circle
+           id="circle3682"
+           r="12.728"
+           cx="23.511"
+           cy="23.782"
+           transform="matrix(0.4871,0,0,0.4871,-521.65,83.397)"
+           style="color:#000000;opacity:0.64772997;stroke-width:2.45970011" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3684"
+           d="m -511.47,80.748 -0.60389,3.974 c -1.1491,0.26168 -3.2628,1.062 -4.2353,1.6655 l -3.2128,-2.398 c -0.85487,0.6637 -0.9135,0.70871 -1.5971,1.5471 l 2.3229,3.4451 c -0.66662,1.0187 -1.4673,2.8342 -1.7548,4.1315 0,0 -4.0705,0.68617 -4.0705,0.68617 -0.07,0.57149 -0.0363,1.7946 0.0108,2.2653 l 3.8882,0.70044 c 0.27218,1.329 1.2908,3.4683 2.0122,4.564 l -2.4588,3.2485 c 0.65186,0.80926 0.78232,0.88331 1.5936,1.5328 l 3.2878,-2.4087 c 1.1263,0.7185 3.362,1.5925 4.7248,1.8406 l 0.5 [...]
+           style="color:#000000;opacity:0.34659005;stroke-width:1.19809997" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/PresentationToPNG.svg b/freeplane/resources/images/PresentationToPNG.svg
new file mode 100644
index 0000000..301805f
--- /dev/null
+++ b/freeplane/resources/images/PresentationToPNG.svg
@@ -0,0 +1,715 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="107.22745"
+   height="39"
+   viewBox="0 0 107.22745 39"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="PresentationToPNG.svg">
+  <svg:defs
+     id="defs5771">
+    <svg:linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <svg:stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <svg:stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6"
+       inkscape:collect="always" />
+    <svg:linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <svg:stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035" />
+      <svg:stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024)" />
+    <svg:linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.90504,0,0,0.90504,-531.65,73.301)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-5">
+      <svg:stop
+         id="stop3664"
+         offset="0"
+         stop-color="#8da6d8" />
+      <svg:stop
+         id="stop3666"
+         offset=".25"
+         stop-color="#b4c5e5" />
+      <svg:stop
+         id="stop3668"
+         offset=".5"
+         stop-color="#d8e1f2" />
+      <svg:stop
+         id="stop3670"
+         offset=".75"
+         stop-color="#92aada" />
+      <svg:stop
+         id="stop3672"
+         offset="1"
+         stop-color="#8ea7d8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-5-8"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)"
+       x1="111.93"
+       y1="310.62"
+       x2="112.73"
+       gradientUnits="userSpaceOnUse"
+       y2="298.92001"
+       id="b">
+      <svg:stop
+         id="stop7-2"
+         offset="0"
+         stop-color="#0d2e2e" />
+      <svg:stop
+         id="stop9-1"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#0d2e2e" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="21.933001"
+       x2="21.933001"
+       gradientTransform="matrix(0.7884076,0,0,-0.59745281,363.49212,534.75709)"
+       y1="24.627001"
+       gradientUnits="userSpaceOnUse"
+       y2="7.1090999"
+       id="a-1">
+      <svg:stop
+         id="stop12"
+         offset="0"
+         stop-color="#acf" />
+      <svg:stop
+         id="stop14"
+         offset="1"
+         stop-color="#04a" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)"
+       x1="105.51"
+       y1="302.84"
+       x2="118.52"
+       gradientUnits="userSpaceOnUse"
+       y2="302.84"
+       id="c">
+      <svg:stop
+         id="stop17"
+         offset="0"
+         stop-color="#37c837" />
+      <svg:stop
+         id="stop19"
+         offset="1"
+         stop-color="#165016" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientTransform="matrix(1.8818656,0,0,1.9734849,170.2998,-81.522771)"
+       x1="112.29"
+       y1="303.64001"
+       x2="112.37"
+       gradientUnits="userSpaceOnUse"
+       y2="300.78"
+       id="d">
+      <svg:stop
+         id="stop22"
+         offset="0"
+         stop-color="#b9d7ff" />
+      <svg:stop
+         id="stop24"
+         offset="1"
+         stop-color="#3c8dff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient4879"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <svg:radialGradient
+       id="a-2"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3222" />
+      <svg:stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3224" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       id="c-0"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       y1="863.29999"
+       x1="348.72">
+      <svg:stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3227" />
+      <svg:stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3229" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="b-48"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       y1="791.28003"
+       x1="333.48999">
+      <svg:stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3232" />
+      <svg:stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3234" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="b-4"
+       y2="563.76"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       y1="563.58"
+       x1="295.32">
+      <svg:stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop4581" />
+      <svg:stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop4583" />
+      <svg:stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop4585" />
+      <svg:stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4587" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-8"
+       y2="557.24"
+       gradientUnits="userSpaceOnUse"
+       x2="290.7"
+       y1="558.21"
+       x1="290.75">
+      <svg:stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop4590" />
+      <svg:stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4592" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.3363238"
+     inkscape:cx="-93.425998"
+     inkscape:cy="11.577575"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-286.32278,-544.86761)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.84978437"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="4.0960579"
+       x="609.6889"
+       height="0"
+       width="0.85563356" />
+    <svg:g
+       id="g4800"
+       transform="matrix(1.058084,0,0,1.058084,-29.440267,17.48475)">
+      <svg:g
+         transform="translate(0,-1.2133285e-6)"
+         id="g4761">
+        <svg:g
+           id="g4577"
+           transform="matrix(1.0895892,0,0,1.0895892,3.3813005,-49.485718)">
+          <svg:path
+             sodipodi:nodetypes="cc"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 290.03565,529.06437 v 6.98637"
+             id="path4575"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             id="path13016"
+             d="M 306.58353,530.38279 H 273.35786 V 506.832 h 33.22567 z"
+             style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:g
+             transform="translate(0.26630924)"
+             id="g4530">
+            <svg:rect
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+               id="rect9222"
+               width="37.615192"
+               height="3.7142279"
+               x="270.89679"
+               y="503.24127"
+               inkscape:r_cx="true"
+               inkscape:r_cy="true"
+               rx="1.790844"
+               ry="1.802771" />
+            <svg:path
+               style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+               id="path4474"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="czcsccc" />
+            <svg:path
+               style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+               id="path4474-7"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="czcsccc" />
+          </svg:g>
+          <svg:path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4535"
+             d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+             style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <svg:circle
+             r="1.8556092"
+             cy="534.54059"
+             cx="290.03564"
+             id="path4573"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering [...]
+        </svg:g>
+        <svg:g
+           id="g4621"
+           transform="matrix(0.61021279,0,0,0.61021279,141.62019,167.61414)">
+          <svg:rect
+             ry="1.862726"
+             rx="1.8591295"
+             y="553.88306"
+             x="270.47888"
+             height="31.358326"
+             width="41.208649"
+             id="rect4498"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+          <svg:g
+             transform="matrix(1.2353875,0,0,1.2353875,-181.15889,-317.07983)"
+             id="g4422">
+            <svg:path
+               id="path4779"
+               d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               id="path4781"
+               d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 v 0 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               id="path4783"
+               d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 v 0 z"
+               style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+               inkscape:connector-curvature="0" />
+            <svg:path
+               id="path4743"
+               d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+               font-size="61.543px"
+               inkscape:connector-curvature="0"
+               style="font-size:61.54299927px;fill:url(#linearGradient4879);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+            <svg:rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+               rx="0.97680634"
+               ry="1.0587236"
+               height="4.8009052"
+               width="8.6384783"
+               y="714.97345"
+               x="-395.90698"
+               id="rect4717"
+               transform="scale(-1,1)" />
+            <svg:rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+               rx="0.9768008"
+               ry="1.0587536"
+               height="4.8010173"
+               width="8.6384134"
+               y="722.9632"
+               x="383.33188"
+               id="rect4723" />
+            <svg:rect
+               style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+               rx="0.91026998"
+               ry="1.007938"
+               height="4.5706868"
+               width="8.0499411"
+               y="-711.94672"
+               x="-391.7066"
+               id="rect4729"
+               transform="scale(-1)" />
+          </svg:g>
+        </svg:g>
+      </svg:g>
+      <svg:g
+         id="g4548"
+         transform="matrix(0,2.1137221,2.1137221,0,289.22799,548.4198)"
+         style="stroke-width:0.81299937">
+        <svg:path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4544"
+           d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+           inkscape:transform-center-y="2.6604092"
+           inkscape:transform-center-x="0.022858851"
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.60974956;stroke-opacity:1" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path4546"
+           d="m -14.930158,21.808892 v 7.927934"
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.26463759;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </svg:g>
+      <svg:g
+         transform="matrix(1.2658568,0,0,1.2658568,-101.61238,-141.3821)"
+         id="g4688">
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path36"
+           d="m 367.31231,508.21372 h 27.65589 c 0.42391,0 0.76517,0.35787 0.76517,0.80242 l -0.11328,21.79912 c -0.009,0.68645 -0.53206,0.83973 -1.07808,0.84923 l -27.2306,0.1188 c -0.42389,0 -0.76517,-0.35787 -0.76517,-0.8024 v -21.96488 c 0,-0.44455 0.34128,-0.80242 0.76517,-0.80242 z"
+           style="color:#000000;fill:url(#b);stroke:#0d2e2e;stroke-width:0.69650364;stroke-opacity:0.52548996" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#a-1);stroke-width:1.86655128"
+           id="path38"
+           d="m 368.85544,529.27081 h 24.48495 v -7.76823 h -24.48495 z" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           style="fill:url(#c);stroke-width:1.86655128"
+           id="path40"
+           d="m 368.85544,510.73978 h 24.48495 v 10.77661 h -24.48495 z" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path42"
+           d="m 369.17535,511.23315 v 10.39277 c 15.18497,0.4954 13.60326,-6.5202 23.88464,-6.5202 v -4.0636 z"
+           style="color:#000000;fill:url(#d);stroke-width:1.86655128" />
+        <svg:path
+           d="m 378.98173,516.20822 c 0,2.26696 -1.77671,4.22479 -4.04694,4.22479 -2.17153,0 -4.04693,-1.85479 -4.04693,-4.22479 0,-2.26695 1.7767,-4.22478 4.04693,-4.22478 2.17153,0 4.04694,1.85478 4.04694,4.22478 z"
+           id="path46"
+           inkscape:connector-curvature="0"
+           style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 378.5869,516.20822 c 0,2.06087 -1.57929,3.81261 -3.65211,3.81261 -1.97411,0 -3.65211,-1.64869 -3.65211,-3.81261 0,-2.06087 1.57929,-3.81261 3.65211,-3.81261 1.97412,0 3.65211,1.6487 3.65211,3.81261 z"
+           id="path48"
+           inkscape:connector-curvature="0"
+           style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 378.19208,516.20822 c 0,1.85479 -1.48059,3.40044 -3.25729,3.40044 -1.7767,0 -3.25729,-1.54565 -3.25729,-3.40044 0,-1.85478 1.48059,-3.40043 3.25729,-3.40043 1.7767,0 3.25729,1.54565 3.25729,3.40043 z"
+           id="path50"
+           inkscape:connector-curvature="0"
+           style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 377.79726,516.20822 c 0,1.6487 -1.28318,2.98827 -2.86247,2.98827 -1.57929,0 -2.86247,-1.33957 -2.86247,-2.98827 0,-1.64869 1.28318,-2.98826 2.86247,-2.98826 1.57929,0 2.86247,1.33957 2.86247,2.98826 z"
+           id="path52"
+           inkscape:connector-curvature="0"
+           style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 377.40243,516.20822 c 0,1.44261 -1.08576,2.57609 -2.46764,2.57609 -1.38188,0 -2.46764,-1.13348 -2.46764,-2.57609 0,-1.44261 1.08576,-2.57609 2.46764,-2.57609 1.38188,0 2.46764,1.13348 2.46764,2.57609 z"
+           id="path54"
+           inkscape:connector-curvature="0"
+           style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 377.00761,516.20822 c 0,1.23653 -0.98706,2.16392 -2.07282,2.16392 -1.08576,0 -2.07282,-1.03044 -2.07282,-2.16392 0,-1.13348 0.98706,-2.16391 2.07282,-2.16391 1.08576,0 2.07282,1.03043 2.07282,2.16391 z"
+           id="path56"
+           inkscape:connector-curvature="0"
+           style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           d="m 376.61279,516.20822 c 0,1.03044 -0.78965,1.85479 -1.77671,1.85479 -0.98705,0 -1.7767,-0.82435 -1.7767,-1.85479 0,-1.03043 0.78965,-1.85478 1.7767,-1.85478 0.98706,0 1.77671,0.82435 1.77671,1.85478 z"
+           id="path58"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;stroke:none;stroke-width:1.16594219" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path60"
+           d="m 368.62961,509.93065 h 24.99118 c 0.0928,0 0.26869,0.0786 0.26869,0.17604 v 19.42363 c -0.002,0.33344 0.0133,0.41763 -0.18255,0.42904 l -25.07773,-0.0377 c -0.093,0 -0.16786,0.0973 -0.16786,0 V 510.1059 c 0,-0.0973 0.0749,-0.17604 0.16786,-0.17604 z"
+           style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.38485551" />
+        <svg:rect
+           id="rect62"
+           x="369.19418"
+           y="511.09503"
+           width="23.847"
+           height="17.876024"
+           style="color:#000000;opacity:0.84658999;fill:none;stroke:#4f4f4f;stroke-width:0.69650364" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/PreviousSlide.svg b/freeplane/resources/images/PreviousSlide.svg
new file mode 100644
index 0000000..4e98466
--- /dev/null
+++ b/freeplane/resources/images/PreviousSlide.svg
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Previous.svg">
+  <defs
+     id="defs8391">
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         offset="0"
+         id="stop2942-8-2-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2944-9-5-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         id="stop3158"
+         offset="0"
+         style="stop-color:#d40000;stop-opacity:1" />
+      <stop
+         id="stop3160"
+         offset="1"
+         style="stop-color:#f3fbfb;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4350-9-7-3"
+       id="linearGradient7743"
+       gradientUnits="userSpaceOnUse"
+       x1="182.54036"
+       y1="229.78313"
+       x2="182.6501"
+       y2="211.30733"
+       gradientTransform="matrix(1.2508606,0,0,1.2508606,-581.78526,295.08159)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4332-7-3-3"
+       id="linearGradient7745"
+       gradientUnits="userSpaceOnUse"
+       x1="184.5444"
+       y1="207.34468"
+       x2="184.58699"
+       y2="224.56676"
+       gradientTransform="matrix(1.3422813,0,0,1.3422813,-601.7188,277.91582)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2940-9-4-2"
+       id="linearGradient7747"
+       gradientUnits="userSpaceOnUse"
+       x1="184.15109"
+       y1="226.48277"
+       x2="184.2887"
+       y2="210.23618"
+       gradientTransform="matrix(1.3877987,0,0,1.3877987,-609.91672,265.26532)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient7749"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-79.75824"
+       y2="329.53061" />
+    <linearGradient
+       id="linearGradient2960-9-8">
+      <stop
+         style="stop-color:#8739af;stop-opacity:1;"
+         offset="0"
+         id="stop2962-6-5" />
+      <stop
+         style="stop-color:#e0c5ea;stop-opacity:1;"
+         offset="1"
+         id="stop2964-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-4-1"
+       id="linearGradient7751"
+       gradientUnits="userSpaceOnUse"
+       x1="-79.75824"
+       y1="329.53061"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       id="linearGradient2968-4-1">
+      <stop
+         style="stop-color:#8f379a;stop-opacity:1;"
+         offset="0"
+         id="stop2970-8-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-4-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9269"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9275"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9483"
+       gradientUnits="userSpaceOnUse"
+       x1="-360.21201"
+       y1="567.90027"
+       x2="-354.95758"
+       y2="567.263"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-9-8"
+       id="linearGradient9485"
+       x1="-356.0567"
+       y1="567.80634"
+       x2="-360.21201"
+       y2="567.90027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,-86.096652,-3.0965001)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0377796"
+     inkscape:cx="9.6068307"
+     inkscape:cy="44.465383"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-391.12787,-691.06306)">
+    <g
+       transform="translate(53.061554,138.71119)"
+       id="g9277">
+      <circle
+         transform="scale(-1,1)"
+         id="path4326-5-9"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ff00ff;stroke:#800080;stroke-width:0.96188784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35187"
+         r="15.519055" />
+      <circle
+         transform="scale(-1,1)"
+         id="path4340-4-2"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7743);stroke-width:2.95701718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35193"
+         r="13.798415" />
+      <circle
+         transform="scale(-1,1)"
+         id="path4356-3-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7745);stroke-width:1.29703701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35193"
+         r="12.193909" />
+      <circle
+         transform="scale(-1,1)"
+         id="path4368-2-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+         cx="-354.06631"
+         cy="568.35187"
+         r="11.606822" />
+      <path
+         inkscape:transform-center-x="1.7243515"
+         inkscape:transform-center-y="0.075110753"
+         transform="matrix(0.2114708,-0.36889765,0.36889763,0.21147081,239.30211,469.7741)"
+         d="m -53.23773,345.69211 -23.767219,13.72201 0,-27.44402 z"
+         inkscape:randomized="0"
+         inkscape:rounded="2.5777991e-015"
+         inkscape:flatsided="true"
+         sodipodi:arg2="1.0471976"
+         sodipodi:arg1="0"
+         sodipodi:r2="7.2885256"
+         sodipodi:r1="15.844812"
+         sodipodi:cy="345.69211"
+         sodipodi:cx="-69.082542"
+         sodipodi:sides="3"
+         id="path2956-3"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7749);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7751);stroke-width:1.18207157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         sodipodi:type="star" />
+      <rect
+         ry="0"
+         transform="scale(-1,1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient9269);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9275);stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker [...]
+         id="rect3105-3-2-1"
+         width="2.8179185"
+         height="11.303813"
+         x="-360.08038"
+         y="562.73865" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Print24.gif b/freeplane/resources/images/Print24.gif
deleted file mode 100644
index e6b4fb1..0000000
Binary files a/freeplane/resources/images/Print24.gif and /dev/null differ
diff --git a/freeplane/resources/images/ReminderHookAction.svg b/freeplane/resources/images/ReminderHookAction.svg
new file mode 100644
index 0000000..4262c1e
--- /dev/null
+++ b/freeplane/resources/images/ReminderHookAction.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.030081"
+   width="16.016481"
+   version="1.1"
+   viewBox="0 0 16.016482 16.030081"
+   id="svg3688"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="reminderhookaction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3740"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="344.07447"
+     inkscape:cy="-440.26707"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3688" />
+  <defs
+     id="defs3690">
+    <linearGradient
+       id="c">
+      <stop
+         stop-color="#fefdb7"
+         offset="0"
+         id="stop3693" />
+      <stop
+         stop-color="#f5f06c"
+         offset="1"
+         id="stop3695" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="-130.78999"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="463.22"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       y1="340.63"
+       x1="41.688999" />
+    <filter
+       id="d"
+       height="1.3585"
+       width="1.3599"
+       y="-0.17925"
+       x="-0.17994"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         stdDeviation="18.47879"
+         id="feGaussianBlur3699" />
+    </filter>
+    <linearGradient
+       id="b"
+       y2="354.38"
+       gradientUnits="userSpaceOnUse"
+       x2="690.78998"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       y1="584.52002"
+       x1="351.57999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3702" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3704" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#c"
+       id="linearGradient4956"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x1="41.688999"
+       y1="340.63"
+       x2="463.22"
+       y2="-130.78999" />
+  </defs>
+  <metadata
+     id="metadata3706">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(345.96723,-89.14794)"
+     id="g3708">
+    <g
+       transform="translate(21.268,0.13654)"
+       id="g3710">
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -5.3082,-0.0724 -10.676,-0.56905 -15.599,-0.25452 0.0184,0.0502 1.046,0.92855 -0.0573,-0.0546 -0.0953,-6.449 0.42493,-9.0149 0,-14.888 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3712"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4956);fill-rule:evenodd" />
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -8.4954,-0.85078 -15.577,-0.3319 -15.577,-0.3319 0,0 0.11023,-5.6825 -0.0793,-14.866 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3714"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);fill-rule:evenodd;stroke:#000000;stroke-width:0.17726" />
+      <path
+         d="m -351.37,89.641 -7.2382,-0.02664 -8.5923,-0.12695 c 0,0 -0.92022,22.89 6.7128,10.332 7.63302,-12.558 8.3328,-8.5522 9.1177,-10.179 z"
+         id="path3716"
+         inkscape:connector-curvature="0"
+         style="opacity:0.27778003;fill:url(#b);fill-rule:evenodd;stroke-width:1pt" />
+      <g
+         transform="matrix(1.4497,0,0,1.4497,161.55,-40.215)"
+         id="g3718">
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-364.14,88.088)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3720"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#a0892c;filter:url(#d)" />
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-363.86,87.746)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3722"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <path
+           d="m -357.93,90.386 -1.1895,0.21751 -0.24904,1.1252 c 0.13821,0.02106 0.28251,0.02138 0.42892,-0.0054 0.65989,-0.1206 1.1056,-0.71584 1.0096,-1.3373 z"
+           id="path3724"
+           inkscape:connector-curvature="0"
+           style="fill:#ee0000" />
+        <path
+           d="m -359.11,89.411 c -0.0819,-8.19e-4 -0.16521,0.0062 -0.24904,0.02151 -0.67064,0.12256 -1.121,0.73528 -1.0054,1.3676 0.0903,0.49431 0.50031,0.85354 0.99517,0.92895 l 0.24904,-1.1252 1.1895,-0.21751 c -0.002,-0.01011 -0.002,-0.02018 -0.004,-0.03031 -0.10112,-0.55331 -0.60231,-0.93934 -1.1753,-0.94508 z"
+           id="path3726"
+           inkscape:connector-curvature="0"
+           style="fill:#ff0000" />
+        <path
+           d="m -359.61,90.043 -0.0893,0.06601 -0.1647,0.12316 c -0.0672,0.14292 -0.0579,0.29457 -0.0158,0.45566 0.10919,0.41794 0.42004,0.62224 0.85865,0.57241 0.22452,-0.02551 0.4302,-0.10101 0.55634,-0.26144 l 0.22874,-0.28684 -1.374,-0.66897 z"
+           id="path3728"
+           inkscape:connector-curvature="0"
+           style="fill:#aa0000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.52,87.832)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3730"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.46,87.769)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3732"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#ff0000" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.76724,0,0,0.80498,-219.15,-610.87)"
+       id="g3734"
+       style="fill:#ff0000">
+      <path
+         style="color:#000000"
+         d="m -161.28,889.17 c 0.59165,-6.8804 5.7208,-14.856 13.736,-16 l 1.3818,2.3683 c -7.776,1.6244 -12.057,5.7928 -15.118,13.632 z"
+         id="path3736"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000"
+         d="m -164.97,874.34 c 6.9053,0.0759 15.242,4.5947 16.982,12.502 l -2.2584,1.555 c -2.2009,-7.6329 -6.6776,-11.591 -14.723,-14.057 z"
+         id="path3738"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/RemoveEncryption.svg b/freeplane/resources/images/RemoveEncryption.svg
new file mode 100644
index 0000000..9a95ff4
--- /dev/null
+++ b/freeplane/resources/images/RemoveEncryption.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003298"
+   width="16"
+   version="1.1"
+   viewBox="0 0 16 16.003298"
+   id="svg4099"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="xx007.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview4142"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.89702957"
+     inkscape:cx="76.082597"
+     inkscape:cy="30.981526"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4099" />
+  <defs
+     id="defs4101">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="498.92001"
+       cx="453.10999"
+       gradientTransform="matrix(1.372,0.93823,-0.52585,0.76894,99.161,-331.72)"
+       r="8.4835997">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop4104" />
+      <stop
+         stop-color="#7c7c7c"
+         offset="1"
+         id="stop4106" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="536.09998"
+       gradientUnits="userSpaceOnUse"
+       x2="501.47"
+       gradientTransform="translate(-74.951,-42.905)"
+       y1="543.42999"
+       x1="517.95001">
+      <stop
+         stop-color="#8dd35f"
+         offset="0"
+         id="stop4109" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop4111" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="514.45001"
+       gradientUnits="userSpaceOnUse"
+       x2="486.73999"
+       y1="506.23001"
+       x1="475.91">
+      <stop
+         stop-color="#5aa02c"
+         offset="0"
+         id="stop4114" />
+      <stop
+         stop-color="#e3f4d7"
+         offset="1"
+         id="stop4116" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4118">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(381.89499,-57.946704)"
+     id="g4120">
+    <g
+       transform="matrix(0.5,0,0,0.5,-608.32,-178.85)"
+       id="g4122">
+      <path
+         d="m 459.53,485.08 -4.8985,0.0645 0.043,-5.5001 c 0.11486,-3.0714 3.5127,-5.5766 7.8204,-5.543 4.4752,-7e-4 7.9512,2.8412 8.0353,5.5001 v 9.6681 h -4.8555 v -9.2384 c -0.07,-1.0834 -1.4878,-2.0378 -3.0316,-1.9984 -1.3368,-0.002 -3.0735,0.31689 -3.156,2.0843 l 0.043,4.963 z"
+         id="path4124"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);fill-rule:evenodd;stroke:#484848;stroke-width:0.99571002px" />
+      <rect
+         transform="scale(-1,-1)"
+         rx="0.16552"
+         ry="0.18513"
+         height="32"
+         width="32"
+         y="-505.60001"
+         x="-484.85001"
+         id="rect4126"
+         style="fill:none" />
+      <g
+         transform="translate(38,0)"
+         id="g4128"
+         style="stroke-linecap:round">
+        <rect
+           height="17.902"
+           width="21.143999"
+           y="487.20001"
+           x="424.04999"
+           id="rect4130"
+           style="fill:url(#c);stroke:#225500" />
+        <path
+           d="m 434.6,491.64 c -1.1338,0 -2.0312,0.89746 -2.0312,2.0312 0,0.87514 0.54097,1.6418 1.3125,1.9375 l -0.40625,1.375 -1.0938,3.6875 h 2.2188 2.25 l -1.1562,-3.6875 -0.40625,-1.375 c 0.80119,-0.28016 1.375,-1.0411 1.375,-1.9375 0,-1.1338 -0.9287,-2.0313 -2.0625,-2.0312 z"
+           id="path4132"
+           inkscape:connector-curvature="0"
+           style="stroke:#2d5016;stroke-width:0.66838002" />
+        <circle
+           transform="translate(-47.222,-13.985)"
+           cy="510.14001"
+           cx="481.84"
+           r="6.7778001"
+           id="circle4134"
+           d="m 488.6178,510.14001 c 0,3.74328 -3.03453,6.7778 -6.7778,6.7778 -3.74328,0 -6.7778,-3.03452 -6.7778,-6.7778 0,-3.74327 3.03452,-6.7778 6.7778,-6.7778 3.74327,0 6.7778,3.03453 6.7778,6.7778 z"
+           sodipodi:cx="481.84"
+           sodipodi:cy="510.14001"
+           sodipodi:rx="6.7778001"
+           sodipodi:ry="6.7778001"
+           style="fill:none;stroke:url(#b)" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.76724,0,0,0.80498,-255.32,-641.95)"
+       id="g4136"
+       style="fill:#ff0000">
+      <path
+         style="color:#000000"
+         d="m -161.28,889.17 c 0.59165,-6.8804 5.7208,-14.856 13.736,-16 l 1.3818,2.3683 c -7.776,1.6244 -12.057,5.7928 -15.118,13.632 z"
+         id="path4138"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000"
+         d="m -164.97,874.34 c 6.9053,0.0759 15.242,4.5947 16.982,12.502 l -2.2584,1.555 c -2.2009,-7.6329 -6.6776,-11.591 -14.723,-14.057 z"
+         id="path4140"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/RemoveNoteAction.svg b/freeplane/resources/images/RemoveNoteAction.svg
new file mode 100644
index 0000000..481cd76
--- /dev/null
+++ b/freeplane/resources/images/RemoveNoteAction.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999 15.873" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19981 .17870 -.15894 .16574 241.58 572.22)" r="6.9383"/>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#b9150a" offset="1"/>
+</linearGradient>
+<radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19981 .17871 -.14353 .14931 230.51 584.03)" r="6.9383"/>
+<radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19980 .17871 -.15040 .15662 235.45 578.78)" r="6.9383"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-37.414 -188.1)">
+<g transform="matrix(.96975 0 0 .96975 392.09 12.019)">
+<g transform="matrix(.46366 .045272 0 .43177 -122.99 -96.5)">
+<rect transform="matrix(.92114 -.38924 0 1 0 0)" height="29.416" width="24.606" stroke="#d40000" y="485.68" x="-567.88" fill="#ff0"/>
+<g>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 266.93)" cy="721.26" r="2.962" fill="url(#d)"/>
+<rect ry=".18629" rx=".12231" transform="matrix(.92114 -.38924 0 1 0 0)" height="2.0194" width="13.971" y="490.23" x="-560.16"/>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 278.47)" cy="721.26" r="2.962" fill="url(#b)"/>
+<rect ry=".18629" rx=".12231" transform="matrix(.92114 -.38924 0 1 0 0)" height="2.0194" width="13.971" y="501.77" x="-560.16"/>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 272.7)" cy="721.26" r="2.962" fill="url(#c)"/>
+<g transform="matrix(1 -.42257 0 1 -640.34 117.66)">
+<rect rx=".11266" ry=".18629" height="2.0194" width="12.869" y="648.93" x="124.36"/>
+</g>
+<circle cx="160.79" transform="matrix(.64502 -.27257 0 .67601 -623.02 284.24)" cy="721.26" r="2.962" fill="url(#b)"/>
+<rect ry=".18629" rx=".12231" transform="matrix(.92114 -.38924 0 1 0 0)" height="2.0194" width="13.971" y="507.54" x="-560.16"/>
+</g>
+</g>
+<g transform="matrix(.76724 0 0 .80498 -237.1 -520.76)" fill="#d20000">
+<path style="color:#000000" d="m-161.28 889.17c0.59165-6.8804 5.7208-14.856 13.736-16l1.3818 2.3683c-7.776 1.6244-12.057 5.7928-15.118 13.632z"/>
+<path style="color:#000000" d="m-164.97 874.34c6.9053 0.0759 15.242 4.5947 16.982 12.502l-2.2584 1.555c-2.2009-7.6329-6.6776-11.591-14.723-14.057z"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/RemoveSlideContent.svg b/freeplane/resources/images/RemoveSlideContent.svg
new file mode 100644
index 0000000..f85fabd
--- /dev/null
+++ b/freeplane/resources/images/RemoveSlideContent.svg
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.499912"
+   height="31.000242"
+   viewBox="0 0 40.499913 31.000242"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="RemoveSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         id="stop3775"
+         offset="0.00000000"
+         style="stop-color:#24424c;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3777"
+         offset="1.0000000"
+         style="stop-color:#79dfee;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         id="stop8253"
+         offset="0.00000000"
+         style="stop-color:#000000;stop-opacity:0.25098041;" />
+      <stop
+         id="stop8255"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         id="stop8985"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.37254903;" />
+      <stop
+         id="stop8987"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.094117649;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.318188"
+     inkscape:cx="9.7504427"
+     inkscape:cy="17.519139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.289351,-1194.1475)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.821793"
+       height="30.321701"
+       x="94.62841"
+       y="1194.4867"
+       rx="1.7965614"
+       ry="1.801149" />
+    <path
+       id="path4779"
+       d="m 95.228437,1211.1015 c 3.750646,-0.06 4.695822,1.1982 6.454233,0.1766 3.72674,-2.3859 8.43121,1.6818 11.60983,1.9587 -2.58906,0.2525 -7.22324,-4.1479 -10.89504,-1.2545 -3.007941,1.8366 -3.329638,0.067 -7.147566,1.8397 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       id="path4783"
+       d="m 95.217347,1206.8757 c 0,0 1.398169,-0.2395 2.774976,-1.7377 2.210167,-2.219 5.772937,-3.0124 9.411097,-3.0731 -2.99799,0.4147 -5.73537,0.1357 -9.065835,3.4714 -1.565615,1.6489 -1.522845,3.1408 -3.133932,3.8599 0,0 0.0136,-2.5205 0.0136,-2.5205 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.57749999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#800080;stroke-width:0.703125;stroke-linejoin:round;stroke-opacity:1"
+       rx="1.5023199"
+       ry="1.6418104"
+       height="7.4449801"
+       width="13.285905"
+       y="1209.1278"
+       x="-126.32931"
+       id="rect4717"
+       transform="scale(-1,1)" />
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1"
+       rx="1.2406157"
+       ry="1.3761101"
+       height="6.2402339"
+       width="10.971343"
+       y="-1203.3688"
+       x="-115.24412"
+       id="rect4729"
+       transform="scale(-1)" />
+    <rect
+       transform="scale(-1,1)"
+       id="rect4792"
+       x="-128.34381"
+       y="1207.0253"
+       width="17.227909"
+       height="11.628439"
+       ry="2.5643706"
+       rx="1.9480666"
+       style="fill:none;fill-rule:evenodd;stroke:#008000;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g4483"
+       transform="matrix(0.55804803,0,0,0.55804803,-302.15764,884.35509)"
+       style="stroke-width:0.57493651">
+      <g
+         id="g5002"
+         style="stroke-width:0.57493651">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3736"
+           d="m 742.1706,607.98132 c 1.33669,-16.30925 12.92478,-35.21456 31.03321,-37.92629 l 3.12185,5.6138 c -17.56802,3.85047 -27.23992,13.73121 -34.15551,32.3132 z"
+           style="color:#000000;fill:#ff0000;stroke-width:0.57493651" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3738"
+           d="m 733.83392,572.82839 c 15.60088,0.17991 34.43566,10.89124 38.36678,29.63465 l -5.10232,3.68596 c -4.97241,-18.09297 -15.08644,-27.47522 -33.2631,-33.32061 z"
+           style="color:#000000;fill:#ff0000;stroke-width:0.57493651" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/RevisionPluginAction.svg b/freeplane/resources/images/RevisionPluginAction.svg
new file mode 100644
index 0000000..653cab7
--- /dev/null
+++ b/freeplane/resources/images/RevisionPluginAction.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-133.35 -116.7)">
+<g transform="translate(544.71 -354.01)">
+<rect stroke-linejoin="round" rx="1.7127" ry="1.6145" height="7.3211" width="15.146" stroke="#000080" y="475.05" x="-410.93" stroke-width=".85381" fill="#ff0"/>
+<rect style="color:#000000" height="16" width="16" y="470.71" x="-411.36" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/Save24.gif b/freeplane/resources/images/Save24.gif
deleted file mode 100644
index bfa98a8..0000000
Binary files a/freeplane/resources/images/Save24.gif and /dev/null differ
diff --git a/freeplane/resources/images/SaveAs24.gif b/freeplane/resources/images/SaveAs24.gif
deleted file mode 100644
index 97eb6fa..0000000
Binary files a/freeplane/resources/images/SaveAs24.gif and /dev/null differ
diff --git a/freeplane/resources/images/ScriptEditor.svg b/freeplane/resources/images/ScriptEditor.svg
new file mode 100644
index 0000000..54369d7
--- /dev/null
+++ b/freeplane/resources/images/ScriptEditor.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="15.998967"
+   width="16.311928"
+   version="1.1"
+   viewBox="0 0 16.311928 15.998967"
+   id="svg3742"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="scripteditor.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3805"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="343.55251"
+     inkscape:cy="-311.32193"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3742" />
+  <defs
+     id="defs3744">
+    <linearGradient
+       id="g"
+       y2="445.79001"
+       gradientUnits="userSpaceOnUse"
+       x2="211.72"
+       gradientTransform="matrix(0.30109,-0.023603,0.01579,0.30158,-424.21,127.29)"
+       y1="439.14001"
+       x1="208.3">
+      <stop
+         stop-color="#f70000"
+         offset="0"
+         id="stop3747" />
+      <stop
+         stop-color="#780000"
+         offset="1"
+         id="stop3749" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       y2="449.60001"
+       gradientUnits="userSpaceOnUse"
+       x2="194.27"
+       gradientTransform="matrix(0.30109,-0.023603,0.01579,0.30158,-418.23,128.78)"
+       y1="456.23999"
+       x1="202.53">
+      <stop
+         stop-color="#baa492"
+         offset="0"
+         id="stop3752" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="449.64001"
+       gradientUnits="userSpaceOnUse"
+       x2="193.03999"
+       gradientTransform="matrix(0.30109,-0.023603,0.01579,0.30158,-418.23,128.78)"
+       y1="457.89001"
+       x1="203.5">
+      <stop
+         offset="0"
+         id="stop3757" />
+      <stop
+         stop-color="#7e7e7e"
+         offset="1"
+         id="stop3759" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="462.64999"
+       gradientUnits="userSpaceOnUse"
+       x2="196.75"
+       gradientTransform="matrix(0.30109,-0.023603,0.01579,0.30158,-418.23,128.78)"
+       y1="458.87"
+       x1="193.00999">
+      <stop
+         stop-color="#c00000"
+         offset="0"
+         id="stop3762" />
+      <stop
+         offset="1"
+         id="stop3764" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="166.63"
+       gradientUnits="userSpaceOnUse"
+       x2="-239.53999"
+       y1="192.64"
+       x1="-241.17">
+      <stop
+         stop-color="#c8e3ee"
+         offset="0"
+         id="stop3767" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3769" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="170.07001"
+       gradientUnits="userSpaceOnUse"
+       x2="-230.53"
+       y1="173.28"
+       x1="-229.32001">
+      <stop
+         stop-color="#90c7dc"
+         offset="0"
+         id="stop3772" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3774" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="191.92999"
+       gradientUnits="userSpaceOnUse"
+       x2="-245.73"
+       y1="194.64"
+       x1="-245.55">
+      <stop
+         stop-color="#64afd2"
+         offset="0"
+         id="stop3777" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3779" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3781">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.0187,0,0,1.0187,373.06527,-252.15219)"
+     id="g3783">
+    <g
+       transform="matrix(0.55109,0,0,0.57877,-225.46,149.37)"
+       id="g3785"
+       style="stroke-width:1px;stroke-linejoin:round">
+      <path
+         d="m -234.63,195.29 -17.922,-0.12801 c 8.8005,-1.9328 -0.41555,-23.448 5.7606,-24.963 l 18.07,-0.0756 c -6.9699,0.86566 0.94577,25.241 -5.9087,25.166 z"
+         id="path3787"
+         inkscape:connector-curvature="0"
+         style="fill:url(#c);stroke:#0073b3" />
+      <path
+         d="m -231.5,173.78 4.6146,0.0567 c 0.13634,-1.7956 -0.74159,-3.7591 -1.9593,-3.7557 -1.9505,0.50173 -2.2545,2.4591 -2.6554,3.699 z"
+         id="path3789"
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);stroke:#0073b3" />
+      <path
+         d="m -252.62,195.16 c -2.0319,-0.87677 -2.019,-2.4351 -2.2929,-3.8979 h 18.458 c 0.17074,1.9039 0.56722,3.7897 1.9776,3.9266 z"
+         id="path3791"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);stroke:#0072af" />
+    </g>
+    <g
+       transform="matrix(0.97595,-0.218,0.218,0.97595,-64.163,-70.895)"
+       id="g3793">
+      <path
+         d="m -357.35,259.6 6.8196,-4.6887 c 0.59584,-0.48206 0.27723,-1.5639 0.0348,-2.172 -0.23151,-0.63181 -0.63889,-0.98063 -1.4592,-0.48175 l -7.4737,5.1104"
+         id="path3795"
+         inkscape:connector-curvature="0"
+         style="fill:url(#g);fill-rule:evenodd;stroke:#550000;stroke-width:0.35565001;stroke-linejoin:round" />
+      <g
+         transform="matrix(0.89468,0.089694,-0.22601,0.87614,13.568,62.018)"
+         id="g3797"
+         style="fill-rule:evenodd;stroke-width:0.35549px;stroke-linejoin:round">
+        <path
+           d="m -351.56,258.97 -1.0297,2.8715 1.1454,1.0197 2.8613,-1.5036 c 0.0577,-0.55003 0.18233,-1.0802 -0.67302,-1.146 -0.10957,-0.44139 -0.0201,-0.95886 -0.9452,-0.90969 -0.34393,-0.9716 -0.92205,-0.46897 -1.3588,-0.33188 z"
+           id="path3799"
+           inkscape:connector-curvature="0"
+           style="fill:url(#f);stroke:url(#e)" />
+        <path
+           d="m -352.59,261.86 -0.62495,1.7792 1.7861,-0.78254 c -0.23617,-0.78087 -0.51585,-1.2232 -1.1611,-0.99667 z"
+           id="path3801"
+           inkscape:connector-curvature="0"
+           style="fill:url(#d);stroke:#750000;stroke-opacity:0.83870999" />
+      </g>
+      <path
+         d="m -350.43,254.9 -6.8443,4.7424"
+         id="path3803"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:0.28942999" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SelectSlideContent.svg b/freeplane/resources/images/SelectSlideContent.svg
new file mode 100644
index 0000000..7f6fb13
--- /dev/null
+++ b/freeplane/resources/images/SelectSlideContent.svg
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.499912"
+   height="31.000242"
+   viewBox="0 0 40.499913 31.000242"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="SelectSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         id="stop3775"
+         offset="0.00000000"
+         style="stop-color:#24424c;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3777"
+         offset="1.0000000"
+         style="stop-color:#79dfee;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         id="stop8253"
+         offset="0.00000000"
+         style="stop-color:#000000;stop-opacity:0.25098041;" />
+      <stop
+         id="stop8255"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         id="stop8985"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.37254903;" />
+      <stop
+         id="stop8987"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.094117649;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.318188"
+     inkscape:cx="9.7504427"
+     inkscape:cy="17.519139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.289351,-1194.1475)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.821793"
+       height="30.321701"
+       x="94.62841"
+       y="1194.4867"
+       rx="1.7965614"
+       ry="1.801149" />
+    <path
+       id="path4779"
+       d="m 95.310185,1214.3168 c 3.72305,-0.068 4.66127,1.369 6.406745,0.2018 3.69933,-2.726 8.3692,1.9216 11.52442,2.238 -2.57002,0.2885 -7.1701,-4.7393 -10.81489,-1.4334 -2.985809,2.0984 -3.305141,0.076 -7.094975,2.102 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       id="path4783"
+       d="m 95.308996,1209.4886 c 0,0 1.281774,-0.2737 2.543952,-1.9855 2.026153,-2.5353 5.292302,-3.4419 8.627572,-3.5112 -2.74839,0.4738 -5.25787,0.155 -8.31106,3.9663 -1.435263,1.884 -1.39606,3.5886 -2.873017,4.4102 0,0 0.01246,-2.8798 0.01246,-2.8798 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.57750005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#d5ffff;fill-rule:evenodd;stroke:#800080;stroke-width:0.703125;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+       rx="1.7153306"
+       ry="1.8758794"
+       height="8.5063934"
+       width="15.169684"
+       y="1212.0616"
+       x="-128.17464"
+       id="rect4717"
+       transform="scale(-1,1)" />
+    <rect
+       style="fill:#d5ffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+       rx="1.4165199"
+       ry="1.5722989"
+       height="7.1298895"
+       width="12.526945"
+       y="-1205.4816"
+       x="-115.51771"
+       id="rect4729"
+       transform="scale(-1)" />
+    <rect
+       transform="scale(-1,1)"
+       id="rect4792"
+       x="-130.48672"
+       y="1209.921"
+       width="19.793903"
+       height="12.787285"
+       ry="2.8199263"
+       rx="2.2382195"
+       style="fill:none;fill-rule:evenodd;stroke:#009d00;stroke-width:0.68741626;stroke-linejoin:round;stroke-opacity:1" />
+    <rect
+       style="fill:none;fill-rule:evenodd;stroke:#009d00;stroke-width:0.70312494;stroke-linejoin:round;stroke-opacity:1"
+       rx="1.8869616"
+       ry="2.4503417"
+       height="11.11136"
+       width="16.687527"
+       y="1196.3427"
+       x="-117.60655"
+       id="rect4792-6"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SetAcceleratorOnNextClickAction.svg b/freeplane/resources/images/SetAcceleratorOnNextClickAction.svg
new file mode 100644
index 0000000..4a0d03c
--- /dev/null
+++ b/freeplane/resources/images/SetAcceleratorOnNextClickAction.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16.003721"
+   version="1.1"
+   viewBox="0 0 16.003721 16"
+   id="svg3807"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="SetAcceleratorOnNextClickAction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="864"
+     inkscape:window-height="480"
+     id="namedview3856"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="7.4212307"
+     inkscape:cx="3.3013392"
+     inkscape:cy="9.6038959"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3807" />
+  <defs
+     id="defs3809">
+    <radialGradient
+       id="b"
+       gradientUnits="userSpaceOnUse"
+       cy="29.5"
+       cx="24.5"
+       gradientTransform="matrix(-0.66258,0,0,0.77605268,22.08375,-12.555874)"
+       r="15.095">
+      <stop
+         stop-color="#f2f4f1"
+         offset="0"
+         id="stop3812" />
+      <stop
+         stop-color="#d3d7cf"
+         offset="1"
+         id="stop3814" />
+    </radialGradient>
+    <linearGradient
+       id="e"
+       y2="34.095001"
+       gradientUnits="userSpaceOnUse"
+       x2="24.094999"
+       gradientTransform="matrix(-0.30564,0,0,0.35798862,13.21375,-0.077362)"
+       y1="12.595"
+       x1="24.094999">
+      <stop
+         stop-color="#eeeeec"
+         offset="0"
+         id="stop3817" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3819" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="8.1619997"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="39.438"
+       gradientTransform="matrix(0.30759,0,0,0.36026052,2.77375,-0.450361)"
+       y1="6.7174001"
+       x1="38.292999" />
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="0"
+         id="stop3823" />
+      <stop
+         stop-color="#fff"
+         offset=".5"
+         id="stop3825" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3827" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="6.7844"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="9.0675001"
+       gradientTransform="matrix(0.30759,0,0,0.36026052,-1.53625,-0.450361)"
+       y1="7.9334002"
+       x1="8.1169004" />
+  </defs>
+  <metadata
+     id="metadata3830">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4496">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3836"
+       display="block"
+       d="m 1.55375,1.177271 12.898,0 c 0.77265,0 1.3947,0.7473657 1.3947,1.6756698 l 0,10.3241602 c 0,0.928338 -0.62203,1.67567 -1.3947,1.67567 l -12.898,0 c -0.77265,0 -1.3947,-0.747355 -1.3947,-1.67567 l 0,-10.3241602 c 0,-0.9283267 0.62203,-1.6756698 1.3947,-1.6756698 z"
+       style="color:#000000;display:block;fill:#d3d7cf;stroke:#50514e;stroke-width:0.33288467" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3838"
+       display="block"
+       d="m 13.75375,2.251056 -11.267,0 c -0.60565,0 -1.0932,0.5710841 -1.0932,1.2804038 l 0,7.8890422 c 0,0.709365 0.48757,1.280404 1.0932,1.280404 l 11.267,0 c 0.60564,0 1.0932,-0.571085 1.0932,-1.280404 l 0,-7.8890422 c 0,-0.7093649 -0.48758,-1.2804038 -1.0932,-1.2804038 z"
+       style="color:#000000;display:block;fill:url(#b);stroke:url(#e);stroke-width:0.33288467" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3840"
+       display="block"
+       d="m 1.54375,1.527664 12.896,0 c 0.6028,0 1.0881,0.568394 1.0881,1.2744133 l 0,10.4246437 c 0,0.706031 -0.48528,1.274413 -1.0881,1.274413 l -12.896,0 c -0.6028,0 -1.0881,-0.568405 -1.0881,-1.274413 l 0,-10.4246437 c 0,-0.7060419 0.48528,-1.2744133 1.0881,-1.2744133 z"
+       style="color:#000000;display:block;opacity:0.48888999;fill:none;stroke:#ffffff;stroke-width:0.33288467" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3842"
+       d="m 0.29375,13.41842 c 0.0192,0.405292 0.4037,1.058277 0.86508,1.193371 l 0.67285,-1.981416 -0.28837,-0.247683 -1.2496,1.035762 z"
+       display="block"
+       style="color:#000000;display:block;opacity:0.48888999;fill:#ffffff" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3844"
+       display="block"
+       d="m 15.71375,13.41842 c -0.0192,0.405292 -0.40371,1.058277 -0.86509,1.193371 l -0.67284,-1.981416 0.28836,-0.247683 1.2496,1.035762 z"
+       style="color:#000000;display:block;opacity:0.48888999;fill:#ffffff" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3846"
+       d="M 15.54375,2.11542 C 15.40918,1.9127685 15.17849,1.5299924 14.87091,1.4174145 L 14.27496,2.3405871 14.56332,2.7008476 15.54375,2.11542 Z"
+       display="block"
+       style="color:#000000;display:block;fill:url(#d)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3848"
+       display="block"
+       d="M 0.44375,2.11542 C 0.57832,1.9127685 0.78978,1.552508 1.09737,1.4399301 L 1.67409,2.4081338 1.46263,2.7684056 0.44373,2.11542 Z"
+       style="color:#000000;display:block;fill:url(#c)" />
+    <g
+       id="text3850"
+       style="font-size:4.37584257px;line-height:125%;font-family:Sans;letter-spacing:0.36465177px;word-spacing:0px;fill:#000000;stroke:#000000;stroke-width:0.22683489"
+       transform="scale(0.94059602,1.0631557)">
+      <path
+         id="path4488"
+         style="stroke-width:0.22683489"
+         d="m 5.0188084,5.8594318 0,0.4551047 Q 4.8008709,6.1115555 4.5530204,6.0111334 4.3073066,5.9107112 4.0295432,5.9107112 q -0.5469803,0 -0.8375636,0.3354528 -0.2905833,0.3333161 -0.2905833,0.9657621 0,0.6303093 0.2905833,0.9657621 0.2905833,0.3333162 0.8375636,0.3333162 0.2777634,0 0.5234772,-0.1004222 Q 4.8008709,8.31016 5.0188084,8.107179 l 0,0.4508315 Q 4.7923243,8.7118487 4.538064,8.7887678 q -0.2521238,0.076919 -0.5341605,0.076919 -0.7243216,0 -1.1409668,-0.4422849 -0.4166451 [...]
+      <path
+         id="path4490"
+         style="stroke-width:0.22683489"
+         d="m 5.6120807,5.613718 2.6985787,0 0,0.3632291 -1.1324202,0 0,2.8267772 -0.4337383,0 0,-2.8267772 -1.1324202,0 0,-0.3632291 z" />
+      <path
+         id="path4492"
+         style="stroke-width:0.22683489"
+         d="m 10.606835,7.308075 q 0.138882,0.047006 0.269217,0.2008443 0.132472,0.1538382 0.264944,0.4230551 l 0.438012,0.8717499 -0.463652,0 -0.408098,-0.8183339 Q 10.549146,7.6648942 10.399581,7.5601987 10.252153,7.4555033 9.9957559,7.4555033 l -0.4700612,0 0,1.348221 -0.4316017,0 0,-3.1900063 0.974309,0 q 0.54698,0 0.816197,0.2286206 0.269217,0.2286207 0.269217,0.6901354 0,0.3012665 -0.141019,0.4999742 -0.138881,0.1987077 -0.405962,0.2756268 z m -1.0811403,-1.3396745 0,1.1324202 0.54 [...]
+      <path
+         id="path4494"
+         style="stroke-width:0.22683489"
+         d="m 12.501322,5.613718 0.431602,0 0,2.8267772 1.553339,0 0,0.3632291 -1.984941,0 0,-3.1900063 z" />
+    </g>
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="2.3437502e-007"
+       x="0.0037207031"
+       id="rect3854" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SetFilterSlideContent.svg b/freeplane/resources/images/SetFilterSlideContent.svg
new file mode 100644
index 0000000..9bb7bf8
--- /dev/null
+++ b/freeplane/resources/images/SetFilterSlideContent.svg
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.710093mm"
+   height="8.1957636mm"
+   viewBox="0 0 37.949148 29.040108"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="SetFilterSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08334743,0,0,0.08361326,79.89008,1190.9851)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </radialGradient>
+    <linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </linearGradient>
+    <linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </linearGradient>
+    <linearGradient
+       x1="295.32"
+       y1="563.58"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76"
+       id="b-4">
+      <stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </linearGradient>
+    <linearGradient
+       x1="290.75"
+       y1="558.21"
+       x2="290.7"
+       gradientUnits="userSpaceOnUse"
+       y2="557.24"
+       id="a-8">
+      <stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.7776558"
+     inkscape:cx="18.612801"
+     inkscape:cy="23.933031"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1194.0722)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="37.270817"
+       height="28.361774"
+       x="94.538063"
+       y="1194.4114"
+       rx="1.6814741"
+       ry="1.6847268" />
+    <g
+       id="g4552"
+       transform="translate(-0.95881879)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 104.51445,1206.7632 c 2.10291,-0.044 4.04549,1.9859 6.25314,0.1679 2.08951,-1.752 4.97537,1.2922 6.75756,1.4955 -1.48981,-0.1579 -4.04993,-3.0459 -6.10862,-0.9213 -3.08471,3.1449 -4.74251,1.2117 -6.89005,1.2556 z"
+         id="path4779" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+         d="m 101.91962,1207.2905 c 2.00909,0.6225 3.81699,1.3647 5.43662,3.7218 1.52428,2.2611 3.58056,4.7975 5.34964,5.0943 -1.47549,-0.2598 -3.17558,-2.8563 -4.56734,-5.4669 -2.09607,-3.8747 -3.60369,-4.6306 -5.65556,-5.266 l -0.56335,1.9167 v 0 z"
+         id="path4781" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 101.59694,1208.0016 c 2.05999,-0.425 3.93128,-0.9887 5.77164,-3.1777 1.73615,-2.1027 4.0285,-4.428 5.81797,-4.552 -1.49368,0.1156 -3.43733,2.5352 -5.07546,4.9988 -2.46157,3.6532 -4.03533,4.2597 -6.13911,4.6932 l -0.37502,-1.9622 v 0 z"
+         id="path4783" />
+      <path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90082085;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 105.61527,1209.3725 a 4.2678888,4.2815005 0 0 1 -4.26822,4.2819 4.2678888,4.2815005 0 0 1 -4.268243,-4.2819 4.2678888,4.2815005 0 0 1 4.268243,-4.2818 4.2678888,4.2815005 0 0 1 4.26822,4.2818 z"
+         id="path4743" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717"
+         x="-126.67882"
+         y="1205.1343"
+         width="9.6958838"
+         height="5.4238472"
+         ry="1.1960983"
+         rx="1.0963738"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#800080;stroke-width:0.42395699;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         id="rect4723"
+         x="110.41728"
+         y="1214.0177"
+         width="8.5920601"
+         height="4.7752547"
+         ry="1.0530723"
+         rx="0.97155929"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66612858;stroke-linejoin:round;stroke-opacity:0.99738668" />
+      <rect
+         transform="scale(-1)"
+         id="rect4729"
+         x="-119.00128"
+         y="-1201.2218"
+         width="8.0067453"
+         height="4.5461607"
+         ry="1.0025294"
+         rx="0.90538543"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4609"
+       transform="matrix(1.228115,0,0,1.228115,92.265319,1168.3149)"
+       style="stroke-width:0.91201901">
+      <g
+         id="g4607"
+         transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+         style="stroke-width:0.91201901">
+        <g
+           id="g4603"
+           transform="translate(5.1953e-6,28.466)"
+           style="fill-rule:evenodd;stroke:#000080;stroke-width:0.91201901">
+          <path
+             style="fill:url(#b-4);stroke-width:0.82724684;stroke-linecap:round;stroke-linejoin:round"
+             id="path4599"
+             d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+             inkscape:connector-curvature="0" />
+          <ellipse
+             style="fill:url(#a-8);stroke-width:0.39610809"
+             id="ellipse4601"
+             cx="290.51001"
+             cy="557.94"
+             ry="0.79745001"
+             transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+             rx="8.6450996" />
+        </g>
+        <rect
+           id="rect4605"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry="0.18513"
+           rx="0.16552"
+           style="fill:none;stroke-width:0.91201901" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SetFoldingSlideContent.svg b/freeplane/resources/images/SetFoldingSlideContent.svg
new file mode 100644
index 0000000..fbe173c
--- /dev/null
+++ b/freeplane/resources/images/SetFoldingSlideContent.svg
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.499912"
+   height="31.000242"
+   viewBox="0 0 40.499913 31.000242"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="SetFoldingSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         id="stop3775"
+         offset="0.00000000"
+         style="stop-color:#24424c;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3777"
+         offset="1.0000000"
+         style="stop-color:#79dfee;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         id="stop8253"
+         offset="0.00000000"
+         style="stop-color:#000000;stop-opacity:0.25098041;" />
+      <stop
+         id="stop8255"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         id="stop8985"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.37254903;" />
+      <stop
+         id="stop8987"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.094117649;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.318188"
+     inkscape:cx="9.7504427"
+     inkscape:cy="17.519139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.289351,-1194.1475)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.821793"
+       height="30.321701"
+       x="94.62841"
+       y="1194.4867"
+       rx="1.7965614"
+       ry="1.801149" />
+    <path
+       id="path4779"
+       d="m 95.019436,1207.7265 c 3.72305,-0.068 4.66127,1.369 6.406744,0.2018 3.69933,-2.726 8.3692,1.9216 11.52442,2.238 -2.57002,0.2885 -7.1701,-4.7393 -10.81489,-1.4334 -2.985808,2.0984 -3.30514,0.076 -7.094974,2.102 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.703125;stroke-linejoin:round;stroke-opacity:1"
+       rx="1.9125912"
+       ry="2.0990884"
+       height="9.5185604"
+       width="16.914177"
+       y="1204.9652"
+       x="-128.75613"
+       id="rect4717"
+       transform="scale(-1,1)" />
+    <rect
+       transform="scale(-1,1)"
+       id="rect4792"
+       x="-132.13429"
+       y="1202.0499"
+       width="23.670555"
+       height="15.348872"
+       ry="3.3848224"
+       rx="2.6765764"
+       style="fill:none;fill-rule:evenodd;stroke:#009d00;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2,2;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SetLinkByFileChooserAction.svg b/freeplane/resources/images/SetLinkByFileChooserAction.svg
new file mode 100644
index 0000000..855d63a
--- /dev/null
+++ b/freeplane/resources/images/SetLinkByFileChooserAction.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.013 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="510.32" gradientUnits="userSpaceOnUse" x2="-286.06" gradientTransform="matrix(.53469 0 -.25393 .51005 -3.8837 253.66)" y1="523.79" x1="-295.68">
+<stop stop-color="#f5863e" offset="0"/>
+<stop stop-color="#d26933" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="510.32" gradientUnits="userSpaceOnUse" x2="-286.06" gradientTransform="matrix(.53469 0 -.25393 .51005 5.6013 246.03)" y1="523.79" x1="-295.68">
+<stop stop-color="#f5863e" offset="0"/>
+<stop stop-color="#d26933" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="553.04" gradientUnits="userSpaceOnUse" x2="-325.57" gradientTransform="matrix(.15519 -.13105 .13105 .15519 -304.44 382.28)" y1="553.04" x1="-371.74">
+<stop stop-color="#de6827" offset="0"/>
+<stop stop-color="#f1833d" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-81.354 -81.772)">
+<g transform="matrix(.95413 0 .27651 .96662 220.22 -406.77)">
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-288.61 513.16c-2.4966 0-5.5009 1.9538-6.6866 4.3354s-0.12692 4.3354 2.3697 4.3354 5.5176-1.9538 6.7033-4.3354 0.1102-4.3354-2.3864-4.3354zm-0.76974 1.5461c1.6242 0 2.3068 1.2399 1.5354 2.7894-0.77138 1.5494-2.6885 2.7894-4.3128 2.7894-1.6242 0-2.3068-1.2399-1.5354-2.7894 0.77138-1.5494 2.6885-2.7894 4.3128-2.7894z" stroke="#d56c34" stroke-width=".25" fill="url(#c)"/>
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-279.12 505.53c-2.4966 0-5.5009 1.9538-6.6866 4.3354s-0.12692 4.3354 2.3697 4.3354 5.5176-1.9538 6.7033-4.3354 0.1102-4.3354-2.3864-4.3354zm-0.76974 1.5461c1.6242 0 2.3068 1.2399 1.5354 2.7894-0.77138 1.5494-2.6885 2.7894-4.3128 2.7894-1.6242 0-2.3068-1.2399-1.5354-2.7894 0.77138-1.5494 2.6885-2.7894 4.3128-2.7894z" stroke="#dd6929" stroke-width=".25" fill="url(#b)"/>
+<path style="color:#000000" d="m-290.05 515.87c2.3281-2.4226 4.531-4.1364 6.6999-5.6578l1.2287 1.455c-2.0498 2.1947-4.2831 4.0806-6.6999 5.6578z" fill-rule="evenodd" stroke-dashoffset="4.503" stroke="#de6827" stroke-linecap="square" stroke-width=".60935" fill="url(#a)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/SetLinkByTextFieldAction.svg b/freeplane/resources/images/SetLinkByTextFieldAction.svg
new file mode 100644
index 0000000..0f3d7cb
--- /dev/null
+++ b/freeplane/resources/images/SetLinkByTextFieldAction.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.296 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="510.32" gradientUnits="userSpaceOnUse" x2="-286.06" gradientTransform="matrix(.53469 0 -.25393 .51005 -3.8837 253.66)" y1="523.79" x1="-295.68">
+<stop stop-color="#f5863e" offset="0"/>
+<stop stop-color="#d26933" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="510.32" gradientUnits="userSpaceOnUse" x2="-286.06" gradientTransform="matrix(.53469 0 -.25393 .51005 5.6013 246.03)" y1="523.79" x1="-295.68">
+<stop stop-color="#f5863e" offset="0"/>
+<stop stop-color="#d26933" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="553.04" gradientUnits="userSpaceOnUse" y1="553.04" gradientTransform="matrix(.15519 -.13105 .13105 .15519 -304.44 382.28)" x2="-325.57" x1="-371.74">
+<stop stop-color="#de6827" offset="0"/>
+<stop stop-color="#f1833d" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-105.05 -81.772)">
+<g transform="translate(295.73 -426.69)">
+<g transform="matrix(.95413 0 .27651 .96662 -51.539 19.925)">
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-288.61 513.16c-2.4966 0-5.5009 1.9538-6.6866 4.3354s-0.12692 4.3354 2.3697 4.3354 5.5176-1.9538 6.7033-4.3354 0.1102-4.3354-2.3864-4.3354zm-0.76974 1.5461c1.6242 0 2.3068 1.2399 1.5354 2.7894-0.77138 1.5494-2.6885 2.7894-4.3128 2.7894-1.6242 0-2.3068-1.2399-1.5354-2.7894 0.77138-1.5494 2.6885-2.7894 4.3128-2.7894z" stroke="#d56c34" stroke-width=".25" fill="url(#c)"/>
+<path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m-279.12 505.53c-2.4966 0-5.5009 1.9538-6.6866 4.3354s-0.12692 4.3354 2.3697 4.3354 5.5176-1.9538 6.7033-4.3354 0.1102-4.3354-2.3864-4.3354zm-0.76974 1.5461c1.6242 0 2.3068 1.2399 1.5354 2.7894-0.77138 1.5494-2.6885 2.7894-4.3128 2.7894-1.6242 0-2.3068-1.2399-1.5354-2.7894 0.77138-1.5494 2.6885-2.7894 4.3128-2.7894z" stroke="#dd6929" stroke-width=".25" fill="url(#b)"/>
+<path style="color:#000000" d="m-290.05 515.87c2.3281-2.4226 4.531-4.1364 6.6999-5.6578l1.2287 1.455c-2.0498 2.1947-4.2831 4.0806-6.6999 5.6578z" fill-rule="evenodd" stroke-dashoffset="4.503" stroke="#de6827" stroke-linecap="square" stroke-width=".60935" fill="url(#a)"/>
+</g>
+<g transform="matrix(.91895 0 0 .91895 -13.626 44.834)">
+<rect style="color:#000000" height="4.2113" width="17.269" stroke="#000" y="516.1" x="-192.64" stroke-width=".067887" fill="#fff"/>
+<text style="word-spacing:0px;letter-spacing:.30677px" xml:space="preserve" font-size="3.6812px" line-height="125%" y="519.52576" x="-191.39433" font-family="Arial" fill="#000000"><tspan x="-191.39433" y="519.52576">LINK</tspan></text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/SetSlideContent.svg b/freeplane/resources/images/SetSlideContent.svg
new file mode 100644
index 0000000..d6ac856
--- /dev/null
+++ b/freeplane/resources/images/SetSlideContent.svg
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.499912"
+   height="31.000242"
+   viewBox="0 0 40.499913 31.000242"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="SetSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         id="stop3775"
+         offset="0.00000000"
+         style="stop-color:#24424c;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3777"
+         offset="1.0000000"
+         style="stop-color:#79dfee;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         id="stop8253"
+         offset="0.00000000"
+         style="stop-color:#000000;stop-opacity:0.25098041;" />
+      <stop
+         id="stop8255"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         id="stop8985"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.37254903;" />
+      <stop
+         id="stop8987"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.094117649;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.318188"
+     inkscape:cx="9.7504427"
+     inkscape:cy="17.519139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.289351,-1194.1475)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.821793"
+       height="30.321701"
+       x="94.62841"
+       y="1194.4867"
+       rx="1.7965614"
+       ry="1.801149" />
+    <path
+       id="path4779"
+       d="m 95.230886,1210.9077 c 3.954649,-0.06 4.951224,1.1982 6.805274,0.1766 3.92943,-2.3859 8.88978,1.6818 12.24129,1.9587 -2.72989,0.2525 -7.61612,-4.1479 -11.48763,-1.2545 -3.171539,1.8366 -3.510733,0.067 -7.536317,1.8397 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       id="path4783"
+       d="m 95.317318,1206.6819 c 0,0 1.500621,-0.2395 2.978283,-1.7377 2.372109,-2.219 6.195879,-3.0124 10.100589,-3.0731 -3.21763,0.4147 -6.15555,0.1357 -9.730033,3.4714 -1.6803,1.6489 -1.634414,3.1408 -3.363538,3.8599 0,0 0.01373,-2.5205 0.01373,-2.5205 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.57750005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607999"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#800080;stroke-width:0.70312494;stroke-linejoin:round;stroke-opacity:1"
+       rx="1.8046737"
+       ry="1.9791565"
+       height="8.9747152"
+       width="15.959798"
+       y="1208.1691"
+       x="-128.63542"
+       id="rect4717"
+       transform="scale(-1,1)" />
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1"
+       rx="1.2406157"
+       ry="1.3761101"
+       height="6.2402339"
+       width="10.971343"
+       y="-1203.1749"
+       x="-116.21328"
+       id="rect4729"
+       transform="scale(-1)" />
+    <rect
+       transform="scale(-1,1)"
+       id="rect4792"
+       x="-131.4556"
+       y="1205.655"
+       width="21.600201"
+       height="14.00231"
+       ry="3.0878706"
+       rx="2.4424686"
+       style="fill:none;fill-rule:evenodd;stroke:#008f00;stroke-width:0.75;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SetZoomSlideContent.svg b/freeplane/resources/images/SetZoomSlideContent.svg
new file mode 100644
index 0000000..189e151
--- /dev/null
+++ b/freeplane/resources/images/SetZoomSlideContent.svg
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40.5"
+   height="31"
+   viewBox="0 0 40.5 31"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="SetZoomSlideContent.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08905181,0,0,0.08945633,79.95121,1189.2788)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </radialGradient>
+    <linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </linearGradient>
+    <linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.7776558"
+     inkscape:cx="0.71485045"
+     inkscape:cy="23.933031"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1194.0483)">
+    <g
+       id="g4552">
+      <rect
+         ry="1.8024591"
+         rx="1.7965559"
+         y="1194.3765"
+         x="94.538063"
+         height="30.343756"
+         width="39.821671"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 105.54497,1207.4891 c 2.24684,-0.047 4.32237,2.1247 6.68111,0.1796 2.23252,-1.8744 5.31589,1.3826 7.22006,1.6001 -1.59178,-0.169 -4.32711,-3.2588 -6.5267,-0.9857 -3.29583,3.3646 -5.06709,1.2964 -7.36161,1.3433 z"
+         id="path4779" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.57726246;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 102.42779,1208.8141 c 2.20097,-0.4547 4.20034,-1.0578 6.16665,-3.3998 1.85498,-2.2496 4.30422,-4.7374 6.21616,-4.8701 -1.59591,0.1237 -3.67258,2.7124 -5.42283,5.3481 -2.63004,3.9085 -4.31151,4.5574 -6.55928,5.0212 l -0.40068,-2.0993 v 0 z"
+         id="path4783" />
+      <path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90082079;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 107.43705,1208.9512 a 4.5599874,4.5807007 0 0 1 -4.56034,4.5811 4.5599874,4.5807007 0 0 1 -4.56036,-4.5811 4.5599874,4.5807007 0 0 1 4.56036,-4.5811 4.5599874,4.5807007 0 0 1 4.56034,4.5811 z"
+         id="path4743" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717"
+         x="-128.30431"
+         y="1205.7462"
+         width="10.35948"
+         height="5.8028769"
+         ry="1.2796842"
+         rx="1.1714107"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#800080;stroke-width:0.42395699;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         transform="scale(-1)"
+         id="rect4729"
+         x="-121.43238"
+         y="-1201.6626"
+         width="8.5547352"
+         height="4.8638558"
+         ry="1.0725882"
+         rx="0.9673509"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1" />
+      <g
+         style="stroke-width:0.85136819"
+         transform="matrix(1.5412978,0.17895957,-0.17895957,1.5412978,417.29374,-101.53964)"
+         id="g3238">
+        <g
+           style="stroke-width:0.85136819"
+           transform="translate(3.5753,-25.448)"
+           id="g3240">
+          <path
+             d="m 451.11,879.75 c 0,31.882 -26.98,57.727 -60.261,57.727 -33.281,0 -60.261,-25.845 -60.261,-57.727 0,-31.882 26.98,-57.727 60.261,-57.727 33.259,0 60.23,25.812 60.261,57.672"
+             transform="matrix(-0.095277,0,0,0.099482,-57.227,798.84)"
+             id="path3242"
+             inkscape:connector-curvature="0"
+             style="fill:url(#a-2);stroke:#1a1a1a;stroke-width:5.38924551;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.81395" />
+          <rect
+             ry="0.32876"
+             rx="0.32876"
+             transform="matrix(-0.7273,-0.68632,-0.70389,0.7103,0,0)"
+             height="5.2533002"
+             width="2.0947001"
+             y="717.26001"
+             x="-558.15002"
+             id="rect3244"
+             style="fill:url(#c);stroke:#a25d2b;stroke-width:0.28767732;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.93725" />
+          <path
+             d="m -98.125,890.88 -0.78603,1.5437 -1.4082,-1.3724 1.4643,-0.87188 0.72987,0.70049 z"
+             id="path3246"
+             inkscape:connector-curvature="0"
+             style="fill:url(#b);fill-rule:evenodd;stroke:#333333;stroke-width:0.1711846;stroke-linejoin:round;stroke-opacity:0.88372001" />
+        </g>
+        <rect
+           style="color:#000000;fill:none;stroke-width:0.85136819"
+           height="16"
+           width="16"
+           y="854.85999"
+           x="-100.73"
+           id="rect3250" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ShowAncestorsSlideContent.svg b/freeplane/resources/images/ShowAncestorsSlideContent.svg
new file mode 100644
index 0000000..aa3a0e0
--- /dev/null
+++ b/freeplane/resources/images/ShowAncestorsSlideContent.svg
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="8.1957626mm"
+   width="10.710093mm"
+   version="1.1"
+   viewBox="0 0 37.948855 29.039815"
+   id="svg44"
+   sodipodi:docname="ShowAncestorsSlideContent.svg"
+   inkscape:version="0.92.1 r15371">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview46"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="6.9139941"
+     inkscape:cx="9.098791"
+     inkscape:cy="25.065982"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg44" />
+  <defs
+     id="defs16">
+    <linearGradient
+       id="a"
+       y2="557.23999"
+       gradientUnits="userSpaceOnUse"
+       x2="290.70001"
+       y1="558.21002"
+       x1="290.75">
+      <stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="563.76001"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       y1="563.58002"
+       x1="295.32001">
+      <stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop9" />
+      <stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop11" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop13" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)"
+       id="a-2"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop4697" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop4699" />
+    </linearGradient>
+    <linearGradient
+       id="a-5"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" />
+    </linearGradient>
+    <linearGradient
+       y2="124.52"
+       x2="219.96001"
+       y1="238.03"
+       x1="268.63"
+       gradientTransform="matrix(0.08334743,0,0,0.08361326,79.89008,1190.9851)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5069"
+       xlink:href="#a-2"
+       inkscape:collect="always" />
+    <radialGradient
+       id="a-2-3"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3222" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3224" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3227" />
+      <stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3229" />
+    </linearGradient>
+    <linearGradient
+       id="b-8"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3232" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3234" />
+    </linearGradient>
+    <linearGradient
+       id="b-4"
+       y2="563.76001"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       y1="563.58002"
+       x1="295.32001">
+      <stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop4581" />
+      <stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop4583" />
+      <stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop4585" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4587" />
+    </linearGradient>
+    <linearGradient
+       id="a-8"
+       y2="557.23999"
+       gradientUnits="userSpaceOnUse"
+       x2="290.70001"
+       y1="558.21002"
+       x1="290.75">
+      <stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop4590" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4592" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4598"
+     transform="matrix(1.5127337,0,0,1.5127337,3.1804282,1.5976062)">
+    <g
+       inkscape:label="Layer 1"
+       id="layer1"
+       transform="matrix(0.66104978,0,0,0.66104978,-64.372598,-790.39729)">
+      <g
+         id="g4803">
+        <rect
+           ry="1.6847268"
+           rx="1.6814741"
+           y="1194.4114"
+           x="94.538063"
+           height="28.361774"
+           width="37.270817"
+           id="rect4498"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           d="m 104.51445,1206.7632 c 2.10291,-0.044 4.04549,1.9859 6.25314,0.1679 2.08951,-1.752 4.97537,1.2922 6.75756,1.4955 -1.48981,-0.1579 -4.04993,-3.0459 -6.10862,-0.9213 -3.08471,3.1449 -4.74251,1.2117 -6.89005,1.2556 z"
+           id="path4779" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           d="m 101.91962,1207.2905 c 2.00909,0.6225 3.81699,1.3647 5.43662,3.7218 1.52428,2.2611 3.58056,4.7975 5.34964,5.0943 -1.47549,-0.2598 -3.17558,-2.8563 -4.56734,-5.4669 -2.09607,-3.8747 -3.60369,-4.6306 -5.65556,-5.266 l -0.56335,1.9167 v 0 z"
+           id="path4781" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           d="m 101.59694,1208.0016 c 2.05999,-0.425 3.93128,-0.9887 5.77164,-3.1777 1.73615,-2.1027 4.0285,-4.428 5.81797,-4.552 -1.49368,0.1156 -3.43733,2.5352 -5.07546,4.9988 -2.46157,3.6532 -4.03533,4.2597 -6.13911,4.6932 l -0.37502,-1.9622 v 0 z"
+           id="path4783" />
+        <path
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90082085;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0"
+           font-size="61.543px"
+           d="m 105.61527,1209.3725 a 4.2678888,4.2815005 0 0 1 -4.26822,4.2819 4.2678888,4.2815005 0 0 1 -4.268243,-4.2819 4.2678888,4.2815005 0 0 1 4.268243,-4.2818 4.2678888,4.2815005 0 0 1 4.26822,4.2818 z"
+           id="path4743" />
+        <rect
+           id="rect4723"
+           x="112.14316"
+           y="1215.5518"
+           width="8.5920601"
+           height="4.7752547"
+           ry="1.0530723"
+           rx="0.97155929"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66612858;stroke-linejoin:round;stroke-opacity:0.99738668" />
+        <rect
+           transform="scale(-1)"
+           id="rect4729"
+           x="-119.00128"
+           y="-1201.2218"
+           width="8.0067453"
+           height="4.5461607"
+           ry="1.0025294"
+           rx="0.90538543"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       id="g38"
+       transform="matrix(1.2654272,0,0,1.2654272,-256.49754,-762.4469)">
+      <path
+         style="fill:none;stroke:#0000ff;stroke-width:1.5"
+         inkscape:connector-curvature="0"
+         id="path30"
+         d="m 206.43,609.36 10.358,0.14386" />
+      <circle
+         id="circle32"
+         r="3.0304"
+         cy="609.42999"
+         cx="205.27"
+         style="color:#000000;fill:#0000ff;stroke:#000000;stroke-width:0.25" />
+      <circle
+         id="circle34"
+         r="1.7269"
+         cx="216.53999"
+         cy="609.42999"
+         style="color:#000000;fill:#0000ff;stroke:#000000;stroke-width:0.25" />
+      <circle
+         id="circle36"
+         r="2.1787"
+         cy="609.42999"
+         cx="211.55"
+         style="color:#000000;fill:#0000ff;stroke:#000000;stroke-width:0.25" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ShowDescendantsSlideContent.svg b/freeplane/resources/images/ShowDescendantsSlideContent.svg
new file mode 100644
index 0000000..779188e
--- /dev/null
+++ b/freeplane/resources/images/ShowDescendantsSlideContent.svg
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="8.1957626mm"
+   width="10.710093mm"
+   version="1.1"
+   viewBox="0 0 37.948855 29.039815"
+   id="svg44"
+   sodipodi:docname="ShowDescendantsSlideContent.svg"
+   inkscape:version="0.92.1 r15371">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     id="namedview46"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="6.9139941"
+     inkscape:cx="-16.212194"
+     inkscape:cy="25.065982"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg44" />
+  <defs
+     id="defs16">
+    <linearGradient
+       id="a"
+       y2="557.23999"
+       gradientUnits="userSpaceOnUse"
+       x2="290.70001"
+       y1="558.21002"
+       x1="290.75">
+      <stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="563.76001"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       y1="563.58002"
+       x1="295.32001">
+      <stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop9" />
+      <stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop11" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop13" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)"
+       id="a-2"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop4697" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop4699" />
+    </linearGradient>
+    <linearGradient
+       id="a-5"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" />
+    </linearGradient>
+    <linearGradient
+       y2="124.52"
+       x2="219.96001"
+       y1="238.03"
+       x1="268.63"
+       gradientTransform="matrix(0.08334743,0,0,0.08361326,79.89008,1190.9851)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5069"
+       xlink:href="#a-2"
+       inkscape:collect="always" />
+    <radialGradient
+       id="a-2-3"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3222" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3224" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3227" />
+      <stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3229" />
+    </linearGradient>
+    <linearGradient
+       id="b-8"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3232" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3234" />
+    </linearGradient>
+    <linearGradient
+       id="b-4"
+       y2="563.76001"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       y1="563.58002"
+       x1="295.32001">
+      <stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop4581" />
+      <stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop4583" />
+      <stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop4585" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4587" />
+    </linearGradient>
+    <linearGradient
+       id="a-8"
+       y2="557.23999"
+       gradientUnits="userSpaceOnUse"
+       x2="290.70001"
+       y1="558.21002"
+       x1="290.75">
+      <stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop4590" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop4592" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4598"
+     transform="matrix(-1.5127337,0,0,1.5127337,34.768427,1.5976062)">
+    <g
+       inkscape:label="Layer 1"
+       id="layer1"
+       transform="matrix(0.66104978,0,0,0.66104978,-64.372598,-790.39729)">
+      <g
+         id="g4803">
+        <rect
+           ry="1.6847268"
+           rx="1.6814741"
+           y="1194.4114"
+           x="94.538063"
+           height="28.361774"
+           width="37.270817"
+           id="rect4498"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           d="m 104.51445,1206.7632 c 2.10291,-0.044 4.04549,1.9859 6.25314,0.1679 2.08951,-1.752 4.97537,1.2922 6.75756,1.4955 -1.48981,-0.1579 -4.04993,-3.0459 -6.10862,-0.9213 -3.08471,3.1449 -4.74251,1.2117 -6.89005,1.2556 z"
+           id="path4779" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#0034b0;stroke:#0034b0;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           d="m 101.91962,1207.2905 c 2.00909,0.6225 3.81699,1.3647 5.43662,3.7218 1.52428,2.2611 3.58056,4.7975 5.34964,5.0943 -1.47549,-0.2598 -3.17558,-2.8563 -4.56734,-5.4669 -2.09607,-3.8747 -3.60369,-4.6306 -5.65556,-5.266 l -0.56335,1.9167 v 0 z"
+           id="path4781" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#ff0000;stroke:#ff0000;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           d="m 101.59694,1208.0016 c 2.05999,-0.425 3.93128,-0.9887 5.77164,-3.1777 1.73615,-2.1027 4.0285,-4.428 5.81797,-4.552 -1.49368,0.1156 -3.43733,2.5352 -5.07546,4.9988 -2.46157,3.6532 -4.03533,4.2597 -6.13911,4.6932 l -0.37502,-1.9622 v 0 z"
+           id="path4783" />
+        <path
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90082085;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0"
+           font-size="61.543px"
+           d="m 105.61527,1209.3725 a 4.2678888,4.2815005 0 0 1 -4.26822,4.2819 4.2678888,4.2815005 0 0 1 -4.268243,-4.2819 4.2678888,4.2815005 0 0 1 4.268243,-4.2818 4.2678888,4.2815005 0 0 1 4.26822,4.2818 z"
+           id="path4743" />
+        <rect
+           id="rect4723"
+           x="112.14316"
+           y="1215.5518"
+           width="8.5920601"
+           height="4.7752547"
+           ry="1.0530723"
+           rx="0.97155929"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66612858;stroke-linejoin:round;stroke-opacity:0.99738668" />
+        <rect
+           transform="scale(-1)"
+           id="rect4729"
+           x="-119.00128"
+           y="-1201.2218"
+           width="8.0067453"
+           height="4.5461607"
+           ry="1.0025294"
+           rx="0.90538543"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63478428;stroke-linejoin:round;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       id="g38"
+       transform="matrix(1.2654272,0,0,1.2654272,-256.49754,-762.4469)">
+      <path
+         style="fill:none;stroke:#0000ff;stroke-width:1.5"
+         inkscape:connector-curvature="0"
+         id="path30"
+         d="m 206.43,609.36 10.358,0.14386" />
+      <circle
+         id="circle32"
+         r="3.0304"
+         cy="609.42999"
+         cx="205.27"
+         style="color:#000000;fill:#0000ff;stroke:#000000;stroke-width:0.25" />
+      <circle
+         id="circle34"
+         r="1.7269"
+         cx="216.53999"
+         cy="609.42999"
+         style="color:#000000;fill:#0000ff;stroke:#000000;stroke-width:0.25" />
+      <circle
+         id="circle36"
+         r="2.1787"
+         cy="609.42999"
+         cx="211.55"
+         style="color:#000000;fill:#0000ff;stroke:#000000;stroke-width:0.25" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ShowFirstSlideAndStartPresentationAction.png b/freeplane/resources/images/ShowFirstSlideAndStartPresentationAction.png
new file mode 100644
index 0000000..740ec66
Binary files /dev/null and b/freeplane/resources/images/ShowFirstSlideAndStartPresentationAction.png differ
diff --git a/freeplane/resources/images/ShowFirstSlideAndStartPresentationAction.svg b/freeplane/resources/images/ShowFirstSlideAndStartPresentationAction.svg
new file mode 100644
index 0000000..e8ad424
--- /dev/null
+++ b/freeplane/resources/images/ShowFirstSlideAndStartPresentationAction.svg
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="ShowFirstSlideAndStartPresentationAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\ShowFirstSlideAndStartPresentationAction.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <defs
+     id="defs8391">
+    <linearGradient
+       id="linearGradient1055">
+      <stop
+         style="stop-color:#338082;stop-opacity:1"
+         offset="0"
+         id="stop1051" />
+      <stop
+         style="stop-color:#358183;stop-opacity:1"
+         offset="1"
+         id="stop1053" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1043">
+      <stop
+         id="stop1039"
+         offset="0"
+         style="stop-color:#2d7d7e;stop-opacity:1;" />
+      <stop
+         id="stop1041"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1035">
+      <stop
+         id="stop1031"
+         offset="0"
+         style="stop-color:#246e6f;stop-opacity:1;" />
+      <stop
+         id="stop1033"
+         offset="1"
+         style="stop-color:#6ac8ca;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient989">
+      <stop
+         id="stop985"
+         offset="0"
+         style="stop-color:#348182;stop-opacity:1" />
+      <stop
+         id="stop987"
+         offset="1"
+         style="stop-color:#77a8a9;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient170">
+      <stop
+         style="stop-color:#348182;stop-opacity:1"
+         offset="0"
+         id="stop166" />
+      <stop
+         style="stop-color:#348283;stop-opacity:1"
+         offset="1"
+         id="stop168" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4567">
+      <stop
+         style="stop-color:#ecf4f4;stop-opacity:1;"
+         offset="0"
+         id="stop4569" />
+      <stop
+         style="stop-color:#307e7f;stop-opacity:1"
+         offset="1"
+         id="stop4571" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4555">
+      <stop
+         style="stop-color:#307d7f;stop-opacity:1"
+         offset="0"
+         id="stop4557" />
+      <stop
+         style="stop-color:#55acad;stop-opacity:1"
+         offset="1"
+         id="stop4559" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4543">
+      <stop
+         style="stop-color:#2e7a7b;stop-opacity:1"
+         offset="0"
+         id="stop4545" />
+      <stop
+         style="stop-color:#307d7f;stop-opacity:1"
+         offset="1"
+         id="stop4547" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         id="stop2942-8-2-7"
+         offset="0"
+         style="stop-color:#c7c7c7;stop-opacity:1;" />
+      <stop
+         id="stop2944-9-5-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1"
+         offset="0"
+         id="stop3158" />
+      <stop
+         style="stop-color:#f3fbfb;stop-opacity:1;"
+         offset="1"
+         id="stop3160" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.2508606,0,0,1.2508606,209.42392,396.2348)"
+       y2="211.30733"
+       x2="182.6501"
+       y1="229.78313"
+       x1="182.54036"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7743"
+       xlink:href="#linearGradient4350-9-7-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.3422813,0,0,1.3422813,189.49038,379.06903)"
+       y2="224.56676"
+       x2="184.58699"
+       y1="207.34468"
+       x1="184.5444"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7745"
+       xlink:href="#linearGradient4332-7-3-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.3877987,0,0,1.3877987,181.29246,366.41853)"
+       y2="210.23618"
+       x2="184.2887"
+       y1="226.48277"
+       x1="184.15109"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7747"
+       xlink:href="#linearGradient2940-9-4-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2960-9-8">
+      <stop
+         id="stop2962-6-5"
+         offset="0"
+         style="stop-color:#8739af;stop-opacity:1;" />
+      <stop
+         id="stop2964-8-7"
+         offset="1"
+         style="stop-color:#e0c5ea;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-4-1">
+      <stop
+         id="stop2970-8-8"
+         offset="0"
+         style="stop-color:#8f379a;stop-opacity:1;" />
+      <stop
+         id="stop2972-4-9"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-9"
+       id="linearGradient4575"
+       gradientUnits="userSpaceOnUse"
+       x1="-77.510239"
+       y1="332.19751"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-2"
+       id="linearGradient4577"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-77.510239"
+       y2="332.19751" />
+    <linearGradient
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,274.20328,-565.61564)"
+       y2="567.263"
+       x2="-354.95758"
+       y1="567.81232"
+       x1="-359.80457"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9269-8"
+       xlink:href="#linearGradient4555"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4567"
+       id="linearGradient4573-8"
+       x1="485.90573"
+       y1="670.56897"
+       x2="489.16266"
+       y2="670.56897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-485.90572,-664.69756)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-2"
+       id="linearGradient4577-0"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-77.510239"
+       y2="332.19751" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-9"
+       id="linearGradient4575-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-77.510239"
+       y1="332.19751"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1055"
+       id="linearGradient1027"
+       gradientUnits="userSpaceOnUse"
+       x1="329.04651"
+       y1="637.56622"
+       x2="338.93719"
+       y2="637.71149"
+       gradientTransform="matrix(0.4063763,0,0,0.4063763,296.76743,409.8829)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.6069505"
+     inkscape:cx="-105.19678"
+     inkscape:cy="-2.4496358"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-421.14286,-653.50506)">
+    <circle
+       r="15.519055"
+       cy="669.50507"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:#257071;stroke-width:0.96188784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;fill-opacity:1"
+       id="path4326-5-9" />
+    <circle
+       r="13.798415"
+       cy="669.50513"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7743);stroke-width:2.95701718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path4340-4-2" />
+    <circle
+       r="12.193909"
+       cy="669.50513"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7745);stroke-width:1.29703701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path4356-3-5" />
+    <circle
+       r="11.606822"
+       cy="669.50507"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="path4368-2-5" />
+    <g
+       id="g1066"
+       transform="translate(-0.7011432,0.25974982)">
+      <g
+         id="g1060">
+        <path
+           sodipodi:type="star"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4577);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4575);stroke-width:1.3263967;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacit [...]
+           id="path2956-3"
+           sodipodi:sides="3"
+           sodipodi:cx="-69.082542"
+           sodipodi:cy="345.69211"
+           sodipodi:r1="15.844812"
+           sodipodi:r2="7.2885256"
+           sodipodi:arg1="0"
+           sodipodi:arg2="1.0471976"
+           inkscape:flatsided="true"
+           inkscape:rounded="2.5777991e-015"
+           inkscape:randomized="0"
+           d="m -53.23773,345.69211 -23.767219,13.72201 V 331.9701 Z"
+           transform="matrix(-0.22697838,-0.39594965,-0.39594963,0.22697838,561.68515,563.43861)"
+           inkscape:transform-center-y="0.080625306"
+           inkscape:transform-center-x="1.850804" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:16.25505066px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;opacity:0.99545456;vector-effect:none;fill:url(#linearGradient1027);fill-opacity:1;stroke:#246e6f;stroke-width:0.26602191;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           x="427.51974"
+           y="674.70612"
+           id="text993"
+           transform="scale(0.99930043,1.0007001)"><tspan
+             sodipodi:role="line"
+             id="tspan991"
+             x="427.51974"
+             y="674.70612"
+             style="fill:url(#linearGradient1027);fill-opacity:1;stroke:#246e6f;stroke-width:0.26602191;stroke-opacity:1">1</tspan></text>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ShowOnlySelectedNodeSlideContent.svg b/freeplane/resources/images/ShowOnlySelectedNodeSlideContent.svg
new file mode 100644
index 0000000..0c6325d
--- /dev/null
+++ b/freeplane/resources/images/ShowOnlySelectedNodeSlideContent.svg
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.710093mm"
+   height="8.1957636mm"
+   viewBox="0 0 37.949148 29.040108"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="ShowOnlySelectedNodeSlideContent.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08334743,0,0,0.08361326,79.89008,1190.9851)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <svg:linearGradient
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)"
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-4">
+      <svg:stop
+         id="stop7"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.7776558"
+     inkscape:cx="-5.9961135"
+     inkscape:cy="10.438936"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1194.0722)">
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="37.270817"
+       height="28.361774"
+       x="94.538063"
+       y="1194.4114"
+       rx="1.6814741"
+       ry="1.6847268" />
+    <svg:g
+       id="g4617"
+       transform="matrix(1,0,0,-1,1.0547007,2419.7046)">
+      <svg:path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#800080;stroke:#800080;stroke-width:0.5772624;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 104.51445,1206.7632 c 2.10291,-0.044 4.04549,1.9859 6.25314,0.1679 2.08951,-1.752 4.97537,1.2922 6.75756,1.4955 -1.48981,-0.1579 -4.04993,-3.0459 -6.10862,-0.9213 -3.08471,3.1449 -4.74251,1.2117 -6.89005,1.2556 z"
+         id="path4779" />
+      <svg:path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90082085;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 105.61527,1209.3725 a 4.2678888,4.2815005 0 0 1 -4.26822,4.2819 4.2678888,4.2815005 0 0 1 -4.268243,-4.2819 4.2678888,4.2815005 0 0 1 4.268243,-4.2818 4.2678888,4.2815005 0 0 1 4.26822,4.2818 z"
+         id="path4743" />
+      <svg:rect
+         transform="scale(-1,1)"
+         id="rect4717"
+         x="-124.61709"
+         y="1203.1753"
+         width="11.900644"
+         height="6.6571836"
+         ry="1.4680809"
+         rx="1.3456798"
+         style="fill:#b0ffff;fill-opacity:1;fill-rule:evenodd;stroke:#800080;stroke-width:0.52036119;stroke-linejoin:round;stroke-opacity:1" />
+    </svg:g>
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.84978437"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="574.09357"
+       x="1071.823"
+       height="0"
+       width="0.85563356" />
+    <svg:g
+       id="g4473"
+       transform="matrix(0.86498421,0,0,0.86498421,132.71375,1178.8507)">
+      <svg:path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path19166"
+         d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+         inkscape:transform-center-y="2.6604092"
+         inkscape:transform-center-x="0.022858851"
+         style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         id="path19168"
+         d="m -14.930158,21.808892 v 7.927934"
+         style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.55552113;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/ShowPreferencesAction.svg b/freeplane/resources/images/ShowPreferencesAction.svg
new file mode 100644
index 0000000..4704b18
--- /dev/null
+++ b/freeplane/resources/images/ShowPreferencesAction.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="15.922721"
+   width="15.920974"
+   version="1.1"
+   viewBox="0 0 15.920974 15.922721"
+   id="svg3659"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="propertyaction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3686"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="341.17951"
+     inkscape:cy="-183.63747"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3659" />
+  <defs
+     id="defs3661">
+    <linearGradient
+       id="a"
+       y2="39.685001"
+       gradientUnits="userSpaceOnUse"
+       x2="34.534"
+       gradientTransform="matrix(0.90504,0,0,0.90504,-531.65,73.301)"
+       y1="12.285"
+       x1="14.463">
+      <stop
+         stop-color="#8da6d8"
+         offset="0"
+         id="stop3664" />
+      <stop
+         stop-color="#b4c5e5"
+         offset=".25"
+         id="stop3666" />
+      <stop
+         stop-color="#d8e1f2"
+         offset=".5"
+         id="stop3668" />
+      <stop
+         stop-color="#92aada"
+         offset=".75"
+         id="stop3670" />
+      <stop
+         stop-color="#8ea7d8"
+         offset="1"
+         id="stop3672" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3674">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.47748,0,0,0.47748,251.57227,-37.390905)"
+     id="g3676">
+    <path
+       style="color:#000000;fill:url(#a);stroke:#003380;stroke-width:1.19809997"
+       d="m -511.05,78.896 c -0.33917,0.02321 -0.66885,0.07574 -1.002,0.11386 h -0.0228 l -0.79705,4.3496 c -1.2991,0.29586 -2.5213,0.79795 -3.6209,1.4802 l -3.5753,-2.5733 c -0.9665,0.75036 -1.846,1.6255 -2.6189,2.5733 l 2.4822,3.6209 c -0.75367,1.1518 -1.3204,2.4669 -1.6396,3.8486 -6e-5,0.0066 -5e-5,0.02164 0,0.02277 l -4.3268,0.68318 c -0.0791,0.64612 -0.11386,1.3139 -0.11386,1.9812 0,0.54604 0.0151,1.0848 0.0683,1.6169 l 4.3268,0.77427 c 0.30773,1.5026 0.8923,2.9058 1.708,4.1446 l -2 [...]
+       id="path3678"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3680"
+       style="fill:none;stroke:#ffffff">
+      <circle
+         style="opacity:0.64772997;color:#000000;stroke-width:2.45970011"
+         transform="matrix(0.4871,0,0,0.4871,-521.65,83.397)"
+         cy="23.782"
+         cx="23.511"
+         r="12.728"
+         id="circle3682"
+         d="m 36.238999,23.782 c 0,7.02948 -5.698519,12.727999 -12.727999,12.727999 -7.02948,0 -12.728,-5.698519 -12.728,-12.727999 0,-7.029481 5.69852,-12.728 12.728,-12.728 7.02948,0 12.727999,5.698519 12.727999,12.728 z"
+         sodipodi:cx="23.511"
+         sodipodi:cy="23.782"
+         sodipodi:rx="12.728"
+         sodipodi:ry="12.728" />
+      <path
+         style="opacity:0.34659005;color:#000000;stroke-width:1.19809997"
+         d="m -511.47,80.748 -0.60389,3.974 c -1.1491,0.26168 -3.2628,1.062 -4.2353,1.6655 l -3.2128,-2.398 c -0.85487,0.6637 -0.9135,0.70871 -1.5971,1.5471 l 2.3229,3.4451 c -0.66662,1.0187 -1.4673,2.8342 -1.7548,4.1315 0,0 -4.0705,0.68617 -4.0705,0.68617 -0.07,0.57149 -0.0363,1.7946 0.0108,2.2653 l 3.8882,0.70044 c 0.27218,1.329 1.2908,3.4683 2.0122,4.564 l -2.4588,3.2485 c 0.65186,0.80926 0.78232,0.88331 1.5936,1.5328 l 3.2878,-2.4087 c 1.1263,0.7185 3.362,1.5925 4.7248,1.8406 l 0.539 [...]
+         id="path3684"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/SortNodes.svg b/freeplane/resources/images/SortNodes.svg
new file mode 100644
index 0000000..2142e08
--- /dev/null
+++ b/freeplane/resources/images/SortNodes.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="377.6" gradientUnits="userSpaceOnUse" x2="142.38" gradientTransform="matrix(-.00036318 -.40809 .31921 -.00042146 -608.54 544.47)" y1="388.92" x1="160.7">
+<stop stop-color="#36d200" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-36.305 -207.1)">
+<g transform="translate(533.3 -243.26)">
+<rect style="color:#000000" height="16" width="16" y="450.36" x="-497" fill="none"/>
+<g transform="translate(0 -24)">
+<rect style="color:#000000" height="16" width="16" y="474.36" x="-497" fill="none"/>
+<g font-size="9.3699px" transform="translate(16.162 -9)" stroke="#000000" font-family="Arial" stroke-width=".29281" fill="#000000">
+<text style="word-spacing:0px;letter-spacing:0px" line-height="125%" y="490.21576" x="-513.00195" xml:space="preserve"><tspan y="490.21576" x="-513.00195" stroke-width=".29281">A</tspan></text>
+<text style="word-spacing:0px;letter-spacing:0px" line-height="125%" y="499.21579" x="-512.64642" xml:space="preserve"><tspan y="499.21579" x="-512.64642" stroke-width=".29281">Z</tspan></text>
+</g>
+<g transform="matrix(.53276 0 0 .53276 -348.31 24.428)">
+<rect stroke-linejoin="round" height="7.3909" stroke="#000080" stroke-width=".85776" fill="#fff" fill-rule="evenodd" rx="1.7122" ry="1.6299" width="15.142" y="864.46" x="-264.93"/>
+</g>
+<rect stroke-linejoin="round" height="3.9375" stroke="#000080" stroke-width=".45698" fill="#fff" fill-rule="evenodd" rx=".91220" ry=".86833" width="8.0671" y="475.93" x="-489.45"/>
+<path d="m-485.41 487.61-3.9642-4.7273 2.3496-0.0234-0.076-4.8838 3.3017-0.004 0.049 4.8838 2.2873-0.003-3.9474 4.758z" fill-rule="evenodd" stroke="#005200" stroke-width=".36092px" fill="url(#a)"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/StartPresentation.svg b/freeplane/resources/images/StartPresentation.svg
new file mode 100644
index 0000000..8e15356
--- /dev/null
+++ b/freeplane/resources/images/StartPresentation.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Present.svg">
+  <defs
+     id="defs8391">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4350-9-7-3"
+       id="linearGradient7711"
+       gradientUnits="userSpaceOnUse"
+       x1="182.54036"
+       y1="229.78313"
+       x2="182.6501"
+       y2="211.30733" />
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4332-7-3-3"
+       id="linearGradient7713"
+       gradientUnits="userSpaceOnUse"
+       x1="184.5444"
+       y1="207.34468"
+       x2="184.58699"
+       y2="224.56676" />
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2940"
+       id="linearGradient2948"
+       x1="184.15109"
+       y1="226.48277"
+       x2="184.2887"
+       y2="210.23618"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2940">
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         offset="0"
+         id="stop2942" />
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:0;"
+         offset="1"
+         id="stop2944" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-2"
+       id="linearGradient7715"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-79.75824"
+       y2="329.53061" />
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-9"
+       id="linearGradient7717"
+       gradientUnits="userSpaceOnUse"
+       x1="-79.75824"
+       y1="329.53061"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-509"
+     inkscape:cy="153.14286"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-421.14286,-653.50506)">
+    <g
+       id="g3622"
+       transform="translate(207.49529,207.94603)"
+       inkscape:export-filename="G:\LiberKey\MyDocuments\Mentalne Mape\Freeplane\FreePlane_radna_mapa\Freeplane_SVG_main_graphic_work\play_forward.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <circle
+         r="13.482502"
+         cy="206.93002"
+         cx="152.70555"
+         transform="matrix(1.1510516,0,0,1.1510516,53.875596,223.3719)"
+         id="path4326-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#257071;stroke-width:0.83566004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         r="11.031137"
+         cy="218.46585"
+         cx="182.04982"
+         transform="matrix(1.2508606,0,0,1.2508606,1.9286136,188.28874)"
+         id="path4340-4"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7711);stroke-width:2.36398625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         r="9.084466"
+         cy="216.37498"
+         cx="184.50119"
+         transform="matrix(1.3422813,0,0,1.3422813,-18.004933,171.12297)"
+         id="path4356-3"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7713);stroke-width:0.96629298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         r="8.3634768"
+         cy="218.39375"
+         cx="184.35699"
+         transform="matrix(1.3877987,0,0,1.3877987,-26.202851,158.47247)"
+         id="path4368-2"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient2948);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+      <path
+         inkscape:transform-center-x="-1.9348937"
+         inkscape:transform-center-y="0.084279085"
+         transform="matrix(-0.23729034,-0.41393822,-0.41393822,0.23729034,355.67762,351.02967)"
+         d="m -53.23773,345.69211 -23.767219,13.72201 0,-27.44402 z"
+         inkscape:randomized="0"
+         inkscape:rounded="2.5777991e-015"
+         inkscape:flatsided="true"
+         sodipodi:arg2="1.0471976"
+         sodipodi:arg1="0"
+         sodipodi:r2="7.2885256"
+         sodipodi:r1="15.844812"
+         sodipodi:cy="345.69211"
+         sodipodi:cx="-69.082542"
+         sodipodi:sides="3"
+         id="path2956"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7715);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7717);stroke-width:1.18207157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/StartPresentationOrShowNextSlideAction.png b/freeplane/resources/images/StartPresentationOrShowNextSlideAction.png
new file mode 100644
index 0000000..e41211c
Binary files /dev/null and b/freeplane/resources/images/StartPresentationOrShowNextSlideAction.png differ
diff --git a/freeplane/resources/images/StartPresentationOrShowNextSlideAction.svg b/freeplane/resources/images/StartPresentationOrShowNextSlideAction.svg
new file mode 100644
index 0000000..c49cca4
--- /dev/null
+++ b/freeplane/resources/images/StartPresentationOrShowNextSlideAction.svg
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="StartPresentationOrShowNextSlideAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\StartPresentationOrShowNextSlideAction.png"
+   inkscape:export-xdpi="45.000004"
+   inkscape:export-ydpi="45.000004">
+  <defs
+     id="defs8391">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4567">
+      <stop
+         style="stop-color:#ecf4f4;stop-opacity:1;"
+         offset="0"
+         id="stop4569" />
+      <stop
+         style="stop-color:#307e7f;stop-opacity:1"
+         offset="1"
+         id="stop4571" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4555">
+      <stop
+         style="stop-color:#307d7f;stop-opacity:1"
+         offset="0"
+         id="stop4557" />
+      <stop
+         style="stop-color:#55acad;stop-opacity:1"
+         offset="1"
+         id="stop4559" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4543">
+      <stop
+         style="stop-color:#2e7a7b;stop-opacity:1"
+         offset="0"
+         id="stop4545" />
+      <stop
+         style="stop-color:#307d7f;stop-opacity:1"
+         offset="1"
+         id="stop4547" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         id="stop2942-8-2-7"
+         offset="0"
+         style="stop-color:#c7c7c7;stop-opacity:1;" />
+      <stop
+         id="stop2944-9-5-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1"
+         offset="0"
+         id="stop3158" />
+      <stop
+         style="stop-color:#f3fbfb;stop-opacity:1;"
+         offset="1"
+         id="stop3160" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.2508606,0,0,1.2508606,209.42392,396.2348)"
+       y2="211.30733"
+       x2="182.6501"
+       y1="229.78313"
+       x1="182.54036"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7743"
+       xlink:href="#linearGradient4350-9-7-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.3422813,0,0,1.3422813,189.49038,379.06903)"
+       y2="224.56676"
+       x2="184.58699"
+       y1="207.34468"
+       x1="184.5444"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7745"
+       xlink:href="#linearGradient4332-7-3-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.3877987,0,0,1.3877987,181.29246,366.41853)"
+       y2="210.23618"
+       x2="184.2887"
+       y1="226.48277"
+       x1="184.15109"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7747"
+       xlink:href="#linearGradient2940-9-4-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2960-9-8">
+      <stop
+         id="stop2962-6-5"
+         offset="0"
+         style="stop-color:#8739af;stop-opacity:1;" />
+      <stop
+         id="stop2964-8-7"
+         offset="1"
+         style="stop-color:#e0c5ea;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-4-1">
+      <stop
+         id="stop2970-8-8"
+         offset="0"
+         style="stop-color:#8f379a;stop-opacity:1;" />
+      <stop
+         id="stop2972-4-9"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.7596756,0,0,1.0054482,704.58192,98.056706)"
+       y2="567.263"
+       x2="-354.95758"
+       y1="567.81232"
+       x1="-359.80457"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9269"
+       xlink:href="#linearGradient4555"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4567"
+       id="linearGradient4573"
+       x1="485.90574"
+       y1="670.56896"
+       x2="489.16266"
+       y2="670.56896"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-55.527073,-1.0252144)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2968-9"
+       id="linearGradient4575"
+       gradientUnits="userSpaceOnUse"
+       x1="-77.510239"
+       y1="332.19751"
+       x2="-63.168125"
+       y2="354.50546" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2960-2"
+       id="linearGradient4577"
+       gradientUnits="userSpaceOnUse"
+       x1="-63.168125"
+       y1="354.50546"
+       x2="-77.510239"
+       y2="332.19751" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.307548"
+     inkscape:cx="19.723241"
+     inkscape:cy="23.093152"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-421.14286,-653.50506)">
+    <circle
+       r="15.519055"
+       cy="669.50507"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:#257071;stroke-width:0.96188784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;fill-opacity:1"
+       id="path4326-5-9" />
+    <circle
+       r="13.798415"
+       cy="669.50513"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7743);stroke-width:2.95701718;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path4340-4-2" />
+    <circle
+       r="12.193909"
+       cy="669.50513"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7745);stroke-width:1.29703701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="path4356-3-5" />
+    <circle
+       r="11.606822"
+       cy="669.50507"
+       cx="437.14285"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="path4368-2-5" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4577);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4575);stroke-width:1.3263967;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1; [...]
+       id="path2956-3"
+       sodipodi:sides="3"
+       sodipodi:cx="-69.082542"
+       sodipodi:cy="345.69211"
+       sodipodi:r1="15.844812"
+       sodipodi:r2="7.2885256"
+       sodipodi:arg1="0"
+       sodipodi:arg2="1.0471976"
+       inkscape:flatsided="true"
+       inkscape:rounded="2.5777991e-015"
+       inkscape:randomized="0"
+       d="m -53.23773,345.69211 -23.767219,13.72201 0,-27.44402 z"
+       transform="matrix(-0.2114708,-0.36889765,-0.36889763,0.21147081,551.90707,570.92731)"
+       inkscape:transform-center-y="0.075110753"
+       inkscape:transform-center-x="1.7243515" />
+    <rect
+       y="663.89185"
+       x="430.59814"
+       height="11.303813"
+       width="2.8179185"
+       id="rect3105-3-2-1"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient9269);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4573);stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:n [...]
+       ry="0" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/StopPresentation.svg b/freeplane/resources/images/StopPresentation.svg
new file mode 100644
index 0000000..238d0d4
--- /dev/null
+++ b/freeplane/resources/images/StopPresentation.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.999998"
+   height="31.999998"
+   viewBox="0 0 31.999999 31.999999"
+   id="svg8389"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Stop.svg">
+  <defs
+     id="defs8391">
+    <linearGradient
+       id="linearGradient4350-9-7-3">
+      <stop
+         id="stop4352-2-1-4"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-3-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-2">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-9">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4350-9-7-3"
+       id="linearGradient7719"
+       gradientUnits="userSpaceOnUse"
+       x1="182.54036"
+       y1="229.78313"
+       x2="182.6501"
+       y2="211.30733" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4332-7-3-3"
+       id="linearGradient7721"
+       gradientUnits="userSpaceOnUse"
+       x1="184.5444"
+       y1="207.34468"
+       x2="184.58699"
+       y2="224.56676" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2940-9-4-2"
+       id="linearGradient7723"
+       gradientUnits="userSpaceOnUse"
+       x1="184.15109"
+       y1="226.48277"
+       x2="184.2887"
+       y2="210.23618" />
+    <linearGradient
+       id="linearGradient2940-9-4-2">
+      <stop
+         style="stop-color:#c7c7c7;stop-opacity:1;"
+         offset="0"
+         id="stop2942-8-2-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2944-9-5-7" />
+    </linearGradient>
+    <linearGradient
+       y2="505.61362"
+       x2="245.39259"
+       y1="485.18768"
+       x1="223.49075"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3037-1"
+       xlink:href="#linearGradient3156"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.59135079,0,0,0.59153572,127.30584,167.71664)" />
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         id="stop3158"
+         offset="0"
+         style="stop-color:#d40000;stop-opacity:1" />
+      <stop
+         id="stop3160"
+         offset="1"
+         style="stop-color:#f3fbfb;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0377796"
+     inkscape:cx="-34.77869"
+     inkscape:cy="26.678884"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8394">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-435.51339,-673.27656)">
+    <g
+       id="g3502"
+       transform="translate(183.75098,227.2821)"
+       inkscape:export-filename="G:\LiberKey\MyDocuments\Mentalne Mape\Freeplane\FreePlane_radna_mapa\Freeplane_SVG_main_graphic_work\stop_exit.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <circle
+         r="13.482502"
+         cy="206.93002"
+         cx="152.70555"
+         transform="matrix(1.1510516,0,0,1.1510516,91.990437,223.80733)"
+         id="path4326-5-8"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#d40000;stroke-width:0.83566004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         r="11.031137"
+         cy="218.46585"
+         cx="182.04982"
+         transform="matrix(1.2508606,0,0,1.2508606,40.043459,188.72414)"
+         id="path4340-4-9"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7719);stroke-width:2.36398625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         r="9.084466"
+         cy="216.37498"
+         cx="184.50119"
+         transform="matrix(1.3422813,0,0,1.3422813,20.109909,171.55837)"
+         id="path4356-3-3"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:url(#linearGradient7721);stroke-width:0.96629298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <circle
+         r="8.3634768"
+         cy="218.39375"
+         cx="184.35699"
+         transform="matrix(1.3877987,0,0,1.3877987,11.912008,158.9079)"
+         id="path4368-2-4"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient7723);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+      <rect
+         y="456.50803"
+         x="262.27768"
+         height="10.972873"
+         width="10.969441"
+         id="rect3105"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.99545456;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d40000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3037-1);stroke-width:0.56438875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/TimeListAction.svg b/freeplane/resources/images/TimeListAction.svg
new file mode 100644
index 0000000..2af07c2
--- /dev/null
+++ b/freeplane/resources/images/TimeListAction.svg
@@ -0,0 +1,441 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.063986"
+   width="16.114672"
+   version="1.1"
+   viewBox="0 0 16.114672 16.063986"
+   id="svg3858"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="timelistaction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3953"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="344.48232"
+     inkscape:cy="-463.20802"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3858" />
+  <defs
+     id="defs3860">
+    <linearGradient
+       id="a"
+       y2="-130.78999"
+       xlink:href="#d"
+       gradientUnits="userSpaceOnUse"
+       x2="463.22"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       y1="340.63"
+       x1="41.688999" />
+    <linearGradient
+       id="d">
+      <stop
+         stop-color="#fefdb7"
+         offset="0"
+         id="stop3864" />
+      <stop
+         stop-color="#f5f06c"
+         offset="1"
+         id="stop3866" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="354.38"
+       xlink:href="#e"
+       gradientUnits="userSpaceOnUse"
+       x2="690.78998"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       y1="584.52002"
+       x1="351.57999" />
+    <linearGradient
+       id="e">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3870" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3872" />
+    </linearGradient>
+    <filter
+       id="c"
+       height="1.3585"
+       width="1.3599"
+       y="-0.17925"
+       x="-0.17994"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         stdDeviation="18.47879"
+         id="feGaussianBlur3875" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d"
+       id="linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x1="41.688999"
+       y1="340.63"
+       x2="463.22"
+       y2="-130.78999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d"
+       id="linearGradient4176"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x1="41.688999"
+       y1="340.63"
+       x2="463.22"
+       y2="-130.78999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#e"
+       id="linearGradient4178"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       x1="351.57999"
+       y1="584.52002"
+       x2="690.78998"
+       y2="354.38" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d"
+       id="linearGradient4180"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x1="41.688999"
+       y1="340.63"
+       x2="463.22"
+       y2="-130.78999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d"
+       id="linearGradient4182"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x1="41.688999"
+       y1="340.63"
+       x2="463.22"
+       y2="-130.78999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#e"
+       id="linearGradient4184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.025883,-0.032241,0,-345.79,81.756)"
+       x1="351.57999"
+       y1="584.52002"
+       x2="690.78998"
+       y2="354.38" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#d"
+       id="linearGradient4186"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.041425,-0.043471,0,-351.19,88.932)"
+       x1="41.688999"
+       y1="340.63"
+       x2="463.22"
+       y2="-130.78999" />
+  </defs>
+  <metadata
+     id="metadata3877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(365.41508,-88.401085)"
+     id="g3879">
+    <g
+       transform="matrix(0.58114,0,0,0.58114,-152,36.673)"
+       id="g3881">
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -5.3082,-0.0724 -10.676,-0.56905 -15.599,-0.25452 0.0184,0.0502 1.046,0.92855 -0.0573,-0.0546 -0.0953,-6.449 0.42493,-9.0149 0,-14.888 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3883"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4174);fill-rule:evenodd" />
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -8.4954,-0.85078 -15.577,-0.3319 -15.577,-0.3319 0,0 0.11023,-5.6825 -0.0793,-14.866 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3885"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4176);fill-rule:evenodd;stroke:#000000;stroke-width:0.43019" />
+      <path
+         d="m -351.37,89.641 -7.2382,-0.02664 -8.5923,-0.12695 c 0,0 -0.92022,22.89 6.7128,10.332 7.63302,-12.558 8.3328,-8.5522 9.1177,-10.179 z"
+         id="path3887"
+         inkscape:connector-curvature="0"
+         style="opacity:0.27778003;fill:url(#linearGradient4178);fill-rule:evenodd;stroke-width:1pt" />
+      <g
+         transform="matrix(1.4497,0,0,1.4497,161.55,-40.215)"
+         id="g3889">
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-364.14,88.088)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3891"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#a0892c;filter:url(#c)" />
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-363.86,87.746)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3893"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <path
+           d="m -357.93,90.386 -1.1895,0.21751 -0.24904,1.1252 c 0.13821,0.02106 0.28251,0.02138 0.42892,-0.0054 0.65989,-0.1206 1.1056,-0.71584 1.0096,-1.3373 z"
+           id="path3895"
+           inkscape:connector-curvature="0"
+           style="fill:#ee0000" />
+        <path
+           d="m -359.11,89.411 c -0.0819,-8.19e-4 -0.16521,0.0062 -0.24904,0.02151 -0.67064,0.12256 -1.121,0.73528 -1.0054,1.3676 0.0903,0.49431 0.50031,0.85354 0.99517,0.92895 l 0.24904,-1.1252 1.1895,-0.21751 c -0.002,-0.01011 -0.002,-0.02018 -0.004,-0.03031 -0.10112,-0.55331 -0.60231,-0.93934 -1.1753,-0.94508 z"
+           id="path3897"
+           inkscape:connector-curvature="0"
+           style="fill:#ff0000" />
+        <path
+           d="m -359.61,90.043 -0.0893,0.06601 -0.1647,0.12316 c -0.0672,0.14292 -0.0579,0.29457 -0.0158,0.45566 0.10919,0.41794 0.42004,0.62224 0.85865,0.57241 0.22452,-0.02551 0.4302,-0.10101 0.55634,-0.26144 l 0.22874,-0.28684 -1.374,-0.66897 z"
+           id="path3899"
+           inkscape:connector-curvature="0"
+           style="fill:#aa0000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.52,87.832)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3901"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.46,87.769)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3903"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#ff0000" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.61921,0,0,0.61921,-135.27,36.031)"
+       id="g3905">
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -5.3082,-0.0724 -10.676,-0.56905 -15.599,-0.25452 0.0184,0.0502 1.046,0.92855 -0.0573,-0.0546 -0.0953,-6.449 0.42493,-9.0149 0,-14.888 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3907"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4180);fill-rule:evenodd" />
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -8.4954,-0.85078 -15.577,-0.3319 -15.577,-0.3319 0,0 0.11023,-5.6825 -0.0793,-14.866 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3909"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4182);fill-rule:evenodd;stroke:#000000;stroke-width:0.40373999" />
+      <path
+         d="m -351.37,89.641 -7.2382,-0.02664 -8.5923,-0.12695 c 0,0 -0.92022,22.89 6.7128,10.332 7.63302,-12.558 8.3328,-8.5522 9.1177,-10.179 z"
+         id="path3911"
+         inkscape:connector-curvature="0"
+         style="opacity:0.27778003;fill:url(#linearGradient4184);fill-rule:evenodd;stroke-width:1pt" />
+      <g
+         transform="matrix(1.4497,0,0,1.4497,161.55,-40.215)"
+         id="g3913">
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-364.14,88.088)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3915"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#a0892c;filter:url(#c)" />
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-363.86,87.746)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3917"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <path
+           d="m -357.93,90.386 -1.1895,0.21751 -0.24904,1.1252 c 0.13821,0.02106 0.28251,0.02138 0.42892,-0.0054 0.65989,-0.1206 1.1056,-0.71584 1.0096,-1.3373 z"
+           id="path3919"
+           inkscape:connector-curvature="0"
+           style="fill:#ee0000" />
+        <path
+           d="m -359.11,89.411 c -0.0819,-8.19e-4 -0.16521,0.0062 -0.24904,0.02151 -0.67064,0.12256 -1.121,0.73528 -1.0054,1.3676 0.0903,0.49431 0.50031,0.85354 0.99517,0.92895 l 0.24904,-1.1252 1.1895,-0.21751 c -0.002,-0.01011 -0.002,-0.02018 -0.004,-0.03031 -0.10112,-0.55331 -0.60231,-0.93934 -1.1753,-0.94508 z"
+           id="path3921"
+           inkscape:connector-curvature="0"
+           style="fill:#ff0000" />
+        <path
+           d="m -359.61,90.043 -0.0893,0.06601 -0.1647,0.12316 c -0.0672,0.14292 -0.0579,0.29457 -0.0158,0.45566 0.10919,0.41794 0.42004,0.62224 0.85865,0.57241 0.22452,-0.02551 0.4302,-0.10101 0.55634,-0.26144 l 0.22874,-0.28684 -1.374,-0.66897 z"
+           id="path3923"
+           inkscape:connector-curvature="0"
+           style="fill:#aa0000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.52,87.832)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3925"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.46,87.769)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3927"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#ff0000" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.65729,0,0,0.65729,-118.53,35.388)"
+       id="g3929">
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -5.3082,-0.0724 -10.676,-0.56905 -15.599,-0.25452 0.0184,0.0502 1.046,0.92855 -0.0573,-0.0546 -0.0953,-6.449 0.42493,-9.0149 0,-14.888 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3931"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient4186);fill-rule:evenodd" />
+      <path
+         d="m -351.98,89.69 c -0.20581,5.0025 -0.11602,10.43 0.65531,15.197 -8.4954,-0.85078 -15.577,-0.3319 -15.577,-0.3319 0,0 0.11023,-5.6825 -0.0793,-14.866 0,-0.03027 0.0256,-0.05464 0.0573,-0.05464 5.0001,0.1909 10.016,0.46272 14.886,0 0.0318,0 0.0573,0.02437 0.0573,0.05464 z"
+         id="path3933"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);fill-rule:evenodd;stroke:#000000;stroke-width:0.38034999" />
+      <path
+         d="m -351.37,89.641 -7.2382,-0.02664 -8.5923,-0.12695 c 0,0 -0.92022,22.89 6.7128,10.332 7.63302,-12.558 8.3328,-8.5522 9.1177,-10.179 z"
+         id="path3935"
+         inkscape:connector-curvature="0"
+         style="opacity:0.27778003;fill:url(#b);fill-rule:evenodd;stroke-width:1pt" />
+      <g
+         transform="matrix(1.4497,0,0,1.4497,161.55,-40.215)"
+         id="g3937">
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-364.14,88.088)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3939"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#a0892c;filter:url(#c)" />
+        <circle
+           transform="matrix(0.0098426,-0.0017988,0.0016961,0.0092808,-363.86,87.746)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3941"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <path
+           d="m -357.93,90.386 -1.1895,0.21751 -0.24904,1.1252 c 0.13821,0.02106 0.28251,0.02138 0.42892,-0.0054 0.65989,-0.1206 1.1056,-0.71584 1.0096,-1.3373 z"
+           id="path3943"
+           inkscape:connector-curvature="0"
+           style="fill:#ee0000" />
+        <path
+           d="m -359.11,89.411 c -0.0819,-8.19e-4 -0.16521,0.0062 -0.24904,0.02151 -0.67064,0.12256 -1.121,0.73528 -1.0054,1.3676 0.0903,0.49431 0.50031,0.85354 0.99517,0.92895 l 0.24904,-1.1252 1.1895,-0.21751 c -0.002,-0.01011 -0.002,-0.02018 -0.004,-0.03031 -0.10112,-0.55331 -0.60231,-0.93934 -1.1753,-0.94508 z"
+           id="path3945"
+           inkscape:connector-curvature="0"
+           style="fill:#ff0000" />
+        <path
+           d="m -359.61,90.043 -0.0893,0.06601 -0.1647,0.12316 c -0.0672,0.14292 -0.0579,0.29457 -0.0158,0.45566 0.10919,0.41794 0.42004,0.62224 0.85865,0.57241 0.22452,-0.02551 0.4302,-0.10101 0.55634,-0.26144 l 0.22874,-0.28684 -1.374,-0.66897 z"
+           id="path3947"
+           inkscape:connector-curvature="0"
+           style="fill:#aa0000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.52,87.832)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3949"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#d40000" />
+        <circle
+           transform="matrix(0.0076932,-0.001406,0.0013257,0.0072541,-362.46,87.769)"
+           cy="393.14001"
+           cx="404.39001"
+           r="123.43"
+           id="circle3951"
+           d="m 527.82001,393.14001 c 0,68.16851 -55.26149,123.43 -123.43,123.43 -68.1685,0 -123.43,-55.26149 -123.43,-123.43 0,-68.1685 55.2615,-123.43 123.43,-123.43 68.16851,0 123.43,55.2615 123.43,123.43 z"
+           sodipodi:cx="404.39001"
+           sodipodi:cy="393.14001"
+           sodipodi:rx="123.43"
+           sodipodi:ry="123.43"
+           style="fill:#ff0000" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/TimeManagementAction.svg b/freeplane/resources/images/TimeManagementAction.svg
new file mode 100644
index 0000000..1774f54
--- /dev/null
+++ b/freeplane/resources/images/TimeManagementAction.svg
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="15.990838"
+   width="20.804829"
+   version="1.1"
+   viewBox="0 0 20.804829 15.990838"
+   id="svg3955"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="timemanagementaction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview4097"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="346.38315"
+     inkscape:cy="-487.87798"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3955" />
+  <defs
+     id="defs3957">
+    <linearGradient
+       id="u"
+       y2="50.549999"
+       gradientUnits="userSpaceOnUse"
+       x2="14.182"
+       gradientTransform="matrix(0.31824,0,0,0.30411,-442.32,132.71)"
+       y1="36.486"
+       x1="-33.818001">
+      <stop
+         stop-color="#b7bec8"
+         offset="0"
+         id="stop3960" />
+      <stop
+         stop-color="#535d6c"
+         offset="1"
+         id="stop3962" />
+    </linearGradient>
+    <linearGradient
+       id="w"
+       y2="70.697998"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="196.21001"
+       gradientTransform="matrix(0.32487,0,0,0.29803,-509.48,117.63)"
+       y1="88.996002"
+       x1="195.92999" />
+    <linearGradient
+       id="c">
+      <stop
+         stop-color="#77000d"
+         offset="0"
+         id="stop3966" />
+      <stop
+         stop-color="#ff0731"
+         offset="1"
+         id="stop3968" />
+    </linearGradient>
+    <linearGradient
+       id="v"
+       y2="103.62"
+       gradientUnits="userSpaceOnUse"
+       x2="195.92999"
+       gradientTransform="matrix(0.32487,0,0,0.29803,-509.48,117.63)"
+       y1="72.996002"
+       x1="195.92999">
+      <stop
+         stop-color="#5c000f"
+         offset="0"
+         id="stop3971" />
+      <stop
+         stop-color="#7c1f16"
+         stop-opacity="0"
+         offset="1"
+         id="stop3973" />
+    </linearGradient>
+    <linearGradient
+       id="x"
+       y2="88.710999"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="196.69"
+       gradientTransform="matrix(0.32487,0,0,0.29803,-509.48,117.67)"
+       y1="82.763"
+       x1="198" />
+    <radialGradient
+       id="e"
+       gradientUnits="userSpaceOnUse"
+       cy="132.31"
+       cx="196.92"
+       gradientTransform="matrix(0,0.98878,-1.0116,0,343.81,-116.14)"
+       r="21">
+      <stop
+         stop-color="#fffefe"
+         offset="0"
+         id="stop3977" />
+      <stop
+         stop-color="#d5d7da"
+         offset="1"
+         id="stop3979" />
+    </radialGradient>
+    <linearGradient
+       id="t"
+       y2="92.452003"
+       xlink:href="#d"
+       gradientUnits="userSpaceOnUse"
+       x2="279.57001"
+       gradientTransform="translate(-34.405,9.1578)"
+       y1="94.042999"
+       x1="281.20001" />
+    <linearGradient
+       id="d">
+      <stop
+         stop-color="#d0bcba"
+         offset="0"
+         id="stop3983" />
+      <stop
+         stop-color="#fefdfd"
+         offset="1"
+         id="stop3985" />
+    </linearGradient>
+    <linearGradient
+       id="s"
+       y2="122.7"
+       xlink:href="#d"
+       gradientUnits="userSpaceOnUse"
+       x2="223.50999"
+       gradientTransform="translate(29.5,-14)"
+       y1="113.87"
+       x1="213.3" />
+    <linearGradient
+       id="r"
+       y2="35.012001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="219.23"
+       gradientTransform="matrix(1.078,0,0,1.0746,-55.113,33.894)"
+       y1="35.012001"
+       x1="221.62" />
+    <linearGradient
+       id="b">
+      <stop
+         stop-color="#978888"
+         offset="0"
+         id="stop3990" />
+      <stop
+         stop-color="#fbfcfc"
+         offset="1"
+         id="stop3992" />
+    </linearGradient>
+    <linearGradient
+       id="q"
+       y2="26.507"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="250.11"
+       gradientTransform="translate(-68.059,38.978)"
+       y1="38.570999"
+       x1="250.11" />
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#d0bcba"
+         offset="0"
+         id="stop3996" />
+      <stop
+         stop-color="#6c6c6c"
+         offset="1"
+         id="stop3998" />
+    </linearGradient>
+    <linearGradient
+       id="p"
+       y2="35.012001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="219.23"
+       gradientTransform="matrix(1.078,0,0,1.0746,-47.594,33.894)"
+       y1="35.012001"
+       x1="221.62" />
+    <linearGradient
+       id="o"
+       y2="26.507"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="250.11"
+       gradientTransform="translate(-60.54,38.978)"
+       y1="38.570999"
+       x1="250.11" />
+    <linearGradient
+       id="n"
+       y2="35.012001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="219.23"
+       gradientTransform="matrix(1.078,0,0,1.0746,-40.075,33.894)"
+       y1="35.012001"
+       x1="221.62" />
+    <linearGradient
+       id="m"
+       y2="26.507"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="250.11"
+       gradientTransform="translate(-53.02,38.978)"
+       y1="38.570999"
+       x1="250.11" />
+    <linearGradient
+       id="l"
+       y2="35.012001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="219.23"
+       gradientTransform="matrix(1.078,0,0,1.0746,-32.555,33.894)"
+       y1="35.012001"
+       x1="221.62" />
+    <linearGradient
+       id="k"
+       y2="26.507"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="250.11"
+       gradientTransform="translate(-45.501,38.978)"
+       y1="38.570999"
+       x1="250.11" />
+    <linearGradient
+       id="j"
+       y2="35.012001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       x2="219.23"
+       gradientTransform="matrix(1.078,0,0,1.0746,-25.036,33.894)"
+       y1="35.012001"
+       x1="221.62" />
+    <linearGradient
+       id="i"
+       y2="26.507"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       x2="250.11"
+       gradientTransform="translate(-37.982,38.978)"
+       y1="38.570999"
+       x1="250.11" />
+    <linearGradient
+       id="h"
+       y2="260.53"
+       gradientUnits="userSpaceOnUse"
+       x2="243.32001"
+       gradientTransform="matrix(0.93683,0.014449,0,0.96961,-682.59,-551.61)"
+       y1="402.14999"
+       x1="243.32001">
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="0"
+         id="stop4009" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".57255"
+         offset="1"
+         id="stop4011" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       y2="469.54999"
+       gradientUnits="userSpaceOnUse"
+       x2="260.54999"
+       gradientTransform="matrix(0.99992,0,0,1.0001,-717.61,-582.54)"
+       y1="307.82999"
+       x1="259.39999">
+      <stop
+         stop-color="#ddd"
+         offset="0"
+         id="stop4014" />
+      <stop
+         stop-color="#f5f5f5"
+         offset="1"
+         id="stop4016" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       y2="850.53003"
+       gradientUnits="userSpaceOnUse"
+       x2="106.81"
+       gradientTransform="matrix(0.94288,0,0,0.92662,-557.49,-1056.4)"
+       y1="987.16998"
+       x1="104.63">
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="0"
+         id="stop4019" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0.85"
+         offset="1"
+         id="stop4021" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.0003,0,0,1.0003,453.21591,-137.72227)"
+     id="g4025">
+    <rect
+       rx="0.49654999"
+       ry="0.45552"
+       height="14.597"
+       width="15.276"
+       y="139.07001"
+       x="-452.76001"
+       id="rect4027"
+       style="fill:#6f7c91" />
+    <rect
+       rx="0.49654999"
+       ry="0.45552"
+       height="14.597"
+       width="15.276"
+       y="138.77"
+       x="-453.07999"
+       id="rect4029"
+       style="fill:url(#u)" />
+    <rect
+       height="4.5897002"
+       width="13.45"
+       y="139.47"
+       x="-452"
+       id="rect4031"
+       style="fill:url(#w);stroke:url(#v);stroke-width:0.1867;stroke-linecap:round" />
+    <path
+       d="m -451.97,139.67 -0.0371,4.3433 c 0.10354,0.01 13.373,-1.3e-4 13.41,0 0.0309,1.1e-4 0.0315,-0.20877 0.0112,-0.78233 -3.4379,-0.0373 -4.5943,-0.70373 -6.132,-1.3225 -1.3921,-0.51736 -4.3766,-0.0249 -5.7868,-0.39116 -1.0358,-0.3981 -0.96467,-0.78648 -1.4654,-1.8473 z"
+       id="path4033"
+       inkscape:connector-curvature="0"
+       style="fill:url(#x)" />
+    <g
+       transform="matrix(0.32487,0,0,0.29838,-518.99,121.78)"
+       id="g4035">
+      <rect
+         height="29.365999"
+         width="41.400002"
+         y="75.136002"
+         x="206.17"
+         id="rect4037"
+         style="fill:url(#e);stroke:#afa497;stroke-width:0.59965003;stroke-linecap:round" />
+      <g
+         transform="matrix(1,0,0,0.99883,-20.881,-12.446)"
+         id="g4039"
+         style="fill:none;stroke:#c60002;stroke-width:1px;stroke-opacity:0.10135001">
+        <path
+           d="m 227.38,90.874 h 41.189"
+           id="path4041"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 227.38,94.881 h 41.189"
+           id="path4043"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 227.38,114.92 h 41.189"
+           id="path4045"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 227.38,110.91 h 41.189"
+           id="path4047"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 227.38,106.9 h 41.189"
+           id="path4049"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 227.38,102.89 h 41.189"
+           id="path4051"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 227.38,98.888 h 41.189"
+           id="path4053"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         d="m 247.46,97.631 c -1.3556,2.8653 -3.0457,4.7151 -5.622,6.6465 2.0989,0.31643 3.9864,-0.45739 5.0362,-0.89983 0.36782,-1.7038 0.67046,-4.0302 0.58573,-5.7467 z"
+         id="path4055"
+         inkscape:connector-curvature="0"
+         style="opacity:0.53897998;fill:url(#t);fill-rule:evenodd;stroke:url(#s);stroke-width:0.45300001" />
+    </g>
+    <g
+       transform="matrix(0.32487,0,0,0.29803,-509.31,118.16)"
+       id="g4057"
+       style="stroke-width:0.66600001;stroke-linecap:round">
+      <rect
+         rx="1.4293"
+         ry="2.2434001"
+         height="11.397"
+         width="2.8585999"
+         y="65.818001"
+         x="180.63"
+         id="rect4059"
+         style="fill:url(#r);stroke:url(#q)" />
+      <rect
+         rx="1.4293"
+         ry="2.2434001"
+         height="11.397"
+         width="2.8585999"
+         y="65.818001"
+         x="188.14"
+         id="rect4061"
+         style="fill:url(#p);stroke:url(#o)" />
+      <rect
+         rx="1.4293"
+         ry="2.2434001"
+         height="11.397"
+         width="2.8585999"
+         y="65.818001"
+         x="195.66"
+         id="rect4063"
+         style="fill:url(#n);stroke:url(#m)" />
+      <rect
+         rx="1.4293"
+         ry="2.2434001"
+         height="11.397"
+         width="2.8585999"
+         y="65.818001"
+         x="203.17999"
+         id="rect4065"
+         style="fill:url(#l);stroke:url(#k)" />
+      <rect
+         rx="1.4293"
+         ry="2.2434001"
+         height="11.397"
+         width="2.8585999"
+         y="65.818001"
+         x="210.7"
+         id="rect4067"
+         style="fill:url(#j);stroke:url(#i)" />
+    </g>
+    <path
+       d="m -448.23,149.9 h 2.2276 v 0.95952 h -3.6787 V 149.9 l 1.8478,-1.6309 c 0.16501,-0.14918 0.28707,-0.29497 0.36619,-0.43738 0.0791,-0.1424 0.11866,-0.29045 0.11866,-0.44416 0,-0.23733 -0.0802,-0.42833 -0.24072,-0.573 -0.15823,-0.14466 -0.36958,-0.21699 -0.63404,-0.217 -0.20343,1e-5 -0.42608,0.0441 -0.66793,0.13223 -0.24186,0.0859 -0.50068,0.21474 -0.77644,0.38653 v -1.1121 c 0.29385,-0.0972 0.5843,-0.17065 0.87137,-0.22039 0.28706,-0.052 0.56848,-0.078 0.84425,-0.078 0.60577,1e- [...]
+       id="path4069"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.040922,0,0,0.040922,-417.91,156.14)"
+       id="g4071">
+      <path
+         d="m -351.19,-193.66 a 103.65,103.65 0 1 0 -207.3,0 103.65,103.65 0 1 0 207.3,0 z"
+         id="path4073"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -356.18,-193.45 a 100.65,96.96 78.224 1 0 -194.23,-2.9958 100.65,96.96 78.224 1 0 194.23,2.9958 z"
+         id="path4075"
+         inkscape:connector-curvature="0"
+         style="fill:url(#h);stroke-width:1.25349998" />
+      <path
+         d="m -366.58,-185.32 a 88.295,95.537 0 1 0 -176.59,0 88.295,95.537 0 0 0 176.59,0 z"
+         id="path4077"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -372.18,-194.4 a 82.601,82.601 0 1 0 -165.2,0 82.601,82.601 0 1 0 165.2,0 z"
+         id="path4079"
+         inkscape:connector-curvature="0"
+         style="fill:url(#g);stroke-width:3.75" />
+      <path
+         d="m -384.9,-200.65 a 69.827,68.607 0 1 0 -139.65,0 69.827,68.607 0 1 0 139.65,0 z"
+         id="path4081"
+         inkscape:connector-curvature="0"
+         style="fill:url(#f)" />
+      <path
+         d="m -449.01,-184.25 -30.719,-47.786"
+         id="path4083"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:6" />
+      <path
+         d="m -460.66,-183.46 36.967,-67.113"
+         id="path4085"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:6" />
+      <path
+         d="m -468.12,-191.76 79.871,-8.1919"
+         id="path4087"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ff0000;stroke-width:3" />
+      <rect
+         y="-271.07999"
+         width="3.7730999"
+         x="-456.62"
+         height="9.0606003"
+         id="rect4089" />
+      <rect
+         y="-127.11"
+         width="3.7730999"
+         x="-456.62"
+         height="9.0606003"
+         id="rect4091" />
+      <rect
+         transform="matrix(0,1,-1,0,0,0)"
+         height="9.0606003"
+         width="3.7730999"
+         y="521.5"
+         x="-196.67999"
+         id="rect4093" />
+      <rect
+         transform="matrix(0,1,-1,0,0,0)"
+         height="9.0606003"
+         width="3.7730999"
+         y="379.13"
+         x="-196.67999"
+         id="rect4095" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/Underline24.gif b/freeplane/resources/images/Underline24.gif
deleted file mode 100644
index 93e20be..0000000
Binary files a/freeplane/resources/images/Underline24.gif and /dev/null differ
diff --git a/freeplane/resources/images/UpPresentation.svg b/freeplane/resources/images/UpPresentation.svg
new file mode 100644
index 0000000..ddd681c
--- /dev/null
+++ b/freeplane/resources/images/UpPresentation.svg
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.821814mm"
+   height="10.402451mm"
+   viewBox="0 0 41.888316 36.859076"
+   id="svg5769"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="UpPresentation.svg">
+  <defs
+     id="defs5771">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd5"
+       gradientUnits="userSpaceOnUse"
+       x1="27.294901"
+       y1="25.4727"
+       x2="20.945299"
+       y2="11.0039">
+      <stop
+         offset="0"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         id="stop13012" />
+      <stop
+         offset="1"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         id="stop13014" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd6"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop13035" />
+      <stop
+         offset="1"
+         style="stop-color:#686868"
+         id="stop13037" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       y2="7.4600263"
+       x2="24.919374"
+       y1="6.1478682"
+       x1="24.919374"
+       gradientTransform="matrix(1.7574358,0,0,2.3416133,245.10519,489.54873)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9224"
+       xlink:href="#aigrd6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="aigrd6-0"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <stop
+         offset="0"
+         style="stop-color:#87deaa;stop-opacity:1"
+         id="stop13035-8" />
+      <stop
+         offset="1"
+         style="stop-color:#008033;stop-opacity:1"
+         id="stop13037-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4484"
+       id="linearGradient4490"
+       x1="270.70633"
+       y1="505.10529"
+       x2="273.03723"
+       y2="505.12097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.21527024,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4484">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4486" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4488" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08379709,0,0,0.08406435,351.02808,700.23699)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.3745636"
+     inkscape:cx="-59.232947"
+     inkscape:cy="37.136288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5774">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(169.64294,-201.26699)">
+    <g
+       id="g4581">
+      <g
+         transform="matrix(1.0895892,0,0,1.0895892,-464.69073,-346.65067)"
+         id="g4577">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4575"
+           d="m 290.03565,529.06437 0,6.98637"
+           style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.68497515px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           d="m 306.58353,530.38279 -33.22567,0 0,-23.55079 33.22567,0 0,23.55079 0,0 z"
+           id="path13016"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true" />
+        <g
+           id="g4530"
+           transform="translate(0.26630924,0)">
+          <rect
+             ry="1.802771"
+             rx="1.790844"
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             y="503.24127"
+             x="270.89679"
+             height="3.7142279"
+             width="37.615192"
+             id="rect9222"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9224);fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+          <path
+             sodipodi:nodetypes="czcsccc"
+             inkscape:connector-curvature="0"
+             id="path4474"
+             d="m 272.50317,503.58778 c -0.48389,0.008 -1.25261,0.52281 -1.25982,1.45249 -0.007,0.92968 0.6178,1.53088 1.32433,1.57022 0,0 1.35181,0.0113 1.19881,0 -1.886,-0.13941 -1.94949,-2.72959 -0.21448,-3.01573 -0.46187,6.1e-4 -0.65743,-0.0107 -1.04884,-0.007 z"
+             style="opacity:0.65899999;fill:url(#linearGradient4490);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="czcsccc"
+             inkscape:connector-curvature="0"
+             id="path4474-7"
+             d="m 306.98696,503.56031 c 0.48389,0.008 1.25261,0.52281 1.25982,1.45249 0.007,0.92968 -0.6178,1.53088 -1.32433,1.57022 0,0 -1.35181,0.0113 -1.19881,0 1.886,-0.13941 1.94949,-2.72959 0.21448,-3.01573 0.46187,6.1e-4 0.65743,-0.0107 1.04884,-0.007 z"
+             style="opacity:0.65899999;fill:#005522;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <path
+           style="fill:#2d5016;fill-opacity:0;fill-rule:evenodd;stroke:#005900;stroke-width:0.93418342px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 271.31254,530.32914 c 0.30445,0.0904 37.44595,0 37.44595,0"
+           id="path4535"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff1e;fill-opacity:1;fill-rule:nonzero;stroke:#005900;stroke-width:0.59698266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:a [...]
+           id="path4573"
+           cx="290.03564"
+           cy="534.54059"
+           r="1.8556092" />
+      </g>
+      <rect
+         ry="1.1366593"
+         rx="1.1344646"
+         y="208.43571"
+         x="-161.40216"
+         height="19.135252"
+         width="25.146044"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.4576596;stroke-opacity:1" />
+      <g
+         transform="matrix(0.66694017,0,0,0.66694017,-402.1936,-260.90153)"
+         id="g4422">
+        <path
+           id="path4779"
+           d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4781"
+           d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4783"
+           d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+           style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4743"
+           d="m 376.89205,718.72358 a 4.290914,4.3045991 0 0 1 -4.29124,4.30494 4.290914,4.3045991 0 0 1 -4.29127,-4.30494 4.290914,4.3045991 0 0 1 4.29127,-4.30493 4.290914,4.3045991 0 0 1 4.29124,4.30493 z"
+           font-size="61.543px"
+           inkscape:connector-curvature="0"
+           style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.90568078;stroke-opacity:0.99738668" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.97680634"
+           ry="1.0587236"
+           height="4.8009052"
+           width="8.6384783"
+           y="714.97345"
+           x="-395.90698"
+           id="rect4717"
+           transform="scale(-1,1)" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668"
+           rx="0.9768008"
+           ry="1.0587536"
+           height="4.8010173"
+           width="8.6384134"
+           y="722.9632"
+           x="383.33188"
+           id="rect4723" />
+        <rect
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1"
+           rx="0.91026998"
+           ry="1.007938"
+           height="4.5706868"
+           width="8.0499411"
+           y="-711.94672"
+           x="-391.7066"
+           id="rect4729"
+           transform="scale(-1,-1)" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="H:\FreeMind_Ikone\forward.png"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.21000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91625612;marker:none;enable-background:accumulate"
+         d="m -160.47651,208.2569 5.00041,6.32261 -2.96694,0.0323 0.0902,8.97336 -4.16918,0 -0.0564,-8.97336 -2.88829,0 4.98988,-6.35481 z"
+         id="path3846-4"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/UpSlide.svg b/freeplane/resources/images/UpSlide.svg
new file mode 100644
index 0000000..342eed9
--- /dev/null
+++ b/freeplane/resources/images/UpSlide.svg
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11.841663mm"
+   height="9.0616827mm"
+   viewBox="0 0 41.958647 32.108324"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="UpSlide.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         id="stop12498-6"
+         offset="0"
+         style="stop-color:#dcdcdc;stop-opacity:1" />
+      <stop
+         id="stop12500-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         id="stop15518-1-5"
+         offset="0"
+         style="stop-color:#dc7fcf;stop-opacity:1" />
+      <stop
+         id="stop15520-5-0"
+         offset="1"
+         style="stop-color:#a8bef9;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         id="stop20604-5"
+         offset="0"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+      <stop
+         id="stop20606-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop20576-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20578-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         style="stop-color:#a6a6c6;stop-opacity:1"
+         offset="0"
+         id="stop20586-8" />
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="1"
+         id="stop20588-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         style="stop-color:#2aa200;stop-opacity:1"
+         offset="0"
+         id="stop20411-3" />
+      <stop
+         style="stop-color:#5ffb57;stop-opacity:1"
+         offset="1"
+         id="stop20413-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         style="stop-color:#f1d103;stop-opacity:1;"
+         offset="0"
+         id="stop13708-7" />
+      <stop
+         style="stop-color:#f7cd03;stop-opacity:1"
+         offset="1"
+         id="stop13710-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06975472,0,0,0.06997719,354.27516,702.66026)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.079175"
+     inkscape:cx="-4.3084896"
+     inkscape:cy="12.249084"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-171.60686,-751.41864)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1"
+       id="rect4498-7"
+       width="41.208649"
+       height="31.358326"
+       x="171.98186"
+       y="751.79364"
+       rx="1.8591295"
+       ry="1.862726" />
+    <g
+       id="g4422-5"
+       transform="matrix(1.1550017,0,0,1.0988222,-247.14393,-20.789425)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 375.78529,716.10016 c 2.11426,-0.0434 4.06732,1.99664 6.28688,0.16883 2.10078,-1.76148 5.00221,1.2991 6.79402,1.50356 -1.49785,-0.15879 -4.07178,-3.0623 -6.14158,-0.92633 -3.10136,3.16195 -4.76809,1.21831 -6.92723,1.26249 l -0.0121,-2.00855 z"
+         id="path4779-9" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+         d="m 372.43853,718.33869 c 2.11424,0.0434 4.0673,0.25882 6.28687,2.08663 2.10078,1.76148 4.7921,3.64141 6.58392,3.43686 -1.49785,0.1588 -3.86169,-1.87811 -5.93148,-4.01416 -3.10137,-3.16194 -4.76809,-3.47377 -6.92723,-3.51794 l -0.0121,2.00854 0,0 z"
+         id="path4781-3" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.58037668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 372.42387,716.20498 c 2.11426,-0.0434 4.06732,-0.25882 6.28689,-2.08663 2.10076,-1.76148 4.7921,-3.6414 6.5839,-3.43687 -1.49784,-0.15879 -3.86167,1.87812 -5.93147,4.01417 -3.10137,3.16195 -4.76809,3.47377 -6.92723,3.51794 l -0.0121,-2.00854 0,0 z"
+         id="path4783-6" />
+      <path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069-2);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.75391054;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 375.80496,718.04895 a 3.5718604,3.5832522 0 0 1 -3.57213,3.58354 3.5718604,3.5832522 0 0 1 -3.57216,-3.58354 3.5718604,3.5832522 0 0 1 3.57216,-3.58353 3.5718604,3.5832522 0 0 1 3.57213,3.58353 z"
+         id="path4743-2" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717-9"
+         x="-395.90698"
+         y="714.97345"
+         width="8.6384783"
+         height="4.8009052"
+         ry="1.0587236"
+         rx="0.97680634"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.66973293;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         id="rect4723-6"
+         x="383.33188"
+         y="722.9632"
+         width="8.6384134"
+         height="4.8010173"
+         ry="1.0587536"
+         rx="0.9768008"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.66972232;stroke-linejoin:round;stroke-opacity:0.99738668" />
+      <rect
+         transform="scale(-1,-1)"
+         id="rect4729-7"
+         x="-391.7066"
+         y="-711.94672"
+         width="8.0499411"
+         height="4.5706868"
+         ry="1.007938"
+         rx="0.91026998"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.63820893;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="H:\FreeMind_Ikone\forward.png"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.21000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91625612;marker:none;enable-background:accumulate"
+       d="m 180.47081,755.79463 5.00041,6.32261 -2.96694,0.0323 0.0902,9.89085 -4.16918,0 -0.0564,-9.89085 -2.88829,0 4.98988,-6.35481 z"
+       id="path3846-4"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/acceleratorPresets.svg b/freeplane/resources/images/acceleratorPresets.svg
new file mode 100644
index 0000000..5d55db2
--- /dev/null
+++ b/freeplane/resources/images/acceleratorPresets.svg
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="17"
+   height="16"
+   id="svg17219"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 17 16">
+  <defs
+     id="defs17221">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4710-3"
+       id="radialGradient36562"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.66257733,0,0,0.68659053,-347.76,301.71995)"
+       cx="24.500004"
+       cy="29.500004"
+       fx="24.500004"
+       fy="29.500004"
+       r="15.095438" />
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4728-0"
+       id="linearGradient36564"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.30564151,0,0,0.31671861,-356.62863,312.75929)"
+       x1="24.095442"
+       y1="12.595438"
+       x2="24.095442"
+       y2="34.09544" />
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4750-3"
+       id="linearGradient36566"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.30758608,0,0,0.31873365,-367.06902,312.42845)"
+       x1="38.292995"
+       y1="6.7174492"
+       x2="39.4375"
+       y2="8.161993" />
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4750-3"
+       id="linearGradient36568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.30758608,0,0,0.31873365,-371.37523,312.42845)"
+       x1="8.1168785"
+       y1="7.9334393"
+       x2="9.0674801"
+       y2="6.7843909" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient33867-4"
+       id="linearGradient36570"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90503689,0,0,0.90503689,-531.65178,73.301179)"
+       x1="14.462892"
+       y1="12.284524"
+       x2="34.534348"
+       y2="39.684914" />
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.54430686"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1421"
+     inkscape:window-height="880"
+     inkscape:window-x="404"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17224">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g17917"
+       transform="matrix(0.99983057,0,0,1.0000018,0.4375037,-0.02625239)">
+      <g
+         transform="matrix(0.92663498,0,0,1.0473479,342.26712,-328.53985)"
+         id="g35998-0">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#50514e;stroke-width:0.31311026;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -368.28661,313.86902 12.89753,0 c 0.77265,0 1.39468,0.66121 1.39468,1.48252 l 0,9.13405 c 0,0.82132 -0.62203,1.48252 -1.39468,1.48252 l -12.89753,0 c -0.77265,0 -1.39468,-0.6612 -1.39468,-1.48252 l 0,-9.13405 c 0,-0.82131 0.62203,-1.48252 1.39468,-1.48252 z"
+           id="rect2960-5" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#radialGradient36562);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient36564);stroke-width:0.31311026;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -356.09409,314.81782 -11.2669,0 c -0.60565,0 -1.09322,0.50525 -1.09322,1.13284 l 0,6.97962 c 0,0.62759 0.48757,1.13284 1.09322,1.13284 l 11.2669,0 c 0.60564,0 1.09322,-0.50525 1.09322,-1.13284 l 0,-6.97962 c 0,-0.62759 -0.48758,-1.13284 -1.09322,-1.13284 z"
+           id="rect3835-5" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.48888903;fill:none;stroke:#ffffff;stroke-width:0.31311026;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -368.30105,314.17958 12.89555,0 c 0.6028,0 1.08808,0.50287 1.08808,1.12752 l 0,9.22294 c 0,0.62464 -0.48528,1.12752 -1.08808,1.12752 l -12.89555,0 c -0.6028,0 -1.08808,-0.50288 -1.08808,-1.12752 l 0,-9.22294 c 0,-0.62465 0.48528,-1.12752 1.08808,-1.12752 z"
+           id="rect4740-9" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.48888903;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           d="m -369.54902,324.69957 c 0.0192,0.35857 0.4037,0.93628 0.86508,1.05581 l 0.67285,-1.75304 -0.28837,-0.21913 -1.24956,0.91636 z"
+           id="path4742-3"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path4744-2"
+           d="m -354.13127,324.69957 c -0.0192,0.35857 -0.40371,0.93628 -0.86509,1.05581 l -0.67284,-1.75304 0.28836,-0.21913 1.24957,0.91636 z"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.48888903;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient36566);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           d="m -354.30429,314.6993 c -0.13457,-0.17929 -0.36526,-0.51794 -0.67284,-0.61754 l -0.59595,0.81675 0.28836,0.31873 0.98043,-0.51794 z"
+           id="path4746-8"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path4748-7"
+           d="m -369.39523,314.6993 c 0.13457,-0.17929 0.34603,-0.49802 0.65362,-0.59762 l 0.57672,0.85659 -0.21146,0.31874 -1.01888,-0.57771 z"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient36568);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.11589432px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0.3429912px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2133555;stroke-opacity:1"
+           x="-367.7739"
+           y="321.10919"
+           id="text35994-4"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan35996-8"
+             x="-367.7739"
+             y="321.10919"
+             style="stroke-width:0.2133555">CTRL</tspan></text>
+      </g>
+      <g
+         transform="matrix(0.28951487,0,0,0.28951487,159.44841,-16.298226)"
+         id="g33704-8">
+        <path
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient36570);fill-opacity:1;fill-rule:nonzero;stroke:#003380;stroke-width:1.19814599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -511.04516,78.896165 c -0.33917,0.02321 -0.66885,0.07574 -1.002,0.113864 l -0.0228,0 -0.79705,4.349598 c -1.29912,0.295856 -2.52133,0.797951 -3.62087,1.480229 l -3.57532,-2.573322 c -0.9665,0.750365 -1.84601,1.625498 -2.61887,2.573322 l 2.48223,3.620869 c -0.75367,1.151766 -1.32043,2.466909 -1.63963,3.848597 -6e-5,0.0066 -5e-5,0.02164 0,0.02277 l -4.32683,0.683183 c -0.0791,0.646115 -0.11386,1.313853 -0.11386,1.98123 0,0.546037 0.0151,1.084777 0.0683,1.616866 l 4.32682,0. [...]
+           id="path3243-9"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g33700-2">
+          <circle
+             transform="matrix(0.48710462,0,0,0.48710462,-521.65212,83.397358)"
+             id="path3283-9"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.64772704;fill:none;stroke:#ffffff;stroke-width:2.4597199;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             inkscape:r_cx="true"
+             inkscape:r_cy="true"
+             cx="23.511301"
+             cy="23.781593"
+             r="12.727922" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.34659101;fill:none;stroke:#ffffff;stroke-width:1.19814599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             d="m -511.47261,80.748403 -0.60389,3.973982 c -1.14908,0.261685 -3.26275,1.062027 -4.23529,1.665503 l -3.21276,-2.397992 c -0.85487,0.663698 -0.9135,0.708707 -1.59709,1.547059 l 2.32294,3.445135 c -0.66662,1.018738 -1.46732,2.834178 -1.75481,4.131509 0,0 -4.07053,0.686173 -4.07053,0.686173 -0.07,0.571489 -0.0363,1.794649 0.0108,2.265282 l 3.88819,0.70044 c 0.27218,1.329015 1.29075,3.468266 2.0122,4.564006 l -2.45877,3.24853 c 0.65186,0.80926 0.78232,0.88331 1.59357,1.53279 l [...]
+             id="path3285-5"
+             inkscape:r_cx="true"
+             inkscape:r_cy="true" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/addons.svg b/freeplane/resources/images/addons.svg
new file mode 100644
index 0000000..a910405
--- /dev/null
+++ b/freeplane/resources/images/addons.svg
@@ -0,0 +1,1030 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.011103"
+   width="15.317327"
+   version="1.1"
+   viewBox="0 0 15.317327 16.011103"
+   id="svg3047"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="active1_addon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3241"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="342.82191"
+     inkscape:cy="-374.2478"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3047" />
+  <defs
+     id="defs3049">
+    <linearGradient
+       id="g">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3052" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <radialGradient
+       id="d"
+       xlink:href="#i"
+       gradientUnits="userSpaceOnUse"
+       cy="235.85001"
+       cx="-1490.8"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       r="12.631" />
+    <linearGradient
+       id="i">
+      <stop
+         stop-color="#2840d5"
+         offset="0"
+         id="stop3058" />
+      <stop
+         stop-color="#99a5eb"
+         offset="1"
+         id="stop3060" />
+    </linearGradient>
+    <radialGradient
+       id="b"
+       xlink:href="#h"
+       gradientUnits="userSpaceOnUse"
+       cy="235.85001"
+       cx="-1490.8"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       r="12.631" />
+    <linearGradient
+       id="h">
+      <stop
+         stop-color="#eda701"
+         offset="0"
+         id="stop3064" />
+      <stop
+         stop-color="#fee806"
+         offset="1"
+         id="stop3066" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="229.36"
+       xlink:href="#g"
+       gradientUnits="userSpaceOnUse"
+       x2="-1508.5"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       y1="210.75"
+       x1="-1498.6" />
+    <linearGradient
+       id="f"
+       y2="229.36"
+       xlink:href="#g"
+       gradientUnits="userSpaceOnUse"
+       x2="-1508.5"
+       gradientTransform="matrix(-0.13131,0.23166,-0.23227,-0.13211,-503.4,1105.3)"
+       y1="210.75"
+       x1="-1498.6" />
+    <radialGradient
+       id="a"
+       xlink:href="#j"
+       gradientUnits="userSpaceOnUse"
+       cy="235.85001"
+       cx="-1490.8"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       r="12.631" />
+    <linearGradient
+       id="j">
+      <stop
+         stop-color="#c933b0"
+         offset="0"
+         id="stop3072" />
+      <stop
+         stop-color="#f695e8"
+         offset="1"
+         id="stop3074" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="229.36"
+       xlink:href="#g"
+       gradientUnits="userSpaceOnUse"
+       x2="-1508.5"
+       gradientTransform="matrix(-0.14292,0.23542,-0.24256,-0.13916,-524.7,1115.7)"
+       y1="210.75"
+       x1="-1498.6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#i"
+       id="radialGradient4968"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient4970"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient4972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient4974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient4976"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient4978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient4980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13131,0.23166,-0.23227,-0.13211,-503.4,1105.3)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient4982"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient4984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.14292,0.23542,-0.24256,-0.13916,-524.7,1115.7)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient4986"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient4988"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#i"
+       id="radialGradient4990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient4992"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient4994"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient4996"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient4998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5000"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13131,0.23166,-0.23227,-0.13211,-503.4,1105.3)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.14292,0.23542,-0.24256,-0.13916,-524.7,1115.7)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5010"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#i"
+       id="radialGradient5012"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5014"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5016"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5018"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5022"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13131,0.23166,-0.23227,-0.13211,-503.4,1105.3)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.14292,0.23542,-0.24256,-0.13916,-524.7,1115.7)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5030"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5032"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#i"
+       id="radialGradient5034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5040"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5046"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13131,0.23166,-0.23227,-0.13211,-503.4,1105.3)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5050"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.14292,0.23542,-0.24256,-0.13916,-524.7,1115.7)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5052"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5054"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="linearGradient5058"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#h"
+       id="radialGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5062"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient5064"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+  </defs>
+  <metadata
+     id="metadata3077">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.99136,0,0,0.99136,332.71467,-739.83219)"
+     id="g3079">
+    <g
+       transform="translate(-17.467,19.017)"
+       id="g3081">
+      <g
+         transform="matrix(1.0018,0,0,1.0018,52.549,1.9931)"
+         id="g3083">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22957,0.16231,-0.16297,-0.23043,-661.96,1033.8)"
+           id="path3085"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient4968);fill-rule:evenodd;stroke:#0d1547;stroke-width:1.77170002" />
+      </g>
+      <g
+         transform="matrix(1.0018,0.0030618,-0.0030618,1.0018,54.081,2.2844)"
+         id="g3087"
+         style="fill-rule:evenodd">
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3089"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4970);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3091"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient4972)" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3093"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4974);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3095"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient4976)" />
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3097"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient4978);stroke:#3c1d03;stroke-width:1.77320004" />
+        <path
+           d="m -357.61,731.3 1.6889,-2.9796 -1.832,-3.0816 -1.056,0.14109 c 1.4757,3.2116 1.4712,4.7994 1.1991,5.9201 z"
+           id="path3099"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient4980)" />
+      </g>
+      <g
+         transform="matrix(1.0018,0,0,1.0018,51.969,1.1222)"
+         id="g3101">
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3103"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4982);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -363.81,734.68 1.8382,-3.0279 -1.8746,-3.1888 -1.1168,0.12775 c 1.4962,3.3165 1.4614,4.9443 1.1532,6.0889 z"
+           id="path3105"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient4984);fill-rule:evenodd" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3107"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4986);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3109"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient4988);fill-rule:evenodd;stroke:#480048;stroke-width:1.77209997" />
+        <g
+           transform="matrix(0.077328,9.1119e-4,-8.5264e-4,0.077374,-375.14,690.52)"
+           id="g3111"
+           style="opacity:0.57521997" />
+      </g>
+    </g>
+    <g
+       transform="translate(-17.467,19.017)"
+       id="g3113">
+      <g
+         transform="matrix(1.0018,0,0,1.0018,52.549,1.9931)"
+         id="g3115">
+        <path
+           transform="matrix(-0.22957,0.16231,-0.16297,-0.23043,-661.96,1033.8)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3117"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient4990);fill-rule:evenodd;stroke:#0d1547;stroke-width:1.77170002" />
+      </g>
+      <g
+         transform="matrix(1.0018,0.0030618,-0.0030618,1.0018,54.081,2.2844)"
+         id="g3119"
+         style="fill-rule:evenodd">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3121"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4992);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3123"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient4994)" />
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3125"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4996);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3127"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient4998)" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3129"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5000);stroke:#3c1d03;stroke-width:1.77320004" />
+        <path
+           d="m -357.61,731.3 1.6889,-2.9796 -1.832,-3.0816 -1.056,0.14109 c 1.4757,3.2116 1.4712,4.7994 1.1991,5.9201 z"
+           id="path3131"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5002)" />
+      </g>
+      <g
+         transform="matrix(1.0018,0,0,1.0018,51.969,1.1222)"
+         id="g3133">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3135"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5004);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -363.81,734.68 1.8382,-3.0279 -1.8746,-3.1888 -1.1168,0.12775 c 1.4962,3.3165 1.4614,4.9443 1.1532,6.0889 z"
+           id="path3137"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5006);fill-rule:evenodd" />
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3139"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5008);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3141"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5010);fill-rule:evenodd;stroke:#480048;stroke-width:1.77209997" />
+        <g
+           transform="matrix(0.077328,9.1119e-4,-8.5264e-4,0.077374,-375.14,690.52)"
+           id="g3143"
+           style="opacity:0.57521997" />
+      </g>
+    </g>
+    <g
+       transform="translate(-17.467,19.017)"
+       id="g3145">
+      <g
+         transform="matrix(1.0018,0,0,1.0018,52.549,1.9931)"
+         id="g3147">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22957,0.16231,-0.16297,-0.23043,-661.96,1033.8)"
+           id="path3149"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5012);fill-rule:evenodd;stroke:#0d1547;stroke-width:1.77170002" />
+      </g>
+      <g
+         transform="matrix(1.0018,0.0030618,-0.0030618,1.0018,54.081,2.2844)"
+         id="g3151"
+         style="fill-rule:evenodd">
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3153"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5014);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3155"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5016)" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3157"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5018);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3159"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5020)" />
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3161"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5022);stroke:#3c1d03;stroke-width:1.77320004" />
+        <path
+           d="m -357.61,731.3 1.6889,-2.9796 -1.832,-3.0816 -1.056,0.14109 c 1.4757,3.2116 1.4712,4.7994 1.1991,5.9201 z"
+           id="path3163"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5024)" />
+      </g>
+      <g
+         transform="matrix(1.0018,0,0,1.0018,51.969,1.1222)"
+         id="g3165">
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3167"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5026);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -363.81,734.68 1.8382,-3.0279 -1.8746,-3.1888 -1.1168,0.12775 c 1.4962,3.3165 1.4614,4.9443 1.1532,6.0889 z"
+           id="path3169"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5028);fill-rule:evenodd" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3171"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5030);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3173"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5032);fill-rule:evenodd;stroke:#480048;stroke-width:1.77209997" />
+        <g
+           transform="matrix(0.077328,9.1119e-4,-8.5264e-4,0.077374,-375.14,690.52)"
+           id="g3175"
+           style="opacity:0.57521997" />
+      </g>
+    </g>
+    <g
+       transform="translate(-17.467,19.017)"
+       id="g3177">
+      <g
+         transform="matrix(1.0018,0,0,1.0018,52.549,1.9931)"
+         id="g3179">
+        <path
+           transform="matrix(-0.22957,0.16231,-0.16297,-0.23043,-661.96,1033.8)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3181"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5034);fill-rule:evenodd;stroke:#0d1547;stroke-width:1.77170002" />
+      </g>
+      <g
+         transform="matrix(1.0018,0.0030618,-0.0030618,1.0018,54.081,2.2844)"
+         id="g3183"
+         style="fill-rule:evenodd">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3185"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5036);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3187"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5038)" />
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3189"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5040);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3191"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5042)" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3193"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5044);stroke:#3c1d03;stroke-width:1.77320004" />
+        <path
+           d="m -357.61,731.3 1.6889,-2.9796 -1.832,-3.0816 -1.056,0.14109 c 1.4757,3.2116 1.4712,4.7994 1.1991,5.9201 z"
+           id="path3195"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5046)" />
+      </g>
+      <g
+         transform="matrix(1.0018,0,0,1.0018,51.969,1.1222)"
+         id="g3197">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3199"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5048);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -363.81,734.68 1.8382,-3.0279 -1.8746,-3.1888 -1.1168,0.12775 c 1.4962,3.3165 1.4614,4.9443 1.1532,6.0889 z"
+           id="path3201"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5050);fill-rule:evenodd" />
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3203"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5052);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3205"
+           inkscape:connector-curvature="0"
+           style="fill:url(#radialGradient5054);fill-rule:evenodd;stroke:#480048;stroke-width:1.77209997" />
+        <g
+           transform="matrix(0.077328,9.1119e-4,-8.5264e-4,0.077374,-375.14,690.52)"
+           id="g3207"
+           style="opacity:0.57521997" />
+      </g>
+    </g>
+    <g
+       transform="translate(-17.467,19.017)"
+       id="g3209">
+      <g
+         transform="matrix(1.0018,0,0,1.0018,52.549,1.9931)"
+         id="g3211">
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22957,0.16231,-0.16297,-0.23043,-661.96,1033.8)"
+           id="path3213"
+           inkscape:connector-curvature="0"
+           style="fill:url(#d);fill-rule:evenodd;stroke:#0d1547;stroke-width:1.77170002" />
+      </g>
+      <g
+         transform="matrix(1.0018,0.0030618,-0.0030618,1.0018,54.081,2.2844)"
+         id="g3215"
+         style="fill-rule:evenodd">
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3217"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5056);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3219"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#linearGradient5058)" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           id="path3221"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5060);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+        <path
+           d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+           id="path3223"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#c)" />
+        <path
+           transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3225"
+           inkscape:connector-curvature="0"
+           style="fill:url(#b);stroke:#3c1d03;stroke-width:1.77320004" />
+        <path
+           d="m -357.61,731.3 1.6889,-2.9796 -1.832,-3.0816 -1.056,0.14109 c 1.4757,3.2116 1.4712,4.7994 1.1991,5.9201 z"
+           id="path3227"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#f)" />
+      </g>
+      <g
+         transform="matrix(1.0018,0,0,1.0018,51.969,1.1222)"
+         id="g3229">
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3231"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5062);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -363.81,734.68 1.8382,-3.0279 -1.8746,-3.1888 -1.1168,0.12775 c 1.4962,3.3165 1.4614,4.9443 1.1532,6.0889 z"
+           id="path3233"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#e);fill-rule:evenodd" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3235"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient5064);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3237"
+           inkscape:connector-curvature="0"
+           style="fill:url(#a);fill-rule:evenodd;stroke:#480048;stroke-width:1.77209997" />
+        <g
+           transform="matrix(0.077328,9.1119e-4,-8.5264e-4,0.077374,-375.14,690.52)"
+           id="g3239"
+           style="opacity:0.57521997" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/algnCtr16.gif b/freeplane/resources/images/algnCtr16.gif
deleted file mode 100644
index 8d24740..0000000
Binary files a/freeplane/resources/images/algnCtr16.gif and /dev/null differ
diff --git a/freeplane/resources/images/algnCtr16.png b/freeplane/resources/images/algnCtr16.png
new file mode 100644
index 0000000..dec55b7
Binary files /dev/null and b/freeplane/resources/images/algnCtr16.png differ
diff --git a/freeplane/resources/images/algnCtr16.svg b/freeplane/resources/images/algnCtr16.svg
new file mode 100644
index 0000000..8bd5a4e
--- /dev/null
+++ b/freeplane/resources/images/algnCtr16.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg17219"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 24 24"
+   inkscape:export-filename="I:\Freeplane\editor\images\algnCtr16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="algnCtr16.svg">
+  <defs
+     id="defs17221">
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.901779"
+     inkscape:cx="11.024634"
+     inkscape:cy="11.635804"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1213"
+     inkscape:window-height="1034"
+     inkscape:window-x="603"
+     inkscape:window-y="142"
+     inkscape:window-maximized="0"
+     inkscape:snap-text-baseline="true" />
+  <metadata
+     id="metadata17224">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <g
+       id="g4498"
+       transform="translate(0,0.0524744)">
+      <path
+         style="fill:#000080"
+         d="m 5.8575786,0.90101337 12.2848424,0 c 0.46259,0 0.837614,-0.29102391 0.837614,-0.65 0,-0.35897606 -0.375024,-0.65 -0.837614,-0.65 l -12.2848424,0 c -0.4625897,0 -0.8376136,0.29102394 -0.8376136,0.65 0,0.35897609 0.3750239,0.65 0.8376136,0.65 z"
+         id="path7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000080"
+         d="m 3.1717526,4.5975256 17.6565344,0 c 0.487526,0 0.882797,-0.2910239 0.882797,-0.65 0,-0.3589761 -0.395271,-0.65 -0.882835,-0.65 l -17.6564964,0 c -0.4875646,0 -0.8828362,0.2910239 -0.8828362,0.65 0,0.3589761 0.3952716,0.65 0.8828362,0.65 z"
+         id="path9"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000080"
+         d="m 3.1717338,11.99055 17.6565322,0 c 0.487564,0 0.882836,-0.291024 0.882836,-0.65 0,-0.358976 -0.395272,-0.65 -0.882836,-0.65 l -17.6565321,0 c -0.4875646,0 -0.882836,0.291024 -0.882836,0.65 0,0.358976 0.3952714,0.65 0.882836,0.65 z"
+         id="path11"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000080"
+         d="m 5.8575786,8.2940378 12.2848424,0 c 0.46259,0 0.837614,-0.2910239 0.837614,-0.65 0,-0.3589761 -0.375024,-0.65 -0.837614,-0.65 l -12.2848424,0 c -0.4625897,0 -0.8376136,0.2910239 -0.8376136,0.65 0,0.3589761 0.3750239,0.65 0.8376136,0.65 z"
+         id="path13"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000080"
+         d="m 3.1717531,-2.7954988 17.6565329,0 c 0.487526,0 0.882797,-0.2910239 0.882797,-0.65 0,-0.3589761 -0.395271,-0.65 -0.882834,-0.65 l -17.6564959,0 c -0.4875646,0 -0.8828361,0.2910239 -0.8828361,0.65 0,0.3589761 0.3952715,0.65 0.8828361,0.65 z"
+         id="path9-7"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/algnCtr16_on.gif b/freeplane/resources/images/algnCtr16_on.gif
deleted file mode 100644
index 5b20e78..0000000
Binary files a/freeplane/resources/images/algnCtr16_on.gif and /dev/null differ
diff --git a/freeplane/resources/images/algnLft16.gif b/freeplane/resources/images/algnLft16.gif
deleted file mode 100644
index 3da838d..0000000
Binary files a/freeplane/resources/images/algnLft16.gif and /dev/null differ
diff --git a/freeplane/resources/images/algnLft16.png b/freeplane/resources/images/algnLft16.png
new file mode 100644
index 0000000..a4a12f0
Binary files /dev/null and b/freeplane/resources/images/algnLft16.png differ
diff --git a/freeplane/resources/images/algnLft16.svg b/freeplane/resources/images/algnLft16.svg
new file mode 100644
index 0000000..90dcaa4
--- /dev/null
+++ b/freeplane/resources/images/algnLft16.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg17219"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 24 24"
+   inkscape:export-filename="I:\Freeplane\editor\images\algnCtr16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="algnLft16.svg">
+  <defs
+     id="defs17221">
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.072683"
+     inkscape:cx="-0.22769988"
+     inkscape:cy="6.0612581"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1213"
+     inkscape:window-height="1034"
+     inkscape:window-x="298"
+     inkscape:window-y="47"
+     inkscape:window-maximized="0"
+     inkscape:snap-text-baseline="true" />
+  <metadata
+     id="metadata17224">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path7"
+       d="m 3.1265306,0.95348777 12.2848424,0 c 0.46259,0 0.837614,-0.29102391 0.837614,-0.65 0,-0.35897606 -0.375024,-0.65 -0.837614,-0.65 l -12.2848424,0 c -0.4625897,0 -0.8376136,0.29102394 -0.8376136,0.65 0,0.35897609 0.3750239,0.65 0.8376136,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path9"
+       d="m 3.1717532,4.65 17.6565348,0 c 0.487526,0 0.882797,-0.2910239 0.882797,-0.65 0,-0.3589761 -0.395271,-0.65 -0.882835,-0.65 l -17.6564968,0 C 2.6841886,3.35 2.288917,3.6410239 2.288917,4 c 0,0.3589761 0.3952716,0.65 0.8828362,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11"
+       d="m 3.1717529,12.043024 17.6565321,0 c 0.487564,0 0.882836,-0.291024 0.882836,-0.65 0,-0.358976 -0.395272,-0.65 -0.882836,-0.65 l -17.656532,0 c -0.4875646,0 -0.882836,0.291024 -0.882836,0.65 0,0.358976 0.3952714,0.65 0.882836,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path13"
+       d="m 3.1265306,8.3465122 12.2848424,0 c 0.46259,0 0.837614,-0.2910239 0.837614,-0.65 0,-0.3589761 -0.375024,-0.65 -0.837614,-0.65 l -12.2848424,0 c -0.4625897,0 -0.8376136,0.2910239 -0.8376136,0.65 0,0.3589761 0.3750239,0.65 0.8376136,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path9-7"
+       d="m 3.1717531,-2.7430244 17.6565329,0 c 0.487526,0 0.882797,-0.2910239 0.882797,-0.65 0,-0.3589761 -0.395271,-0.65 -0.882834,-0.65 l -17.6564959,0 c -0.4875646,0 -0.8828361,0.2910239 -0.8828361,0.65 0,0.3589761 0.3952715,0.65 0.8828361,0.65 z"
+       style="fill:#000080" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/algnLft16_on.gif b/freeplane/resources/images/algnLft16_on.gif
deleted file mode 100644
index 0ae3829..0000000
Binary files a/freeplane/resources/images/algnLft16_on.gif and /dev/null differ
diff --git a/freeplane/resources/images/algnRt16.gif b/freeplane/resources/images/algnRt16.gif
deleted file mode 100644
index 0440b66..0000000
Binary files a/freeplane/resources/images/algnRt16.gif and /dev/null differ
diff --git a/freeplane/resources/images/algnRt16.png b/freeplane/resources/images/algnRt16.png
new file mode 100644
index 0000000..754f9a9
Binary files /dev/null and b/freeplane/resources/images/algnRt16.png differ
diff --git a/freeplane/resources/images/algnRt16.svg b/freeplane/resources/images/algnRt16.svg
new file mode 100644
index 0000000..c591592
--- /dev/null
+++ b/freeplane/resources/images/algnRt16.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg17219"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 24 24"
+   inkscape:export-filename="I:\Freeplane\editor\images\algnRt16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="algnRt16.svg">
+  <defs
+     id="defs17221">
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.072683"
+     inkscape:cx="-0.22769988"
+     inkscape:cy="6.0612581"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1213"
+     inkscape:window-height="1034"
+     inkscape:window-x="298"
+     inkscape:window-y="47"
+     inkscape:window-maximized="0"
+     inkscape:snap-text-baseline="true" />
+  <metadata
+     id="metadata17224">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path7"
+       d="m 8.5886266,0.95348777 12.2848424,0 c 0.46259,0 0.837614,-0.29102391 0.837614,-0.65 0,-0.35897606 -0.375024,-0.65 -0.837614,-0.65 l -12.2848424,0 c -0.4625897,0 -0.8376136,0.29102394 -0.8376136,0.65 0,0.35897609 0.3750239,0.65 0.8376136,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path9"
+       d="m 3.1717512,4.65 17.6565348,0 c 0.487526,0 0.882797,-0.2910239 0.882797,-0.65 0,-0.3589761 -0.395271,-0.65 -0.882835,-0.65 l -17.6564968,0 C 2.6841866,3.35 2.288915,3.6410239 2.288915,4 c 0,0.3589761 0.3952716,0.65 0.8828362,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path11"
+       d="m 3.1717149,12.043024 17.6565321,0 c 0.487564,0 0.882836,-0.291024 0.882836,-0.65 0,-0.358976 -0.395272,-0.65 -0.882836,-0.65 l -17.656532,0 c -0.4875646,0 -0.882836,0.291024 -0.882836,0.65 0,0.358976 0.3952714,0.65 0.882836,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path13"
+       d="m 8.5886266,8.3465122 12.2848424,0 c 0.46259,0 0.837614,-0.2910239 0.837614,-0.65 0,-0.3589761 -0.375024,-0.65 -0.837614,-0.65 l -12.2848424,0 c -0.4625897,0 -0.8376136,0.2910239 -0.8376136,0.65 0,0.3589761 0.3750239,0.65 0.8376136,0.65 z"
+       style="fill:#000080" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path9-7"
+       d="m 3.1717531,-2.7430244 17.6565329,0 c 0.487526,0 0.882797,-0.2910239 0.882797,-0.65 0,-0.3589761 -0.395271,-0.65 -0.882834,-0.65 l -17.6564959,0 c -0.4875646,0 -0.8828361,0.2910239 -0.8828361,0.65 0,0.3589761 0.3952715,0.65 0.8828361,0.65 z"
+       style="fill:#000080" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/algnRt16_on.gif b/freeplane/resources/images/algnRt16_on.gif
deleted file mode 100644
index 3f90304..0000000
Binary files a/freeplane/resources/images/algnRt16_on.gif and /dev/null differ
diff --git a/freeplane/resources/images/arrow-mode-backward.svg b/freeplane/resources/images/arrow-mode-backward.svg
new file mode 100644
index 0000000..cd56017
--- /dev/null
+++ b/freeplane/resources/images/arrow-mode-backward.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="1.2962mm" width="6.1059mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 21.635246 4.5929265">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-539.67 -454.86)">
+  <path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m545.92 455.12-5.875 1.9062 5.7188 2.1562-1.1875-1.5312 16.596-0.0625v-0.84375h-16.596l1.3438-1.625z" stroke="#000080" stroke-width=".25277" fill="#06f"/>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/arrow-mode-both.svg b/freeplane/resources/images/arrow-mode-both.svg
new file mode 100644
index 0000000..25efe32
--- /dev/null
+++ b/freeplane/resources/images/arrow-mode-both.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="1.2962mm" width="6.1775mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 21.888877 4.5929273">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-317.63 -495.78)">
+  <path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m323.88 496.03-5.875 1.9062 5.7188 2.1562-1.1875-1.5312h9.4062 0.75 1.9062l-1.1875 1.5312 5.7188-2.1562-5.875-1.9062 1.3438 1.625h-1.9062-0.75-9.4062l1.3438-1.625z" stroke="#000080" stroke-width=".25277" fill="#06f"/>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/arrow-mode-forward.svg b/freeplane/resources/images/arrow-mode-forward.svg
new file mode 100644
index 0000000..46b5c00
--- /dev/null
+++ b/freeplane/resources/images/arrow-mode-forward.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="1.2962mm" width="6.1059mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 21.635248 4.5929273">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-538.85 -458.23)">
+  <path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m554.23 458.48 5.875 1.9062-5.7188 2.1562 1.1875-1.5312-16.596-0.0625v-0.84375h16.596l-1.3438-1.625z" stroke="#000080" stroke-width=".25277" fill="#06f"/>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/arrow-mode-none.svg b/freeplane/resources/images/arrow-mode-none.svg
new file mode 100644
index 0000000..b98d232
--- /dev/null
+++ b/freeplane/resources/images/arrow-mode-none.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height=".31457mm" width="6.0162mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 21.317169 1.114634">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-557.48 -469.05)">
+  <path style="color:#000000;text-indent:0;block-progression:tb;text-decoration-line:none;text-transform:none" d="m557.6 470.04 21.067-0.0596v-0.80468h-21.067v0.86429z" stroke="#000080" stroke-width=".25" fill="#06f"/>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/bell.png b/freeplane/resources/images/bell.png
index 5d2ecaa..9f5e6ec 100644
Binary files a/freeplane/resources/images/bell.png and b/freeplane/resources/images/bell.png differ
diff --git a/freeplane/resources/images/bell.svg b/freeplane/resources/images/bell.svg
new file mode 100644
index 0000000..bc61937
--- /dev/null
+++ b/freeplane/resources/images/bell.svg
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16"
+   sodipodi:docname="bell.svg"
+   inkscape:export-filename="J:\Freeplane\editor\images\bell.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049"
+       gradientTransform="matrix(0.05380612,0,0,0.05376087,1.1128447,17.118605)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13045-6"
+       xlink:href="#XMLID_11_"
+       inkscape:collect="always" />
+    <svg:linearGradient
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951"
+       gradientTransform="matrix(0.05380612,0,0,0.05376086,1.1127046,17.118704)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13047-6"
+       xlink:href="#XMLID_12_"
+       inkscape:collect="always" />
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.634173"
+     inkscape:cx="-8.2305805"
+     inkscape:cy="1.8199095"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1390"
+     inkscape:window-height="686"
+     inkscape:window-x="401"
+     inkscape:window-y="119"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g4574">
+      <svg:path
+         d="m 13.32478,29.774761 c -0.171532,0.158166 -5.0870588,-5.83878 -5.2812215,-5.709395 -0.1941627,0.129385 3.4481215,6.974787 3.2361085,7.072206 -0.212012,0.09742 -3.0337979,-7.124997 -3.2584397,-7.061945 -0.2246419,0.06305 1.1240303,7.698945 0.8922905,7.72608 -0.2317398,0.02714 -0.6835681,-7.71377 -0.9166996,-7.723221 -0.2331316,-0.0095 -1.3100883,7.669475 -1.5388711,7.623671 -0.2287828,-0.04581 1.733574,-7.547466 1.5147734,-7.628496 -0.2188007,-0.08103 -3.6159664,6.889265 -3.81 [...]
+         inkscape:randomized="0"
+         inkscape:rounded="0.03"
+         inkscape:flatsided="false"
+         sodipodi:arg2="0.98299615"
+         sodipodi:arg1="0.82591652"
+         sodipodi:r2="0.078550078"
+         sodipodi:r1="7.8550076"
+         sodipodi:cy="24"
+         sodipodi:cx="8"
+         sodipodi:sides="20"
+         id="path12955"
+         style="fill:#d40000;fill-opacity:1;stroke:#d40000;stroke-width:0.39671242;stroke-opacity:1"
+         sodipodi:type="star" />
+      <svg:g
+         transform="matrix(0.8354362,0,0,0.8354362,1.3165104,3.9495313)"
+         id="layer1-1"
+         inkscape:label="Layer 1">
+        <svg:rect
+           style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+           id="rect234-8"
+           transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+           y="-5.9568191"
+           x="13.175798"
+           height="0"
+           width="0.9126758" />
+        <svg:g
+           id="g4668">
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 1.3807956,23.999985 c 0,3.64671 2.9694363,6.613721 6.6193237,6.613721 3.6497257,0 6.6190967,-2.967011 6.6190967,-6.613721 0,-3.646776 -2.969371,-6.613754 -6.6190967,-6.613754 -3.6498874,0 -6.6193237,2.966978 -6.6193237,6.613754 z"
+             id="path137-7"
+             style="fill:url(#linearGradient13045-6);stroke:#000080;stroke-width:1.13361216;stroke-opacity:1" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 1.7788103,24.000095 c 0,3.427452 2.7908273,6.215867 6.2211689,6.215867 3.4302458,0 6.2209218,-2.788415 6.2209218,-6.215867 0,-3.427475 -2.790676,-6.215933 -6.2209218,-6.215933 -3.4303416,0 -6.2211689,2.788458 -6.2211689,6.215933 z"
+             id="path158-9"
+             style="fill:url(#linearGradient13047-6)" />
+          <svg:path
+             d="m 2.8654636,23.836519 c -0.068626,0 -0.1241356,0.04509 -0.1241356,0.100835 l 0,0.125338 c 0,0.05569 0.055593,0.100835 0.1241356,0.100835 l 1.0834106,0 c 0.068626,0 0.1241358,-0.04509 0.1241358,-0.100835 l 0,-0.125338 c 0,-0.05569 -0.055593,-0.100835 -0.1241358,-0.100835 l -1.0834106,0 z"
+             id="path212-3"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.56554395;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:rect
+             width="1.0834113"
+             height="0.12538038"
+             x="2.865509"
+             y="23.93734"
+             id="rect214-6"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+          <svg:path
+             d="m 11.981784,23.840487 c -0.07234,0 -0.130843,0.04399 -0.130843,0.0984 l 0,0.122309 c 0,0.05435 0.0586,0.0984 0.130843,0.0984 l 1.142416,0 c 0.07234,0 0.130969,-0.044 0.130969,-0.0984 l 0,-0.122309 c 0,-0.05436 -0.0586,-0.0984 -0.130969,-0.0984 l -1.142416,0 z"
+             id="path216-2"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.57356685;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:rect
+             width="1.1423982"
+             height="0.12235197"
+             x="11.98178"
+             y="23.938869"
+             id="rect218-5"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+          <svg:path
+             d="m 7.9371397,27.924102 c -0.055709,0 -0.1008801,0.05558 -0.1008801,0.124007 l 0,1.081608 c 0,0.0685 0.045136,0.123885 0.1008801,0.123885 l 0.1256299,0 c 0.055709,0 0.1008711,-0.05547 0.1008711,-0.123885 l 0,-1.081608 c 0,-0.06862 -0.045136,-0.124007 -0.1008711,-0.124007 l -0.1256299,0 z"
+             id="path220-7"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.56511807;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:rect
+             width="0.12567313"
+             height="1.0815915"
+             x="7.9371524"
+             y="28.048059"
+             id="rect222-1"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+          <svg:path
+             d="m 7.9379213,18.748494 c -0.054985,0 -0.099629,0.05696 -0.099629,0.127328 l 0,1.110622 c 0,0.07036 0.044625,0.127328 0.099629,0.127328 l 0.1240823,0 c 0.054985,0 0.09962,-0.0571 0.09962,-0.127328 l 0,-1.110622 c 0,-0.07049 -0.044527,-0.127328 -0.09962,-0.127328 l -0.1240823,0 0,0 z"
+             id="path224-1"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.56910372;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:rect
+             width="0.1241189"
+             height="1.1106374"
+             x="7.9379368"
+             y="18.875732"
+             id="rect226-7"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 10.24933,27.759882 -0.115718,0.06709 c -0.05134,0.02987 -0.06877,0.09553 -0.03907,0.146774 l 0.335296,0.579504 c 0.0296,0.05139 0.09545,0.06896 0.146809,0.03931 l 0.115944,-0.06654 c 0.02486,-0.01428 0.04283,-0.03777 0.05035,-0.06533 0.0075,-0.02756 0.0043,-0.05689 -0.01195,-0.08159 l -0.335609,-0.580019 c -0.0142,-0.02493 -0.03777,-0.04293 -0.06532,-0.05018 -0.02776,-0.0066 -0.05703,-0.0023 -0.08168,0.01197 z"
+             id="path228-0"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+          <svg:polygon
+             transform="matrix(0.05380612,0,0,0.05376086,1.1127046,17.118704)"
+             points="81.1152,211.694 81.1152,211.694 87.3418,200.915 85.1855,199.665 78.9561,210.454 "
+             id="polygon238-1"
+             style="fill:none;fill-opacity:1;stroke:none;stroke-width:5.57442522" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 10.429714,19.446423 -0.335285,0.580096 c -0.0142,0.02493 -0.01786,0.05413 -0.01195,0.08159 0.0075,0.02756 0.02551,0.05106 0.05036,0.06533 l 0.115708,0.06654 c 0.05155,0.02964 0.117128,0.01296 0.146915,-0.03942 l 0.335609,-0.579921 c 0.0142,-0.02493 0.01808,-0.05413 0.01195,-0.08159 -0.0075,-0.02756 -0.02551,-0.05106 -0.05025,-0.06523 l -0.115934,-0.06699 c -0.05155,-0.02976 -0.117258,-0.01296 -0.146992,0.03942 z"
+             id="path240-5"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 3.4702195,21.309549 -0.067152,0.115855 c -0.014205,0.02493 -0.018079,0.05413 -0.011945,0.08159 0.00754,0.02756 0.025505,0.05106 0.050256,0.06533 l 0.5803686,0.33487 c 0.051548,0.02964 0.1172575,0.01296 0.1469593,-0.0392 l 0.067152,-0.115985 c 0.014313,-0.02493 0.018079,-0.05413 0.011945,-0.08159 -0.00754,-0.02756 -0.025505,-0.05106 -0.050364,-0.06533 L 3.6171035,21.270316 c -0.051548,-0.02964 -0.1172468,-0.01296 -0.1469808,0.0392 z"
+             id="path273-5"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+          <svg:polyline
+             transform="matrix(0.05380612,0,0,0.05376086,1.1127046,17.118704)"
+             style="fill:none"
+             points="0,256 0,0 256,0 256,256"
+             id="_x3C_Slice_x3E_-8" />
+          <svg:path
+             d="m 315.96433,571.60078 c -26.67655,12.12571 -23.93396,14.08603 -21.09685,-15.07939 2.8371,-29.16542 -0.23188,-27.77043 23.60756,-10.73072 23.83945,17.03972 24.16584,13.68441 -2.51071,25.81011 z"
+             id="path24770-8-8"
+             inkscape:flatsided="true"
+             inkscape:randomized="0"
+             inkscape:rounded="1.13"
+             sodipodi:arg1="1.1441688"
+             sodipodi:arg2="2.1913664"
+             sodipodi:cx="309.76895"
+             sodipodi:cy="557.97095"
+             sodipodi:r1="14.97181"
+             sodipodi:r2="7.4859052"
+             sodipodi:sides="3"
+             sodipodi:type="star"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:3.90614462;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering: [...]
+             transform="matrix(0.01986697,0.01614964,-0.01616325,0.01985027,11.422955,5.2647744)" />
+          <svg:rect
+             transform="matrix(0.97187868,0.23548211,-0.23585698,0.97178778,0,0)"
+             height="2.4733286"
+             id="rect24772-8-4"
+             rx="0.22280924"
+             ry="0.22264311"
+             style="fill:#d40000;fill-opacity:1;stroke:#d40000;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1"
+             width="0.31733069"
+             x="13.186641"
+             y="18.816151" />
+          <svg:path
+             d="m 315.96433,571.60078 c -26.67655,12.12571 -23.93396,14.08603 -21.09685,-15.07939 2.8371,-29.16542 -0.23188,-27.77043 23.60756,-10.73072 23.83945,17.03972 24.16584,13.68441 -2.51071,25.81011 z"
+             id="path24778-5-3"
+             inkscape:flatsided="true"
+             inkscape:randomized="0"
+             inkscape:rounded="1.13"
+             sodipodi:arg1="1.1441688"
+             sodipodi:arg2="2.1913664"
+             sodipodi:cx="309.76895"
+             sodipodi:cy="557.97095"
+             sodipodi:r1="14.97181"
+             sodipodi:r2="7.4859052"
+             sodipodi:sides="3"
+             sodipodi:type="star"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:3.90614724;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering: [...]
+             transform="matrix(-0.01952078,0.01656572,-0.01657967,-0.01950436,26.670486,31.293332)" />
+          <svg:rect
+             transform="matrix(-0.40953827,0.91229294,-0.91255015,-0.40896482,0,0)"
+             height="3.4903057"
+             id="rect24780-5-4"
+             rx="0.22266346"
+             ry="0.22278847"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.10000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering: [...]
+             width="0.31712312"
+             x="18.493101"
+             y="-20.747091" />
+          <svg:ellipse
+             ry="0.38062045"
+             rx="0.38068813"
+             transform="matrix(0.77859431,0.62752761,-0.62816738,0.77807824,0,0)"
+             style="fill:#d40000;fill-opacity:1;stroke:#d40000;stroke-width:0.54352123;stroke-miterlimit:4"
+             id="path24774-2-1"
+             cx="21.235037"
+             cy="13.695663" />
+          <svg:path
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+             id="path18387-5"
+             d="m 5.5046466,19.466653 -0.1157189,0.06709 c -0.051336,0.02987 -0.068766,0.09553 -0.039068,0.146775 l 0.3352965,0.579503 c 0.029593,0.05139 0.095455,0.06896 0.1468089,0.03931 l 0.1159476,-0.06654 c 0.024858,-0.01427 0.042831,-0.03777 0.050365,-0.06533 0.00754,-0.02756 0.00431,-0.05687 -0.011946,-0.08159 L 5.6507224,19.505854 c -0.014204,-0.02493 -0.03777,-0.04293 -0.065322,-0.05018 -0.027765,-0.0066 -0.057036,-0.0023 -0.08168,0.01197 z"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+             id="path18395-7"
+             d="m 11.590016,21.754767 0.06521,0.116793 c 0.02903,0.05181 0.0944,0.07031 0.14612,0.04144 l 0.584877,-0.325833 c 0.05186,-0.02876 0.0705,-0.09432 0.04169,-0.146151 l -0.06465,-0.11701 c -0.01388,-0.02509 -0.03707,-0.04344 -0.0645,-0.05142 -0.02743,-0.0079 -0.05679,-0.0053 -0.08177,0.01066 l -0.585397,0.326137 c -0.02515,0.0138 -0.04354,0.03707 -0.05124,0.0645 -0.007,0.02765 -0.0032,0.057 0.01066,0.08187 z"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+             id="path18399-2"
+             d="m 5.5551461,27.74215 -0.3798832,0.55192 c -0.016123,0.02374 -0.022065,0.05257 -0.018325,0.0804 0.00534,0.02807 0.021411,0.05291 0.045067,0.06909 L 5.3121183,28.519 c 0.049055,0.03361 0.115747,0.02214 0.1495626,-0.02774 l 0.3801917,-0.55172 c 0.016123,-0.02374 0.022283,-0.05254 0.018325,-0.0804 -0.00534,-0.02807 -0.02141,-0.0529 -0.044964,-0.06898 L 5.7049263,27.71427 C 5.6558773,27.68054 5.5890512,27.69212 5.5552885,27.742 Z"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+             id="path18403-8"
+             d="m 11.723576,26.29346 -0.06715,0.115854 c -0.0142,0.02493 -0.01808,0.05413 -0.01195,0.08159 0.0075,0.02756 0.02551,0.05106 0.05025,0.06533 l 0.580368,0.334871 c 0.05155,0.02964 0.117257,0.01296 0.146958,-0.0392 l 0.06716,-0.115985 c 0.01432,-0.02493 0.01808,-0.05413 0.01195,-0.08159 -0.0075,-0.02756 -0.02551,-0.05106 -0.05037,-0.06533 l -0.580337,-0.334774 c -0.05155,-0.02964 -0.117248,-0.01296 -0.146981,0.0392 z"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             inkscape:connector-curvature="0"
+             d="m 3.4848011,26.617896 0.0652,0.116793 c 0.02903,0.05181 0.094399,0.07031 0.1461206,0.04144 L 4.280998,26.4503 c 0.051859,-0.02875 0.0705,-0.09432 0.041694,-0.14615 L 4.258043,26.18714 C 4.244172,26.16205 4.220975,26.1437 4.193537,26.13572 4.166105,26.12782 4.136742,26.13042 4.111768,26.14638 l -0.5853976,0.326137 c -0.025157,0.0138 -0.043539,0.03707 -0.051238,0.0645 -0.00704,0.02765 -0.00316,0.057 0.010645,0.08186 z"
+             id="path18475-7"
+             style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+          <svg:rect
+             y="16"
+             x="0"
+             height="16"
+             width="16"
+             id="rect4517"
+             style="opacity:0.8479996;fill:none;stroke:none;stroke-width:1.48273611;stroke-opacity:1" />
+        </svg:g>
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/cancel_button.svg b/freeplane/resources/images/cancel_button.svg
new file mode 100644
index 0000000..3188c43
--- /dev/null
+++ b/freeplane/resources/images/cancel_button.svg
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4568-1"
+       id="linearGradient12584"
+       gradientUnits="userSpaceOnUse"
+       x1="314.56537"
+       y1="369.97995"
+       x2="332.02466"
+       y2="387.43924"
+       gradientTransform="matrix(0.52298354,0,0,0.52298354,-156.63314,-182.64461)" />
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4738-4"
+       id="linearGradient12495"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37208262,0,0,0.3721228,-139.26079,-128.94179)"
+       x1="401.93405"
+       y1="376.13748"
+       x2="414.38986"
+       y2="390.49332" />
+    <svg:linearGradient
+       id="linearGradient4738-4">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740-8" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742-6" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18569"
+       id="linearGradient12492"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-172.97732,-201.46744)"
+       x1="302.12158"
+       y1="377.05707"
+       x2="311.27377"
+       y2="390.78342" />
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.036679"
+     inkscape:cx="8.4562299"
+     inkscape:cy="14.83281"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1086"
+     inkscape:window-height="686"
+     inkscape:window-x="267"
+     inkscape:window-y="76"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g18575"
+       transform="matrix(2,0,0,2,-11.270576,-14.146881)">
+      <svg:circle
+         r="8"
+         cy="15.073441"
+         cx="13.635288"
+         style="display:inline;overflow:visible;visibility:visible;fill:#b4281c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.625;marker:none"
+         id="path4531-1" />
+      <svg:circle
+         r="7.3043432"
+         cy="15.073444"
+         cx="13.635174"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient12584);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.16992879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         id="path4533-3" />
+      <svg:path
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient12495);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+         d="m 8.62593,11.9476 c -0.0829,0.0829 -0.0674,0.2133 0.0156,0.29621 l 2.82182,2.82181 -2.83741,2.83741 c -0.0829,0.0829 -0.0829,0.22889 0,0.3118 l 1.87083,1.87083 c 0.0829,0.0829 0.2133,0.0674 0.2962,-0.0156 l 2.83741,-2.8374 2.83741,2.8374 c 0.0829,0.0829 0.21329,0.0985 0.29621,0.0156 l 1.87081,-1.87083 c 0.0829,-0.0829 0.0829,-0.22888 0,-0.3118 l -2.8374,-2.83741 2.8374,-2.8374 c 0.0829,-0.0829 0.0829,-0.19771 0,-0.28062 L 16.764,10.07679 c -0.0829,-0.0829 -0.2133,-0.0985 -0.2 [...]
+         id="rect4574-5"
+         inkscape:connector-curvature="0" />
+      <svg:path
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient12492);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+         d="m 13.502232,7.7805916 c -4.0319896,0 -7.3030996,3.2711004 -7.3030996,7.3031004 0,1.93721 0.79057,3.66832 2.02268,4.97613 0.64009,-5.28682 5.1022496,-9.39737 10.5608496,-9.39737 0.14718,0 0.28385,0.0299 0.42959,0.0358 -1.33569,-1.7372604 -3.35087,-2.9176604 -5.71002,-2.9176604 z"
+         id="path4537-9"
+         inkscape:connector-curvature="0" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/checkbox12.png b/freeplane/resources/images/checkbox12.png
index 93e929f..93c903b 100644
Binary files a/freeplane/resources/images/checkbox12.png and b/freeplane/resources/images/checkbox12.png differ
diff --git a/freeplane/resources/images/checkbox12.svg b/freeplane/resources/images/checkbox12.svg
new file mode 100644
index 0000000..1b29ffa
--- /dev/null
+++ b/freeplane/resources/images/checkbox12.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="23"
+   height="14"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 23 14">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4738-4">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740-8" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742-6" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.41517"
+     inkscape:cx="10.603036"
+     inkscape:cy="6.7352621"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1086"
+     inkscape:window-height="794"
+     inkscape:window-x="267"
+     inkscape:window-y="76"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-18)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g19208">
+      <svg:g
+         transform="matrix(1.0944063,0,0,1.0944063,-9.4823809,6.2413755)"
+         id="g19184">
+        <svg:rect
+           id="rect19148"
+           x="17.092566"
+           y="10.856424"
+           width="12.568066"
+           height="12.568066"
+           style="color:#000000;fill:#ffffff;stroke:#1a1a1a;stroke-width:0.22425842" />
+        <svg:path
+           id="path19150"
+           d="m 17.156527,10.965157 0.780494,0.678954 0.05613,11.711784 -0.836539,0 z"
+           style="color:#000000;fill:#808080;stroke:#4d4d4d;stroke-width:0.18904066;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.82447001"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <svg:path
+           id="path19152"
+           d="m 17.156527,10.918787 0.735078,0.740604 11.738167,0 0,-0.768667 z"
+           style="color:#000000;fill:#808080;stroke:#4d4d4d;stroke-width:0.18878482;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.82447001"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <svg:path
+           id="path19154"
+           d="m 20.138644,17.75607 3.143616,3.576622 5.281146,-6.595276 -1.467234,-1.114017 -3.847171,5.879728 -2.476277,-2.591643 z"
+           inkscape:connector-curvature="0"
+           style="stroke:#000000;stroke-width:0.35308111;stroke-linecap:round;stroke-linejoin:round" />
+      </svg:g>
+      <svg:g
+         transform="matrix(0.38887625,0,0,0.38887625,2.4397202,21.477168)"
+         id="g19171">
+        <svg:path
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1"
+           inkscape:transform-center-x="0.022858851"
+           inkscape:transform-center-y="2.6604092"
+           d="m 5.541571,25.929601 -9.956184,-14.638895 19.77438,-0.07967 z"
+           id="path19166"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+        <svg:path
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 5.472717,-5.7831033 0,20.3865663"
+           id="path19168"
+           inkscape:connector-curvature="0" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/clearFormat.png b/freeplane/resources/images/clearFormat.png
index 0695cb9..e89dc50 100644
Binary files a/freeplane/resources/images/clearFormat.png and b/freeplane/resources/images/clearFormat.png differ
diff --git a/freeplane/resources/images/clearFormat.svg b/freeplane/resources/images/clearFormat.svg
new file mode 100644
index 0000000..557dca0
--- /dev/null
+++ b/freeplane/resources/images/clearFormat.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4738-4">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740-8" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742-6" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.41517"
+     inkscape:cx="10.603036"
+     inkscape:cy="6.7352621"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1310"
+     inkscape:window-height="912"
+     inkscape:window-x="101"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g19561"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <svg:rect
+         y="15.999999"
+         x="1.5234375e-006"
+         height="16"
+         width="16"
+         id="rect9508"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.25143504;marker:none;enable-background:accumulate" />
+      <svg:circle
+         r="6.9936538"
+         cy="2.0768454"
+         cx="-25.212828"
+         transform="matrix(-0.23727853,-0.97144166,0.97144166,-0.23727853,0,0)"
+         id="path9404"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:2.00944281;marker:none;enable-background:accumulate" />
+      <svg:g
+         transform="matrix(0.91352254,0,0,0.91352254,214.46946,-821.93346)"
+         id="text14641-5-1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.01333427px;line-height:125%;font-family:'Microsoft Himalaya';-inkscape-font-specification:'Microsoft Himalaya';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.43312895;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1">
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path26477-4"
+           style="line-height:125%;font-family:'Microsoft Himalaya';-inkscape-font-specification:'Microsoft Himalaya';fill:#000000;stroke-width:0.43312895"
+           d="m -224.03577,925.91983 c 0.3583,0.0782 0.66612,0.18568 0.92346,0.32248 0.25733,0.13681 0.4658,0.29643 0.62542,0.47884 0.1596,0.18241 0.27687,0.38437 0.3518,0.60587 0.0749,0.2215 0.11237,0.45278 0.11238,0.69382 -1e-5,0.2215 -0.0358,0.43975 -0.1075,0.65473 -0.0717,0.21499 -0.17428,0.41858 -0.30782,0.61076 -0.13356,0.19219 -0.29806,0.36483 -0.49349,0.51792 -0.19545,0.1531 -0.41695,0.27851 -0.66451,0.37623 -0.46907,0.18242 -1.20849,0.27362 -2.21827,0.27362 l -4.19225,0 0,-0.244 [...]
+      </svg:g>
+      <svg:rect
+         inkscape:transform-center-y="-1.5505848"
+         inkscape:transform-center-x="-8.9420035"
+         transform="matrix(0.6071811,-0.79456347,0.79481871,0.60684695,0,0)"
+         y="19.928394"
+         x="-20.211678"
+         height="2.0008943"
+         width="11.981611"
+         id="rect9406"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;marker:none;enable-background:accumulate" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/clock.png b/freeplane/resources/images/clock.png
index 7dba5a2..d601f84 100644
Binary files a/freeplane/resources/images/clock.png and b/freeplane/resources/images/clock.png differ
diff --git a/freeplane/resources/images/clock.svg b/freeplane/resources/images/clock.svg
new file mode 100644
index 0000000..6bf2b83
--- /dev/null
+++ b/freeplane/resources/images/clock.svg
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16"
+   sodipodi:docname="clock.svg"
+   inkscape:export-filename="J:\Freeplane\editor\images\clock.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_11_"
+       id="linearGradient13045"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05380612,0,0,0.05376087,1.1128447,17.118605)"
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135" />
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_"
+       id="linearGradient13047"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05380612,0,0,0.05376086,1.1127046,17.118704)"
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326" />
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.232014"
+     inkscape:cx="11.203879"
+     inkscape:cy="5.0740605"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1370"
+     inkscape:window-height="686"
+     inkscape:window-x="401"
+     inkscape:window-y="119"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g4668">
+      <svg:path
+         inkscape:connector-curvature="0"
+         d="m 1.3807956,23.999985 c 0,3.64671 2.9694363,6.613721 6.6193237,6.613721 3.6497257,0 6.6190967,-2.967011 6.6190967,-6.613721 0,-3.646776 -2.969371,-6.613754 -6.6190967,-6.613754 -3.6498874,0 -6.6193237,2.966978 -6.6193237,6.613754 z"
+         id="path137"
+         style="fill:url(#linearGradient13045);stroke:#000080;stroke-width:1.13361216;stroke-opacity:1" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         d="m 1.7788103,24.000095 c 0,3.427452 2.7908273,6.215867 6.2211689,6.215867 3.4302458,0 6.2209218,-2.788415 6.2209218,-6.215867 0,-3.427475 -2.790676,-6.215933 -6.2209218,-6.215933 -3.4303416,0 -6.2211689,2.788458 -6.2211689,6.215933 z"
+         id="path158"
+         style="fill:url(#linearGradient13047)" />
+      <svg:path
+         d="m 2.8654636,23.836519 c -0.068626,0 -0.1241356,0.04509 -0.1241356,0.100835 l 0,0.125338 c 0,0.05569 0.055593,0.100835 0.1241356,0.100835 l 1.0834106,0 c 0.068626,0 0.1241358,-0.04509 0.1241358,-0.100835 l 0,-0.125338 c 0,-0.05569 -0.055593,-0.100835 -0.1241358,-0.100835 l -1.0834106,0 z"
+         id="path212"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.56554395;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <svg:rect
+         width="1.0834113"
+         height="0.12538038"
+         x="2.865509"
+         y="23.93734"
+         id="rect214"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+      <svg:path
+         d="m 11.981784,23.840487 c -0.07234,0 -0.130843,0.04399 -0.130843,0.0984 l 0,0.122309 c 0,0.05435 0.0586,0.0984 0.130843,0.0984 l 1.142416,0 c 0.07234,0 0.130969,-0.044 0.130969,-0.0984 l 0,-0.122309 c 0,-0.05436 -0.0586,-0.0984 -0.130969,-0.0984 l -1.142416,0 z"
+         id="path216"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.57356685;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <svg:rect
+         width="1.1423982"
+         height="0.12235197"
+         x="11.98178"
+         y="23.938869"
+         id="rect218"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+      <svg:path
+         d="m 7.9371397,27.924102 c -0.055709,0 -0.1008801,0.05558 -0.1008801,0.124007 l 0,1.081608 c 0,0.0685 0.045136,0.123885 0.1008801,0.123885 l 0.1256299,0 c 0.055709,0 0.1008711,-0.05547 0.1008711,-0.123885 l 0,-1.081608 c 0,-0.06862 -0.045136,-0.124007 -0.1008711,-0.124007 l -0.1256299,0 z"
+         id="path220"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.56511807;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <svg:rect
+         width="0.12567313"
+         height="1.0815915"
+         x="7.9371524"
+         y="28.048059"
+         id="rect222"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+      <svg:path
+         d="m 7.9379213,18.748494 c -0.054985,0 -0.099629,0.05696 -0.099629,0.127328 l 0,1.110622 c 0,0.07036 0.044625,0.127328 0.099629,0.127328 l 0.1240823,0 c 0.054985,0 0.09962,-0.0571 0.09962,-0.127328 l 0,-1.110622 c 0,-0.07049 -0.044527,-0.127328 -0.09962,-0.127328 l -0.1240823,0 0,0 z"
+         id="path224"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.56910372;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <svg:rect
+         width="0.1241189"
+         height="1.1106374"
+         x="7.9379368"
+         y="18.875732"
+         id="rect226"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25;stroke-opacity:1" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         d="m 10.24933,27.759882 -0.115718,0.06709 c -0.05134,0.02987 -0.06877,0.09553 -0.03907,0.146774 l 0.335296,0.579504 c 0.0296,0.05139 0.09545,0.06896 0.146809,0.03931 l 0.115944,-0.06654 c 0.02486,-0.01428 0.04283,-0.03777 0.05035,-0.06533 0.0075,-0.02756 0.0043,-0.05689 -0.01195,-0.08159 l -0.335609,-0.580019 c -0.0142,-0.02493 -0.03777,-0.04293 -0.06532,-0.05018 -0.02776,-0.0066 -0.05703,-0.0023 -0.08168,0.01197 z"
+         id="path228"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+      <svg:polygon
+         transform="matrix(0.05380612,0,0,0.05376086,1.1127046,17.118704)"
+         points="81.1152,211.694 87.3418,200.915 85.1855,199.665 78.9561,210.454 81.1152,211.694 "
+         id="polygon238"
+         style="fill:none;fill-opacity:1;stroke:none;stroke-width:5.57442522" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         d="m 10.429714,19.446423 -0.335285,0.580096 c -0.0142,0.02493 -0.01786,0.05413 -0.01195,0.08159 0.0075,0.02756 0.02551,0.05106 0.05036,0.06533 l 0.115708,0.06654 c 0.05155,0.02964 0.117128,0.01296 0.146915,-0.03942 l 0.335609,-0.579921 c 0.0142,-0.02493 0.01808,-0.05413 0.01195,-0.08159 -0.0075,-0.02756 -0.02551,-0.05106 -0.05025,-0.06523 l -0.115934,-0.06699 c -0.05155,-0.02976 -0.117258,-0.01296 -0.146992,0.03942 z"
+         id="path240"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         d="m 3.4702195,21.309549 -0.067152,0.115855 c -0.014205,0.02493 -0.018079,0.05413 -0.011945,0.08159 0.00754,0.02756 0.025505,0.05106 0.050256,0.06533 l 0.5803686,0.33487 c 0.051548,0.02964 0.1172575,0.01296 0.1469593,-0.0392 l 0.067152,-0.115985 c 0.014313,-0.02493 0.018079,-0.05413 0.011945,-0.08159 -0.00754,-0.02756 -0.025505,-0.05106 -0.050364,-0.06533 L 3.6171035,21.270316 c -0.051548,-0.02964 -0.1172468,-0.01296 -0.1469808,0.0392 z"
+         id="path273"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+      <svg:polyline
+         transform="matrix(0.05380612,0,0,0.05376086,1.1127046,17.118704)"
+         style="fill:none"
+         points="0,256 0,0 256,0 256,256"
+         id="_x3C_Slice_x3E_" />
+      <svg:path
+         d="m 315.96433,571.60078 c -26.67655,12.12571 -23.93396,14.08603 -21.09685,-15.07939 2.8371,-29.16542 -0.23188,-27.77043 23.60756,-10.73072 23.83945,17.03972 24.16584,13.68441 -2.51071,25.81011 z"
+         id="path24770-8"
+         inkscape:flatsided="true"
+         inkscape:randomized="0"
+         inkscape:rounded="1.13"
+         sodipodi:arg1="1.1441688"
+         sodipodi:arg2="2.1913664"
+         sodipodi:cx="309.76895"
+         sodipodi:cy="557.97095"
+         sodipodi:r1="14.97181"
+         sodipodi:r2="7.4859052"
+         sodipodi:sides="3"
+         sodipodi:type="star"
+         style="fill:#d40000;fill-opacity:1;stroke-width:3.90614454;stroke-miterlimit:4;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianB [...]
+         transform="matrix(0.01986697,0.01614964,-0.01616325,0.01985027,11.422955,5.2647744)" />
+      <svg:rect
+         transform="matrix(0.97187868,0.23548211,-0.23585698,0.97178778,0,0)"
+         height="2.4733286"
+         id="rect24772-8"
+         rx="0.22280924"
+         ry="0.22264311"
+         style="fill:#d40000;fill-opacity:1;stroke-width:0.1;stroke-miterlimit:4;stroke:#d40000;stroke-opacity:1"
+         width="0.31733069"
+         x="13.186641"
+         y="18.816151" />
+      <svg:path
+         d="m 315.96433,571.60078 c -26.67655,12.12571 -23.93396,14.08603 -21.09685,-15.07939 2.8371,-29.16542 -0.23188,-27.77043 23.60756,-10.73072 23.83945,17.03972 24.16584,13.68441 -2.51071,25.81011 z"
+         id="path24778-5"
+         inkscape:flatsided="true"
+         inkscape:randomized="0"
+         inkscape:rounded="1.13"
+         sodipodi:arg1="1.1441688"
+         sodipodi:arg2="2.1913664"
+         sodipodi:cx="309.76895"
+         sodipodi:cy="557.97095"
+         sodipodi:r1="14.97181"
+         sodipodi:r2="7.4859052"
+         sodipodi:sides="3"
+         sodipodi:type="star"
+         style="fill:#d40000;fill-opacity:1;stroke-width:3.90614721;stroke-miterlimit:4;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianB [...]
+         transform="matrix(-0.01952078,0.01656572,-0.01657967,-0.01950436,26.670486,31.293332)" />
+      <svg:rect
+         transform="matrix(-0.40953827,0.91229294,-0.91255015,-0.40896482,0,0)"
+         height="3.4903057"
+         id="rect24780-5"
+         rx="0.22266346"
+         ry="0.22278847"
+         style="fill:#d40000;fill-opacity:1;stroke-width:0.10000001;stroke-miterlimit:4;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianB [...]
+         width="0.31712312"
+         x="18.493101"
+         y="-20.747091" />
+      <svg:ellipse
+         ry="0.38062045"
+         rx="0.38068813"
+         transform="matrix(0.77859431,0.62752761,-0.62816738,0.77807824,0,0)"
+         style="fill:#d40000;fill-opacity:1;stroke:#d40000;stroke-width:0.54352123;stroke-miterlimit:4"
+         id="path24774-2"
+         cx="21.235037"
+         cy="13.695663" />
+      <svg:path
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+         id="path18387"
+         d="m 5.5046466,19.466653 -0.1157189,0.06709 c -0.051336,0.02987 -0.068766,0.09553 -0.039068,0.146775 l 0.3352965,0.579503 c 0.029593,0.05139 0.095455,0.06896 0.1468089,0.03931 l 0.1159476,-0.06654 c 0.024858,-0.01427 0.042831,-0.03777 0.050365,-0.06533 0.00754,-0.02756 0.00431,-0.05687 -0.011946,-0.08159 L 5.6507224,19.505854 c -0.014204,-0.02493 -0.03777,-0.04293 -0.065322,-0.05018 -0.027765,-0.0066 -0.057036,-0.0023 -0.08168,0.01197 z"
+         inkscape:connector-curvature="0" />
+      <svg:path
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+         id="path18395"
+         d="m 11.590016,21.754767 0.06521,0.116793 c 0.02903,0.05181 0.0944,0.07031 0.14612,0.04144 l 0.584877,-0.325833 c 0.05186,-0.02876 0.0705,-0.09432 0.04169,-0.146151 l -0.06465,-0.11701 c -0.01388,-0.02509 -0.03707,-0.04344 -0.0645,-0.05142 -0.02743,-0.0079 -0.05679,-0.0053 -0.08177,0.01066 l -0.585397,0.326137 c -0.02515,0.0138 -0.04354,0.03707 -0.05124,0.0645 -0.007,0.02765 -0.0032,0.057 0.01066,0.08187 z"
+         inkscape:connector-curvature="0" />
+      <svg:path
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+         id="path18399"
+         d="m 5.5551461,27.74215 -0.3798832,0.55192 c -0.016123,0.02374 -0.022065,0.05257 -0.018325,0.0804 0.00534,0.02807 0.021411,0.05291 0.045067,0.06909 L 5.3121183,28.519 c 0.049055,0.03361 0.115747,0.02214 0.1495626,-0.02774 l 0.3801917,-0.55172 c 0.016123,-0.02374 0.022283,-0.05254 0.018325,-0.0804 -0.00534,-0.02807 -0.02141,-0.0529 -0.044964,-0.06898 L 5.7049263,27.71427 C 5.6558773,27.68054 5.5890512,27.69212 5.5552885,27.742 Z"
+         inkscape:connector-curvature="0" />
+      <svg:path
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25"
+         id="path18403"
+         d="m 11.723576,26.29346 -0.06715,0.115854 c -0.0142,0.02493 -0.01808,0.05413 -0.01195,0.08159 0.0075,0.02756 0.02551,0.05106 0.05025,0.06533 l 0.580368,0.334871 c 0.05155,0.02964 0.117257,0.01296 0.146958,-0.0392 l 0.06716,-0.115985 c 0.01432,-0.02493 0.01808,-0.05413 0.01195,-0.08159 -0.0075,-0.02756 -0.02551,-0.05106 -0.05037,-0.06533 l -0.580337,-0.334774 c -0.05155,-0.02964 -0.117248,-0.01296 -0.146981,0.0392 z"
+         inkscape:connector-curvature="0" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         d="m 3.4848011,26.617896 0.0652,0.116793 c 0.02903,0.05181 0.094399,0.07031 0.1461206,0.04144 L 4.280998,26.4503 c 0.051859,-0.02875 0.0705,-0.09432 0.041694,-0.14615 L 4.258043,26.18714 C 4.244172,26.16205 4.220975,26.1437 4.193537,26.13572 4.166105,26.12782 4.136742,26.13042 4.111768,26.14638 l -0.5853976,0.326137 c -0.025157,0.0138 -0.043539,0.03707 -0.051238,0.0645 -0.00704,0.02765 -0.00316,0.057 0.010645,0.08186 z"
+         id="path18475"
+         style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.25" />
+      <svg:rect
+         y="16"
+         x="0"
+         height="16"
+         width="16"
+         id="rect4517"
+         style="opacity:0.8479996;fill:none;stroke:none;stroke-width:1.48273611;stroke-opacity:1" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/color_fill.svg b/freeplane/resources/images/color_fill.svg
new file mode 100644
index 0000000..6743584
--- /dev/null
+++ b/freeplane/resources/images/color_fill.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="795.42" gradientUnits="userSpaceOnUse" x2="-224.13" y1="787.17" x1="-223.82">
+<stop stop-color="#048aac" stop-opacity=".93725" offset="0"/>
+<stop stop-color="#ff7f2a" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="785.47" gradientUnits="userSpaceOnUse" x2="-206.56" y1="796.31" x1="-202.64">
+<stop stop-color="#08a" offset="0"/>
+<stop stop-color="#d5f6ff" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="796.02" gradientUnits="userSpaceOnUse" x2="-207.64" y1="802.89" x1="-207.64">
+<stop stop-color="#d45500" offset="0"/>
+<stop stop-color="#ff7f2a" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-87.777 -215.15)">
+<g transform="translate(456.52 -565.32)">
+<g transform="matrix(-.86706 0 0 .86706 -539.24 100.32)">
+<ellipse opacity=".93720" stroke="#164450" style="color:#000000" fill-rule="evenodd" rx="3.1022" transform="matrix(.88339 -.32078 .33024 .85809 -273.28 42.919)" ry="5.4886" cy="791.06" cx="-224.08" stroke-width=".53793" fill="url(#c)"/>
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m-202.5 785.72-9.25 3.125c4.4361-0.50391 6.6699 8.3341 3.6562 9.4688l9-3.125c2.4988-1.4901 0.84607-9.205-3.4062-9.4688z" fill-rule="evenodd" stroke="#164450" stroke-linecap="round" stroke-width=".5" fill="url(#b)"/>
+<path stroke-linejoin="round" style="color:#000000" d="m-208.85 796.32c-0.23083 1.1337 0.0736 1.4127-0.76393 2.5464-0.63241 0.50912-1.9006 0.40521-2.3933 0.6411-0.86273 0.25262-1.7369 1.7233-1.7369 1.7233s2.4302 0.3337 6.0808 1.3429c2.6412-1.3013 6.13-1.8608 6.13-1.8608-2.5492-2.7883-5.2221-0.90506-6.2756-1.6979-0.97188-1.2782-0.70695-1.4167-1.0412-2.695h-0.00003z" stroke="url(#a)" stroke-linecap="round" stroke-width=".61704px" fill="#ff7f2a"/>
+<g transform="matrix(.24751 0 0 .24751 -115.52 598.5)" stroke="#000" stroke-linecap="round">
+<path style="color:#000000" d="m-384.03 766.54c-9.0574-23.171 18.853-16.997 23.014 16.843" stroke-width="3" fill="none"/>
+<ellipse stroke-linejoin="round" ry="2.2795" cy="784.81" stroke-width="2" fill="#fff" style="color:#000000" fill-rule="evenodd" rx="2.4219" transform="matrix(1.1738 0 0 1.1738 62.373 -136.66)" opacity=".93720" cx="-360.58"/>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="780.46" x="-368.75" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/colorpicker.svg b/freeplane/resources/images/colorpicker.svg
new file mode 100644
index 0000000..c9669ca
--- /dev/null
+++ b/freeplane/resources/images/colorpicker.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="816.61" gradientUnits="userSpaceOnUse" x2="-234.46" gradientTransform="matrix(.46667 -.44890 .44890 .46667 -534.91 317.57)" y1="819.35" x1="-234.71">
+<stop stop-color="#00f" offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="799.52" xlink:href="#d" gradientUnits="userSpaceOnUse" x2="-255.46" y1="803.02" x1="-246.88"/>
+<linearGradient id="d">
+<stop stop-color="#be3d3d" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="792.39" gradientUnits="userSpaceOnUse" x2="-220.13" gradientTransform="matrix(.64753 0 0 .64753 -129.51 283.96)" y1="795.36" x1="-217.18">
+<stop stop-color="#a00" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-86.716 -190.2)">
+<g transform="translate(369.83 -604.43)">
+<g transform="matrix(1.0173 .031128 -.031128 1.0173 29.723 -5.4029)">
+<path opacity=".93720" stroke-linejoin="round" style="color:#000000" d="m-279.55 807.38c-0.35808 0.33085-0.62707 0.71802-1.0158 0.67884-0.22599-0.0228-0.27281-0.11858-0.38417-0.11405-0.23557 0.01-0.26417 0.46576-1.0038 0.39451-0.0665-0.76675 0.4145-0.75273 0.43315-0.98776 0.009-0.1111-0.0851-0.1616-0.0991-0.3883-0.0241-0.38998 0.38782-0.66008 0.71001-0.99677 2.5874-2.5776 5.2486-5.11 7.7404-7.8184l1.7603 1.83c-2.8763 2.3087-5.4809 4.8685-8.141 7.402z" stroke="#000" stroke-linecap="round" [...]
+<ellipse stroke-linejoin="round" ry="3.4542" cy="801.72" stroke-linecap="round" stroke-width="1.0239" fill="url(#a)" style="color:#000000" fill-rule="evenodd" rx="4.5147" transform="matrix(.48835 .34161 0 .48835 -150.66 493.81)" opacity=".93720" stroke="#501616" cx="-250.67"/>
+<ellipse stroke-linejoin="round" stroke="#501616" style="color:#000000" stroke-linecap="round" fill-rule="evenodd" rx="4.5147" transform="matrix(.48835 .34161 0 .48835 -150.66 493.81)" ry="3.4542" cy="801.72" cx="-250.67" stroke-width="1.0239" fill="url(#a)"/>
+<path stroke-linejoin="round" style="color:#000000" d="m-270.21 795.23-3.7505 3.3039c0.21412 0.91325 0.75025 1.6834 1.904 2.179l3.7658-3.3172c1.3376-1.418-0.55261-3.2617-1.9192-2.1658l-0.00002 0.00002z" fill-rule="evenodd" stroke="#501616" stroke-linecap="round" stroke-width=".5" fill="url(#b)"/>
+<path opacity=".93720" style="color:#000000" d="m-281.55 809.65c0.33373 0.7741 0.0871 1.0518-0.44234 1.0525-0.54087 0.00064-0.6186-0.32155-0.38815-1.0411 0.29876-0.93278 0.28853-0.93358 0.39647-1.3736 0.11077 0.50346 0.12147 0.4493 0.43402 1.3622z" stroke="#000" stroke-width=".1" fill="#00f"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="794.63" x="-283.12" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/connector_color.svg b/freeplane/resources/images/connector_color.svg
new file mode 100644
index 0000000..41fa4c6
--- /dev/null
+++ b/freeplane/resources/images/connector_color.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16.25"
+   viewBox="0 0 16 16.25"
+   id="svg6483"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Connectors.svg">
+  <defs
+     id="defs6485" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.8065657"
+     inkscape:cx="54.796262"
+     inkscape:cy="-25.016164"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata6488">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-47.739381,-55.38173)">
+    <g
+       id="g9858"
+       inkscape:export-filename="M:\FreePlane_radna_mapa\images-view\connector_color.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="translate(-296.90988,-677.55577)">
+      <rect
+         y="733.08521"
+         x="344.64926"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-89-0-4-2"
+         style="color:#000000;fill:none;stroke:none;stroke-width:0.85016513;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         transform="matrix(-0.01266322,-1.1462458,1.2659251,-0.01146606,-596.20149,1195.9953)"
+         id="g11439">
+        <rect
+           style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4348563;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9394-2"
+           width="2.9648025"
+           height="2.9648025"
+           x="383.45514"
+           y="747.22778" />
+        <rect
+           style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4348563;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9394-0-7"
+           width="2.9648025"
+           height="2.9648025"
+           x="386.41992"
+           y="747.22778" />
+        <rect
+           style="color:#000000;fill:#55d400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4348563;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9394-4-6"
+           width="2.9648025"
+           height="2.9648025"
+           x="392.3403"
+           y="747.22778" />
+        <rect
+           style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4348563;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9394-7-4"
+           width="2.9648025"
+           height="2.9648025"
+           x="389.38474"
+           y="747.22778" />
+      </g>
+      <path
+         id="path11375"
+         d="m 360.39121,740.45729 c -0.38582,-2.82578 -2.86668,-5.46405 -7.02276,-5.627 a 0.49909629,0.45191222 0 0 0 -0.1443,2.5e-4 l 1.40116,-1.61895 -5.86214,1.8999 5.71919,2.16193 -1.17926,-1.54376 a 0.49909629,0.45191222 0 0 0 0.0111,-4.6e-4 c 3.96432,0.15542 6.03386,2.71392 6.12969,5.31931 0.0958,2.60538 -1.73899,5.23234 -6.09711,5.5461 a 0.49909629,0.45191222 0 0 0 -0.14256,0.0203 l 1.13863,-1.70058 -5.57694,2.49262 5.95431,1.55185 -1.41673,-1.46634 a 0.49909629,0.45191222 0 0 0 0 [...]
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#0066ff;fill-opacity:1;stroke:#000080;stroke-width:0.25276804;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-backgroun [...]
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/copy_id.svg b/freeplane/resources/images/copy_id.svg
new file mode 100644
index 0000000..0ae45e6
--- /dev/null
+++ b/freeplane/resources/images/copy_id.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.236 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-80.609 -233.67)">
+<g transform="translate(37.649 -76.494)">
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Sans" transform="scale(.98238 1.0179)" line-height="125%" stroke="#000000" xml:space="preserve" font-size="16.989px" y="318.63574" x="43.043873" stroke-width=".24615" fill="#000000"><tspan y="318.63574" x="43.043873" stroke-width=".24615">ID</tspan></text>
+<rect style="color:#000000" transform="scale(1,-1)" height="16" width="16" y="-326.16" x="42.96" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/delCol.png b/freeplane/resources/images/delCol.png
new file mode 100644
index 0000000..749ad50
Binary files /dev/null and b/freeplane/resources/images/delCol.png differ
diff --git a/freeplane/resources/images/delCol.svg b/freeplane/resources/images/delCol.svg
new file mode 100644
index 0000000..aab7454
--- /dev/null
+++ b/freeplane/resources/images/delCol.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg4451"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16"
+   sodipodi:docname="delCol.svg">
+  <defs
+     id="defs4453" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.70198013"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4456">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g5353"
+       transform="translate(-0.06381624,-0.19203855)">
+      <g
+         transform="translate(0.08262831,-0.36116922)"
+         id="g4359-0">
+        <path
+           style="fill:#162d50"
+           inkscape:connector-curvature="0"
+           id="path13-2"
+           d="m 15.831708,15.183204 -15.66341616,0 0,-13.2976164 15.66341616,0 0,13.2976164 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#0055d4"
+           id="path15-9"
+           d="m 0.33145202,2.0702777 15.33713598,0 0,12.9282413 -15.33713598,0 0,-12.9282413 z" />
+        <path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           id="path17-2"
+           d="m 0.49461342,2.2549649 15.01073258,0 0,12.5588571 -15.01073258,0 0,-12.5588571 z" />
+        <path
+           style="fill:#00ccff"
+           inkscape:connector-curvature="0"
+           id="path19-8"
+           d="m 15.479669,5.134725 -15.01073289,0 0,-2.9311147 15.01073289,0 0,2.9311147 z" />
+        <path
+           style="fill:#0055d4"
+           inkscape:connector-curvature="0"
+           id="path21-7"
+           d="m 0.46893611,5.2397743 15.11344189,0 0,-0.1801283 -15.11344189,0 0,0.1801283 z" />
+        <path
+           style="fill:#0055d4"
+           inkscape:connector-curvature="0"
+           id="path23-9"
+           d="m 4.1287141,14.842443 0.1631565,0 0,-12.6959969 -0.1631565,0 0,12.6959969 z" />
+        <path
+           style="fill:#0055d4"
+           inkscape:connector-curvature="0"
+           id="path25-1"
+           d="m 11.759483,14.91884 0.163157,0 0,-12.8271712 -0.163157,0 0,12.8271712 z" />
+        <path
+           style="fill:#0055d4"
+           inkscape:connector-curvature="0"
+           id="path29-5"
+           d="m 0.49461342,8.3234761 15.01073258,0 0,-0.1846845 -15.01073258,0 0,0.1846845 z" />
+        <path
+           style="fill:#0055d4"
+           inkscape:connector-curvature="0"
+           id="path33-7"
+           d="m 0.36622686,11.613389 15.29318314,0 0,-0.184879 -15.29318314,0 0,0.184879 z" />
+        <path
+           style="fill:#0055d4"
+           inkscape:connector-curvature="0"
+           id="path4398-8"
+           d="m 8.0090596,14.944517 0.163156,0 0,-12.7466769 -0.163156,0 0,12.7466769 z" />
+      </g>
+      <rect
+         y="1.8244361"
+         x="8.2448282"
+         height="12.633238"
+         width="3.5498352"
+         id="rect4517-8"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51200002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-ren [...]
+      <g
+         transform="matrix(0.14830394,0,0,0.14830394,-64.066053,-82.49837)"
+         id="g4483">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3736"
+           d="m 485.54327,611.61627 c 1.33669,-16.30925 12.92478,-35.21456 31.03321,-37.92629 l 3.12185,5.6138 c -17.56802,3.85047 -27.23992,13.73121 -34.15551,32.3132 z"
+           style="color:#000000;fill:#ff0000" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3738"
+           d="m 477.20659,576.46334 c 15.60088,0.17991 34.43566,10.89124 38.36678,29.63465 l -5.10232,3.68596 c -4.97241,-18.09297 -15.08644,-27.47522 -33.2631,-33.32061 z"
+           style="color:#000000;fill:#ff0000" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/delRow.png b/freeplane/resources/images/delRow.png
new file mode 100644
index 0000000..ff714e9
Binary files /dev/null and b/freeplane/resources/images/delRow.png differ
diff --git a/freeplane/resources/images/delRow.svg b/freeplane/resources/images/delRow.svg
new file mode 100644
index 0000000..bddde4b
--- /dev/null
+++ b/freeplane/resources/images/delRow.svg
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="delRow.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\delRow.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <svg:metadata
+     id="metadata41">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview39"
+     showgrid="false"
+     inkscape:zoom="9.7362218"
+     inkscape:cx="-23.014715"
+     inkscape:cy="-1.32665"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <svg:defs
+     id="defs4">
+    <svg:linearGradient
+       id="def0"
+       x1="55.228268"
+       x2="55.228268"
+       y1="1.5451168"
+       y2="109.70261"
+       gradientTransform="scale(1.1588185,0.86294789)"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         offset="0"
+         stop-color="#B3E2FF"
+         id="stop7" />
+      <svg:stop
+         offset="1"
+         stop-color="#99CCFF"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="268.63"
+       y1="238.03"
+       x2="219.96"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="b"
+       gradientTransform="matrix(0.0987286,0,0,0.0953437,-44.037647,-13.774238)">
+      <svg:stop
+         id="stop4376"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4378"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#e"
+       y2="446.77"
+       id="d" />
+    <svg:linearGradient
+       id="e">
+      <svg:stop
+         id="stop4525"
+         offset="0"
+         stop-color="#f70000" />
+      <svg:stop
+         id="stop4527"
+         offset="1"
+         stop-color="#780000" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="449.6"
+       id="c" />
+    <svg:linearGradient
+       id="f">
+      <svg:stop
+         id="stop4531"
+         offset="0"
+         stop-color="#baa492" />
+      <svg:stop
+         id="stop4533"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="449.64"
+       id="b-4" />
+    <svg:linearGradient
+       id="h">
+      <svg:stop
+         id="stop4537"
+         offset="0" />
+      <svg:stop
+         id="stop4539"
+         offset="1"
+         stop-color="#7e7e7e" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="462.65"
+       id="a" />
+    <svg:linearGradient
+       id="g">
+      <svg:stop
+         id="stop4543"
+         offset="0"
+         stop-color="#c00000" />
+      <svg:stop
+         id="stop4545"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#e"
+       y2="446.77"
+       id="d-7" />
+    <svg:linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="449.6"
+       id="c-4" />
+    <svg:linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="449.64"
+       id="b-5" />
+    <svg:linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="462.65"
+       id="a-1" />
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-9"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="11.0039"
+       x2="20.945299"
+       y1="25.4727"
+       x1="27.294901"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd5">
+      <svg:stop
+         id="stop13012"
+         style="stop-color:#f5f5f5;stop-opacity:1;"
+         offset="0" />
+      <svg:stop
+         id="stop13014"
+         style="stop-color:#e1e1e1;stop-opacity:1;"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       y2="10.4377"
+       x2="24.6035"
+       y1="9.3432999"
+       x1="24.6035"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd6">
+      <svg:stop
+         id="stop13035"
+         style="stop-color:#87deaa;stop-opacity:1"
+         offset="0" />
+      <svg:stop
+         id="stop13037"
+         style="stop-color:#008033;stop-opacity:1"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="aigrd6-7"
+       gradientUnits="userSpaceOnUse"
+       x1="24.6035"
+       y1="9.3432999"
+       x2="24.6035"
+       y2="10.4377">
+      <svg:stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop13035-6" />
+      <svg:stop
+         offset="1"
+         style="stop-color:#686868"
+         id="stop13037-5" />
+    </svg:linearGradient>
+  </svg:defs>
+  <svg:rect
+     style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+     id="rect234"
+     transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+     y="13.240949"
+     x="-9.4223404"
+     height="0"
+     width="0.9126758" />
+  <svg:g
+     id="g4359"
+     transform="translate(0.02567731,-0.20541849)">
+    <svg:path
+       d="m 15.831708,15.183204 -15.66341616,0 0,-13.2976164 15.66341616,0 0,13.2976164 z"
+       id="path13"
+       inkscape:connector-curvature="0"
+       style="fill:#162d50" />
+    <svg:path
+       d="m 0.33145202,2.0702777 15.33713598,0 0,12.9282413 -15.33713598,0 0,-12.9282413 z"
+       id="path15"
+       style="fill:#0055d4"
+       inkscape:connector-curvature="0" />
+    <svg:path
+       d="m 0.49461342,2.2549649 15.01073258,0 0,12.5588571 -15.01073258,0 0,-12.5588571 z"
+       id="path17"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <svg:path
+       d="m 15.479669,5.134725 -15.01073289,0 0,-2.9311147 15.01073289,0 0,2.9311147 z"
+       id="path19"
+       inkscape:connector-curvature="0"
+       style="fill:#00ccff" />
+    <svg:path
+       d="m 0.46893611,5.2397743 15.11344189,0 0,-0.1801283 -15.11344189,0 0,0.1801283 z"
+       id="path21"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 4.1287141,14.842443 0.1631565,0 0,-12.6959969 -0.1631565,0 0,12.6959969 z"
+       id="path23"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 11.759483,14.91884 0.163157,0 0,-12.8271712 -0.163157,0 0,12.8271712 z"
+       id="path25"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 0.49461342,8.3234761 15.01073258,0 0,-0.1846845 -15.01073258,0 0,0.1846845 z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 0.36622686,11.613389 15.29318314,0 0,-0.184879 -15.29318314,0 0,0.184879 z"
+       id="path33"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 8.0090596,14.944517 0.163156,0 0,-12.7466769 -0.163156,0 0,12.7466769 z"
+       id="path4398"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+  </svg:g>
+  <svg:rect
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51200002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-renderi [...]
+     id="rect4517"
+     width="3.1389983"
+     height="14.99555"
+     x="8.0625277"
+     y="-15.56045"
+     transform="matrix(0,1,-1,0,0,0)" />
+  <svg:circle
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51200002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-renderi [...]
+     id="path4946"
+     cx="-31.069548"
+     cy="5.6263661"
+     r="3.3894055" />
+  <svg:g
+     id="g4483"
+     transform="matrix(0.14830394,0,0,0.14830394,-70.125898,-77.568326)">
+    <svg:path
+       style="color:#000000;fill:#ff0000"
+       d="m 485.54327,611.61627 c 1.33669,-16.30925 12.92478,-35.21456 31.03321,-37.92629 l 3.12185,5.6138 c -17.56802,3.85047 -27.23992,13.73121 -34.15551,32.3132 z"
+       id="path3736"
+       inkscape:connector-curvature="0" />
+    <svg:path
+       style="color:#000000;fill:#ff0000"
+       d="m 477.20659,576.46334 c 15.60088,0.17991 34.43566,10.89124 38.36678,29.63465 l -5.10232,3.68596 c -4.97241,-18.09297 -15.08644,-27.47522 -33.2631,-33.32061 z"
+       id="path3738"
+       inkscape:connector-curvature="0" />
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/designer.svg b/freeplane/resources/images/designer.svg
new file mode 100644
index 0000000..e150191
--- /dev/null
+++ b/freeplane/resources/images/designer.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.052 16.189" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="235.85" cx="-1490.8" gradientTransform="matrix(-1.0088 1.5906 -.51887 -.32907 -2866.2 2679.4)" r="12.631">
+<stop stop-color="#ed0000" offset="0"/>
+<stop stop-color="#f68686" offset="1"/>
+</radialGradient>
+<linearGradient id="g" y2="229.36" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="-1508.5" gradientTransform="matrix(1.1724 0 0 1.1724 1474.7 15.739)" y1="210.75" x1="-1498.6"/>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="235.85" cx="-1490.8" gradientTransform="matrix(-1.0088 1.5906 -.51887 -.32907 -2866.2 2679.4)" r="12.631">
+<stop stop-color="#2840d5" offset="0"/>
+<stop stop-color="#99a5eb" offset="1"/>
+</radialGradient>
+<linearGradient id="f" y2="229.36" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="-1508.5" gradientTransform="matrix(1.1724 0 0 1.1724 1296.5 -15.143)" y1="210.75" x1="-1498.6"/>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="235.85" cx="-1490.8" gradientTransform="matrix(-1.0088 1.5906 -.51887 -.32907 -2866.2 2679.4)" r="12.631">
+<stop stop-color="#eda701" offset="0"/>
+<stop stop-color="#fee806" offset="1"/>
+</radialGradient>
+<linearGradient id="e" y2="229.36" gradientUnits="userSpaceOnUse" x2="-1508.5" y1="210.75" x1="-1498.6">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-33.679 -81.583)">
+<g transform="translate(181.06 -716.47)">
+<g transform="translate(-89.793 -68.005)">
+<path d="m-44.105 871.1c-0.58873 0.51848-1.6403 1.4955-1.4664 2.0452 0.17388 0.54969 0.62338 0.93118 1.0351 1.4544 0.6286 0.79875 0.97983 2.2526 0.60381 3.0451-0.37602 0.79248-0.6363 0.89776-1.4233 1.318" stroke="#000080" stroke-width="1.017px" fill="none"/>
+<path d="m-46.046 869.42c-0.60494 0.0923-1.3681 0.0147-2.0074 0.10367-2.2034 0.30677-0.4245 2.349-1.5343 3.8178-0.5731 0.75849-2.968 0.80879-3.9128 0.94034" stroke="#a00" stroke-width="1px" fill="none"/>
+<g fill-rule="evenodd" transform="matrix(.18846 -.015387 .015387 .18846 3.9494 811.59)">
+<path transform="matrix(1.0656 .48876 -.48876 1.0656 1424.6 755.24)" stroke="#c60000" stroke-width="2.2554" fill="url(#d)" d="m-1480.3 247.22-12.13 5.5765-10.895-7.717 1.2358-13.294 12.13-5.5765 10.895 7.7171z"/>
+<path d="m-274.75 269.39-13.932 0.0937-7.9414 12.494 2.8385 3.7254c9.079-12.581 14.154-14.927 19.035-16.313z" fill="url(#g)"/>
+</g>
+<g fill-rule="evenodd" transform="matrix(.18649 -.031227 .031227 .18649 33.125 818.09)">
+<path transform="matrix(1.0656 .48876 -.48876 1.0656 1246.4 724.36)" stroke="#17257c" stroke-width="2.2554" fill="url(#c)" d="m-1480.3 247.22-12.13 5.5765-10.895-7.717 1.2358-13.294 12.13-5.5765 10.895 7.7171z"/>
+<path d="m-452.82 238.46-13.755 0.45519-8.2587 12.183 2.8385 3.7254c9.079-12.581 14.294-14.978 19.175-16.364z" fill="url(#f)"/>
+</g>
+<g fill-rule="evenodd" transform="matrix(.22019 -.025734 .025734 .22019 269.64 785.65)">
+<path transform="matrix(.90896 .41689 -.41689 .90896 -42.729 630.77)" stroke="#ce6209" stroke-width="2.2554" fill="url(#b)" d="m-1480.3 247.22-12.13 5.5765-10.895-7.717 1.2358-13.294 12.13-5.5765 10.895 7.7171z" stroke-opacity=".91860"/>
+<path d="m-1492.1 216.54-12.036-0.29892-6.7618 10.848 2.4211 3.1776c7.744-10.731 12.214-12.545 16.377-13.727z" fill="url(#e)"/>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="798.15" x="-147.36" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/edit12.svg b/freeplane/resources/images/edit12.svg
new file mode 100644
index 0000000..01cfbb3
--- /dev/null
+++ b/freeplane/resources/images/edit12.svg
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17645"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <svg:defs
+     id="defs17647">
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         id="stop18571"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.99342108" />
+      <svg:stop
+         id="stop18573"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.11842106" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_"
+       y2="11.573135"
+       x2="128.00047"
+       y1="244.42773"
+       x1="128.00049">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         id="stop120" />
+      <svg:stop
+         offset="0.54494399"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         id="stop122" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         id="stop124" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#0035ED"
+         id="midPointStop126" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#0035ED"
+         id="midPointStop128" />
+      <midPointStop
+         offset="0.544944"
+         style="stop-color:#00008D"
+         id="midPointStop130" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#00008D"
+         id="midPointStop132" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#0053BD"
+         id="midPointStop134" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_12_"
+       y2="11.546326"
+       x2="127.9995"
+       y1="244.40723"
+       x1="127.99951">
+      <svg:stop
+         offset="0.005615"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         id="stop141" />
+      <svg:stop
+         offset="0.57303399"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         id="stop143" />
+      <svg:stop
+         offset="1"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         id="stop145" />
+      <midPointStop
+         offset="0.005615"
+         style="stop-color:#428AFF"
+         id="midPointStop147" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#428AFF"
+         id="midPointStop149" />
+      <midPointStop
+         offset="0.573034"
+         style="stop-color:#94CAFF"
+         id="midPointStop151" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#94CAFF"
+         id="midPointStop153" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#DCF0FF"
+         id="midPointStop155" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9" />
+      <svg:stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4738-4">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740-8" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742-6" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6993-9"
+       id="linearGradient23920"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9909405,0,0,1.0072608,134.73194,-154.35921)"
+       x1="209.71291"
+       y1="440.74988"
+       x2="215.36411"
+       y2="446.76654" />
+    <svg:linearGradient
+       id="linearGradient6993-9">
+      <svg:stop
+         style="stop-color:#f70000;stop-opacity:1;"
+         offset="0"
+         id="stop6995-1" />
+      <svg:stop
+         style="stop-color:#780000;stop-opacity:1;"
+         offset="1"
+         id="stop6997-3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6985-7"
+       id="linearGradient23922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9909405,0,0,1.0072608,134.73194,-154.35921)"
+       x1="202.52689"
+       y1="456.24124"
+       x2="194.27422"
+       y2="449.5975" />
+    <svg:linearGradient
+       id="linearGradient6985-7">
+      <svg:stop
+         style="stop-color:#baa492;stop-opacity:1;"
+         offset="0"
+         id="stop6987-4" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6989-6" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6959-6"
+       id="linearGradient23924"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9909405,0,0,1.0072608,134.73194,-154.35921)"
+       x1="203.49844"
+       y1="457.89331"
+       x2="193.03886"
+       y2="449.63895" />
+    <svg:linearGradient
+       id="linearGradient6959-6">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6961-5" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6963-2" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6977-1"
+       id="linearGradient23926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9909405,0,0,1.0072608,134.73194,-154.35921)"
+       x1="193.01372"
+       y1="458.86801"
+       x2="196.75475"
+       y2="462.65179" />
+    <svg:linearGradient
+       id="linearGradient6977-1">
+      <svg:stop
+         style="stop-color:#c00000;stop-opacity:1;"
+         offset="0"
+         id="stop6979-03" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop6981-1" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.41517"
+     inkscape:cx="10.603036"
+     inkscape:cy="6.7352621"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1310"
+     inkscape:window-height="912"
+     inkscape:window-x="506"
+     inkscape:window-y="90"
+     inkscape:window-maximized="0" />
+  <svg:metadata
+     id="metadata17650">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+       y="-5.9568191"
+       x="13.175798"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g23928"
+       inkscape:export-filename="E:\FreePlane_radna_mapa\images\edit12.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="translate(377.85669,-827.55096)">
+      <svg:rect
+         y="843.55096"
+         x="-377.85669"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-89-0-36-0"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+      <svg:g
+         transform="translate(0.97640887,-14.001863)"
+         id="g23896">
+        <svg:g
+           id="g10366-8"
+           transform="matrix(0.60290045,0,0,0.63473247,-401.90943,317.12629)">
+          <svg:rect
+             y="854.06769"
+             x="38.699677"
+             height="22.161352"
+             width="20.342138"
+             id="rect10214-3"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.70816725;marker:none;enable-background:accumulate" />
+          <svg:path
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-2"
+             d="m 48.870745,858.77559 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#b1b1b1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.16712102;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-8-4"
+             d="m 48.870745,863.63668 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-89-1"
+             d="m 48.870746,868.49777 -10.121757,0 0,-4.68684 10.121757,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-7-1"
+             d="m 48.870744,873.35886 -10.121755,0 0,-4.68684 10.121755,0 m 0,4.68684 10.121758,0 0,-4.68684 -10.121758,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             id="path10281-5"
+             d="m 39.022949,874.74058 0,-1.23649 9.847796,0 9.847797,0 0,1.23649 0,1.2365 -9.847797,0 -9.847796,0 0,-1.2365 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.04416052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <svg:text
+             id="text10283-9"
+             y="861.82092"
+             x="40.057484"
+             style="font-style:italic;font-size:2.08346057px;fill:#0000ff;fill-opacity:1;stroke:none"
+             xml:space="preserve"><svg:tspan
+               y="861.82092"
+               x="40.057484"
+               id="tspan10285-5"
+               sodipodi:role="line">Predrag</svg:tspan></svg:text>
+          <svg:text
+             id="text10283-8-1"
+             y="866.51904"
+             x="40.350864"
+             style="font-style:italic;font-size:2.08346057px;fill:#ff0000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><svg:tspan
+               y="866.51904"
+               x="40.350864"
+               id="tspan10285-1-0"
+               sodipodi:role="line">Romina</svg:tspan></svg:text>
+          <svg:text
+             id="text10283-86-6"
+             y="866.53125"
+             x="51.055748"
+             style="font-style:italic;font-size:2.08346057px;fill:#008000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><svg:tspan
+               id="tspan10362-4"
+               y="866.53125"
+               x="51.055748"
+               sodipodi:role="line">Sara</svg:tspan></svg:text>
+          <svg:text
+             id="text10283-86-4-5"
+             y="862.04016"
+             x="51.055748"
+             style="font-style:italic;font-size:2.08346057px;fill:#ff6600;fill-opacity:1;stroke:none"
+             xml:space="preserve"><svg:tspan
+               y="862.04016"
+               x="51.055748"
+               id="tspan10285-12-2-3"
+               sodipodi:role="line">Stela</svg:tspan></svg:text>
+        </svg:g>
+        <svg:g
+           id="g6733-5"
+           transform="matrix(0.45468225,0,0,0.45468225,-524.81635,730.43475)"
+           inkscape:export-filename="H:\FreeMind_Ikone\pencil.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90">
+          <svg:path
+             sodipodi:nodetypes="ccccc"
+             id="path6953-5"
+             d="m 340.339,304.70358 15.30124,-14.82536 0.0255,-9.71272 -7.71931,0.11132 -17.09417,15.86926"
+             style="fill:url(#linearGradient23920);fill-opacity:1;fill-rule:evenodd;stroke:#550000;stroke-width:1.01904869;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             sodipodi:nodetypes="ccccccc"
+             id="path6955-2"
+             d="m 330.9211,296.04293 -3.86795,9.28298 3.57943,3.69043 9.6367,-4.25543 c 0.28336,-1.81451 0.78302,-3.5456 -2.00934,-3.98739 -0.2834,-1.49678 0.0987,-3.19467 -2.94203,-3.27236 -0.96058,-3.32146 -2.94177,-1.80035 -4.39681,-1.45823 z"
+             style="fill:url(#linearGradient23922);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient23924);stroke-width:1.01858938px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             sodipodi:nodetypes="cccc"
+             id="path6957-2"
+             d="m 327.03375,305.38316 -2.35379,5.75517 5.98861,-2.13721 c -0.64013,-2.65898 -1.48093,-4.20303 -3.63482,-3.61796 z"
+             style="fill:url(#linearGradient23926);fill-opacity:1;fill-rule:evenodd;stroke:#750000;stroke-width:1.01858938px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.83870963"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             id="path6967-1"
+             d="M 355.75487,289.96188 340.70818,304.763"
+             style="fill:none;stroke:#000000;stroke-width:0.39962694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             id="path7011-7"
+             d="m 335.35391,297.57011 -6.17208,7.70774"
+             style="fill:none;stroke:#000000;stroke-width:0.09990674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <svg:path
+             id="path7013-4"
+             d="m 338.29299,300.97585 c -0.2939,0.11951 -8.17065,5.55674 -8.17065,5.55674"
+             style="fill:none;stroke:#000000;stroke-width:0.09990674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+        </svg:g>
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/edit_add.png b/freeplane/resources/images/edit_add.png
deleted file mode 100644
index 8c026a4..0000000
Binary files a/freeplane/resources/images/edit_add.png and /dev/null differ
diff --git a/freeplane/resources/images/edit_details.svg b/freeplane/resources/images/edit_details.svg
new file mode 100644
index 0000000..7c9bac0
--- /dev/null
+++ b/freeplane/resources/images/edit_details.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.005 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="396.55" gradientUnits="userSpaceOnUse" x2="307.79" y1="381.33" x1="301.2">
+<stop stop-color="#000080" offset="0"/>
+<stop stop-color="#000080" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-37.638 -164.72)">
+<g transform="translate(-232.89 -198.94)">
+<g transform="translate(-3.3786 -20.727)">
+<rect style="color:#000000" height="14.163" width="16.005" y="385.38" x="273.91" fill="none"/>
+<rect stroke-linejoin="round" height="6.4723" stroke="#000080" stroke-width=".71830" fill="#fff" fill-rule="evenodd" rx="1.6754" ry="1.6252" width="14.359" y="385.22" x="274.73"/>
+<g transform="matrix(1.0027 0 0 .86533 -.77761 53.664)" stroke="#000" stroke-dasharray="1.43526771, 1.43526771" stroke-width="1.4353" fill="none">
+<path d="m274.64 399.35h14.565"/>
+<path d="m274.64 393.64h14.565"/>
+<path d="m274.64 396.5h14.565"/>
+</g>
+<path stroke-linejoin="round" transform="matrix(.24031 0 0 .24031 206.41 295.1)" stroke="#000" stroke-linecap="round" stroke-width="1.3" fill="url(#a)" d="m301.17 397-9.5008-16.456h19.002z"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="363.65" x="270.53" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/edit_long_node.svg b/freeplane/resources/images/edit_long_node.svg
new file mode 100644
index 0000000..17c94af
--- /dev/null
+++ b/freeplane/resources/images/edit_long_node.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.001 16.001" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d" y2="446.77" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="215.36" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="440.75" x1="209.71"/>
+<linearGradient id="e">
+<stop stop-color="#f70000" offset="0"/>
+<stop stop-color="#780000" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="449.6" xlink:href="#f" gradientUnits="userSpaceOnUse" x2="194.27" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="456.24" x1="202.53"/>
+<linearGradient id="f">
+<stop stop-color="#baa492" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="449.64" xlink:href="#h" gradientUnits="userSpaceOnUse" x2="193.04" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="457.89" x1="203.5"/>
+<linearGradient id="h">
+<stop offset="0"/>
+<stop stop-color="#7e7e7e" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="462.65" xlink:href="#g" gradientUnits="userSpaceOnUse" x2="196.75" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="458.87" x1="193.01"/>
+<linearGradient id="g">
+<stop stop-color="#c00000" offset="0"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-61.193 -114.56)">
+<g transform="translate(-49.01 -260.39)">
+<g transform="matrix(.99766 0 0 .99192 .25830 3.1594)">
+<rect opacity=".92511" style="color:#000000" rx=".070384" ry=".092563" height="16" width="16" y="374.95" x="110.2" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="374.95" x="110.2" fill="none"/>
+<rect stroke-linejoin="round" height="7.3623" stroke="#000080" stroke-width=".85615" fill="#fff" fill-rule="evenodd" rx="1.7124" ry="1.6236" width="15.144" y="383.16" x="110.63"/>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Sans" xml:space="preserve" transform="scale(1.002 .99801)" stroke="#000000" font-size="5.7243px" y="389.63705" x="112.14785" stroke-width=".26739" line-height="125%" fill="#000000"><tspan y="389.63705" x="112.14785" stroke-width=".26739">N</tspan></text>
+<g transform="matrix(1.243 -.13583 .13583 1.243 -80.398 -76.306)">
+<g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+<path stroke-linejoin="round" d="m340.34 304.7 10.562-10.6 1.2706-8.9948-8.9644-0.60659-12.355 11.644" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+<path d="m335.35 297.57-6.1721 7.7077" stroke="#000" stroke-width=".40004" fill="none"/>
+<path d="m338.29 300.98c-0.2939 0.11951-8.1706 5.5567-8.1706 5.5567" stroke="#000" stroke-width=".40004" fill="none"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+<path d="m351.02 294.19-10.31 10.57" stroke="#000" stroke-width=".46147" fill="none"/>
+</g>
+<g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+<path stroke-linejoin="round" d="m340.34 304.7 10.878-10.924 1.2315-8.9383-8.9253-0.66307-12.671 11.968" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+<path d="m351.01 294.5-10.3 10.26" stroke="#000" stroke-width=".46147" fill="none"/>
+</g>
+</g>
+<path d="m113.09 374.9v2.4666h-2.2948v1.7201h2.2948v2.4666h1.7454v-2.4666h2.2948v-1.7201h-2.2948v-2.4666h-1.7454z" stroke="#000" stroke-width=".15466px" fill="#f21313"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/edit_node.svg b/freeplane/resources/images/edit_node.svg
new file mode 100644
index 0000000..b83c10d
--- /dev/null
+++ b/freeplane/resources/images/edit_node.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.001 15.972" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d" y2="446.77" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="215.36" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="440.75" x1="209.71"/>
+<linearGradient id="e">
+<stop stop-color="#f70000" offset="0"/>
+<stop stop-color="#780000" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="449.6" xlink:href="#f" gradientUnits="userSpaceOnUse" x2="194.27" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="456.24" x1="202.53"/>
+<linearGradient id="f">
+<stop stop-color="#baa492" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="449.64" xlink:href="#h" gradientUnits="userSpaceOnUse" x2="193.04" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="457.89" x1="203.5"/>
+<linearGradient id="h">
+<stop offset="0"/>
+<stop stop-color="#7e7e7e" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="462.65" xlink:href="#g" gradientUnits="userSpaceOnUse" x2="196.75" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="458.87" x1="193.01"/>
+<linearGradient id="g">
+<stop stop-color="#c00000" offset="0"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-37.141 -114.25)">
+<g transform="translate(-73.061 -260.73)">
+<g transform="matrix(.99766 0 0 .99192 .25830 3.1594)">
+<rect opacity=".92511" style="color:#000000" rx=".070384" ry=".092563" height="16" width="16" y="374.95" x="110.2" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="374.95" x="110.2" fill="none"/>
+<rect stroke-linejoin="round" height="7.3623" stroke="#000080" stroke-width=".85615" fill="#fff" fill-rule="evenodd" rx="1.7124" ry="1.6236" width="15.144" y="383.16" x="110.63"/>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Sans" xml:space="preserve" transform="scale(1.002 .99801)" stroke="#000000" font-size="5.7243px" y="389.63705" x="112.14785" stroke-width=".26739" line-height="125%" fill="#000000"><tspan y="389.63705" x="112.14785" stroke-width=".26739">N</tspan></text>
+<g transform="matrix(1.243 -.13583 .13583 1.243 -80.398 -76.306)">
+<g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+<path stroke-linejoin="round" d="m340.34 304.7 10.562-10.6 1.2706-8.9948-8.9644-0.60659-12.355 11.644" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+<path d="m335.35 297.57-6.1721 7.7077" stroke="#000" stroke-width=".40004" fill="none"/>
+<path d="m338.29 300.98c-0.2939 0.11951-8.1706 5.5567-8.1706 5.5567" stroke="#000" stroke-width=".40004" fill="none"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+<path d="m351.02 294.19-10.31 10.57" stroke="#000" stroke-width=".46147" fill="none"/>
+</g>
+<g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+<path stroke-linejoin="round" d="m340.34 304.7 10.878-10.924 1.2315-8.9383-8.9253-0.66307-12.671 11.968" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+<path d="m351.01 294.5-10.3 10.26" stroke="#000" stroke-width=".46147" fill="none"/>
+</g>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/edit_remove.png b/freeplane/resources/images/edit_remove.png
deleted file mode 100644
index e2cb9df..0000000
Binary files a/freeplane/resources/images/edit_remove.png and /dev/null differ
diff --git a/freeplane/resources/images/editcut.svg b/freeplane/resources/images/editcut.svg
new file mode 100644
index 0000000..ec80668
--- /dev/null
+++ b/freeplane/resources/images/editcut.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16.213" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="1202.6" gradientUnits="userSpaceOnUse" x2="-281.66" gradientTransform="matrix(.035434 -.054547 .054547 .035434 -167.48 808.31)" y1="1242.5" x1="-227.36">
+<stop stop-color="#000080" offset="0"/>
+<stop stop-color="#00f" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="1091.7" gradientUnits="userSpaceOnUse" x2="-562.53" y1="1086.7" x1="-568.7">
+<stop stop-color="#808080" offset="0"/>
+<stop stop-color="#ccc" stop-opacity="0" offset="1"/>
+</linearGradient>
+<filter id="c" style="color-interpolation-filters:sRGB">
+<feGaussianBlur stdDeviation="0.31601763"/>
+</filter>
+<filter id="d" style="color-interpolation-filters:sRGB">
+<feGaussianBlur stdDeviation="0.31601763"/>
+</filter>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-39.09 -321.08)">
+<g transform="translate(368.52 -512.67)">
+<g stroke-linecap="round" transform="matrix(.98857 0 0 .98857 -213.85 -8.7874)">
+<path style="color:#000000" d="m-109.4 861.56c-0.14215 0.22802-0.25938 0.46783-0.29941 0.7072-0.10201 0.51596 0.24496 0.72082 0.0583 1.2983-0.0812 0.27147-1.0458 0.27617-1.4895 1.0467-0.9524 2.1289 0.98516 3.5185 1.2519 3.6662 0.90743 0.50365 1.6031 0.36431 1.9699-0.76372 0.26639-1.6399-1.4267-4.5105-0.46053-5.6754l-0.57639-0.91496c-0.14414 0.19212-0.31206 0.40771-0.45419 0.63574zm-1.0075 3.648c0.0885-0.14332 0.20874-0.25044 0.35721-0.30364 0.47515-0.17022 1.0533 0.2726 1.2927 0.98763 0. [...]
+<path style="color:#000000" d="m-108.16 860.77c0.26664-0.0332 0.53351-0.0389 0.76755 0.0254 0.51108 0.12418 0.55124 0.5251 1.1537 0.59831 0.28045 0.0404 0.68995-0.83304 1.5756-0.91202 2.332 0.03 2.7791 2.3721 2.8011 2.6762 0.0759 1.035-0.34283 1.6078-1.5206 1.4668-1.6001-0.44715-3.4939-3.1895-4.9569-2.8021l-0.58818-0.90742c0.23489-0.0501 0.50108-0.11192 0.76772-0.1451zm3.7337 0.61817c-0.16725 0.0201-0.31496 0.0842-0.4256 0.19661-0.35407 0.35968-0.19509 1.0703 0.35319 1.588 0.54829 0.5176 [...]
+<path style="color:#000000" d="m-109.72 861.68-0.64885-9.0584c0.34186 0.2061 0.69157 0.39593 0.84758 0.98688 0.61749 2.387 0.88922 4.7126 1.3102 7.0647 0.0419 0.66301-0.0722 1.0002-0.38864 1.1956-0.31643 0.19551-0.47109 0.23143-1.1203-0.18882z" stroke="#000" stroke-width=".25" fill="#fff"/>
+<path style="color:#000000" d="m-108.19 860.95-7.6046-4.9644c0.0142 0.39893 0.0105 0.79682 0.45137 1.2201 1.7872 1.6986 3.6885 3.065 5.5406 4.5749 0.5593 0.35848 0.90946 0.42236 1.234 0.24061 0.32452-0.18175 0.43101-0.29954 0.37871-1.0711z" stroke="#000" stroke-width=".25" fill="#fff"/>
+<circle opacity=".93720" stroke-linejoin="round" style="color:#000000" cx="-564.45" fill-rule="evenodd" transform="matrix(.035434 -.054547 .054547 .035434 -148.53 791.79)" cy="1089.5" r="7.2325" stroke="#000" stroke-width="1.5374" fill="url(#b)"/>
+<path opacity=".88333" stroke-linejoin="round" style="color:#000000" d="m-183.17 1068.9-0.77108 114.51" transform="matrix(.033771 -.051987 .051987 .033771 -165.01 810.71)" filter="url(#c)" stroke="#ccc" stroke-width="7.6869" fill="#4d4d4d"/>
+<path opacity=".88333" stroke-linejoin="round" d="m-93.301 1109.4-87.518 66.699" transform="matrix(.034295 -.052793 .053101 .034495 -165.87 809.77)" filter="url(#d)" stroke="#ccc" stroke-width="7.9192" fill="#4d4d4d"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="833.96" x="-329.43" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/editdelete.svg b/freeplane/resources/images/editdelete.svg
new file mode 100644
index 0000000..cfd9afe
--- /dev/null
+++ b/freeplane/resources/images/editdelete.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="editdelete.svg">
+  <defs
+     id="defs28" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1187"
+     inkscape:window-height="759"
+     id="namedview26"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-2.3050847"
+     inkscape:cy="7.9322034"
+     inkscape:window-x="617"
+     inkscape:window-y="159"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4493">
+    <rect
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.85776001;stroke-linejoin:round"
+       id="rect10"
+       x="0.43000001"
+       y="4.2980218"
+       width="15.142"
+       ry="1.6299"
+       rx="1.7122"
+       height="7.3909001" />
+    <g
+       id="text12"
+       style="font-style:italic;font-size:5.13579988px;fill:#000000">
+      <path
+         id="path4485"
+         style=""
+         d="m 2.6333016,6.0618166 0.6820984,0 1.0331785,3.2098749 0.6269287,-3.2098749 0.4940198,0 -0.729745,3.7440182 -0.6846061,0 -1.0306708,-3.2299367 -0.6269287,3.2299367 -0.4940198,0 0.729745,-3.7440182 z" />
+      <path
+         id="path4487"
+         style=""
+         d="m 6.911463,9.8785585 q -0.4940198,0 -0.782407,-0.3034335 -0.2858795,-0.3059412 -0.2858795,-0.8325613 0,-0.3059412 0.097801,-0.6219133 Q 6.041286,7.8021707 6.199272,7.5865072 6.4475358,7.2504734 6.753477,7.0899797 7.0594182,6.9294859 7.4456063,6.9294859 q 0.4789735,0 0.7723761,0.2984181 0.2959104,0.298418 0.2959104,0.7798993 0,0.333526 -0.097801,0.6645444 Q 8.318291,9.003366 8.160305,9.2215372 7.9145489,9.557571 7.6086077,9.7180648 7.3026665,9.8785585 6.911463,9.8785585 Z M 6. [...]
+      <path
+         id="path4489"
+         style=""
+         d="m 10.893714,9.3845387 q -0.185571,0.2432483 -0.43885,0.3686341 -0.253279,0.1253857 -0.5617283,0.1253857 -0.4212961,0 -0.6670522,-0.2858795 -0.2432483,-0.2883872 -0.2432483,-0.7874224 0,-0.4162807 0.1479552,-0.7924379 0.1479551,-0.3786649 0.4288192,-0.677083 0.1855709,-0.1981095 0.4187884,-0.3009258 0.233217,-0.105324 0.489004,-0.105324 0.270834,0 0.476466,0.1304012 0.20814,0.1304011 0.320988,0.3736495 l 0.300925,-1.529706 0.463928,0 -0.759838,3.9020042 -0.463927,0 0.08777,-0. [...]
+      <path
+         id="path4491"
+         style=""
+         d="m 14.477239,8.150743 q 0.0075,-0.040123 0.01003,-0.082755 0.005,-0.042631 0.005,-0.085262 0,-0.3059412 -0.180555,-0.4839889 -0.178048,-0.1780478 -0.486497,-0.1780478 -0.343557,0 -0.606867,0.2181712 -0.26331,0.2156635 -0.398727,0.6143901 l 1.6576,-0.00251 z m 0.401234,0.3611109 -2.146604,0 q -0.01505,0.095293 -0.02006,0.1504629 -0.005,0.05517 -0.005,0.095293 0,0.3485723 0.213156,0.5391587 0.215663,0.1905863 0.606867,0.1905863 0.300926,0 0.569251,-0.067708 0.268326,-0.067708 0. [...]
+    </g>
+    <g
+       style="fill:#ff0000"
+       id="g18"
+       transform="matrix(0.85044,0,0,0.98108,140.3,-856.5046)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path20"
+         d="m -161.28,889.17 c 0.59165,-6.8804 5.7208,-14.856 13.736,-16 l 1.3818,2.3683 c -7.776,1.6244 -12.057,5.7928 -15.118,13.632 z"
+         style="color:#000000" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path22"
+         d="m -164.97,874.34 c 6.9053,0.0759 15.242,4.5947 16.982,12.502 l -2.2584,1.555 c -2.2009,-7.6329 -6.6776,-11.591 -14.723,-14.057 z"
+         style="color:#000000" />
+    </g>
+    <rect
+       id="rect24"
+       x="7.3242186e-006"
+       y="-0.0020268555"
+       width="16"
+       height="16"
+       ry="0.092563003"
+       rx="0.070384003"
+       style="color:#000000;opacity:0.92510998;fill:none" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/editpaste.svg b/freeplane/resources/images/editpaste.svg
new file mode 100644
index 0000000..11ac4c9
--- /dev/null
+++ b/freeplane/resources/images/editpaste.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16.11" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="845.97" gradientUnits="userSpaceOnUse" x2="-67.119" gradientTransform="matrix(.52548 0 0 .47720 -48.261 430.74)" y1="863.37" x1="-54.129">
+<stop stop-color="#f60" offset="0"/>
+<stop stop-color="#ffe680" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 830.2 1606.4)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="d" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="a" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.31920 0 0 .31597 740.16 1533.1)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-39.09 -297.18)">
+<g transform="translate(123.67 -534.8)">
+<g fill-rule="evenodd">
+<rect style="color:#000000" stroke-opacity=".98039" ry="1.8976" height="13.301" width="11.705" stroke="#c87137" y="833.21" x="-83.944" stroke-width=".75" fill="url(#c)"/>
+<rect style="color:#000000" ry="1.0748" height="2.1496" width="6.0086" stroke="#917c6f" y="832.23" x="-81.096" stroke-width=".5" fill="#c8beb7"/>
+<g transform="matrix(.79555 0 0 .79555 -2.878 153.24)" stroke="#666">
+<path d="m-94.573 858.54h7.4607l3.7543 3.9023-0.08477 10.715h-11.13v-14.617z" stroke-width=".51007" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.31920 0 0 .31597 816.02 1436.8)" filter="url(#d)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m-86.89 858.77c0.34102 1.514 0.12249 2.6984-0.01908 3.4407 0.84097-0.20683 1.8321-0.43776 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" stroke-width=".51007" fill="url(#a)"/>
+</g>
+<path stroke-linejoin="round" style="color:#000000" d="m-75.914 841.91-0.92324-4.2868-1.0036 1.5628-2.6487-1.7414-1.3946 2.2059 2.66 1.7234-0.96612 1.5282 4.2761-0.992z" stroke-opacity=".91626" stroke="#784421" stroke-width=".45077" fill="#fff"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="832.09" x="-84.584" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/edittrash.png b/freeplane/resources/images/edittrash.png
deleted file mode 100644
index d3849b8..0000000
Binary files a/freeplane/resources/images/edittrash.png and /dev/null differ
diff --git a/freeplane/resources/images/export.svg b/freeplane/resources/images/export.svg
new file mode 100644
index 0000000..1d315fd
--- /dev/null
+++ b/freeplane/resources/images/export.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16.093" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.37028 0 0 .36654 1011.7 985.36)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="d" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="a" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.33386 0 0 .33049 917.56 908.65)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="373.15" gradientUnits="userSpaceOnUse" x2="151.09" gradientTransform="matrix(-.41430 .00030670 -.00042788 -.26957 116.51 298.43)" y1="386.85" x1="150.88">
+<stop stop-color="#289c00" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -197.63)">
+<g transform="translate(52.661 11.687)">
+<g fill-rule="evenodd" transform="translate(-1.1829 -16.623)" stroke="#666">
+<path d="m44.481 203.1h7.8035l3.9268 4.0816-0.0887 11.207h-11.642v-15.288z" stroke-width=".53351" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.33386 0 0 .33049 996.91 807.89)" filter="url(#d)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m52.517 203.34c0.35669 1.5836 0.12812 2.8224-0.02 3.5988 0.8796-0.21633 1.9163-0.45787 3.4556 0.009-1.6593-1.8338-2.3361-2.3982-3.4356-3.6086z" stroke-width=".53351" fill="url(#a)"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="185.94" x="43.031" fill="none"/>
+<path stroke-linejoin="round" d="m58.781 194.45-4.7993 3.3477-0.02372-1.9842-4.9581 0.0641-0.0044-2.7882 4.9581-0.0414-0.0029-1.9316 4.8305 3.3335z" fill-rule="evenodd" stroke="#005200" stroke-linecap="round" stroke-width=".5" fill="url(#c)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/f1.svg b/freeplane/resources/images/f1.svg
new file mode 100644
index 0000000..c17f8e7
--- /dev/null
+++ b/freeplane/resources/images/f1.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17.000001 17.000001" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="693.54" gradientUnits="userSpaceOnUse" x2="218.23" y1="710.54" x1="201.23">
+   <stop stop-color="#b16ec9" offset="0"/>
+   <stop stop-color="#280a95" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-49.248 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="16.15" width="16.15" stroke="#550084" y="693.97" x="201.65" stroke-width=".85017" fill="url(#a)"/>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="203.02362" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="203.02362" stroke-width=".23611" fill="#ffffff">F1</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f10.svg b/freeplane/resources/images/f10.svg
new file mode 100644
index 0000000..3aa18f3
--- /dev/null
+++ b/freeplane/resources/images/f10.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7207mm" width="6.567mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 23.26876 16.727014" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.09" y1="689.43" x1="174.33">
+   <stop stop-color="#a263c3" offset="0"/>
+   <stop stop-color="#4b27a2" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-229.25 -44.135)">
+  <g transform="translate(-151.98 -649.54)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(1.3021 0 0 .93604 172.23 45.367)" stroke="#800080" stroke-width=".77007" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".77007" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".77007" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.32px" stroke="#ffffff" stroke-linecap="square" y="706.3938" x="382.09131" stroke-width=".23401" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.32px" stroke="#ffffff" stroke-linecap="square" y="706.3938" x="382.09131" stroke-width=".23401" fill="#ffffff">F10</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f11.svg b/freeplane/resources/images/f11.svg
new file mode 100644
index 0000000..b5640fb
--- /dev/null
+++ b/freeplane/resources/images/f11.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7207mm" width="6.567mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 23.26876 16.727014" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.09" y1="689.43" x1="174.33">
+   <stop stop-color="#a162c3" offset="0"/>
+   <stop stop-color="#532ca5" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-255.51 -44.135)">
+  <g transform="translate(-151.98 -649.54)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(1.3021 0 0 .93604 198.49 45.367)" stroke="#800080" stroke-width=".77007" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".77007" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".77007" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.32px" stroke="#ffffff" stroke-linecap="square" y="706.46899" x="409.04953" stroke-width=".23401" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.32px" stroke="#ffffff" stroke-linecap="square" y="706.46899" x="409.04953" stroke-width=".23401" fill="#ffffff">F11</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f12.svg b/freeplane/resources/images/f12.svg
new file mode 100644
index 0000000..8c0e5cc
--- /dev/null
+++ b/freeplane/resources/images/f12.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7207mm" width="6.567mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 23.26876 16.727014" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.09" y1="689.43" x1="174.33">
+   <stop stop-color="#9f61c2" offset="0"/>
+   <stop stop-color="#2c1598" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-281.77 -44.135)">
+  <g transform="translate(-151.98 -649.54)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(1.3021 0 0 .93604 224.75 45.367)" stroke="#800080" stroke-width=".77007" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".77007" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".77007" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.32px" stroke="#ffffff" stroke-linecap="square" y="706.46899" x="434.61813" stroke-width=".23401" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.32px" stroke="#ffffff" stroke-linecap="square" y="706.46899" x="434.61813" stroke-width=".23401" fill="#ffffff">F12</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f2.svg b/freeplane/resources/images/f2.svg
new file mode 100644
index 0000000..75fe03e
--- /dev/null
+++ b/freeplane/resources/images/f2.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17.000001 17.000001" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="693.54" gradientUnits="userSpaceOnUse" x2="238.23" y1="710.54" x1="221.23">
+   <stop stop-color="#a364c4" offset="0"/>
+   <stop stop-color="#160690" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-69.248 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <rect style="color:#000000" stroke-opacity=".85635" fill-rule="evenodd" height="16.15" width="16.15" stroke="#550084" y="693.97" x="221.65" stroke-width=".85017" fill="url(#a)"/>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="222.32614" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="222.32614" stroke-width=".23611" fill="#ffffff">F2</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f3.svg b/freeplane/resources/images/f3.svg
new file mode 100644
index 0000000..dd97e1f
--- /dev/null
+++ b/freeplane/resources/images/f3.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17.000001 17.000001" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="693.54" gradientUnits="userSpaceOnUse" x2="258.23" y1="710.54" x1="241.23">
+   <stop stop-color="#955bbf" offset="0"/>
+   <stop stop-color="#251095" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-89.249 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="16.15" width="16.15" stroke="#550084" y="693.97" x="241.65" stroke-width=".85017" fill="url(#a)"/>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="242.28119" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="242.28119" stroke-width=".23611" fill="#ffffff">F3</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f4.svg b/freeplane/resources/images/f4.svg
new file mode 100644
index 0000000..2db9433
--- /dev/null
+++ b/freeplane/resources/images/f4.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17.000001 17.000001" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="693.54" gradientUnits="userSpaceOnUse" x2="278.23" y1="710.54" x1="261.23">
+   <stop stop-color="#a263c3" offset="0"/>
+   <stop stop-color="#271196" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-109.25 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="16.15" width="16.15" stroke="#550084" y="693.97" x="261.65" stroke-width=".85017" fill="url(#a)"/>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="262.15732" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="262.15732" stroke-width=".23611" fill="#ffffff">F4</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f5.svg b/freeplane/resources/images/f5.svg
new file mode 100644
index 0000000..1b1676f
--- /dev/null
+++ b/freeplane/resources/images/f5.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17 16.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.21" y1="689.42" x1="174.21">
+   <stop stop-color="#a263c3" offset="0"/>
+   <stop stop-color="#1b0891" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-129.25 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(.94444 0 0 .94444 129.7 39.475)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".90017" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="282.2034" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.50879" x="282.2034" stroke-width=".23611" fill="#ffffff">F5</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f6.svg b/freeplane/resources/images/f6.svg
new file mode 100644
index 0000000..60659b0
--- /dev/null
+++ b/freeplane/resources/images/f6.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17.000001 17.000001" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.21" gradientTransform="matrix(.94444 0 0 .94444 67.927 -63.078)" y1="689.42" x1="174.21">
+   <stop stop-color="#a061c2" offset="0"/>
+   <stop stop-color="#2b1296" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-149.25 -43.862)">
+  <g transform="translate(-83.208 -527.18)">
+   <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="16.15" width="16.15" stroke="#550084" y="571.47" x="232.88" stroke-width=".85017" fill="url(#a)"/>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="584.00952" x="233.46581" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="584.00952" x="233.46581" stroke-width=".23611" fill="#ffffff">F6</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f7.svg b/freeplane/resources/images/f7.svg
new file mode 100644
index 0000000..0e2515f
--- /dev/null
+++ b/freeplane/resources/images/f7.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17 16.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.21" y1="689.42" x1="174.21">
+   <stop stop-color="#9358bd" offset="0"/>
+   <stop stop-color="#391b9b" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-169.25 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(.94444 0 0 .94444 169.7 39.475)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".90017" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.49054" x="322.29251" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.49054" x="322.29251" stroke-width=".23611" fill="#ffffff">F7</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f8.svg b/freeplane/resources/images/f8.svg
new file mode 100644
index 0000000..bfc0ad1
--- /dev/null
+++ b/freeplane/resources/images/f8.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17 16.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.21" y1="689.42" x1="174.21">
+   <stop stop-color="#8750b8" offset="0"/>
+   <stop stop-color="#44229f" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-189.25 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(.94444 0 0 .94444 189.71 39.475)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".90017" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.42981" x="342.29608" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.42981" x="342.29608" stroke-width=".23611" fill="#ffffff">F8</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/f9.svg b/freeplane/resources/images/f9.svg
new file mode 100644
index 0000000..ab0ed34
--- /dev/null
+++ b/freeplane/resources/images/f9.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.7978mm" width="4.7978mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 17 16.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="671.42" gradientUnits="userSpaceOnUse" x2="192.21" y1="689.42" x1="174.21">
+   <stop stop-color="#9358bd" offset="0"/>
+   <stop stop-color="#3a179c" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-209.25 -43.862)">
+  <g transform="translate(-151.98 -649.68)">
+   <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="matrix(.94444 0 0 .94444 209.71 39.475)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+    <g style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" transform="translate(-13.77 21.12)" stroke="#800080" stroke-width=".90017" fill="#db71c9">
+     <rect style="color:#000000" stroke-opacity=".78453" fill-rule="evenodd" height="17.1" width="17.1" stroke="#550084" y="671.87" x="174.66" stroke-width=".90017" fill="url(#a)"/>
+    </g>
+   </g>
+   <text font-family="Arial" xml:space="preserve" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.42981" x="362.30573" stroke-width=".23611" fill="#ffffff"><tspan font-family="Arial" font-weight="bold" font-size="12.431px" stroke="#ffffff" stroke-linecap="square" y="706.42981" x="362.30573" stroke-width=".23611" fill="#ffffff">F9</tspan></text>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/resources/images/fileclose.png b/freeplane/resources/images/fileclose.png
deleted file mode 100644
index edf5f76..0000000
Binary files a/freeplane/resources/images/fileclose.png and /dev/null differ
diff --git a/freeplane/resources/images/fileopen.svg b/freeplane/resources/images/fileopen.svg
new file mode 100644
index 0000000..fd2edad
--- /dev/null
+++ b/freeplane/resources/images/fileopen.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.987 15.983" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b" y2="909.21" gradientUnits="userSpaceOnUse" x2="-290.83" gradientTransform="matrix(.54901 -.035509 .035509 .54901 -148.28 380.46)" y1="915.11" x1="-290.09">
+<stop stop-color="#ffd700" offset="0"/>
+<stop stop-color="#f5f6c2" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="903.8" gradientUnits="userSpaceOnUse" x2="-298.56" gradientTransform="matrix(.54901 -.035509 .035509 .54901 -148.28 380.46)" y1="912.77" x1="-290.83">
+<stop stop-color="#ebc600" offset="0"/>
+<stop stop-color="#f5f6c2" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -172.38)">
+<g stroke-linejoin="round" stroke-linecap="round" transform="matrix(1.045 0 0 .98663 392.64 -697.07)">
+<path style="color:#000000" d="m-270.55 892.96-0.73987-11.439-6.8522 2.1351-1.0873-1.6661-4.6524 1.7257c0.16814 2.3372 0.59252 8.891 0.75866 11.346 0.195 2.8811 1.3625 2.0384 1.8899 1.6765 4.8055-1.6994 6.5582-2.5443 10.683-3.7774h-0.00002 0.00002z" stroke="#6c5d53" stroke-width=".579" fill="url(#b)"/>
+<path style="color:#000000" d="m-282.16 897.15c2.082-0.52883 8.2916-2.961 12.437-4.4415l0.55947-9.9369-2.9966 0.99525-4.8737 1.6991-0.96324 1.3081-3.1531 0.91704c0.16755 3.8843 0.16239 8.9902-1.0103 9.4589z" stroke="#6c5d53" stroke-width=".579" fill="url(#a)"/>
+<path style="color:#000000" d="m-272.13 889.51-2.9873 3.9273-3.2785-3.5221 1.7978-0.20963c-0.17758-4.4089-3.3-4.5932-5.1445-2.625 0.77833-1.8695 1.8995-2.6484 3.0869-2.6564 2.2294 0.0894 4.5666 1.4164 4.6209 5.1156l1.9047-0.0299v0.00005z" fill-rule="evenodd" stroke="#008033" stroke-width="0.507" fill="#00d400"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/filesave.svg b/freeplane/resources/images/filesave.svg
new file mode 100644
index 0000000..db46de2
--- /dev/null
+++ b/freeplane/resources/images/filesave.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b" y2="907.59" gradientUnits="userSpaceOnUse" x2="-278.93" gradientTransform="matrix(-1.1335 0 0 -1.1335 -568.28 1961.7)" y1="932.61" x1="-258.39">
+<stop stop-color="#083ea2" offset="0"/>
+<stop stop-color="#a8e2fb" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="932.7" gradientUnits="userSpaceOnUse" x2="-265.45" gradientTransform="matrix(-1.1335 0 0 -1.1335 -568.34 1961.8)" y1="924.27" x1="-276.11">
+<stop stop-color="#c1c1c1" offset="0"/>
+<stop stop-color="#fff" offset=".5"/>
+<stop stop-color="#9c9c9c" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -124.41)">
+<g transform="translate(292.03 -706.66)">
+<g transform="matrix(0.5 0 0 0.5 -55.536 379.2)">
+<path d="m-277.47 911.17v-1.1174h0.79994l-1.3205-2.9966-1.3206 2.9966h0.78724v1.1174h1.0539z" stroke="#000" stroke-width=".050790" fill="#909192"/>
+<path d="m-251.81 934.69h-27.568c-1.1216 0-2.0245-0.90293-2.0245-2.0245v-25.864c0-1.1216 0.90292-2.0245 2.0245-2.0245h13.784l8.5363 0.41104 3.2759 0.0457 0.62691-0.45672h1.3451l2.0245 2.0245v25.865c0 1.1216-0.90293 2.0245-2.0245 2.0245z" stroke="#000" stroke-width=".38256" fill="url(#b)"/>
+<path d="m-254.59 934.47v-14.58c0-0.5513-0.44061-0.96198-0.98321-0.96198h-19.919c-0.5426 0-0.98321 0.41068-0.98321 0.96198v14.58h21.885z" stroke="#000" stroke-width=".17619" fill="#fff"/>
+<rect transform="scale(-1)" height="2.0567" width="21.648" y="-934.3" x="254.7" fill="#ffee4f"/>
+<path d="m-256.28 929.82h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-256.28 927.12h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-256.28 924.42h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-256.28 921.72h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<rect transform="scale(-1)" height="1.0786" width="1.5433" stroke="#000" y="-933.48" x="251.34" stroke-width=".14795" fill="#fff"/>
+<path d="m-256.2 914.18c0.56094 0 0.99182-0.43087 0.99182-0.99181v-8.2888h-20.041v8.2888c-0.00001 0.56095 0.46629 0.99181 1.0272 0.99181h18.022z" stroke="#000" stroke-width=".14169" fill="#6aa3d9"/>
+<path d="m-256.56 914.01c0.56094 0.00001 0.99182-0.43087 0.99182-0.99182l0.0516-8.2888h-15.265l-0.0516 8.2888c0 0.56095 0.4663 0.99182 1.0272 0.99182h13.246zm-1.6133-1.4877h-2.019c-0.40919 0-0.74387-0.33467-0.74387-0.74386v-5.6866h3.5068v5.6866c0 0.40919-0.33467 0.74386-0.74387 0.74386z" stroke="#000" stroke-width=".28338" fill="url(#a)"/>
+<path d="m-256.16 914.08h-17.573" stroke="#acabac" stroke-width=".11335" fill="none"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="831.06" x="-196.34" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/filesaveas.svg b/freeplane/resources/images/filesaveas.svg
new file mode 100644
index 0000000..20f2f27
--- /dev/null
+++ b/freeplane/resources/images/filesaveas.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d" y2="907.59" gradientUnits="userSpaceOnUse" x2="-278.93" gradientTransform="matrix(-1.1335 0 0 -1.1335 -555.03 2007.9)" y1="932.61" x1="-258.39">
+<stop stop-color="#083ea2" offset="0"/>
+<stop stop-color="#a8e2fb" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="932.7" gradientUnits="userSpaceOnUse" x2="-265.45" gradientTransform="matrix(-1.1335 0 0 -1.1335 -555.1 2008)" y1="924.27" x1="-276.11">
+<stop stop-color="#c1c1c1" offset="0"/>
+<stop stop-color="#fff" offset=".5"/>
+<stop stop-color="#9c9c9c" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="907.59" gradientUnits="userSpaceOnUse" x2="-278.93" gradientTransform="matrix(-1.1335 0 0 -1.1335 -541.54 2021.1)" y1="932.61" x1="-258.39">
+<stop stop-color="#f60" offset="0"/>
+<stop stop-color="#fca" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="932.7" gradientUnits="userSpaceOnUse" x2="-265.45" gradientTransform="matrix(-1.1335 0 0 -1.1335 -541.61 2021.3)" y1="924.27" x1="-276.11">
+<stop stop-color="#c1c1c1" offset="0"/>
+<stop stop-color="#fff" offset=".5"/>
+<stop stop-color="#9c9c9c" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -146.29)">
+<g transform="translate(258.99 -685.8)">
+<g transform="matrix(.36790 0 0 .36790 -64.569 482.65)">
+<path d="m-264.23 957.41v-1.1174h0.79994l-1.3205-2.9966-1.3206 2.9966h0.78724v1.1174h1.0539z" stroke="#000" stroke-width=".050790" fill="#909192"/>
+<path d="m-238.57 980.93h-27.568c-1.1216 0-2.0245-0.90293-2.0245-2.0245v-25.864c0-1.1216 0.90292-2.0245 2.0245-2.0245h13.784l8.5363 0.41104 3.2759 0.0457 0.62691-0.45672h1.3451l2.0245 2.0245v25.865c0 1.1216-0.90293 2.0245-2.0245 2.0245z" stroke="#000" stroke-width=".38256" fill="url(#d)"/>
+<path d="m-241.35 980.71v-14.58c0-0.5513-0.44061-0.96198-0.98321-0.96198h-19.919c-0.5426 0-0.98321 0.41068-0.98321 0.96198v14.58h21.885z" stroke="#000" stroke-width=".17619" fill="#fff"/>
+<rect transform="scale(-1)" height="2.0567" width="21.648" y="-980.54" x="241.45" fill="#ffee4f"/>
+<path d="m-243.04 976.06h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-243.04 973.36h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-243.04 970.66h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-243.04 967.96h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-242.96 960.42c0.56094 0 0.99182-0.43087 0.99182-0.99181v-8.2888h-20.041v8.2888c-0.00001 0.56095 0.46629 0.99181 1.0272 0.99181h18.022z" stroke="#000" stroke-width=".14169" fill="#6aa3d9"/>
+<path d="m-243.31 960.25c0.56094 0.00001 0.99182-0.43087 0.99182-0.99182l0.0516-8.2888h-15.265l-0.0516 8.2888c0 0.56095 0.4663 0.99182 1.0272 0.99182h13.246zm-1.6133-1.4877h-2.019c-0.40919 0-0.74387-0.33467-0.74387-0.74386v-5.6866h3.5068v5.6866c0 0.40919-0.33467 0.74386-0.74387 0.74386z" stroke="#000" stroke-width=".28338" fill="url(#c)"/>
+<path d="m-242.91 960.32h-17.573" stroke="#acabac" stroke-width=".11335" fill="none"/>
+<g transform="translate(-2,-2)">
+<rect transform="scale(-1)" height="1.0786" width="1.5433" stroke="#000" y="-979.72" x="238.09" stroke-width=".14795" fill="#fff"/>
+<path d="m-250.74 970.62v-1.1174h0.79994l-1.3205-2.9966-1.3206 2.9966h0.78724v1.1174h1.0539z" stroke="#000" stroke-width=".050790" fill="#909192"/>
+<path d="m-225.08 994.14h-27.568c-1.1216 0-2.0245-0.90293-2.0245-2.0245v-25.864c0-1.1216 0.90292-2.0245 2.0245-2.0245h13.784l8.5363 0.41104 3.2759 0.0457 0.62691-0.45672h1.3451l2.0245 2.0245v25.865c0 1.1216-0.90293 2.0245-2.0245 2.0245z" stroke="#000" stroke-width=".38256" fill="url(#b)"/>
+<path d="m-227.86 993.92v-14.58c0-0.5513-0.44061-0.96198-0.98321-0.96198h-19.919c-0.5426 0-0.98321 0.41068-0.98321 0.96198v14.58h21.885z" stroke="#000" stroke-width=".17619" fill="#fff"/>
+<rect transform="scale(-1)" height="2.0567" width="21.648" y="-993.75" x="227.96" fill="#ffee4f"/>
+<path d="m-229.55 989.27h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-229.55 986.57h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-229.55 983.87h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<path d="m-229.55 981.17h-18.361" stroke="#000" stroke-width=".14682" fill="none"/>
+<rect transform="scale(-1)" height="1.0786" width="1.5433" stroke="#000" y="-992.93" x="224.6" stroke-width=".14795" fill="#fff"/>
+<path d="m-229.47 973.63c0.56094 0 0.99182-0.43087 0.99182-0.99181v-8.2888h-20.041v8.2888c-0.00001 0.56095 0.46629 0.99181 1.0272 0.99181h18.022z" stroke="#000" stroke-width=".14169" fill="#ffa86d"/>
+<path d="m-229.82 973.46c0.56094 0.00001 0.99182-0.43087 0.99182-0.99182l0.0516-8.2888h-15.265l-0.0516 8.2888c0 0.56095 0.4663 0.99182 1.0272 0.99182h13.246zm-1.6133-1.4877h-2.019c-0.40919 0-0.74387-0.33467-0.74387-0.74386v-5.6866h3.5068v5.6866c0 0.40919-0.33467 0.74386-0.74387 0.74386z" stroke="#000" stroke-width=".28338" fill="url(#a)"/>
+<path d="m-229.42 973.53h-17.573" stroke="#acabac" stroke-width=".11335" fill="none"/>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="832.09" x="-163.3" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/flag.svg b/freeplane/resources/images/flag.svg
new file mode 100644
index 0000000..1c5b8fb
--- /dev/null
+++ b/freeplane/resources/images/flag.svg
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExtractLinkFromTextAction.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="J:\Freeplane\editor\images\ExtractLinkFromTextAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1113"
+     inkscape:window-height="843"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-1.1346272"
+     inkscape:cy="8"
+     inkscape:window-x="720"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4568-1-4"
+       id="linearGradient12580"
+       gradientUnits="userSpaceOnUse"
+       x1="314.56537"
+       y1="369.97995"
+       x2="332.02466"
+       y2="387.43924" />
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4554-5-4"
+       id="linearGradient12582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,13.495532,604.3737)"
+       x1="302.73621"
+       y1="377.9527"
+       x2="311.27377"
+       y2="390.78342" />
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g12572"
+     transform="translate(-191.98,-812.92219)"
+     inkscape:export-filename="O:\FreePlane_radna_mapa\images\flag.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <circle
+       r="13.966679"
+       cy="378.05789"
+       cx="325.57108"
+       style="display:inline;overflow:visible;visibility:visible;fill:#b4281c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.625;marker:none"
+       id="path4531-1-9"
+       transform="matrix(0.57279188,0,0,0.57279188,13.495532,604.3737)" />
+    <circle
+       r="13.966679"
+       cy="378.05789"
+       cx="325.57108"
+       style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient12580);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.32492188;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       id="path4533-3-7"
+       transform="matrix(0.52298354,0,0,0.52298354,29.711582,623.20399)" />
+    <g
+       transform="matrix(0.88889827,0,0,0.88889827,-111.64077,270.39197)"
+       id="g12745">
+      <ellipse
+         ry="4.10572"
+         rx="2.944432"
+         cy="264.84561"
+         cx="535.42358"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.97666609;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path10390-2"
+         transform="matrix(0.52025402,0,0,0.365589,71.892902,526.97299)" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.30455706;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 350.48363,621.00663 -2.47202,-7.68149 4.41275,-0.64859 -1.94073,8.33008 z"
+         id="path12167"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient12582);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+       d="m 199.97509,813.62172 c -4.03199,0 -7.3031,3.2711 -7.3031,7.3031 0,1.93721 0.79057,3.66832 2.02268,4.97613 0.64009,-5.28682 5.10225,-9.39737 10.56085,-9.39737 0.14718,0 0.28385,0.0299 0.42959,0.0358 -1.33569,-1.73726 -3.35087,-2.91766 -5.71002,-2.91766 z"
+       id="path4537-9-7"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/fmtPara.png b/freeplane/resources/images/fmtPara.png
new file mode 100644
index 0000000..928c6bc
Binary files /dev/null and b/freeplane/resources/images/fmtPara.png differ
diff --git a/freeplane/resources/images/fmtPara.svg b/freeplane/resources/images/fmtPara.svg
new file mode 100644
index 0000000..0a45e3f
--- /dev/null
+++ b/freeplane/resources/images/fmtPara.svg
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="fmtPara.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\fmtPara.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="19.40237"
+     inkscape:cx="8.9147894"
+     inkscape:cy="9.6376101"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+    <linearGradient
+       x1="-300.92999"
+       y1="808.62"
+       gradientTransform="translate(319.04664,-809.90824)"
+       x2="-285.82999"
+       gradientUnits="userSpaceOnUse"
+       y2="823.71997"
+       id="b-3">
+      <stop
+         id="stop3538"
+         offset="0" />
+      <stop
+         id="stop3540"
+         offset="1"
+         stop-color="#ccc" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.17001"
+       y1="810.40002"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="813.87"
+       id="c-1">
+      <stop
+         id="stop3543"
+         offset="0"
+         stop-color="#f60" />
+      <stop
+         id="stop3545"
+         offset="1"
+         stop-color="#f9ac79" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="814.65002"
+       gradientTransform="matrix(0.97877023,0,0,0.97877023,304.91277,-792.30756)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="818.06"
+       id="d">
+      <stop
+         id="stop3548"
+         offset="0"
+         stop-color="#00f" />
+      <stop
+         id="stop3550"
+         offset="1"
+         stop-color="#6666fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="818.78998"
+       gradientTransform="translate(319.04664,-810.11324)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="822.23999"
+       id="e">
+      <stop
+         id="stop3553"
+         offset="0"
+         stop-color="#fc0" />
+      <stop
+         id="stop3555"
+         offset="1"
+         stop-color="#f7e28c" />
+    </linearGradient>
+    <linearGradient
+       x1="-292.20999"
+       y1="826.48999"
+       gradientTransform="translate(299.95945,-814.913)"
+       x2="-288.70999"
+       gradientUnits="userSpaceOnUse"
+       y2="829.98999"
+       id="f">
+      <stop
+         id="stop3558"
+         offset="0"
+         stop-color="#ce72fc" />
+      <stop
+         id="stop3560"
+         offset="1"
+         stop-color="#d893fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-295.16"
+       y1="818.67999"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-291.66"
+       gradientUnits="userSpaceOnUse"
+       y2="822.19"
+       id="g">
+      <stop
+         id="stop3563"
+         offset="0"
+         stop-color="#008000" />
+      <stop
+         id="stop3565"
+         offset="1"
+         stop-color="#78b978" />
+    </linearGradient>
+    <linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.30262,0,0,0.30262,-240.46,727.85)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-2">
+      <stop
+         id="stop3568"
+         offset="0"
+         stop-color="#dadada" />
+      <stop
+         id="stop3570"
+         offset="1"
+         stop-color="#f1f1f1" />
+    </linearGradient>
+    <font
+       horiz-adv-x="1024"
+       id="font4776"
+       inkscape:label="font 1">
+      <font-face
+         units-per-em="1024"
+         id="font-face4778"
+         font-family="SVGFont 1" />
+      <missing-glyph
+         d="M0,0h1000v1024h-1000z"
+         id="missing-glyph4780" />
+    </font>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4405">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609"
+       d="m 5.244389,2.4277289 9.334685,0"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609-9"
+       d="m 1.3526884,5.0148865 13.2946236,0"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4.0999999;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609-1"
+       d="m 1.3526884,7.6020446 6.4916511,0"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609-1-4"
+       d="m 1.3526884,10.189203 6.4916511,0"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609-1-6"
+       d="m 1.3526884,12.776361 6.4916511,0"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+    <g
+       transform="matrix(0.64206466,0,0,0.5478708,15.404237,-5.6816877)"
+       id="g4789">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.50581627;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-ren [...]
+         d="m -5.9286794,33.746015 0,-9.635869 2.9073745,0 0,9.635869"
+         id="rect4782"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.73813891;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+         id="path4785"
+         sodipodi:type="arc"
+         sodipodi:cx="26.634073"
+         sodipodi:cy="6.1064763"
+         sodipodi:rx="2.3862057"
+         sodipodi:ry="2.6740129"
+         sodipodi:start="0"
+         sodipodi:end="3.1415927"
+         sodipodi:open="true"
+         d="m 29.020279,6.1064763 a 2.3862057,2.6740129 0 0 1 -1.193103,2.3157631 2.3862057,2.6740129 0 0 1 -2.386206,0 2.3862057,2.6740129 0 0 1 -1.193102,-2.3157632"
+         transform="matrix(0,1,-1,0,0,0)" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50581627;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m -5.9286794,24.110146 4.6517987,0"
+         id="path4787"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/font.png b/freeplane/resources/images/font.png
new file mode 100644
index 0000000..8e497c7
Binary files /dev/null and b/freeplane/resources/images/font.png differ
diff --git a/freeplane/resources/images/font.svg b/freeplane/resources/images/font.svg
new file mode 100644
index 0000000..e28d168
--- /dev/null
+++ b/freeplane/resources/images/font.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="font.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\fontColor.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="10.826979"
+     inkscape:cy="8"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.41699409px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.66928107;stroke-opacity:1"
+     id="text14029">
+    <path
+       d="m 7.1686274,0.7058822 1.7254903,0 4.5281043,12.1934648 q 0.334641,0.920261 0.669281,1.223529 0.345098,0.292811 0.920262,0.292811 l 0.230065,0 0,0.878431 -5.197386,0 0,-0.878431 q 0.250981,-0.02092 0.491504,-0.02092 0.501961,0 0.658823,-0.104575 0.303268,-0.198692 0.303268,-0.50196 0,-0.219608 -0.29281,-1.077125 l -0.962092,-2.8235292 -5.2915031,0 -1.1294118,3.1581702 q -0.1777778,0.491503 -0.1777778,0.679738 0,0.209151 0.1045752,0.366014 0.1150327,0.156862 0.303268,0.240522 0.1 [...]
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Bookman Old Style';-inkscape-font-specification:'Bookman Old Style Light';stroke-width:0.66928107"
+       id="path4432" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/fontColor.png b/freeplane/resources/images/fontColor.png
new file mode 100644
index 0000000..b115b31
Binary files /dev/null and b/freeplane/resources/images/fontColor.png differ
diff --git a/freeplane/resources/images/fontColor.svg b/freeplane/resources/images/fontColor.svg
new file mode 100644
index 0000000..ab6f1bc
--- /dev/null
+++ b/freeplane/resources/images/fontColor.svg
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="fontColor.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\fontColor.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="10.826979"
+     inkscape:cy="8"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+    <linearGradient
+       x1="-300.92999"
+       y1="808.62"
+       gradientTransform="translate(319.04664,-809.90824)"
+       x2="-285.82999"
+       gradientUnits="userSpaceOnUse"
+       y2="823.71997"
+       id="b-3">
+      <stop
+         id="stop3538"
+         offset="0" />
+      <stop
+         id="stop3540"
+         offset="1"
+         stop-color="#ccc" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.17001"
+       y1="810.40002"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="813.87"
+       id="c-1">
+      <stop
+         id="stop3543"
+         offset="0"
+         stop-color="#f60" />
+      <stop
+         id="stop3545"
+         offset="1"
+         stop-color="#f9ac79" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="814.65002"
+       gradientTransform="matrix(0.97877023,0,0,0.97877023,304.91277,-792.30756)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="818.06"
+       id="d">
+      <stop
+         id="stop3548"
+         offset="0"
+         stop-color="#00f" />
+      <stop
+         id="stop3550"
+         offset="1"
+         stop-color="#6666fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="818.78998"
+       gradientTransform="translate(319.04664,-810.11324)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="822.23999"
+       id="e">
+      <stop
+         id="stop3553"
+         offset="0"
+         stop-color="#fc0" />
+      <stop
+         id="stop3555"
+         offset="1"
+         stop-color="#f7e28c" />
+    </linearGradient>
+    <linearGradient
+       x1="-292.20999"
+       y1="826.48999"
+       gradientTransform="translate(299.95945,-814.913)"
+       x2="-288.70999"
+       gradientUnits="userSpaceOnUse"
+       y2="829.98999"
+       id="f">
+      <stop
+         id="stop3558"
+         offset="0"
+         stop-color="#ce72fc" />
+      <stop
+         id="stop3560"
+         offset="1"
+         stop-color="#d893fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-295.16"
+       y1="818.67999"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-291.66"
+       gradientUnits="userSpaceOnUse"
+       y2="822.19"
+       id="g">
+      <stop
+         id="stop3563"
+         offset="0"
+         stop-color="#008000" />
+      <stop
+         id="stop3565"
+         offset="1"
+         stop-color="#78b978" />
+    </linearGradient>
+    <linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.30262,0,0,0.30262,-240.46,727.85)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-2">
+      <stop
+         id="stop3568"
+         offset="0"
+         stop-color="#dadada" />
+      <stop
+         id="stop3570"
+         offset="1"
+         stop-color="#f1f1f1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4573">
+    <text
+       sodipodi:linespacing="125%"
+       id="text4434"
+       y="15.144282"
+       x="0.57681274"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.32916832px;line-height:125%;font-family:Andalus;-inkscape-font-specification:'Andalus, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="15.144282"
+         x="0.57681274"
+         id="tspan4436"
+         sodipodi:role="line">T</tspan></text>
+    <g
+       transform="matrix(0.90453052,0,0,0.90453052,1.686336,1.6460421)"
+       id="g4543">
+      <rect
+         style="color:#000000;fill:#00ff00;stroke:#000000;stroke-width:0.25;stroke-opacity:1"
+         height="3.4256957"
+         width="3.4256957"
+         y="11.85301"
+         x="11.982501"
+         id="rect3578" />
+      <rect
+         style="color:#000000;fill:#0066ff;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-opacity:1"
+         height="3.4256957"
+         width="3.4256957"
+         y="5.0016193"
+         x="11.982501"
+         id="rect3580" />
+      <rect
+         style="color:#000000;fill:#fffe2f;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-opacity:1"
+         height="3.4256957"
+         width="3.4256957"
+         y="8.4273157"
+         x="11.982501"
+         id="rect3582" />
+      <rect
+         style="color:#000000;fill:#e22fff;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-opacity:1"
+         height="3.4256957"
+         width="3.4256957"
+         y="11.85301"
+         x="8.5568056"
+         id="rect3584" />
+      <rect
+         style="color:#000000;fill:#ff6600;stroke:#000000;stroke-width:0.25;stroke-opacity:1"
+         height="3.4256957"
+         width="3.4256957"
+         y="5.0016193"
+         x="8.5568056"
+         id="rect3586" />
+      <rect
+         style="color:#000000;fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-opacity:1"
+         height="3.4256957"
+         width="3.4256957"
+         y="8.4273157"
+         x="8.5568056"
+         id="rect3594" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/formula.svg b/freeplane/resources/images/formula.svg
new file mode 100644
index 0000000..4dd29a4
--- /dev/null
+++ b/freeplane/resources/images/formula.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="17.119272"
+   width="25.57029"
+   version="1.1"
+   viewBox="0 0 25.57029 17.119273"
+   id="svg4144"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="xx025.svg">
+  <defs
+     id="defs4172" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview4170"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.2685914"
+     inkscape:cx="-1.7998631"
+     inkscape:cy="44.783749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4144" />
+  <metadata
+     id="metadata4146">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.94455,0,0,0.94455,-238.27641,-794.86073)"
+     id="g4148"
+     style="stroke-width:0.46787">
+    <path
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#693dd6;fill-opacity:0.93725;stroke:#6436d5;stroke-opacity:0.79215997"
+       d="m 265.83,855.33 c 1.8247,0.48767 3.315,-0.1049 4.1973,0.95428 0.88236,1.0591 1.8328,0.86272 3.4153,1.1331 -1.321,-0.23313 -2.3614,-0.32694 -3.1733,-1.5023 -0.82684,-1.1994 -2.2652,-1.274 -4.1287,-1.7719 l -0.31057,1.1869 -1e-5,-10e-6 z"
+       id="path4150"
+       inkscape:connector-curvature="0" />
+    <rect
+       height="3.0676"
+       style="color:#000000;fill:#ffffff;stroke:#212190"
+       rx="0.73589998"
+       ry="0.67648"
+       width="6.5079999"
+       y="855.71002"
+       x="271.78"
+       id="rect4152" />
+  </g>
+  <g
+     transform="matrix(0.94455,0,0,-0.94455,-237.51641,817.96927)"
+     id="g4154"
+     style="stroke-width:0.46787">
+    <path
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#693dd6;fill-opacity:0.93725;stroke:#6436d5;stroke-opacity:0.79215997"
+       d="m 265.83,855.33 c 1.8247,0.48767 3.315,-0.1049 4.1973,0.95428 0.88236,1.0591 1.8328,0.86272 3.4153,1.1331 -1.321,-0.23313 -2.3614,-0.32694 -3.1733,-1.5023 -0.82684,-1.1994 -2.2652,-1.274 -4.1287,-1.7719 l -0.31057,1.1869 -1e-5,-10e-6 z"
+       id="path4156"
+       inkscape:connector-curvature="0" />
+    <rect
+       height="3.0676"
+       style="color:#000000;fill:#ffffff;stroke:#212190"
+       rx="0.73589998"
+       ry="0.67648"
+       width="6.5079999"
+       y="855.71002"
+       x="271.78"
+       id="rect4158" />
+  </g>
+  <ellipse
+     cy="234.45"
+     rx="5.0323"
+     ry="4.8597002"
+     cx="36.667999"
+     id="ellipse4160"
+     sodipodi:cx="36.667999"
+     sodipodi:cy="234.45"
+     sodipodi:rx="5.0323"
+     sodipodi:ry="4.8597002"
+     style="fill:#ffffff;fill-rule:evenodd;stroke:#7851db;stroke-width:0.90999001;stroke-opacity:0.93332998"
+     transform="translate(-26.906406,-222.63073)" />
+  <text
+     style="font-size:14.71012688px;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#14148a;stroke:#000080;stroke-width:0.21001181;font-family:Gabriola"
+     transform="matrix(1.0072913,0,-0.17054853,0.99276145,0,0)"
+     xml:space="preserve"
+     line-height="125%"
+     font-size="14.71px"
+     y="14.200613"
+     x="8.2709503"
+     id="text4162"
+     sodipodi:linespacing="125%"><tspan
+       dx="0.64732939"
+       y="14.200613"
+       x="8.2709503"
+       id="tspan4164"
+       style="fill:#14148a;stroke:#000080;stroke-width:0.21001181">x</tspan></text>
+  <text
+     style="font-size:16.80999947px;font-style:italic;line-height:1000%;letter-spacing:0.6724px;word-spacing:0px;fill:#5730ca;fill-opacity:0.93725;stroke:#562fc8;stroke-width:0.70841002;stroke-opacity:0.93332998;font-family:Arial"
+     line-height="1000%"
+     transform="matrix(1,0,-0.24473,1,0,0)"
+     font-style="italic"
+     xml:space="preserve"
+     font-size="16.81px"
+     y="13.125865"
+     x="3.1807165"
+     id="text4166"
+     sodipodi:linespacing="1000%"><tspan
+       font-style="normal"
+       y="13.125865"
+       x="3.1807165"
+       id="tspan4168"
+       style="font-style:normal;fill:#5730ca;fill-opacity:0.93725;stroke:#562fc8;stroke-width:0.70841002;stroke-opacity:0.93332998;font-family:Gabriola">f</tspan></text>
+</svg>
diff --git a/freeplane/resources/images/fullscreen.png b/freeplane/resources/images/fullscreen.png
new file mode 100644
index 0000000..c1246da
Binary files /dev/null and b/freeplane/resources/images/fullscreen.png differ
diff --git a/freeplane/resources/images/fullscreen.svg b/freeplane/resources/images/fullscreen.svg
new file mode 100644
index 0000000..c3e9163
--- /dev/null
+++ b/freeplane/resources/images/fullscreen.svg
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 2 2"
+   xml:space="preserve"
+   width="32"
+   height="32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="fullscreen.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\fullscreen.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45"><metadata
+     id="metadata47"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs45"><linearGradient
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)"
+       id="a"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"><stop
+         stop-color="#fff"
+         offset="0"
+         id="stop4697" /><stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop4699" /></linearGradient><linearGradient
+       id="a-5"
+       y2="838.97998"
+       gradientUnits="userSpaceOnUse"
+       x2="56.047001"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       y1="834.12"
+       x1="56.425999"><stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop3019" /><stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3021" /></linearGradient><linearGradient
+       y2="124.52"
+       x2="219.96001"
+       y1="238.03"
+       x1="268.63"
+       gradientTransform="matrix(0.00313038,0,0,0.00314036,-0.18173388,0.28310115)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5069"
+       xlink:href="#a"
+       inkscape:collect="always" /></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview43"
+     showgrid="false"
+     inkscape:zoom="8.2009548"
+     inkscape:cx="-40.109152"
+     inkscape:cy="28.490942"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1"
+     showguides="true"
+     inkscape:guide-bbox="true"><sodipodi:guide
+       position="0.68589574,0.67827468"
+       orientation="-0.70710678,0.70710678"
+       id="guide4409" /></sodipodi:namedview><g
+     id="g13"
+     transform="translate(0,-30)" /><g
+     id="g15"
+     transform="translate(0,-30)" /><g
+     id="g17"
+     transform="translate(0,-30)" /><g
+     id="g19"
+     transform="translate(0,-30)" /><g
+     id="g21"
+     transform="translate(0,-30)" /><g
+     id="g23"
+     transform="translate(0,-30)" /><g
+     id="g25"
+     transform="translate(0,-30)" /><g
+     id="g27"
+     transform="translate(0,-30)" /><g
+     id="g29"
+     transform="translate(0,-30)" /><g
+     id="g31"
+     transform="translate(0,-30)" /><g
+     id="g33"
+     transform="translate(0,-30)" /><g
+     id="g35"
+     transform="translate(0,-30)" /><g
+     id="g37"
+     transform="translate(0,-30)" /><g
+     id="g39"
+     transform="translate(0,-30)" /><g
+     id="g41"
+     transform="translate(0,-30)" /><g
+     id="g4419"
+     transform="matrix(0,1,-1,0,2.0039974,0.00579405)"><rect
+       ry="0.18566743"
+       y="0.062832847"
+       x="0.057038799"
+       height="1.8841257"
+       width="1.8841257"
+       id="rect4396"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.05337429;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-ren [...]
+       transform="translate(0.02286319,0.23625297)"
+       id="g4384"><path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.043;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 0.20267884,1.2846689 0,0.2604176 0.26060211,0 z"
+         id="polygon11"
+         inkscape:connector-curvature="0" /><path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0.55567049,1.1847349 0.20643585,1.5387369"
+         id="path4382"
+         inkscape:connector-curvature="0" /></g><g
+       id="g4384-6"
+       transform="matrix(0,1,1,0,0.22826483,0.02824638)"><path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.043;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 0.20267884,1.2846689 0,0.2604176 0.26060211,0 z"
+         id="polygon11-1"
+         inkscape:connector-curvature="0" /><path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 0.55567049,1.1847349 0.20643585,1.5387369"
+         id="path4382-8"
+         inkscape:connector-curvature="0" /></g></g><g
+     id="g4556"
+     transform="matrix(1.1372162,0,0,1.1372162,-0.14257253,-0.12995309)"><path
+       inkscape:connector-curvature="0"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.02168093;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+       d="m 0.74311255,0.87569604 c 0.0789817,-0.001621 0.15194145,0.0745878 0.23485678,0.006307 0.0784781,-0.065803 0.18686577,0.04853 0.25380187,0.056168 C 1.1758165,0.93223907 1.0796631,0.82377366 1.0023423,0.90356634 0.88648588,1.0216862 0.82422243,0.94907832 0.7435642,0.95072874 l -4.5202e-4,-0.0750327 z"
+       id="path4779" /><path
+       inkscape:connector-curvature="0"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.02168093;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+       d="m 0.61808881,0.95932002 c 0.0789809,0.001621 0.1519407,0.009669 0.2348564,0.0779495 C 0.93142332,1.1030725 1.031962,1.1733004 1.0988984,1.1656591 1.0429438,1.1715913 0.95463861,1.0954992 0.87731819,1.0157035 0.76146139,0.89758405 0.69919832,0.88593513 0.61854008,0.88428508 l -4.5202e-4,0.0750323 0,0 z"
+       id="path4781" /><path
+       inkscape:connector-curvature="0"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.02168093;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+       d="m 0.61754116,0.87961177 c 0.0789817,-0.001621 0.15194145,-0.009669 0.23485715,-0.0779495 C 0.93087567,0.73585927 1.0314151,0.66563175 1.0983508,0.67327231 1.0423965,0.66734045 0.95409171,0.74343258 0.87677091,0.82322825 0.76091412,0.94134811 0.69865104,0.95299666 0.61799281,0.95464671 l -4.5202e-4,-0.0750323 0,0 z"
+       id="path4783" /><path
+       style="font-size:61.54299927px;fill:url(#linearGradient5069);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.0338332;stroke-opacity:0.99738668"
+       inkscape:connector-curvature="0"
+       font-size="61.543px"
+       d="M 0.7844574,0.97369822 A 0.16029417,0.1608054 0 0 1 0.62415105,1.1345164 0.16029417,0.1608054 0 0 1 0.46384358,0.97369822 0.16029417,0.1608054 0 0 1 0.62415105,0.81288046 0.16029417,0.1608054 0 0 1 0.7844574,0.97369822 Z"
+       id="path4743" /><rect
+       transform="scale(-1,1)"
+       id="rect4717"
+       x="-1.4947916"
+       y="0.83360595"
+       width="0.32270461"
+       height="0.17934574"
+       ry="0.039550364"
+       rx="0.036490213"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.02501898;stroke-linejoin:round;stroke-opacity:1" /><rect
+       id="rect4723"
+       x="1.0250279"
+       y="1.132076"
+       width="0.3227022"
+       height="0.17934993"
+       ry="0.039551489"
+       rx="0.036490005"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.02501858;stroke-linejoin:round;stroke-opacity:0.99738668" /><rect
+       transform="scale(-1,-1)"
+       id="rect4729"
+       x="-1.3378795"
+       y="-0.7205373"
+       width="0.30071884"
+       height="0.17074555"
+       ry="0.037653189"
+       rx="0.034004636"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.02384135;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/freeplane/resources/images/hotlistadd.png b/freeplane/resources/images/hotlistadd.png
deleted file mode 100644
index 0347b30..0000000
Binary files a/freeplane/resources/images/hotlistadd.png and /dev/null differ
diff --git a/freeplane/resources/images/hotlistdel.png b/freeplane/resources/images/hotlistdel.png
deleted file mode 100644
index 2ada18e..0000000
Binary files a/freeplane/resources/images/hotlistdel.png and /dev/null differ
diff --git a/freeplane/resources/images/icon_trash.svg b/freeplane/resources/images/icon_trash.svg
new file mode 100644
index 0000000..6e5f591
--- /dev/null
+++ b/freeplane/resources/images/icon_trash.svg
@@ -0,0 +1,1123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17547"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16"
+   sodipodi:docname="icon_trash.svg">
+  <defs
+     id="defs17549">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6502-2-6">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6504-45-0" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6506-2-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7752-0-5-07">
+      <stop
+         style="stop-color:#283c6d;stop-opacity:1"
+         offset="0"
+         id="stop7754-7-7-5" />
+      <stop
+         style="stop-color:#136ec1;stop-opacity:1"
+         offset="1"
+         id="stop7756-2-4-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7819-5-3-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop7821-2-4-1" />
+      <stop
+         style="stop-color:#b9150a;stop-opacity:1"
+         offset="1"
+         id="stop7823-1-0-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7772-8-8-9">
+      <stop
+         style="stop-color:#fcfcfc;stop-opacity:0;"
+         offset="0"
+         id="stop7774-6-1-8" />
+      <stop
+         style="stop-color:#b7d9fb;stop-opacity:1;"
+         offset="1"
+         id="stop7776-4-5-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8851-0">
+      <stop
+         style="stop-color:#0066ff;stop-opacity:1;"
+         offset="0"
+         id="stop8853-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop8855-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13853-7">
+      <stop
+         style="stop-color:#a1a1a1;stop-opacity:0.55263156"
+         offset="0"
+         id="stop13855-2" />
+      <stop
+         style="stop-color:#acacac;stop-opacity:0.84736842"
+         offset="1"
+         id="stop13857-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9699"
+       inkscape:collect="always">
+      <stop
+         id="stop9701"
+         offset="0"
+         style="stop-color:#ad0650;stop-opacity:0.98823529" />
+      <stop
+         id="stop9703"
+         offset="1"
+         style="stop-color:#f6d5ff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6712-7-7">
+      <stop
+         id="stop6714-4-6"
+         offset="0"
+         style="stop-color:#ffff00;stop-opacity:1;" />
+      <stop
+         id="stop6716-0-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6746-8-2">
+      <stop
+         style="stop-color:#999999;stop-opacity:1;"
+         offset="0"
+         id="stop6748-8-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6750-2-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3972-5-4">
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1;"
+         offset="0"
+         id="stop3974-5-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3976-1-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11604-1-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop11606-1-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop11608-5-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8851-0"
+       id="linearGradient19039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17414565,-0.21139346,0.21139346,0.17414565,84.430924,771.3713)"
+       x1="206.07385"
+       y1="632.78802"
+       x2="199.9192"
+       y2="621.1626" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-5-8-1-6-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-8-1-8-2-1" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-7-99-4-1-1-4">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-7-8-9-7-3-0" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-7-9-8-5-1-9-9">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-7-4-6-4-3-0-3" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter7439-6-4-6-2-0"
+       x="-0.051574819"
+       width="1.1031497"
+       y="-0.42098197"
+       height="1.841964">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.58480536"
+         id="feGaussianBlur7441-2-4-7-1-7" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter7302-7-5-3-0">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.32617743"
+         id="feGaussianBlur7304-8-6-9-1" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13940-5-5-6-0-4"
+       x="-0.033950556"
+       width="1.0679011"
+       y="-0.23408014"
+       height="1.4681603">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.3721843"
+         id="feGaussianBlur13942-7-8-3-9-8" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13876-1-2-5-1"
+       x="-0.11119386"
+       width="1.2223877"
+       y="-0.038451634"
+       height="1.0769033">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57987162"
+         id="feGaussianBlur13878-3-3-8-2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-2-0-2-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-1-6-6-6" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter9709-2-7-9"
+       x="-0.019477759"
+       width="1.0389555"
+       y="-0.15966143"
+       height="1.3193228">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.25385953"
+         id="feGaussianBlur9711-2-6-3" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-7-6-4-9-3">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-7-3-8-0-3" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-7-9-2-8-7-3">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-7-4-3-4-2-7" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter7439-5-7-6-2"
+       x="-0.051574819"
+       width="1.1031497"
+       y="-0.42098197"
+       height="1.841964">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.58480536"
+         id="feGaussianBlur7441-8-3-6-3" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-5-8-2-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-8-1-82-8" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6502-2-6"
+       id="linearGradient7296-9-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(38.324919,-35.660141)"
+       x1="118.08942"
+       y1="890.2583"
+       x2="118.08942"
+       y2="868.35883" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-7-99-4-5-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-7-8-9-9-2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6502-2-6"
+       id="linearGradient7298-8-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(38.324917,-35.660151)"
+       x1="118.08942"
+       y1="887.4151"
+       x2="118.08942"
+       y2="877.88696" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter7439-6-4-65-6"
+       x="-0.051574819"
+       width="1.1031497"
+       y="-0.42098197"
+       height="1.841964">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.58480536"
+         id="feGaussianBlur7441-2-4-0-9" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7752-0-5-07"
+       id="linearGradient18480-5-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20800828,0,0,0.12430357,226.3412,756.72051)"
+       x1="137.93004"
+       y1="665.3894"
+       x2="111.5116"
+       y2="634.26111" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-5-3-5"
+       id="radialGradient7303-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1998129,0.1787036,-0.1589379,0.1657398,241.58479,572.22416)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7772-8-8-9"
+       id="linearGradient18482-4-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20098438,0,0,0.11535113,224.61446,758.59972)"
+       x1="136.40031"
+       y1="682.29431"
+       x2="149.98343"
+       y2="699.43719" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-5-3-5"
+       id="radialGradient7308-7-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1997994,0.1787128,-0.1504045,0.1566166,235.45341,578.78014)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8851-0"
+       id="linearGradient20152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17414565,-0.21139346,0.21139346,0.17414565,84.430924,771.3713)"
+       x1="206.07385"
+       y1="632.78802"
+       x2="199.9192"
+       y2="621.1626" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter8885-6-8-7"
+       x="-0.074112795"
+       width="1.1482255"
+       y="-0.31508768"
+       height="1.6301754">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.76171525"
+         id="feGaussianBlur8887-7-1-8" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter7302-7-6-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.32617743"
+         id="feGaussianBlur7304-8-5-4" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13940-5-5-8-5"
+       x="-0.033950556"
+       width="1.0679011"
+       y="-0.23408014"
+       height="1.4681603">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.3721843"
+         id="feGaussianBlur13942-7-8-8-9" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9699"
+       id="linearGradient7316-4-1"
+       gradientUnits="userSpaceOnUse"
+       x1="9.8880129"
+       y1="815.25696"
+       x2="28.548529"
+       y2="817.22333" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13876-1-7-4"
+       x="-0.11119386"
+       width="1.2223877"
+       y="-0.038451634"
+       height="1.0769033">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57987162"
+         id="feGaussianBlur13878-3-2-7" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-2-2-0">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-1-4-7" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6502-2-6"
+       id="linearGradient7318-2-8"
+       gradientUnits="userSpaceOnUse"
+       x1="154.24544"
+       y1="820.03363"
+       x2="154.24544"
+       y2="826.37286" />
+    <filter
+       inkscape:collect="always"
+       id="filter9709-6-0"
+       x="-0.019477759"
+       width="1.0389555"
+       y="-0.15966143"
+       height="1.3193228">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.25385953"
+         id="feGaussianBlur9711-7-2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6502-2-6"
+       id="linearGradient7320-7-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(164.86327,-63.522023)"
+       x1="118.08942"
+       y1="890.2583"
+       x2="118.08942"
+       y2="868.35883" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13924-7-6-0-4">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44792182"
+         id="feGaussianBlur13926-7-3-2-7" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6502-2-6"
+       id="linearGradient7322-3-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(164.86326,-63.522033)"
+       x1="118.08942"
+       y1="887.4151"
+       x2="118.08942"
+       y2="877.88696" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7752-0-5-07"
+       id="linearGradient7300-0-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20800828,0,0,0.12430357,226.3412,756.72051)"
+       x1="137.93004"
+       y1="665.3894"
+       x2="111.5116"
+       y2="634.26111" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-5-3-5"
+       id="radialGradient7326-7-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1998129,0.1787036,-0.1589379,0.1657398,241.58479,572.22416)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7772-8-8-9"
+       id="linearGradient7306-3-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20098438,0,0,0.11535113,224.61446,758.59972)"
+       x1="136.40031"
+       y1="682.29431"
+       x2="149.98343"
+       y2="699.43719" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-5-3-5"
+       id="radialGradient7330-7-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1997994,0.1787128,-0.1504045,0.1566166,235.45341,578.78014)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter7439-5-9-5"
+       x="-0.051574819"
+       width="1.1031497"
+       y="-0.42098197"
+       height="1.841964">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.58480536"
+         id="feGaussianBlur7441-8-4-6" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6712-7-7"
+       id="radialGradient7390-5-8-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2129191,0.09530024,-0.1070114,0.2262983,-54.270086,83.778214)"
+       cx="590.34711"
+       cy="555.9632"
+       fx="590.34711"
+       fy="555.9632"
+       r="70.341484" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6712-7-7"
+       id="radialGradient7393-8-0-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2892197,-0.03288572,0.02789302,0.2321914,-174.31375,156.18093)"
+       cx="591.23499"
+       cy="537.33655"
+       fx="591.23499"
+       fy="537.33655"
+       r="65.043396" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8851-0"
+       id="linearGradient20252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17414565,-0.21139346,0.21139346,0.17414565,84.430924,771.3713)"
+       x1="206.07385"
+       y1="635.18152"
+       x2="198.83701"
+       y2="611.35455" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8851-0"
+       id="linearGradient20254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17414565,-0.21139346,0.21139346,0.17414565,84.430924,771.3713)"
+       x1="206.07385"
+       y1="632.78802"
+       x2="199.9192"
+       y2="621.1626" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13853-7"
+       id="linearGradient20256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3303566,0,0,0.2930067,-72.524006,-231.21068)"
+       x1="134.95354"
+       y1="804.94543"
+       x2="175.51765"
+       y2="804.94543" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6746-8-2"
+       id="linearGradient20258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1368557,0,0,0.133146,-45.888395,192.67641)"
+       x1="389.94601"
+       y1="586.44977"
+       x2="457.61359"
+       y2="586.44977" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3972-5-4"
+       id="linearGradient20260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1368557,0,0,0.133146,-45.888395,192.2992)"
+       x1="378.31357"
+       y1="665.35596"
+       x2="433.80917"
+       y2="665.35596" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11604-1-3"
+       id="linearGradient20262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0374695,0.04648216,-0.04777726,1.009347,-252.26682,-42.548627)"
+       x1="261.90396"
+       y1="284.4545"
+       x2="265.32843"
+       y2="287.58585" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter20767"
+       x="-0.015758586"
+       width="1.0315172"
+       y="-0.041217012"
+       height="1.082434">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.2903438"
+         id="feGaussianBlur20769" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.098901"
+     inkscape:cx="5.9128502"
+     inkscape:cy="18.463269"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="685"
+     inkscape:window-height="435"
+     inkscape:window-x="1153"
+     inkscape:window-y="107"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17552">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g20839"
+       transform="matrix(0.86785727,0,0,0.86785727,26.555898,4.4620856)">
+      <g
+         style="fill:#ffffff;stroke:#ffffff;stroke-opacity:1"
+         transform="translate(-298.26212,-847.3287)"
+         id="g9761-9-6-5">
+        <g
+           style="fill:#ffffff;stroke:#ffffff;stroke-opacity:1"
+           id="g7613-3-5-8-4"
+           transform="matrix(0.25409322,0,0,0.32006599,237.07027,587.53895)">
+          <path
+             sodipodi:nodetypes="cssscccscz"
+             id="path13793-8-3-1-5-3"
+             d="m 156.41432,834.27883 c -11.93234,0 -21.61486,3.56793 -21.61486,7.96306 0,4.39512 9.68252,7.93289 21.61486,7.93289 11.93235,0 21.61487,-3.53777 21.61487,-7.93289 0,-4.39513 -9.68252,-7.96306 -21.61487,-7.96306 z m 0,4.21932 c 6.24659,10e-4 16.53894,0.5057 17.49032,3.74374 -0.71099,2.65454 -7.3457,3.58632 -17.49032,3.58632 -10.14461,0 -16.56785,-1.09091 -17.16934,-3.58632 0.60149,-3.28768 10.92276,-3.74495 17.16934,-3.74374 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1;marker:none;filter:url(#filter13924-5-8-1-6-8);enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path13793-9-6-1-9-5-8"
+             d="m 156.42996,833.77368 c -6.016,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61909,1.58199 -4.78127,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78653,1.86267 4.78127,2.59375 3.98948,1.46216 9.45317,2.375 15.46875,2.375 6.01561,0 11.44803,-0.91284 15.4375,-2.375 1.99476,-0.73108 3.65011,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.18639 1.84375,-3.46875 0,-1.28237 -0.68155,-2.48824 -1.84375,-3 [...]
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visib [...]
+             inkscape:connector-curvature="0" />
+          <path
+             id="path13793-9-8-2-0-0-8-7"
+             d="m 156.42995,833.77368 c -6.01601,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61908,1.58199 -4.78126,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78652,2.47536 4.78126,3.20644 3.98948,1.46216 9.45317,2.52817 15.46875,2.52817 6.0156,0 11.44803,-1.06601 15.4375,-2.52817 1.99477,-0.73108 3.65012,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.79908 1.84375,-4.08144 0,-1.28237 -0.68154,-2.48824 -1.8 [...]
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visib [...]
+             sodipodi:nodetypes="csssssssssssccsssssssssssccsscccssssscccsscccsscssssscssc"
+             inkscape:connector-curvature="0" />
+          <path
+             transform="matrix(0.99986897,-0.01618748,0.01618748,0.99986897,-11.15847,58.061021)"
+             sodipodi:nodetypes="cscsc"
+             id="path7400-7-8-2-7-9"
+             d="m 168.74215,789.78542 c 0,0 -7.54066,2.02813 -14.59235,2.02813 -7.05169,0 -13.59023,-2.88495 -13.59023,-2.88495 0,0 6.86734,1.49482 13.91903,1.49482 7.05169,0 14.26355,-0.638 14.26355,-0.638 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1;marker:none;filter:url(#filter7439-6-4-6-2-0);enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.49999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 283.63894,845.87699 -2.14043,10.93887 c -0.65655,2.29617 -8.93104,2.05439 -9.27186,-0.2314 -0.7966,-3.80838 -1.10451,-6.8561 -1.82316,-10.70747 2.97003,2.30501 8.95826,2.63779 13.23545,0 z"
+           id="rect13811-7-8-3-7"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible [...]
+           d="m 154.83242,817.9665 c -2.46024,-5.2e-4 -5.78969,0.20365 -8.59375,0.75 -1.40203,0.27317 -2.66448,0.63133 -3.65625,1.125 -2.35543,1.37303 -2.43388,2.47647 -0.4375,4.0937 0.77375,0.50964 1.8081,0.93819 3.0625,1.3125 2.50879,0.74862 5.914,1.21875 9.90625,1.21875 3.98944,0 7.39457,-0.42445 9.90625,-1.15625 1.25584,-0.3659 2.27894,-0.82703 3.0625,-1.34375 0.78356,-0.51672 1.34922,-1.11156 1.53125,-1.84375 l 0.0312,-0.125 -0.0312,-0.125 c -0.24894,-0.91278 -1.06817,-1.545 -2.125, [...]
+           id="path13793-5-2-3-6-0"
+           sodipodi:nodetypes="csccsssscccccccsscssssscssc"
+           transform="matrix(0.28165121,0,0,0.28165121,233.14118,625.58572)"
+           inkscape:connector-curvature="0" />
+        <ellipse
+           ry="1.907984"
+           rx="13.155047"
+           cy="823.20325"
+           cx="154.24544"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;marker:none;filter:url(#filter13940-5-5-6-0-4);enable-background:accumulate"
+           id="path13914-8-8-1-4-3"
+           transform="matrix(0.3303566,0,0,0.60855161,225.90712,355.96975)" />
+        <path
+           transform="matrix(0.32646934,-0.04481686,0.05052972,0.28955893,225.37725,616.12865)"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1;marker:none;filter:url(#filter13876-1-2-5-1);enable-background:accumulate"
+           d="m 15.431142,799.78387 c 3.400707,3.07854 6.288925,4.56382 9.990611,5.69774 l -3.157928,31.98406 c -2.636139,-0.97259 -5.466548,-1.67089 -7.861758,-4.20011 0.0042,-10.87738 0.656447,-22.53375 1.029075,-33.48169 z"
+           id="rect13861-2-4-2-1"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1;marker:none;filter:url(#filter13924-2-0-2-1);enable-background:accumulate"
+           d="m 282.95267,806.41695 c -11.93234,0 -21.61486,3.56793 -21.61486,7.96306 0,4.39512 9.68252,7.93289 21.61486,7.93289 11.93235,0 21.61487,-3.53777 21.61487,-7.93289 0,-4.39513 -9.68252,-7.96306 -21.61487,-7.96306 z m 0,4.21932 c 6.24659,10e-4 16.53894,0.5057 17.49032,3.74374 -0.71099,2.65454 -7.3457,3.58632 -17.49032,3.58632 -10.14461,0 -16.56785,-1.09091 -17.16934,-3.58632 0.60149,-3.28768 10.92276,-3.74495 17.16934,-3.74374 z"
+           id="path13793-0-3-0-6"
+           sodipodi:nodetypes="cssscccscz"
+           transform="matrix(0.3303566,0,0,0.3303566,183.47843,576.51872)"
+           inkscape:connector-curvature="0" />
+        <ellipse
+           ry="1.907984"
+           rx="15.639963"
+           cy="823.20325"
+           cx="154.24544"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#ffffff;fill-opacity:0.77647059;stroke:#ffffff;stroke-width:0.51868141;stroke-opacity:1;marker:none;filter:url(#filter9709-2-7-9);enable-background:accumulate"
+           id="path13914-2-2-1-9-7"
+           transform="matrix(0.35418149,0,0,0.65592296,222.35564,305.55882)" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible [...]
+           d="m 282.96831,805.9118 c -6.016,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61909,1.58199 -4.78127,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78653,1.86267 4.78127,2.59375 3.98948,1.46216 9.45317,2.375 15.46875,2.375 6.01561,0 11.44803,-0.91284 15.4375,-2.375 1.99476,-0.73108 3.65011,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.18639 1.84375,-3.46875 0,-1.28237 -0.68155,-2.48824 -1.84375,-3.5  [...]
+           id="path13793-9-2-0-3-5"
+           transform="matrix(0.3303566,0,0,0.3303566,183.47843,576.51872)"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible [...]
+           d="m 282.9683,805.9118 c -6.01601,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61908,1.58199 -4.78126,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78652,1.86267 4.78126,2.59375 3.98948,1.46216 9.45317,2.375 15.46875,2.375 6.0156,0 11.44803,-0.91284 15.4375,-2.375 1.99477,-0.73108 3.65012,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.18639 1.84375,-3.46875 0,-1.28237 -0.68154,-2.48824 -1.84375,-3.5  [...]
+           id="path13793-9-8-0-4-4-3"
+           transform="matrix(0.3303566,0,0,0.3303566,183.47843,576.51872)"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1;marker:none;filter:url(#filter7439-5-7-6-2);enable-background:accumulate"
+           d="m 170.49407,789.05251 c -0.0162,1.00176 -9.28902,2.86873 -16.34427,2.76104 -6.04982,-0.0923 -15.27609,-3.22955 -14.66868,-3.44618 0,0 7.94579,2.05605 14.99748,2.05605 7.05169,0 16.01547,-1.37091 16.01547,-1.37091 z"
+           id="path7400-4-0-0-2"
+           sodipodi:nodetypes="cscsc"
+           transform="matrix(0.33031331,-0.00534764,0.00534764,0.33031331,221.55901,586.38743)"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0.25452171,0,0,0.31008159,-61.258868,-251.48201)"
+         id="g7613-3-0-2">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#9b0f4e;fill-opacity:1;fill-rule:evenodd;marker:none;filter:url(#filter13924-5-8-2-1);enable-background:accumulate"
+           d="m 156.41432,834.27883 c -11.93234,0 -21.61486,3.56793 -21.61486,7.96306 0,4.39512 9.68252,7.93289 21.61486,7.93289 11.93235,0 21.61487,-3.53777 21.61487,-7.93289 0,-4.39513 -9.68252,-7.96306 -21.61487,-7.96306 z m 0,4.21932 c 6.24659,10e-4 16.53894,0.5057 17.49032,3.74374 -0.71099,2.65454 -7.3457,3.58632 -17.49032,3.58632 -10.14461,0 -16.56785,-1.09091 -17.16934,-3.58632 0.60149,-3.28768 10.92276,-3.74495 17.16934,-3.74374 z"
+           id="path13793-8-3-3-1"
+           sodipodi:nodetypes="cssscccscz"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible [...]
+           d="m 156.42996,833.77368 c -6.016,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61909,1.58199 -4.78127,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78653,1.86267 4.78127,2.59375 3.98948,1.46216 9.45317,2.375 15.46875,2.375 6.01561,0 11.44803,-0.91284 15.4375,-2.375 1.99476,-0.73108 3.65011,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.18639 1.84375,-3.46875 0,-1.28237 -0.68155,-2.48824 -1.84375,-3.5 [...]
+           id="path13793-9-6-1-1-3"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="csssssssssssccsssssssssssccsscccssssscccsscccsscssssscssc"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible [...]
+           d="m 156.42995,833.77368 c -6.01601,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61908,1.58199 -4.78126,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78652,2.47536 4.78126,3.20644 3.98948,1.46216 9.45317,2.52817 15.46875,2.52817 6.0156,0 11.44803,-1.06601 15.4375,-2.52817 1.99477,-0.73108 3.65012,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.79908 1.84375,-4.08144 0,-1.28237 -0.68154,-2.48824 -1.843 [...]
+           id="path13793-9-8-2-0-7-3"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#e90067;fill-opacity:1;fill-rule:evenodd;marker:none;filter:url(#filter7439-6-4-65-6);enable-background:accumulate"
+           d="m 168.74215,789.78542 c 0,0 -7.54066,2.02813 -14.59235,2.02813 -7.05169,0 -13.59023,-2.88495 -13.59023,-2.88495 0,0 6.86734,1.49482 13.91903,1.49482 7.05169,0 14.26355,-0.638 14.26355,-0.638 z"
+           id="path7400-7-8-1-6"
+           sodipodi:nodetypes="cscsc"
+           transform="matrix(0.99986897,-0.01618748,0.01618748,0.99986897,-11.15847,58.061021)"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(1,0,0,-0.89136088,-274.27973,747.98248)"
+         id="g10500-7-5-1">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient18480-5-5);stroke-width:0.52959418;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 250.64576,839.51555 0,-3.458 4.84306,0 0.007,3.47173"
+           id="rect7730-1-6-3-6-4"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g7877-5-2-3-1-9"
+           transform="matrix(0.20646153,0,0,0.20646153,226.52155,704.28263)">
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,0,0,0.676014,17.319475,156.7011)"
+             id="path7732-5-9-0-7-0"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient7303-6-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <rect
+             ry="1.0122632"
+             rx="0.54568654"
+             y="643.27649"
+             x="124.36045"
+             height="2.0193746"
+             width="12.869411"
+             id="rect7742-8-0-7-0-6"
+             style="display:inline;overflow:visible;visibility:visible;fill:#0a67d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate" />
+        </g>
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient18482-4-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           d="m 250.72753,836.15447 4.67953,0 0,3.50193 c -1.55985,0.32907 -3.11968,0.29388 -4.67953,0 l 0,-3.50193 z"
+           id="rect7760-4-4-6-9-4"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g7884-7-1-6-8-1"
+           transform="matrix(0.20646153,0,0,0.20646153,226.52155,704.3063)">
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,0,0,0.676014,17.319475,162.3571)"
+             id="path7843-2-9-0-0-1"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient7308-7-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <g
+             id="g7881-1-9-2-2-3">
+            <rect
+               style="display:inline;overflow:visible;visibility:visible;fill:#0a67d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate"
+               id="rect7845-4-5-8-4-0"
+               width="12.869411"
+               height="2.0193746"
+               x="124.36045"
+               y="648.9325"
+               rx="0.54568654"
+               ry="1.0122632" />
+          </g>
+        </g>
+      </g>
+      <g
+         transform="translate(-272.27363,-836.84986)"
+         id="g7889-3-5">
+        <path
+           style="fill:url(#linearGradient20252);fill-opacity:1;fill-rule:evenodd;stroke:#00005c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.7093023"
+           d="m 253.29653,841.79424 -5.34828,-4.14852 0.20043,-0.26932 -0.33797,-0.72245 1.3918,-1.66022 0.94866,0.0745 2.45916,-2.93306 4.26089,3.71837 -3.57468,5.94073 z"
+           id="path8849-6-4-8"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:url(#linearGradient20254);fill-opacity:1;fill-rule:evenodd;stroke:#00005c;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.7093023"
+           d="m 256.8732,835.85867 c -0.1381,0.29024 -3.57973,5.93928 -3.57973,5.93928 l -3.28528,-2.878 1.25411,-1.52235 -0.56617,-1.27443 2.60296,-3.15971 3.57411,2.89521 z"
+           id="path8847-4-9-4"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0.88372091;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50205594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect8861-4-3-2"
+           width="4.2386346"
+           height="0.96341437"
+           x="-491.07059"
+           y="665.85156"
+           transform="matrix(0.53215406,-0.84664754,0.77182825,0.63583108,0,0)" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1.84036362;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.68604653;filter:url(#filter8885-6-8-7)"
+           d="m 195.96471,620.75962 6.74558,0 2.1723,-4.45893 15.20613,-10e-6"
+           id="path8883-1-9-4"
+           sodipodi:nodetypes="cccc"
+           transform="matrix(0.17274604,-0.20969449,0.20969449,0.17274604,85.858915,772.55017)"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="rect13811-7-0-1"
+         d="m -14.623176,-1.4630117 -2.14043,10.9388705 c -0.65655,2.2961702 -8.93104,2.0543892 -9.27186,-0.2314 -0.7966,-3.8083806 -1.10451,-6.8561006 -1.82316,-10.7074705 2.97003,2.3050099 8.95826,2.6377899 13.23545,0 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient20256);fill-opacity:1;fill-rule:evenodd;stroke:#333333;stroke-width:0.49999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.84736843;marker:none;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.28165121,0,0,0.28165121,-65.120936,-221.75427)"
+         sodipodi:nodetypes="csccsssscccccccsscssssscssc"
+         id="path13793-5-2-0-4"
+         d="m 154.83242,817.9665 c -2.46024,-5.2e-4 -5.78969,0.20365 -8.59375,0.75 -1.40203,0.27317 -2.66448,0.63133 -3.65625,1.125 -2.35543,1.37303 -2.43388,2.47647 -0.4375,4.0937 0.77375,0.50964 1.8081,0.93819 3.0625,1.3125 2.50879,0.74862 5.914,1.21875 9.90625,1.21875 3.98944,0 7.39457,-0.42445 9.90625,-1.15625 1.25584,-0.3659 2.27894,-0.82703 3.0625,-1.34375 0.78356,-0.51672 1.34922,-1.11156 1.53125,-1.84375 l 0.0312,-0.125 -0.0312,-0.125 c -0.24894,-0.91278 -1.06817,-1.545 -2.125,-2 [...]
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;f [...]
+         inkscape:connector-curvature="0" />
+      <ellipse
+         ry="1.907984"
+         rx="13.155047"
+         cy="823.20325"
+         cx="154.24544"
+         transform="matrix(0.3303566,0,0,0.60855161,-72.354996,-491.37024)"
+         id="path13914-8-8-2-6"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#591127;fill-opacity:1;marker:none;filter:url(#filter13940-5-5-8-5);enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="rect13861-2-43-6"
+         d="m 15.431142,799.78387 c 3.400707,3.07854 6.288925,4.56382 9.990611,5.69774 l -3.157928,31.98406 c -2.636139,-0.97259 -5.466548,-1.67089 -7.861758,-4.20011 0.0042,-10.87738 0.656447,-22.53375 1.029075,-33.48169 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7316-4-1);fill-opacity:1;fill-rule:evenodd;marker:none;filter:url(#filter13876-1-7-4);enable-background:accumulate"
+         transform="matrix(0.32646934,-0.04481686,0.05052972,0.28955893,-72.884866,-231.21134)"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.3303566,0,0,0.3303566,-114.78369,-270.82127)"
+         sodipodi:nodetypes="cssscccscz"
+         id="path13793-0-5-0"
+         d="m 282.95267,806.41695 c -11.93234,0 -21.61486,3.56793 -21.61486,7.96306 0,4.39512 9.68252,7.93289 21.61486,7.93289 11.93235,0 21.61487,-3.53777 21.61487,-7.93289 0,-4.39513 -9.68252,-7.96306 -21.61487,-7.96306 z m 0,4.21932 c 6.24659,10e-4 16.53894,0.5057 17.49032,3.74374 -0.71099,2.65454 -7.3457,3.58632 -17.49032,3.58632 -10.14461,0 -16.56785,-1.09091 -17.16934,-3.58632 0.60149,-3.28768 10.92276,-3.74495 17.16934,-3.74374 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#9b0f4e;fill-opacity:1;fill-rule:evenodd;marker:none;filter:url(#filter13924-2-2-0);enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <ellipse
+         ry="1.907984"
+         rx="15.639963"
+         cy="823.20325"
+         cx="154.24544"
+         transform="matrix(0.35418149,0,0,0.65592296,-75.906476,-541.78117)"
+         id="path13914-2-2-5-7"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#a9a9a9;fill-opacity:0.77647059;stroke:url(#linearGradient7318-2-8);stroke-width:0.51868141;marker:none;filter:url(#filter9709-6-0);enable-background:accumulate" />
+      <path
+         transform="matrix(0.3303566,0,0,0.3303566,-114.78369,-270.82127)"
+         id="path13793-9-2-4-3"
+         d="m 282.96831,805.9118 c -6.016,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61909,1.58199 -4.78127,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78653,1.86267 4.78127,2.59375 3.98948,1.46216 9.45317,2.375 15.46875,2.375 6.01561,0 11.44803,-0.91284 15.4375,-2.375 1.99476,-0.73108 3.65011,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.18639 1.84375,-3.46875 0,-1.28237 -0.68155,-2.48824 -1.84375,-3.5 -1 [...]
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;f [...]
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.3303566,0,0,0.3303566,-114.78369,-270.82127)"
+         id="path13793-9-8-0-8-0"
+         d="m 282.9683,805.9118 c -6.01601,0 -11.47922,0.90512 -15.46875,2.375 -1.99476,0.73494 -3.61908,1.58199 -4.78126,2.59375 -1.16218,1.01176 -1.875,2.21763 -1.875,3.5 0,1.28236 0.71262,2.45981 1.875,3.46875 1.1624,1.00894 2.78652,1.86267 4.78126,2.59375 3.98948,1.46216 9.45317,2.375 15.46875,2.375 6.0156,0 11.44803,-0.91284 15.4375,-2.375 1.99477,-0.73108 3.65012,-1.58481 4.8125,-2.59375 1.1624,-1.00894 1.84375,-2.18639 1.84375,-3.46875 0,-1.28237 -0.68154,-2.48824 -1.84375,-3.5 -1 [...]
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;f [...]
+         inkscape:connector-curvature="0" />
+      <rect
+         ry="0.092562973"
+         rx="0.082762189"
+         y="-5.0920496"
+         x="-29.132694"
+         height="18.30777"
+         width="15.6486"
+         id="rect7171-0-3-3"
+         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+      <g
+         transform="matrix(1,0,0,0.89136088,-274.27973,-749.39048)"
+         id="g10500-5-7">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7300-0-3);stroke-width:0.52959418;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 250.64576,839.51555 0,-3.458 4.84306,0 0.007,3.47173"
+           id="rect7730-1-6-1-6"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g7877-5-2-4-3"
+           transform="matrix(0.20646153,0,0,0.20646153,226.52155,704.28263)">
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,0,0,0.676014,17.319475,156.7011)"
+             id="path7732-5-9-03-4"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient7326-7-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <rect
+             ry="1.0122632"
+             rx="0.54568654"
+             y="643.27649"
+             x="124.36045"
+             height="2.0193746"
+             width="12.869411"
+             id="rect7742-8-0-3-8"
+             style="display:inline;overflow:visible;visibility:visible;fill:#0a67d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate" />
+        </g>
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7306-3-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           d="m 250.72753,836.15447 4.67953,0 0,3.50193 c -1.55985,0.32907 -3.11968,0.29388 -4.67953,0 l 0,-3.50193 z"
+           id="rect7760-4-4-3-7"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g7884-7-1-1-5"
+           transform="matrix(0.20646153,0,0,0.20646153,226.52155,704.3063)">
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,0,0,0.676014,17.319475,162.3571)"
+             id="path7843-2-9-2-6"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient7330-7-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <g
+             id="g7881-1-9-1-5">
+            <rect
+               style="display:inline;overflow:visible;visibility:visible;fill:#0a67d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate"
+               id="rect7845-4-5-5-5"
+               width="12.869411"
+               height="2.0193746"
+               x="124.36045"
+               y="648.9325"
+               rx="0.54568654"
+               ry="1.0122632" />
+          </g>
+        </g>
+      </g>
+      <path
+         transform="matrix(0.33031331,-0.00534764,0.00534764,0.33031331,-76.703106,-260.95256)"
+         sodipodi:nodetypes="cscsc"
+         id="path7400-4-2-1"
+         d="m 170.49407,789.05251 c -0.0162,1.00176 -9.28902,2.86873 -16.34427,2.76104 -6.04982,-0.0923 -15.27609,-3.22955 -14.66868,-3.44618 0,0 7.94579,2.05605 14.99748,2.05605 7.05169,0 16.01547,-1.37091 16.01547,-1.37091 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9251101;fill:#e90067;fill-opacity:1;fill-rule:evenodd;marker:none;filter:url(#filter7439-5-9-5);enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccc"
+         id="path2062-6-6"
+         d="m -22.666036,2.3469782 -0.98689,1.71096 1.35984,0.79055 0.83938,-1.45437 0.32827,0.56825 -0.34697,0.20049 0.0893,0.15583 1.38996,0 0.68667,-1.18739 -0.0945,-0.16414 -0.33555,0.19322 -0.46644,-0.8134 -2.46308,0 1e-5,0 z m 3.36999,1.71927 -1.36399,0.78224 0.83937,1.4543701 -0.65654,0 0,-0.40098 -0.17868,0 -0.69498,1.20401 0.68459,1.18738 0.18907,0 0,-0.38645 0.93807,0.003 1.23206,-2.13273 -0.98897,-1.7109601 0,1.2e-4 z m -5.20872,0.4415 -0.0945,0.16311 0.33451,0.19425 -0.47164, [...]
+         style="fill:#ff00ff;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="H:\FreeMind_Ikone\idea.png"
+         transform="matrix(0.31400031,0,0,0.31400031,-30.691566,-82.163902)"
+         id="g6586-2-1-8-1">
+        <g
+           id="g4781-7-1-8-8">
+          <path
+             style="fill:url(#radialGradient7390-5-8-8);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.94267333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="m 11.933155,278.39473 c -1.085155,0.005 -1.093697,0.003 -3.263154,0.0167 -0.5430606,2.5e-4 -0.8878467,-0.21306 -1.2359836,-0.65741 -0.4883167,-0.56154 -0.2993751,-2.11064 -0.4490524,-3.16638 -1.0638578,-4.66147 -2.3635072,-5.33696 -4.0415229,-9.5033 -0.8789455,-2.60143 -0.581513,-5.13096 1.1247895,-7.6975 0.9599821,-1.23472 2.9087675,-4.03075 7.8649234,-4.09424 4.956145,0.0635 6.904941,2.85952 7.864923,4.09424 1.706303,2.56654 1.999459,5.09607 1.120514,7.6975 -1.578971,3. [...]
+             id="path3843-6-3-1-8"
+             sodipodi:nodetypes="ccccccccccccc"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#radialGradient7393-8-0-6);fill-opacity:1;fill-rule:evenodd;stroke:#1a1a1a;stroke-width:0.42989808px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.87790695"
+             d="m 11.916051,277.77477 c -0.629894,0.003 -1.501604,0.002 -3.24605,0.0125 -0.369835,1.8e-4 -0.4385887,-0.0492 -0.722772,-0.41192 -0.0069,-0.009 -0.01403,-0.0168 -0.02138,-0.025 -0.029407,-0.0338 -0.1702242,-0.46964 -0.2010087,-1.02772 -0.030784,-0.55808 -0.01698,-1.21824 -0.1026423,-1.82244 -0.00236,-0.014 -0.00522,-0.0278 -0.00855,-0.0416 -1.0520477,-4.80829 -2.7330545,-5.92008 -4.0714543,-9.61147 -0.8053711,-2.41831 -0.54857,-4.67343 1.0392405,-7.0817 0.00359,-0.005 0.009 [...]
+             id="path3855-1-8-5-9"
+             sodipodi:nodetypes="ccsssccccscsccccssscc"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cccszscccc"
+             id="path3858-4-7-2-9"
+             d="m 11.445722,277.64322 -0.04947,-6.74117 c -0.984774,-0.37663 -5.7434878,-3.1882 -3.0175872,-5.96783 1.3336511,-0.95166 2.6402592,0.60207 2.9172062,1.44402 0.507055,1.54147 0.279106,0.84068 0.562672,2.02117 0.283577,1.18049 0.123405,-1.05841 0.719771,-2.2938 0.678358,-1.40527 2.159466,-2.80067 3.369054,-1.98956 2.945935,2.58888 -4.089195,6.87386 -3.71015,6.786 l 0.148413,6.73787 -0.939908,0.003 z"
+             style="fill:url(#linearGradient20258);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.68783689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.40116278"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             id="path3860-2-4-1-2"
+             d="m 11.066462,269.79733 c -0.416274,-0.006 -1.5939782,-1.03984 -2.1897887,-2.07069 -0.3929826,-0.57027 -0.8002318,-1.71906 0.1841928,-2.11052 0.7930573,-0.0493 1.2362199,0.8973 1.3916429,1.27427 0.480228,0.82497 0.564543,1.8724 0.613953,2.90694 z"
+             style="fill:#ffec00;fill-opacity:0.94901961;fill-rule:evenodd;stroke:#000000;stroke-width:0.68783689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.40116278"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             id="path3862-3-2-7-3"
+             d="m 12.580893,269.39912 c 0.02995,-0.30427 0.603119,-2.28453 0.839075,-2.80738 0.352114,-1.14446 1.076521,-1.90253 1.821412,-1.71231 0.98349,0.96353 -0.07294,2.05263 -0.286516,2.30962 -0.79132,0.97949 -1.582651,1.7084 -2.373971,2.21007 z"
+             style="fill:#ffed00;fill-opacity:0.70196078;fill-rule:evenodd;stroke:#000000;stroke-width:0.68783689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.40116278"
+             inkscape:connector-curvature="0" />
+          <path
+             transform="matrix(0.1342564,0,0,0.2394227,-44.72173,117.53755)"
+             sodipodi:open="true"
+             sodipodi:end="3.1427022"
+             sodipodi:start="0"
+             d="m 438.46516,693.52692 a 17.278181,5.7593942 0 0 1 -8.64462,4.98884 17.278181,5.7593942 0 0 1 -17.28372,-0.003 17.278181,5.7593942 0 0 1 -8.62801,-4.99204"
+             sodipodi:ry="5.7593942"
+             sodipodi:rx="17.278181"
+             sodipodi:cy="693.52692"
+             sodipodi:cx="421.18698"
+             id="path3966-2-7-6-7"
+             style="fill:#1a1a1a;fill-opacity:1;stroke:#999999;stroke-width:6.36942053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.87209305"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:nodetypes="ccccccccc"
+             id="path3964-2-7-5-5"
+             d="m 15.248987,283.40592 -6.819701,0 c -0.7281478,-0.4591 -0.8578023,-0.95244 -0.034269,-1.50034 -1.0891535,-0.82288 -0.3915333,-1.13449 0,-1.53368 -0.8144677,-0.63389 -0.6078777,-1.14361 0.034269,-1.60036 l 6.785432,0 c 0.515051,0.43546 0.870856,0.9019 0.03427,1.60036 0.245083,0.40474 1.022722,0.60223 0,1.50034 0.404854,0.44143 1.095577,0.74878 0,1.53368 z"
+             style="fill:url(#linearGradient20260);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9027859;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99418604"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cc"
+             id="path3968-1-9-3-0"
+             d="m 8.4635549,280.30522 6.8197001,0.0333"
+             style="fill:#424242;fill-opacity:0.81568627;fill-rule:evenodd;stroke:#333333;stroke-width:0.42989808px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path3970-6-3-5-2"
+             d="m 8.4978238,281.90558 6.6140772,-0.0333"
+             style="fill:none;stroke:#333333;stroke-width:0.42989808px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:transform-center-y="-1.0070483"
+             inkscape:transform-center-x="-0.71818473"
+             sodipodi:nodetypes="cccc"
+             id="path11602-8-1-3-2"
+             d="m 4.1509025,264.89694 c -0.472539,-1.87545 -0.1899797,-4.20853 1.1804791,-6.59847 2.1046401,-3.47339 5.1925334,-3.12923 7.0950644,-3.16615 -2.8352133,3.19337 -5.2725827,6.13173 -8.2755435,9.76462 z"
+             style="fill:url(#linearGradient20262);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/idea.svg b/freeplane/resources/images/idea.svg
new file mode 100644
index 0000000..3d22c7a
--- /dev/null
+++ b/freeplane/resources/images/idea.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16.082" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="e" style="color-interpolation-filters:sRGB" height="1.2261" width="1.2447" y="-.11307" x="-.12234">
+<feGaussianBlur stdDeviation="0.60443961"/>
+</filter>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="555.96" cx="590.35" gradientTransform="matrix(.12749 .047352 -.064075 .11244 -340.5 748.45)" r="70.341">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="537.34" cx="591.23" gradientTransform="matrix(.17318 -.016340 .016702 .11537 -412.38 784.42)" r="65.043">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<linearGradient id="d" y2="666.84" gradientUnits="userSpaceOnUse" x2="447.56" gradientTransform="matrix(.081945 0 0 .066156 -335.48 802.37)" y1="665.36" x1="410.6">
+<stop stop-color="#6c5353" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="287.59" gradientUnits="userSpaceOnUse" x2="265.33" gradientTransform="matrix(.62121 .023096 -.028608 .50151 -459.05 685.68)" y1="284.45" x1="261.9">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-54.414 -21.616)">
+<g transform="translate(363.4 -810.83)">
+<g transform="matrix(.91438 0 0 .91438 -25.846 72.646)">
+<path d="m-300.91 845.32c-0.42273 0.001-1.0078 0.001-2.1785 0.006-0.24821 0.0001-0.29435-0.0265-0.48508-0.22126-0.004-0.004-0.009-0.009-0.0143-0.0134-0.0197-0.0182-0.11426-0.25226-0.13491-0.55203-0.0206-0.29978-0.0114-0.65439-0.0689-0.97893-0.001-0.008-0.003-0.0149-0.005-0.0224-0.70607-2.5828-1.8342-3.18-2.7325-5.1628-0.54052-1.299-0.36817-2.5103 0.69747-3.8039 0.002-0.002 0.007-0.006 0.009-0.009 0.63139-0.65129 2.0613-2.0955 4.9024-2.0652 2.841-0.0303 4.3141 1.4139 4.9455 2.0652l0.009 0 [...]
+<path d="m-300.86 845.15c-0.64976 0.002-0.65487 0.001-1.9539 0.008-0.32517 0.00012-0.53162-0.10587-0.74008-0.32665-0.29239-0.27901-0.17925-1.0487-0.26888-1.5733-0.637-2.3161-1.4152-2.6518-2.42-4.7219-0.52629-1.2926-0.34819-2.5494 0.67349-3.8247 0.57482-0.61349 1.7417-2.0028 4.7093-2.0343 2.9676 0.0315 4.1345 1.4208 4.7093 2.0343 1.0217 1.2752 1.1972 2.5321 0.67093 3.8247-0.94544 1.9096-1.7943 2.3643-2.42 4.7219-0.0896 0.52457 0.0235 1.2943-0.26888 1.5733-0.20845 0.22078-0.41234 0.32677-0 [...]
+<path d="m-300.87 844.84c-0.37716 0.001-0.89912 0.00099-1.9436 0.006-0.22145 0.00009-0.26262-0.0245-0.43278-0.20467-0.004-0.004-0.008-0.008-0.0128-0.0124-0.0176-0.0168-0.10193-0.23335-0.12036-0.51064-0.0184-0.2773-0.0102-0.60531-0.0615-0.90552-0.001-0.007-0.003-0.0138-0.005-0.0207-0.62994-2.3891-1.6365-2.9415-2.4379-4.7756-0.48224-1.2016-0.32847-2.3221 0.62227-3.5187l0.008-0.008c0.56331-0.60245 1.8391-1.9383 4.3738-1.9103 2.5347-0.028 3.849 1.3079 4.4123 1.9103l0.008 0.008c0.95074 1.1966 [...]
+<path stroke-linejoin="round" d="m438.47 693.53a17.278 5.7594 0 0 1 -8.6446 4.9888 17.278 5.7594 0 0 1 -17.284 -0.003 17.278 5.7594 0 0 1 -8.628 -4.992" stroke-opacity=".87209" transform="matrix(.080389 0 0 .11896 -334.78 765.22)" stroke="#999" stroke-linecap="round" stroke-width="2" fill="#1a1a1a"/>
+<path stroke-linejoin="round" d="m-302.96 845.33c-0.38448 0.22695-0.51893 0.46629-0.0312 0.78125-0.23444 0.19835-0.65215 0.37239 0 0.78125-0.49312 0.27224-0.40474 0.52188 0.0312 0.75h4.0938c0.656-0.39 0.24242-0.56192 0-0.78125 0.61238-0.44625 0.14675-0.54889 0-0.75 0.50095-0.34704 0.27715-0.56488-0.0312-0.78125h-4.0625z" stroke-opacity=".99419" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".15462" fill="url(#d)"/>
+<path d="m-305.52 838.44c-0.28295-0.93186-0.11376-2.0911 0.70683-3.2786 1.2602-1.7258 3.1092-1.5548 4.2483-1.5732-1.6976 1.5867-3.1571 3.0467-4.9552 4.8518z" fill-rule="evenodd" fill="url(#c)"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="832.45" x="-308.99" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/import.svg b/freeplane/resources/images/import.svg
new file mode 100644
index 0000000..98006ee
--- /dev/null
+++ b/freeplane/resources/images/import.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16.093" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.37028 0 0 .36654 1011.7 985.36)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="d" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="b" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.33386 0 0 .33049 917.56 908.65)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="373.15" gradientUnits="userSpaceOnUse" x2="151.09" gradientTransform="matrix(-.41430 .00030670 -.00042788 -.26957 108.62 315.05)" y1="386.85" x1="150.88">
+<stop stop-color="#289c00" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -225.77)">
+<g transform="translate(54.897 23.201)">
+<g fill-rule="evenodd" transform="translate(.13071)" stroke="#666">
+<path d="m44.481 203.1h7.8035l3.9268 4.0816-0.0887 11.207h-11.642v-15.288z" stroke-width=".53351" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.33386 0 0 .33049 996.91 807.89)" filter="url(#d)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m52.517 203.34c0.35669 1.5836 0.12812 2.8224-0.02 3.5988 0.8796-0.21633 1.9163-0.45787 3.4556 0.009-1.6593-1.8338-2.3361-2.3982-3.4356-3.6086z" stroke-width=".53351" fill="url(#b)"/>
+</g>
+<rect style="color:#000000" height="16" width="16" y="202.57" x="40.796" fill="none"/>
+<path stroke-linejoin="round" d="m50.89 211.07-4.7993 3.3477-0.02372-1.9842-4.9581 0.0641-0.0044-2.7882 4.9581-0.0414-0.0029-1.9316 4.8305 3.3335z" fill-rule="evenodd" stroke="#005200" stroke-linecap="round" stroke-width=".5" fill="url(#a)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/insCol.png b/freeplane/resources/images/insCol.png
new file mode 100644
index 0000000..fe9a0b5
Binary files /dev/null and b/freeplane/resources/images/insCol.png differ
diff --git a/freeplane/resources/images/insCol.svg b/freeplane/resources/images/insCol.svg
new file mode 100644
index 0000000..dfb29fd
--- /dev/null
+++ b/freeplane/resources/images/insCol.svg
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="insCol.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\insCol.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <svg:metadata
+     id="metadata41">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     id="namedview39"
+     showgrid="false"
+     inkscape:zoom="9.7362218"
+     inkscape:cx="-39.653613"
+     inkscape:cy="-1.32665"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <svg:defs
+     id="defs4">
+    <svg:linearGradient
+       id="def0"
+       x1="55.228268"
+       x2="55.228268"
+       y1="1.5451168"
+       y2="109.70261"
+       gradientTransform="scale(1.1588185,0.86294789)"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         offset="0"
+         stop-color="#B3E2FF"
+         id="stop7" />
+      <svg:stop
+         offset="1"
+         stop-color="#99CCFF"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="268.63"
+       y1="238.03"
+       x2="219.96"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="b"
+       gradientTransform="matrix(0.0987286,0,0,0.0953437,-44.037647,-13.774238)">
+      <svg:stop
+         id="stop4376"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4378"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#e"
+       y2="446.77"
+       id="d" />
+    <svg:linearGradient
+       id="e">
+      <svg:stop
+         id="stop4525"
+         offset="0"
+         stop-color="#f70000" />
+      <svg:stop
+         id="stop4527"
+         offset="1"
+         stop-color="#780000" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="449.6"
+       id="c" />
+    <svg:linearGradient
+       id="f">
+      <svg:stop
+         id="stop4531"
+         offset="0"
+         stop-color="#baa492" />
+      <svg:stop
+         id="stop4533"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="449.64"
+       id="b-4" />
+    <svg:linearGradient
+       id="h">
+      <svg:stop
+         id="stop4537"
+         offset="0" />
+      <svg:stop
+         id="stop4539"
+         offset="1"
+         stop-color="#7e7e7e" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="462.65"
+       id="a" />
+    <svg:linearGradient
+       id="g">
+      <svg:stop
+         id="stop4543"
+         offset="0"
+         stop-color="#c00000" />
+      <svg:stop
+         id="stop4545"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#e"
+       y2="446.77"
+       id="d-7" />
+    <svg:linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="449.6"
+       id="c-4" />
+    <svg:linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="449.64"
+       id="b-5" />
+    <svg:linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="462.65"
+       id="a-1" />
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-9"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+  </svg:defs>
+  <svg:rect
+     style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+     id="rect234"
+     transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+     y="13.240949"
+     x="-9.4223404"
+     height="0"
+     width="0.9126758" />
+  <svg:g
+     id="g4359"
+     transform="translate(0.02567731,-0.20541849)">
+    <svg:path
+       d="m 15.831708,15.183204 -15.66341616,0 0,-13.2976164 15.66341616,0 0,13.2976164 z"
+       id="path13"
+       inkscape:connector-curvature="0"
+       style="fill:#162d50" />
+    <svg:path
+       d="m 0.33145202,2.0702777 15.33713598,0 0,12.9282413 -15.33713598,0 0,-12.9282413 z"
+       id="path15"
+       style="fill:#0055d4"
+       inkscape:connector-curvature="0" />
+    <svg:path
+       d="m 0.49461342,2.2549649 15.01073258,0 0,12.5588571 -15.01073258,0 0,-12.5588571 z"
+       id="path17"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <svg:path
+       d="m 15.479669,5.134725 -15.01073289,0 0,-2.9311147 15.01073289,0 0,2.9311147 z"
+       id="path19"
+       inkscape:connector-curvature="0"
+       style="fill:#00ccff" />
+    <svg:path
+       d="m 0.46893611,5.2397743 15.11344189,0 0,-0.1801283 -15.11344189,0 0,0.1801283 z"
+       id="path21"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 4.1287141,14.842443 0.1631565,0 0,-12.6959969 -0.1631565,0 0,12.6959969 z"
+       id="path23"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 11.759483,14.91884 0.163157,0 0,-12.8271712 -0.163157,0 0,12.8271712 z"
+       id="path25"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 0.49461342,8.3234761 15.01073258,0 0,-0.1846845 -15.01073258,0 0,0.1846845 z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 0.36622686,11.613389 15.29318314,0 0,-0.184879 -15.29318314,0 0,0.184879 z"
+       id="path33"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 8.0090596,14.944517 0.163156,0 0,-12.7466769 -0.163156,0 0,12.7466769 z"
+       id="path4398"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+  </svg:g>
+  <svg:rect
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51200002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-renderi [...]
+     id="rect4517"
+     width="3.5498352"
+     height="12.633238"
+     x="8.1878786"
+     y="1.9801878" />
+  <svg:g
+     id="g4384"
+     transform="matrix(-11.84504,-7.3852583,11.837871,-7.3897311,-8.2716206,16.281869)">
+    <svg:path
+       inkscape:connector-curvature="0"
+       id="polygon11"
+       d="m 0.20267884,1.2846689 0,0.2604176 0.26060211,0 z"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.043;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <svg:path
+       inkscape:connector-curvature="0"
+       id="path4382"
+       d="M 0.48192172,1.258439 0.20643585,1.5387369"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/insRow.png b/freeplane/resources/images/insRow.png
new file mode 100644
index 0000000..e39071e
Binary files /dev/null and b/freeplane/resources/images/insRow.png differ
diff --git a/freeplane/resources/images/insRow.svg b/freeplane/resources/images/insRow.svg
new file mode 100644
index 0000000..6800be5
--- /dev/null
+++ b/freeplane/resources/images/insRow.svg
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="insRow.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\insRow.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <svg:metadata
+     id="metadata41">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview39"
+     showgrid="false"
+     inkscape:zoom="9.7362218"
+     inkscape:cx="-23.014715"
+     inkscape:cy="-1.32665"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <svg:defs
+     id="defs4">
+    <svg:linearGradient
+       id="def0"
+       x1="55.228268"
+       x2="55.228268"
+       y1="1.5451168"
+       y2="109.70261"
+       gradientTransform="scale(1.1588185,0.86294789)"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         offset="0"
+         stop-color="#B3E2FF"
+         id="stop7" />
+      <svg:stop
+         offset="1"
+         stop-color="#99CCFF"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="268.63"
+       y1="238.03"
+       x2="219.96"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="b"
+       gradientTransform="matrix(0.0987286,0,0,0.0953437,-44.037647,-13.774238)">
+      <svg:stop
+         id="stop4376"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4378"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#e"
+       y2="446.77"
+       id="d" />
+    <svg:linearGradient
+       id="e">
+      <svg:stop
+         id="stop4525"
+         offset="0"
+         stop-color="#f70000" />
+      <svg:stop
+         id="stop4527"
+         offset="1"
+         stop-color="#780000" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="449.6"
+       id="c" />
+    <svg:linearGradient
+       id="f">
+      <svg:stop
+         id="stop4531"
+         offset="0"
+         stop-color="#baa492" />
+      <svg:stop
+         id="stop4533"
+         offset="1"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="449.64"
+       id="b-4" />
+    <svg:linearGradient
+       id="h">
+      <svg:stop
+         id="stop4537"
+         offset="0" />
+      <svg:stop
+         id="stop4539"
+         offset="1"
+         stop-color="#7e7e7e" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="462.65"
+       id="a" />
+    <svg:linearGradient
+       id="g">
+      <svg:stop
+         id="stop4543"
+         offset="0"
+         stop-color="#c00000" />
+      <svg:stop
+         id="stop4545"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="209.71"
+       y1="440.75"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="215.36"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#e"
+       y2="446.77"
+       id="d-7" />
+    <svg:linearGradient
+       x1="202.53"
+       y1="456.24"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="194.27"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f"
+       y2="449.6"
+       id="c-4" />
+    <svg:linearGradient
+       x1="203.5"
+       y1="457.89"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="193.04"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#h"
+       y2="449.64"
+       id="b-5" />
+    <svg:linearGradient
+       x1="193.01"
+       y1="458.87"
+       gradientTransform="matrix(0.99094,0,0,1.0073,134.73,-154.36)"
+       x2="196.75"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#g"
+       y2="462.65"
+       id="a-1" />
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a-9"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+  </svg:defs>
+  <svg:rect
+     style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643662"
+     id="rect234"
+     transform="matrix(0.50024975,0.86588116,-0.86624539,0.49961879,0,0)"
+     y="13.240949"
+     x="-9.4223404"
+     height="0"
+     width="0.9126758" />
+  <svg:g
+     id="g4359"
+     transform="translate(0.02567731,-0.20541849)">
+    <svg:path
+       d="m 15.831708,15.183204 -15.66341616,0 0,-13.2976164 15.66341616,0 0,13.2976164 z"
+       id="path13"
+       inkscape:connector-curvature="0"
+       style="fill:#162d50" />
+    <svg:path
+       d="m 0.33145202,2.0702777 15.33713598,0 0,12.9282413 -15.33713598,0 0,-12.9282413 z"
+       id="path15"
+       style="fill:#0055d4"
+       inkscape:connector-curvature="0" />
+    <svg:path
+       d="m 0.49461342,2.2549649 15.01073258,0 0,12.5588571 -15.01073258,0 0,-12.5588571 z"
+       id="path17"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <svg:path
+       d="m 15.479669,5.134725 -15.01073289,0 0,-2.9311147 15.01073289,0 0,2.9311147 z"
+       id="path19"
+       inkscape:connector-curvature="0"
+       style="fill:#00ccff" />
+    <svg:path
+       d="m 0.46893611,5.2397743 15.11344189,0 0,-0.1801283 -15.11344189,0 0,0.1801283 z"
+       id="path21"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 4.1287141,14.842443 0.1631565,0 0,-12.6959969 -0.1631565,0 0,12.6959969 z"
+       id="path23"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 11.759483,14.91884 0.163157,0 0,-12.8271712 -0.163157,0 0,12.8271712 z"
+       id="path25"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 0.49461342,8.3234761 15.01073258,0 0,-0.1846845 -15.01073258,0 0,0.1846845 z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 0.36622686,11.613389 15.29318314,0 0,-0.184879 -15.29318314,0 0,0.184879 z"
+       id="path33"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+    <svg:path
+       d="m 8.0090596,14.944517 0.163156,0 0,-12.7466769 -0.163156,0 0,12.7466769 z"
+       id="path4398"
+       inkscape:connector-curvature="0"
+       style="fill:#0055d4" />
+  </svg:g>
+  <svg:rect
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51200002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-renderi [...]
+     id="rect4517"
+     width="3.1389983"
+     height="14.99555"
+     x="8.0625277"
+     y="-15.56045"
+     transform="matrix(0,1,-1,0,0,0)" />
+  <svg:circle
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51200002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-renderi [...]
+     id="path4946"
+     cx="-31.069548"
+     cy="5.6263661"
+     r="3.3894055" />
+  <svg:g
+     id="g4384"
+     transform="matrix(7.3852583,-11.84504,7.3897311,11.837871,-8.5442936,-8.4532007)">
+    <svg:path
+       inkscape:connector-curvature="0"
+       id="polygon11"
+       d="m 0.20267884,1.2846689 0,0.2604176 0.26060211,0 z"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.043;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <svg:path
+       inkscape:connector-curvature="0"
+       id="path4382"
+       d="M 0.48192172,1.258439 0.20643585,1.5387369"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/resources/images/install_addons.svg b/freeplane/resources/images/install_addons.svg
new file mode 100644
index 0000000..d5422a1
--- /dev/null
+++ b/freeplane/resources/images/install_addons.svg
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.000387"
+   width="19.958782"
+   version="1.1"
+   viewBox="0 0 19.958782 16.000387"
+   id="svg3370"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="install_addon1.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3453"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="314.98919"
+     inkscape:cy="-373.30758"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3370" />
+  <defs
+     id="defs3372">
+    <linearGradient
+       id="i"
+       y2="536.19"
+       gradientUnits="userSpaceOnUse"
+       x2="45.105"
+       gradientTransform="translate(-20.697,3.4775)"
+       y1="535.87"
+       x1="33.452">
+      <stop
+         stop-color="#c2c2f1"
+         offset="0"
+         id="stop3375" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3377" />
+    </linearGradient>
+    <linearGradient
+       id="h"
+       y2="540.94"
+       gradientUnits="userSpaceOnUse"
+       x2="38.103001"
+       gradientTransform="translate(-20.697,3.4775)"
+       y1="536.89001"
+       x1="31.407">
+      <stop
+         stop-color="#ccc"
+         offset="0"
+         id="stop3380" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3382" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       y2="537.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="47.243"
+       gradientTransform="translate(-20.697,3.4775)"
+       y1="540.38"
+       x1="39.308998">
+      <stop
+         stop-color="#a6a6c6"
+         offset="0"
+         id="stop3385" />
+      <stop
+         stop-color="#c2c2f1"
+         offset="1"
+         id="stop3387" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       y2="538.06"
+       gradientUnits="userSpaceOnUse"
+       x2="47.259998"
+       gradientTransform="matrix(0.76635,0,0,0.76635,-11.12,129.68)"
+       y1="538.06"
+       x1="25.643">
+      <stop
+         offset="0"
+         id="stop3390" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop3392" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="535.51001"
+       gradientUnits="userSpaceOnUse"
+       x2="17.872"
+       y1="535.12"
+       x1="11.146">
+      <stop
+         stop-color="#c2c2f1"
+         offset="0"
+         id="stop3395" />
+      <stop
+         stop-color="#fefefe"
+         offset="1"
+         id="stop3397" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="377.60001"
+       gradientUnits="userSpaceOnUse"
+       x2="142.38"
+       gradientTransform="matrix(-9.2707e-4,-1.2899,0.81484,-0.0013322,-503.8,1007)"
+       y1="388.92001"
+       x1="160.7">
+      <stop
+         stop-color="#36d200"
+         offset="0"
+         id="stop3400" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3402" />
+    </linearGradient>
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3405" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3407" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.074862,0,0,0.035378,-776.1,471.94)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#00f"
+         offset="0"
+         id="stop3410" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3412" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(0.056864,-0.055812,0.035022,0.03596,-241.08,860.4)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3415" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3417" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3419">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.50045,0,0,0.50045,109.13194,-398.27313)"
+     id="g3421">
+    <g
+       transform="matrix(1.8862,0,0,1.8419,-228.29,-179.03)"
+       id="g3423"
+       style="fill-rule:evenodd;stroke-linejoin:round">
+      <path
+         d="m 17.845,536.99 c 2.8718,0.85006 5.7394,1.7143 8.5939,2.6201 -2.631,0.86787 -2.6809,0.97205 -8.183,2.738 -3.0311,-1.0498 -5.6107,-2.0635 -8.4187,-3.2041 l 7.913,-2.1003 c 0.02051,-0.0393 0.06279,-0.0632 0.0948,-0.0536 z"
+         id="path3425"
+         inkscape:connector-curvature="0"
+         style="fill:url(#i);stroke:#000000;stroke-width:0.25" />
+      <path
+         d="m 9.8681,539.19 c 2.8718,0.85005 5.5404,2.1928 8.3949,3.0986 0.0088,1.8427 -0.07623,2.2169 0.05104,3.7891 -3.4399,-1.3417 -5.7859,-2.4723 -8.5939,-3.6128 0.064488,-1.1125 0.049507,-1.7398 0.14797,-3.2749 z"
+         id="path3427"
+         inkscape:connector-curvature="0"
+         style="fill:url(#h);stroke:#000000;stroke-width:0.25" />
+      <path
+         d="m 26.421,539.57 c -2.8718,0.85005 -5.2949,1.8192 -8.1494,2.725 -0.05532,2.9118 0.05299,1.264 -0.05104,3.7891 3.4399,-1.3417 5.3765,-2.5992 8.1845,-3.7398 -0.01801,-1.3217 0.02022,-1.6474 0.01589,-2.7743 z"
+         id="path3429"
+         inkscape:connector-curvature="0"
+         style="fill:url(#g);stroke:#000000;stroke-width:0.25" />
+      <path
+         d="m 23.316,541.02 c -2.2008,0.65144 -2.3844,0.88283 -4.5719,1.577 -0.04239,2.2314 0.04061,0.9687 -0.03911,2.9038 1.66,-0.74934 2.1681,-1.1087 4.5059,-2.2152 -0.0138,-1.0129 0.10846,-1.4019 0.10515,-2.2655 z"
+         id="path3431"
+         inkscape:connector-curvature="0"
+         style="fill:url(#f);stroke:#000000;stroke-width:0.19159" />
+      <ellipse
+         rx="4.1370001"
+         ry="1.5572"
+         transform="matrix(-1.0256,-0.084171,-0.19973,0.95865,139.46,27.411)"
+         cy="535.40997"
+         cx="14.038"
+         id="ellipse3433"
+         d="m 18.175,535.40997 c 0,0.86002 -1.852198,1.5572 -4.137,1.5572 -2.284802,0 -4.137,-0.69718 -4.137,-1.5572 0,-0.86001 1.852198,-1.5572 4.137,-1.5572 2.284802,0 4.137,0.69719 4.137,1.5572 z"
+         sodipodi:cx="14.038"
+         sodipodi:cy="535.40997"
+         sodipodi:rx="4.1370001"
+         sodipodi:ry="1.5572"
+         style="fill:url(#e);stroke:#b3b3b3;stroke-width:0.25" />
+    </g>
+    <path
+       d="m -190.48,822.86 -8.5279,-12.613 5.0545,-0.0623 -0.16341,-13.03 7.1027,-0.0115 0.10539,13.03 4.9205,-0.008 -8.4918,12.695 z"
+       id="path3435"
+       inkscape:connector-curvature="0"
+       style="fill:url(#d);fill-rule:evenodd;stroke:#005200;stroke-width:1.02520001px" />
+    <rect
+       rx="0.13665999"
+       ry="0.13826001"
+       height="31.972"
+       width="31.972"
+       y="795.83002"
+       x="-210.17999"
+       id="rect3437"
+       style="fill:none" />
+    <g
+       transform="matrix(-1.6018,0.025031,0.025031,1.6018,-544.17,-579.54)"
+       id="g3439"
+       style="stroke-linejoin:round">
+      <rect
+         transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
+         rx="0.27803001"
+         ry="0.27803001"
+         height="4.4428"
+         width="1.7715"
+         y="500.42999"
+         x="-751.59003"
+         id="rect3441"
+         style="fill:#ffffff;stroke:#7900aa;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997" />
+      <path
+         d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+         id="path3443"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001" />
+      <g
+         transform="translate(-0.035609,-0.059735)"
+         id="g3445">
+        <path
+           d="m 451.11,879.75 a 60.261,57.727 0 0 1 -60.247,57.727 60.261,57.727 0 0 1 -60.275,-57.699 60.261,57.727 0 0 1 60.218,-57.754 60.261,57.727 0 0 1 60.304,57.672"
+           transform="matrix(0.06936,0,0,0.072422,-224.82,802.68)"
+           id="path3447"
+           inkscape:connector-curvature="0"
+           style="fill:url(#a);stroke:#000000;stroke-width:6.33010006;stroke-linecap:round;stroke-opacity:0.81395" />
+        <rect
+           transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
+           rx="0.27803001"
+           ry="0.27803001"
+           height="4.4428"
+           width="1.7715"
+           y="500.42999"
+           x="-751.59003"
+           id="rect3449"
+           style="fill:url(#c);stroke:#000080;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997" />
+        <path
+           d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+           id="path3451"
+           inkscape:connector-curvature="0"
+           style="fill:url(#b);fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/kalzium.svg b/freeplane/resources/images/kalzium.svg
new file mode 100644
index 0000000..4ff6486
--- /dev/null
+++ b/freeplane/resources/images/kalzium.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="201.49" cx="250.8" gradientTransform="matrix(.61353 .75941 -.64044 .51741 225.97 -93.219)" r="51.206">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#f60" offset="1"/>
+</radialGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="201.49" cx="250.8" gradientTransform="matrix(.61353 .75941 -.64044 .51741 225.97 -93.219)" r="51.206">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#2ca02c" offset="1"/>
+</radialGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="201.49" cx="250.8" gradientTransform="matrix(.61353 .75941 -.64044 .51741 225.97 -93.219)" r="51.206">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#0055d4" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-37.639 -141.41)">
+<g transform="translate(161.04 -724.37)">
+<g transform="matrix(.22785 0 0 .22785 -95.518 655.49)">
+<g fill-rule="evenodd" transform="matrix(.91510 0 0 .91510 -5.943 79.75)">
+<circle style="color:#000000" stroke-width="2.9068" stroke-opacity=".78453" cy="219.91" transform="matrix(.29248 0 0 .29248 -149.15 917.39)" stroke="#803300" cx="257.44" r="51.206" fill="#db71c9"/>
+<circle style="color:#000000" cy="219.91" transform="matrix(.28375 0 0 .28375 -146.9 919.31)" cx="257.44" r="51.206" fill="url(#c)"/>
+</g>
+<g transform="translate(-6.9782 -36.434)" fill-rule="evenodd">
+<circle style="color:#000000" stroke-width="2.9068" stroke-opacity=".78453" cy="219.91" transform="matrix(.30384 0 0 .30384 -139.38 909.5)" stroke="#050" cx="257.44" r="51.206" fill="#00d400"/>
+<circle style="color:#000000" cy="219.91" transform="matrix(.29478 0 0 .29478 -137.05 911.49)" cx="257.44" r="51.206" fill="url(#b)"/>
+</g>
+<path style="color:#000000" d="m-69.956 953.97-1.9614 9.8069" stroke="#000" stroke-linecap="round" stroke-width="6" fill="none"/>
+<path style="color:#000000" d="m-95.127 951.68 16.672-8.4994" stroke="#000" stroke-linecap="round" stroke-width="6" fill="none"/>
+<path style="color:#000000" d="m-95.127 962.79 14.71 11.768" stroke="#000" stroke-linecap="round" stroke-width="6" fill="none"/>
+<g transform="matrix(1.1698 0 0 1.1698 17.718 -162.14)">
+<g fill-rule="evenodd" transform="translate(-134.02 30.091)" stroke="#000080">
+<circle style="color:#000000" stroke-width="2.9068" stroke-opacity=".78453" cy="219.91" transform="matrix(.29248 0 0 .29248 -45.621 860.51)" cx="257.44" r="51.206" fill="#db71c9"/>
+<circle style="color:#000000" cy="219.91" transform="matrix(.28375 0 0 .28375 -43.375 862.43)" cx="257.44" r="51.206" fill="url(#a)"/>
+</g>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="865.78" x="-123.4" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/kcmsystem.png b/freeplane/resources/images/kcmsystem.png
deleted file mode 100644
index 43eab76..0000000
Binary files a/freeplane/resources/images/kcmsystem.png and /dev/null differ
diff --git a/freeplane/resources/images/kword.svg b/freeplane/resources/images/kword.svg
new file mode 100644
index 0000000..dbd62d2
--- /dev/null
+++ b/freeplane/resources/images/kword.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="19"
+   width="19"
+   version="1.1"
+   id="svg3093"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="kword.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3114"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="343.36101"
+     inkscape:cy="-312.04999"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3093" />
+  <defs
+     id="defs3095">
+    <linearGradient
+       id="a"
+       y2="377.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="388.92001"
+       gradientTransform="matrix(-0.44755,0,0,0.27373,182.85,603.09)"
+       x2="142.38"
+       x1="160.7">
+      <stop
+         stop-color="#0d56c0"
+         offset="0"
+         id="stop3098" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3100" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3102">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-108.55,-703.96002)"
+     id="g3104">
+    <text
+       transform="scale(0.81043,1.2339)"
+       line-height="125%"
+       xml:space="preserve"
+       font-size="9.1135px"
+       y="583.85767"
+       x="133.98459"
+       id="text3106"
+       sodipodi:linespacing="125%"
+       style="font-size:9.11349964px;line-height:125%;fill:#ff2a2a;stroke:#1a1a1a;stroke-width:0.18091001;font-family:Digital Readout ExpUpright"><tspan
+         font-size="9.1135px"
+         line-height="125%"
+         dx="0 0.38516894"
+         dy="0 -1.2914487 1.2914487"
+         y="583.85767"
+         x="133.98459"
+         id="tspan3108"
+         style="font-size:9.11349964px;line-height:125%;fill:#ff2a2a;stroke:#1a1a1a;stroke-width:0.18091001;font-family:Digital Readout ExpUpright">9:20</tspan></text>
+    <rect
+       style="color:#000000;fill:none"
+       height="19"
+       width="19"
+       y="703.96002"
+       x="108.55"
+       id="rect3110" />
+    <path
+       d="m 120.66,708.72 -5.1902,-3.3957 -0.0211,2.0148 -5.3561,-0.0613 v 2.8313 l 5.3561,0.0382 v 1.9614 l 5.2123,-3.3886 z"
+       id="path3112"
+       inkscape:connector-curvature="0"
+       style="fill:url(#a);fill-rule:evenodd;stroke:#002277;stroke-width:0.35001001px;stroke-opacity:0.72673998" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/manage_addons.svg b/freeplane/resources/images/manage_addons.svg
new file mode 100644
index 0000000..525e57a
--- /dev/null
+++ b/freeplane/resources/images/manage_addons.svg
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.011959"
+   width="23.143818"
+   version="1.1"
+   viewBox="0 0 23.143818 16.011959"
+   id="svg3455"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="manage_addon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3531"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="285.71971"
+     inkscape:cy="-374.72531"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3455" />
+  <defs
+     id="defs3457">
+    <linearGradient
+       id="c">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3460" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop3462" />
+    </linearGradient>
+    <linearGradient
+       id="g">
+      <stop
+         stop-color="#eda701"
+         offset="0"
+         id="stop3465" />
+      <stop
+         stop-color="#fee806"
+         offset="1"
+         id="stop3467" />
+    </linearGradient>
+    <linearGradient
+       id="j">
+      <stop
+         stop-color="#c933b0"
+         offset="0"
+         id="stop3470" />
+      <stop
+         stop-color="#f695e8"
+         offset="1"
+         id="stop3472" />
+    </linearGradient>
+    <radialGradient
+       id="e"
+       gradientUnits="userSpaceOnUse"
+       cy="235.85001"
+       cx="-1490.8"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       r="12.631">
+      <stop
+         stop-color="#2840d5"
+         offset="0"
+         id="stop3475" />
+      <stop
+         stop-color="#99a5eb"
+         offset="1"
+         id="stop3477" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       xlink:href="#g"
+       gradientUnits="userSpaceOnUse"
+       cy="235.85001"
+       cx="-1490.8"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       r="12.631" />
+    <linearGradient
+       id="d"
+       y2="229.36"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="-1508.5"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       y1="210.75"
+       x1="-1498.6" />
+    <linearGradient
+       id="i"
+       y2="229.36"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="-1508.5"
+       gradientTransform="matrix(-0.13131,0.23166,-0.23227,-0.13211,-503.4,1105.3)"
+       y1="210.75"
+       x1="-1498.6" />
+    <radialGradient
+       id="a"
+       xlink:href="#j"
+       gradientUnits="userSpaceOnUse"
+       cy="235.85001"
+       cx="-1490.8"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       r="12.631" />
+    <linearGradient
+       id="h"
+       y2="39.685001"
+       gradientUnits="userSpaceOnUse"
+       x2="34.534"
+       gradientTransform="matrix(0.30262,0,0,0.30262,-240.46,727.85)"
+       y1="12.285"
+       x1="14.463">
+      <stop
+         stop-color="#dadada"
+         offset="0"
+         id="stop3484" />
+      <stop
+         stop-color="#f1f1f1"
+         offset="1"
+         id="stop3486" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       y2="229.36"
+       xlink:href="#c"
+       gradientUnits="userSpaceOnUse"
+       x2="-1508.5"
+       gradientTransform="matrix(-0.14292,0.23542,-0.24256,-0.13916,-524.7,1115.7)"
+       y1="210.75"
+       x1="-1498.6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="radialGradient4958"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#c"
+       id="linearGradient4960"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.13856,0.24444,-0.24509,-0.13939,-511.49,1126.1)"
+       x1="-1498.6"
+       y1="210.75"
+       x2="-1508.5"
+       y2="229.36" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="radialGradient4962"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient4964"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#j"
+       id="radialGradient4966"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0088,1.5906,-0.51887,-0.32907,-2866.2,2679.4)"
+       cx="-1490.8"
+       cy="235.85001"
+       r="12.631" />
+  </defs>
+  <metadata
+     id="metadata3489">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(415.97247,-775.12382)"
+     id="g3491">
+    <g
+       transform="matrix(0.99142,0,0,0.99142,-41.881,56.566)"
+       id="g3493">
+      <g
+         transform="matrix(1.0018,0,0,1.0018,0.68015,-1.3645)"
+         id="g3495">
+        <g
+           transform="translate(0.57952,0.86928)"
+           id="g3497">
+          <path
+             transform="matrix(-0.22957,0.16231,-0.16297,-0.23043,-661.96,1033.8)"
+             d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+             id="path3499"
+             inkscape:connector-curvature="0"
+             style="fill:url(#e);fill-rule:evenodd;stroke:#0d1547;stroke-width:1.77170002" />
+        </g>
+        <g
+           transform="matrix(1,0.0030561,-0.0030561,1,2.1083,1.1601)"
+           id="g3501"
+           style="fill-rule:evenodd">
+          <path
+             d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+             transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+             id="path3503"
+             inkscape:connector-curvature="0"
+             style="opacity:0.73683998;fill:url(#radialGradient4958);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+          <path
+             d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+             id="path3505"
+             inkscape:connector-curvature="0"
+             style="opacity:0.73683998;fill:url(#linearGradient4960)" />
+          <path
+             transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+             d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+             id="path3507"
+             inkscape:connector-curvature="0"
+             style="opacity:0.73683998;fill:url(#radialGradient4962);stroke:#ce6209;stroke-width:1px;stroke-opacity:0.91860004" />
+          <path
+             d="m -357.66,731.54 1.7821,-3.1439 -1.933,-3.2515 -1.1142,0.14888 c 1.5571,3.3888 1.5523,5.0642 1.2652,6.2466 z"
+             id="path3509"
+             inkscape:connector-curvature="0"
+             style="opacity:0.73683998;fill:url(#d)" />
+          <path
+             d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+             transform="matrix(-0.22812,0.16407,-0.16501,-0.22861,-660.16,1027.7)"
+             id="path3511"
+             inkscape:connector-curvature="0"
+             style="fill:url(#b);stroke:#3c1d03;stroke-width:1.77320004" />
+          <path
+             d="m -357.61,731.3 1.6889,-2.9796 -1.832,-3.0816 -1.056,0.14109 c 1.4757,3.2116 1.4712,4.7994 1.1991,5.9201 z"
+             id="path3513"
+             inkscape:connector-curvature="0"
+             style="opacity:0.73683998;fill:url(#i)" />
+        </g>
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3515"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4964);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -363.81,734.68 1.8382,-3.0279 -1.8746,-3.1888 -1.1168,0.12775 c 1.4962,3.3165 1.4614,4.9443 1.1532,6.0889 z"
+           id="path3517"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#f);fill-rule:evenodd" />
+        <path
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           id="path3519"
+           inkscape:connector-curvature="0"
+           style="opacity:0.73683998;fill:url(#radialGradient4966);fill-rule:evenodd;stroke:#800080;stroke-width:1px" />
+        <path
+           d="m -1480.3,247.22 -12.13,5.5765 -10.895,-7.717 1.2358,-13.294 12.13,-5.5765 10.895,7.7171 z"
+           transform="matrix(0.25601,0.11742,-0.11715,0.25607,44.412,845.48)"
+           id="path3521"
+           inkscape:connector-curvature="0"
+           style="fill:url(#a);fill-rule:evenodd;stroke:#480048;stroke-width:1.77209997" />
+        <g
+           transform="matrix(0.077328,9.1119e-4,-8.5264e-4,0.077374,-375.14,690.52)"
+           id="g3523"
+           style="opacity:0.57521997" />
+      </g>
+    </g>
+    <g
+       transform="matrix(1.0816,0,0,1.0816,-157.63,-10.459)"
+       id="g3525">
+      <path
+         style="color:#000000;fill:url(#h);stroke:#000000;stroke-width:0.40062001"
+         d="m -233.56,729.72 c -0.11342,0.008 -0.22365,0.0253 -0.33504,0.0381 h -0.008 l -0.26651,1.4544 c -0.43438,0.0989 -0.84305,0.26681 -1.2107,0.49495 l -1.1955,-0.86044 c -0.32317,0.25089 -0.61725,0.54351 -0.87567,0.86044 l 0.82998,1.2107 c -0.25201,0.38511 -0.44151,0.82486 -0.54824,1.2868 -2e-5,0.002 -2e-5,0.007 0,0.008 l -1.4468,0.22844 c -0.0264,0.21603 -0.0381,0.43931 -0.0381,0.66246 0,0.18258 0.005,0.36271 0.0229,0.54063 l 1.4468,0.25889 c 0.10289,0.50241 0.29835,0.97161 0.571 [...]
+         id="path3527"
+         inkscape:connector-curvature="0" />
+      <circle
+         style="opacity:0.64772997;color:#000000;fill:none;stroke:#ffffff;stroke-width:2.45970011"
+         transform="matrix(0.16287,0,0,0.16287,-237.11,731.22)"
+         cy="23.782"
+         cx="23.511"
+         r="12.728"
+         id="circle3529"
+         d="m 36.238999,23.782 c 0,7.02948 -5.698519,12.727999 -12.727999,12.727999 -7.02948,0 -12.728,-5.698519 -12.728,-12.727999 0,-7.029481 5.69852,-12.728 12.728,-12.728 7.02948,0 12.727999,5.698519 12.727999,12.728 z"
+         sodipodi:cx="23.511"
+         sodipodi:cy="23.782"
+         sodipodi:rx="12.728"
+         sodipodi:ry="12.728" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/manage_themes.svg b/freeplane/resources/images/manage_themes.svg
new file mode 100644
index 0000000..d21e8a9
--- /dev/null
+++ b/freeplane/resources/images/manage_themes.svg
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="24.893923"
+   version="1.1"
+   viewBox="0 0 24.893923 16"
+   id="svg3533"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="manage_themes.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3602"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="253.01617"
+     inkscape:cy="-374.57984"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3533" />
+  <defs
+     id="defs3535">
+    <linearGradient
+       id="b"
+       y2="823.71997"
+       gradientUnits="userSpaceOnUse"
+       x2="-285.82999"
+       gradientTransform="translate(-73,-32.856)"
+       y1="808.62"
+       x1="-300.92999">
+      <stop
+         offset="0"
+         id="stop3538" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3540" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="813.87"
+       gradientUnits="userSpaceOnUse"
+       x2="-295.78"
+       gradientTransform="translate(-73,-33.033)"
+       y1="810.40002"
+       x1="-299.17001">
+      <stop
+         stop-color="#f60"
+         offset="0"
+         id="stop3543" />
+      <stop
+         stop-color="#f9ac79"
+         offset="1"
+         id="stop3545" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="818.06"
+       gradientUnits="userSpaceOnUse"
+       x2="-295.78"
+       gradientTransform="translate(-64.746,-28.893)"
+       y1="814.65002"
+       x1="-299.28">
+      <stop
+         stop-color="#00f"
+         offset="0"
+         id="stop3548" />
+      <stop
+         stop-color="#6666fa"
+         offset="1"
+         id="stop3550" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="822.23999"
+       gradientUnits="userSpaceOnUse"
+       x2="-295.78"
+       gradientTransform="translate(-73,-33.061)"
+       y1="818.78998"
+       x1="-299.28">
+      <stop
+         stop-color="#fc0"
+         offset="0"
+         id="stop3553" />
+      <stop
+         stop-color="#f7e28c"
+         offset="1"
+         id="stop3555" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       y2="829.98999"
+       gradientUnits="userSpaceOnUse"
+       x2="-288.70999"
+       gradientTransform="translate(-71.816,-49.115)"
+       y1="826.48999"
+       x1="-292.20999">
+      <stop
+         stop-color="#ce72fc"
+         offset="0"
+         id="stop3558" />
+      <stop
+         stop-color="#d893fa"
+         offset="1"
+         id="stop3560" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       y2="822.19"
+       gradientUnits="userSpaceOnUse"
+       x2="-291.66"
+       gradientTransform="translate(-73,-33.033)"
+       y1="818.67999"
+       x1="-295.16">
+      <stop
+         stop-color="#008000"
+         offset="0"
+         id="stop3563" />
+      <stop
+         stop-color="#78b978"
+         offset="1"
+         id="stop3565" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="39.685001"
+       gradientUnits="userSpaceOnUse"
+       x2="34.534"
+       gradientTransform="matrix(0.30262,0,0,0.30262,-240.46,727.85)"
+       y1="12.285"
+       x1="14.463">
+      <stop
+         stop-color="#dadada"
+         offset="0"
+         id="stop3568" />
+      <stop
+         stop-color="#f1f1f1"
+         offset="1"
+         id="stop3570" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3572">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(383.26892,-775.28125)"
+     id="g3574">
+    <rect
+       style="color:#000000;fill:#f2f2f2;stroke:url(#b);stroke-width:0.72100002;stroke-linecap:round"
+       height="15.279"
+       width="15.279"
+       y="775.65002"
+       x="-374.01999"
+       id="rect3576" />
+    <rect
+       style="color:#000000;fill:url(#c)"
+       height="3.5"
+       width="3.5"
+       y="777.37"
+       x="-372.28"
+       id="rect3578" />
+    <rect
+       style="color:#000000;fill:url(#d)"
+       height="3.5"
+       width="3.5"
+       y="785.71002"
+       x="-364.03"
+       id="rect3580" />
+    <rect
+       style="color:#000000;fill:url(#e)"
+       height="3.5"
+       width="3.5"
+       y="785.67999"
+       x="-372.28"
+       id="rect3582" />
+    <rect
+       style="color:#000000;fill:url(#f)"
+       height="3.5"
+       width="3.5"
+       y="777.37"
+       x="-364.03"
+       id="rect3584" />
+    <rect
+       style="color:#000000;fill:#ff4f4f"
+       height="3.5"
+       width="3.5"
+       y="777.37"
+       x="-368.16"
+       id="rect3586" />
+    <rect
+       style="color:#000000"
+       height="3.5"
+       width="3.5"
+       y="781.53998"
+       x="-372.34"
+       id="rect3588" />
+    <rect
+       style="color:#000000;fill:#ffffff"
+       height="3.5"
+       width="3.5"
+       y="781.56"
+       x="-364.07999"
+       id="rect3590" />
+    <rect
+       style="color:#000000;fill:#b3b3b3"
+       height="3.5"
+       width="3.5"
+       y="781.56"
+       x="-368.16"
+       id="rect3592" />
+    <rect
+       style="color:#000000;fill:url(#g)"
+       height="3.5"
+       width="3.5"
+       y="785.65002"
+       x="-368.16"
+       id="rect3594" />
+    <g
+       transform="matrix(1.1631,0,0,1.1631,-105.46,-70.969)"
+       id="g3596">
+      <path
+         style="color:#000000;fill:url(#a);stroke:#000000;stroke-width:0.40062001"
+         d="m -233.56,729.72 c -0.11342,0.008 -0.22365,0.0253 -0.33504,0.0381 h -0.008 l -0.26651,1.4544 c -0.43438,0.0989 -0.84305,0.26681 -1.2107,0.49495 l -1.1955,-0.86044 c -0.32317,0.25089 -0.61725,0.54351 -0.87567,0.86044 l 0.82998,1.2107 c -0.25201,0.38511 -0.44151,0.82486 -0.54824,1.2868 -2e-5,0.002 -2e-5,0.007 0,0.008 l -1.4468,0.22844 c -0.0264,0.21603 -0.0381,0.43931 -0.0381,0.66246 0,0.18258 0.005,0.36271 0.0229,0.54063 l 1.4468,0.25889 c 0.10289,0.50241 0.29835,0.97161 0.571 [...]
+         id="path3598"
+         inkscape:connector-curvature="0" />
+      <circle
+         style="opacity:0.64772997;color:#000000;fill:none;stroke:#ffffff;stroke-width:2.45970011"
+         transform="matrix(0.16287,0,0,0.16287,-237.11,731.22)"
+         cy="23.782"
+         cx="23.511"
+         r="12.728"
+         id="circle3600"
+         d="m 36.238999,23.782 c 0,7.02948 -5.698519,12.727999 -12.727999,12.727999 -7.02948,0 -12.728,-5.698519 -12.728,-12.727999 0,-7.029481 5.69852,-12.728 12.728,-12.728 7.02948,0 12.727999,5.698519 12.727999,12.728 z"
+         sodipodi:cx="23.511"
+         sodipodi:cy="23.782"
+         sodipodi:rx="12.728"
+         sodipodi:ry="12.728" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/newNode.png b/freeplane/resources/images/newNode.png
deleted file mode 100644
index 031e7ad..0000000
Binary files a/freeplane/resources/images/newNode.png and /dev/null differ
diff --git a/freeplane/resources/images/new_map_.svg b/freeplane/resources/images/new_map_.svg
new file mode 100644
index 0000000..02c337a
--- /dev/null
+++ b/freeplane/resources/images/new_map_.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg18792"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs18794">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12496-4"
+       id="linearGradient13401"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37028083,0,0,0.36653737,1009.2809,1189.8121)"
+       x1="-2585.9324"
+       y1="-2128.6074"
+       x2="-2596.4077"
+       y2="-2104.9236" />
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter13521-5"
+       x="-0.17406622"
+       width="1.3481324"
+       y="-0.16575947"
+       height="1.331519">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.82320991"
+         id="feGaussianBlur13523-1" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13527-70"
+       id="linearGradient13397"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.33386416,0,0,0.33048886,915.09733,1113.0958)"
+       x1="-2584.3708"
+       y1="-2130.1299"
+       x2="-2589.2568"
+       y2="-2125.231" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13527-70">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop13529-49" />
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="1"
+         id="stop13531-81" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15516-1-8"
+       id="linearGradient13330"
+       gradientUnits="userSpaceOnUse"
+       x1="290.63553"
+       y1="287.8978"
+       x2="233.16635"
+       y2="169.99185"
+       gradientTransform="matrix(0.06898975,0,0,0.06898975,24.30892,404.18143)" />
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         style="stop-color:#dc7fcf;stop-opacity:1"
+         offset="0"
+         id="stop15518-1-5" />
+      <stop
+         style="stop-color:#a8bef9;stop-opacity:1"
+         offset="1"
+         id="stop15520-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15516-1-8"
+       id="linearGradient13413"
+       gradientUnits="userSpaceOnUse"
+       x1="290.63553"
+       y1="287.8978"
+       x2="233.16635"
+       y2="169.99185"
+       gradientTransform="matrix(0.06579273,0,0,0.06579273,28.87373,400.30785)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.54430686"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata18797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g18745"
+       transform="translate(-364.04724,-518.18109)">
+      <rect
+         y="518.18109"
+         x="364.04724"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-89-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+      <g
+         transform="matrix(1.0112502,0,0,1.0112502,325.35563,106.31383)"
+         id="g18735">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient13401);fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:0.53350997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 42.01579,407.55198 7.80351,0 3.92679,4.08159 -0.0887,11.2069 -11.64162,0 0,-15.28849 z"
+           id="path16071-0"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccc"
+           id="path16073-1"
+           d="m -2829.3089,-1828.3335 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.8893 2.6346,-0.6545 5.7398,-1.3853 10.3503,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.2904,-10.9191 z"
+           style="fill:#d3d3d3;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:1.60612452;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;filter:url(#filter13521-5)"
+           transform="matrix(0.33386416,0,0,0.33048886,994.44283,1012.3348)"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:url(#linearGradient13397);fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:0.53350997;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 50.05187,407.79363 c 0.35669,1.58358 0.12812,2.82239 -0.02,3.59882 0.8796,-0.21633 1.91632,-0.45787 3.45561,0.009 -1.65926,-1.83376 -2.33611,-2.39819 -3.43561,-3.60864 z"
+           id="path16075-63"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <circle
+           r="3.5326948"
+           cy="419.35303"
+           cx="42.069626"
+           style="font-size:61.54321671px;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient13330);fill-opacity:1;fill-rule:evenodd;stroke:#6b00a7;stroke-width:0.41260314;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.58333333;marker:none;enable-background:accumulate"
+           id="path10466-1-3-7-5"
+           inkscape:export-filename="C:\Documents and Settings\Designm5\Desktop\4.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+        <circle
+           r="3.3689878"
+           cy="414.7764"
+           cx="45.811394"
+           style="font-size:61.54321671px;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient13413);fill-opacity:1;fill-rule:evenodd;stroke:#7200b2;stroke-width:0.39348292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.58333333;marker:none;enable-background:accumulate"
+           id="path10466-1-3-7-5-2"
+           inkscape:export-filename="C:\Documents and Settings\Designm5\Desktop\4.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+        <path
+           inkscape:connector-curvature="0"
+           style="font-style:normal;font-weight:normal;font-size:12.08761501px;font-family:'Bitstream Vera Sans';fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.08680958px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 45.496094,413.01562 0,1.38086 -1.283203,0 0,0.88477 1.283203,0 0,1.38086 0.882812,0 0,-1.38086 1.316406,0 0,-0.88477 -1.316406,0 0,-1.38086 -0.882812,0 z"
+           id="text10478-8-8-1-9-3" />
+        <path
+           inkscape:connector-curvature="0"
+           style="font-style:normal;font-weight:normal;font-size:12.08761501px;font-family:'Bitstream Vera Sans';fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.08680958px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 41.612296,417.53201 0,1.38086 -1.283203,0 0,0.88477 1.283203,0 0,1.38086 0.882812,0 0,-1.38086 1.316406,0 0,-0.88477 -1.316406,0 0,-1.38086 -0.882812,0 z"
+           id="text10478-8-8-1-9-3-5" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ok_button.svg b/freeplane/resources/images/ok_button.svg
new file mode 100644
index 0000000..aec2b69
--- /dev/null
+++ b/freeplane/resources/images/ok_button.svg
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg18792"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs18794">
+    <linearGradient
+       id="linearGradient19965">
+      <stop
+         id="stop19967"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.95686275" />
+      <stop
+         id="stop19969"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         style="stop-color:#dc7fcf;stop-opacity:1"
+         offset="0"
+         id="stop15518-1-5" />
+      <stop
+         style="stop-color:#a8bef9;stop-opacity:1"
+         offset="1"
+         id="stop15520-5-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="0"
+         id="stop20604-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20606-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         id="stop20576-6"
+         offset="0"
+         style="stop-color:#cccccc;stop-opacity:1" />
+      <stop
+         id="stop20578-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         id="stop20586-8"
+         offset="0"
+         style="stop-color:#a6a6c6;stop-opacity:1" />
+      <stop
+         id="stop20588-6"
+         offset="1"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         id="stop20411-3"
+         offset="0"
+         style="stop-color:#36d200;stop-opacity:1;" />
+      <stop
+         id="stop20413-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         id="stop13708-7"
+         offset="0"
+         style="stop-color:#f1d103;stop-opacity:1;" />
+      <stop
+         id="stop13710-8"
+         offset="1"
+         style="stop-color:#f7cd03;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4318-5">
+      <stop
+         id="stop4320-98"
+         offset="0"
+         style="stop-color:#ff9e3b;stop-opacity:1" />
+      <stop
+         id="stop4322-4"
+         offset="1"
+         style="stop-color:#e47800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4738">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742" />
+    </linearGradient>
+    <linearGradient
+       y2="387.43924"
+       x2="332.02466"
+       y1="369.97995"
+       x1="314.56537"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2464"
+       xlink:href="#linearGradient4568"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.52298354,0,0,0.52298354,-162.26843,-189.71819)" />
+    <linearGradient
+       y2="379.76682"
+       x2="405.6488"
+       y1="377.19687"
+       x1="433.72797"
+       gradientTransform="matrix(0.30207939,0,0,0.30211201,-117.23149,-105.62341)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2466"
+       xlink:href="#linearGradient4738"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-178.48447,-208.54848)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468"
+       xlink:href="#linearGradient19965"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-179.17645,-209.24803)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468-5"
+       xlink:href="#linearGradient4738"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.515327"
+     inkscape:cx="6.6978123"
+     inkscape:cy="11.44101"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="808"
+     inkscape:window-height="818"
+     inkscape:window-x="805"
+     inkscape:window-y="36"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g19971">
+      <circle
+         r="8"
+         cy="7.9999971"
+         cx="7.9999976"
+         style="display:inline;overflow:visible;visibility:visible;fill:#226122;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.625;marker:none"
+         id="path4531-7" />
+      <circle
+         r="7.3043432"
+         cy="7.9998751"
+         cx="7.9998908"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2464);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.16992879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         id="path4533" />
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2466);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+         d="m 2.83197,8.7592 c -0.0673,0.0673 -0.0547,0.17317 0.0127,0.24048 l 4.08667,4.2861 6.807,-7.69938 c 0.0673,-0.0673 0.0673,-0.16051 0,-0.22783 L 12.2195,3.83973 C 12.1522,3.77243 12.04236,3.75603 11.97902,3.82703 L 6.89492,9.53124 4.604,7.24032 c -0.0673,-0.0673 -0.18582,-0.0673 -0.25314,0 L 2.83202,8.75917 Z"
+         id="rect4574"
+         sodipodi:nodetypes="cccccsscccc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2468);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none;color:#000000;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mo [...]
+         d="m 7.99508,0.69955 c -4.03199,0 -7.3031,3.2711 -7.3031,7.3031 0,1.93721 0.79057,3.66832 2.02268,4.97613 0.64009,-5.28682 5.10225,-9.39737 10.56085,-9.39737 0.14718,0 0.28385,0.0299 0.42959,0.0358 C 12.36941,1.87995 10.35423,0.69955 7.99508,0.69955 Z"
+         id="path4537" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/ol.png b/freeplane/resources/images/ol.png
new file mode 100644
index 0000000..4df8f97
Binary files /dev/null and b/freeplane/resources/images/ol.png differ
diff --git a/freeplane/resources/images/ol.svg b/freeplane/resources/images/ol.svg
new file mode 100644
index 0000000..93d8c54
--- /dev/null
+++ b/freeplane/resources/images/ol.svg
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ol.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\ol.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-0.15607185"
+     inkscape:cy="8"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+    <linearGradient
+       x1="-300.92999"
+       y1="808.62"
+       gradientTransform="translate(319.04664,-809.90824)"
+       x2="-285.82999"
+       gradientUnits="userSpaceOnUse"
+       y2="823.71997"
+       id="b-3">
+      <stop
+         id="stop3538"
+         offset="0" />
+      <stop
+         id="stop3540"
+         offset="1"
+         stop-color="#ccc" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.17001"
+       y1="810.40002"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="813.87"
+       id="c-1">
+      <stop
+         id="stop3543"
+         offset="0"
+         stop-color="#f60" />
+      <stop
+         id="stop3545"
+         offset="1"
+         stop-color="#f9ac79" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="814.65002"
+       gradientTransform="matrix(0.97877023,0,0,0.97877023,304.91277,-792.30756)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="818.06"
+       id="d">
+      <stop
+         id="stop3548"
+         offset="0"
+         stop-color="#00f" />
+      <stop
+         id="stop3550"
+         offset="1"
+         stop-color="#6666fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="818.78998"
+       gradientTransform="translate(319.04664,-810.11324)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="822.23999"
+       id="e">
+      <stop
+         id="stop3553"
+         offset="0"
+         stop-color="#fc0" />
+      <stop
+         id="stop3555"
+         offset="1"
+         stop-color="#f7e28c" />
+    </linearGradient>
+    <linearGradient
+       x1="-292.20999"
+       y1="826.48999"
+       gradientTransform="translate(299.95945,-814.913)"
+       x2="-288.70999"
+       gradientUnits="userSpaceOnUse"
+       y2="829.98999"
+       id="f">
+      <stop
+         id="stop3558"
+         offset="0"
+         stop-color="#ce72fc" />
+      <stop
+         id="stop3560"
+         offset="1"
+         stop-color="#d893fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-295.16"
+       y1="818.67999"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-291.66"
+       gradientUnits="userSpaceOnUse"
+       y2="822.19"
+       id="g">
+      <stop
+         id="stop3563"
+         offset="0"
+         stop-color="#008000" />
+      <stop
+         id="stop3565"
+         offset="1"
+         stop-color="#78b978" />
+    </linearGradient>
+    <linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.30262,0,0,0.30262,-240.46,727.85)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-2">
+      <stop
+         id="stop3568"
+         offset="0"
+         stop-color="#dadada" />
+      <stop
+         id="stop3570"
+         offset="1"
+         stop-color="#f1f1f1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#003380;fill-rule:evenodd;stroke:#003380;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 5.7378799,3.4216324 8.7391841,0"
+     id="path4609"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#003380;fill-rule:evenodd;stroke:#003380;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 5.7378799,8.1694918 8.7391841,0"
+     id="path4609-3"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#003380;fill-rule:evenodd;stroke:#003380;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 5.7378799,12.442775 8.7391841,0"
+     id="path4609-8"
+     inkscape:connector-curvature="0" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.17107964px;line-height:125%;font-family:'Arial Unicode MS';-inkscape-font-specification:'Arial Unicode MS';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#003380;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     x="1.9778425"
+     y="4.9216323"
+     id="text4660"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan4662"
+       x="1.9778425"
+       y="4.9216323">1</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.17107964px;line-height:125%;font-family:'Arial Unicode MS';-inkscape-font-specification:'Arial Unicode MS';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#003380;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="1.8739728"
+     y="9.4322033"
+     id="text4660-8"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan4662-1"
+       x="1.8739728"
+       y="9.4322033">2</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.10146856px;line-height:125%;font-family:'Arial Unicode MS';-inkscape-font-specification:'Arial Unicode MS';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#003380;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     x="1.8485575"
+     y="13.892708"
+     id="text4660-8-5"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan4662-1-3"
+       x="1.8485575"
+       y="13.892708">3</tspan></text>
+</svg>
diff --git a/freeplane/resources/images/on_selected_node.png b/freeplane/resources/images/on_selected_node.png
deleted file mode 100644
index 64df718..0000000
Binary files a/freeplane/resources/images/on_selected_node.png and /dev/null differ
diff --git a/freeplane/resources/images/on_selected_node_recursively.png b/freeplane/resources/images/on_selected_node_recursively.png
deleted file mode 100644
index 66c1c17..0000000
Binary files a/freeplane/resources/images/on_selected_node_recursively.png and /dev/null differ
diff --git a/freeplane/resources/images/on_selected_node_recursively_small.png b/freeplane/resources/images/on_selected_node_recursively_small.png
deleted file mode 100644
index a012736..0000000
Binary files a/freeplane/resources/images/on_selected_node_recursively_small.png and /dev/null differ
diff --git a/freeplane/resources/images/on_selected_node_small.png b/freeplane/resources/images/on_selected_node_small.png
deleted file mode 100644
index 7a0c3a4..0000000
Binary files a/freeplane/resources/images/on_selected_node_small.png and /dev/null differ
diff --git a/freeplane/resources/images/on_single_node.png b/freeplane/resources/images/on_single_node.png
deleted file mode 100644
index f674367..0000000
Binary files a/freeplane/resources/images/on_single_node.png and /dev/null differ
diff --git a/freeplane/resources/images/on_single_node_small.png b/freeplane/resources/images/on_single_node_small.png
deleted file mode 100644
index 28a8782..0000000
Binary files a/freeplane/resources/images/on_single_node_small.png and /dev/null differ
diff --git a/freeplane/resources/images/redo.svg b/freeplane/resources/images/redo.svg
new file mode 100644
index 0000000..5a4eb22
--- /dev/null
+++ b/freeplane/resources/images/redo.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.089 15.989" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2=".029297" gradientUnits="userSpaceOnUse" y1="8.4145" gradientTransform="matrix(-1 0 0 1 16.1 0)" x2="-.13419" x1="12.978">
+<stop stop-color="#003a00" offset="0"/>
+<stop stop-color="#00d800" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-38.749 -273.51)">
+<g transform="translate(38.738 273.51)" stroke="#008000">
+<path d="m9.2652 2.3145c-9.1112-0.0305-9.2023 13.622-9.2023 13.622" stroke-linecap="square" stroke-width=".10268" fill="none"/>
+<path d="m9.2265 7.5577c-9.164-0.0551-9.164 8.3793-9.164 8.3793" stroke-width=".097447" fill="none"/>
+<path d="m0.27159 13.918c0.04417-0.0012 0.08824 0.03624 0.07709 0.08282-0.01649 0.06229-0.02393 0.12816-0.04842 0.18767-0.02758 0.05273-0.11714 0.03995-0.12565-0.02028-0.0012-0.06518 0.01129-0.13063 0.01907-0.19538 0.0077-0.03491 0.04255-0.05906 0.07791-0.05483zm0.07228-0.41032c0.08234-0.003 0.12906 0.0819 0.08981 0.15232-0.0371 0.10056-0.03381 0.22471-0.10556 0.30694-0.06998 0.05137-0.14352-0.04469-0.11806-0.11482 0.02667-0.10564-0.000226-0.2319 0.0662-0.32315 0.01876-0.01605 0.04283-0. [...]
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/remove.png b/freeplane/resources/images/remove.png
deleted file mode 100644
index 5ef7f99..0000000
Binary files a/freeplane/resources/images/remove.png and /dev/null differ
diff --git a/freeplane/resources/images/remove_connector.svg b/freeplane/resources/images/remove_connector.svg
new file mode 100644
index 0000000..394fc3c
--- /dev/null
+++ b/freeplane/resources/images/remove_connector.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16.25"
+   viewBox="0 0 16 16.25"
+   id="svg6483"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Connectors.svg">
+  <defs
+     id="defs6485" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.8065657"
+     inkscape:cx="54.969452"
+     inkscape:cy="-4.3657446"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata6488">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-47.566192,-76.03215)">
+    <g
+       id="g9971"
+       inkscape:export-filename="M:\FreePlane_radna_mapa\images-view\remove_connector.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="translate(-326.24732,-655.96785)">
+      <rect
+         y="732.13361"
+         x="373.81351"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-89-0-4-2-7"
+         style="color:#000000;fill:none;stroke:none;stroke-width:0.85016513;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         id="path11375-8"
+         d="m 385.93609,739.5057 c -0.38582,-2.82578 -2.86668,-5.46405 -7.02276,-5.627 a 0.49909629,0.45191222 0 0 0 -0.1443,2.5e-4 l 1.40116,-1.61895 -5.86214,1.8999 5.71919,2.16193 -1.17926,-1.54376 a 0.49909629,0.45191222 0 0 0 0.0111,-4.6e-4 c 3.96432,0.15542 6.03386,2.71392 6.12969,5.31931 0.0958,2.60538 -1.73899,5.23234 -6.09711,5.5461 a 0.49909629,0.45191222 0 0 0 -0.14256,0.0203 l 1.13863,-1.70058 -5.57694,2.49262 5.95431,1.55185 -1.41673,-1.46634 a 0.49909629,0.45191222 0 0 0 0. [...]
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#0066ff;fill-opacity:1;stroke:#000080;stroke-width:0.25276804;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-backgroun [...]
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.53129361,0,0,0.61290798,466.76818,201.02343)"
+         id="g10471-7">
+        <g
+           id="g9978"
+           transform="matrix(1.233278,0,0,1.233278,35.135356,-205.55836)">
+          <path
+             sodipodi:nodetypes="cccc"
+             id="path6973-11"
+             d="m -161.27771,889.17334 c 0.59165,-6.88036 5.72083,-14.85638 13.73595,-16 l 1.38183,2.36827 c -7.77604,1.62438 -12.05709,5.79282 -15.11778,13.63173 z"
+             style="color:#000000;fill:#ff0000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cccc"
+             id="path6973-1-5"
+             d="m -164.9737,874.3432 c 6.90533,0.0759 15.24234,4.59466 16.98172,12.5019 l -2.2584,1.55495 c -2.20091,-7.63292 -6.67761,-11.59051 -14.72332,-14.05685 z"
+             style="color:#000000;fill:#ff0000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/remove_first_icon.svg b/freeplane/resources/images/remove_first_icon.svg
new file mode 100644
index 0000000..3d0850e
--- /dev/null
+++ b/freeplane/resources/images/remove_first_icon.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.94 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.3772 -1.014 1.5479 -2.1022 282.85 984.73)" r="54.705">
+<stop stop-color="#625b18" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.80860 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#4d0033" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-124.07 -142.81)">
+<g transform="translate(-17.706 -650.86)">
+<g transform="matrix(1.0555 0 0 1.1113 -42.95 -123.48)">
+<circle stroke-width="6.8381" cy="219.91" fill-rule="evenodd" transform="matrix(.064073 0 0 .064073 170.11 820.49)" stroke="#82792b" cx="257.44" r="51.206" fill="url(#b)"/>
+<text xml:space="preserve" font-size="6.2779px" y="836.83807" x="184.93179" font-family="Arial" fill="#ffffff"><tspan font-size="6.2779px" y="836.83807" x="184.93179" font-family="Arial" fill="#ffffff">2</tspan></text>
+</g>
+<rect opacity=".92511" style="color:#000000" rx=".066851" ry=".092563" height="16" width="15.197" y="793.67" x="142.15" fill="none"/>
+<g transform="matrix(1.5754 0 0 1.6587 -133.23 -582.46)">
+<circle stroke-width="6.8381" cy="219.91" fill-rule="evenodd" transform="matrix(.064073 0 0 .064073 161.57 820.22)" stroke="#590059" cx="257.44" r="51.206" fill="url(#a)"/>
+<text xml:space="preserve" font-size="6.8663px" y="836.77893" x="176.09413" font-family="Arial" fill="#ffffff"><tspan font-size="6.8663px" y="836.77893" x="176.09413" font-family="Arial" fill="#ffffff">1</tspan></text>
+</g>
+<g transform="matrix(.66508 0 0 .79197 251.53 103.83)" fill="#f00">
+<path style="color:#000000" d="m-161.28 889.17c0.59165-6.8804 5.7208-14.856 13.736-16l1.3818 2.3683c-7.776 1.6244-12.057 5.7928-15.118 13.632z"/>
+<path style="color:#000000" d="m-164.97 874.34c6.9053 0.0759 15.242 4.5947 16.982 12.502l-2.2584 1.555c-2.2009-7.6329-6.6776-11.591-14.723-14.057z"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/remove_last_icon.svg b/freeplane/resources/images/remove_last_icon.svg
new file mode 100644
index 0000000..f2bc324
--- /dev/null
+++ b/freeplane/resources/images/remove_last_icon.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.773 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.80860 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#4d0033" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.3772 -1.014 1.5479 -2.1022 282.85 984.73)" r="54.705">
+<stop stop-color="#625b18" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-102.55 -142.81)">
+<g transform="translate(-18.555 -651.23)">
+<rect opacity=".92511" style="color:#000000" rx=".066851" ry=".092563" height="16" width="15.197" y="794.04" x="121.39" fill="none"/>
+<g transform="matrix(1.0765 0 0 1.1334 -66.812 -142.77)">
+<circle stroke-width="6.8381" cy="219.91" fill-rule="evenodd" transform="matrix(.064073 0 0 .064073 161.57 820.22)" stroke="#590059" cx="257.44" r="51.206" fill="url(#b)"/>
+<text xml:space="preserve" font-size="6.8663px" y="836.77893" x="176.09413" font-family="Arial" fill="#ffffff"><tspan font-size="6.8663px" y="836.77893" x="176.09413" font-family="Arial" fill="#ffffff">1</tspan></text>
+</g>
+<g transform="matrix(1.6271 0 0 1.7131 -172.43 -629.23)">
+<circle stroke-width="6.8381" cy="219.91" fill-rule="evenodd" transform="matrix(.064073 0 0 .064073 170.11 820.49)" stroke="#82792b" cx="257.44" r="51.206" fill="url(#a)"/>
+<text xml:space="preserve" font-size="6.2779px" y="836.83807" x="184.93179" font-family="Arial" fill="#ffffff"><tspan font-size="6.2779px" y="836.83807" x="184.93179" font-family="Arial" fill="#ffffff">2</tspan></text>
+</g>
+<g transform="matrix(.64580 0 0 .74226 231 147.48)" fill="#f00">
+<path style="color:#000000" d="m-161.28 889.17c0.59165-6.8804 5.7208-14.856 13.736-16l1.3818 2.3683c-7.776 1.6244-12.057 5.7928-15.118 13.632z"/>
+<path style="color:#000000" d="m-164.97 874.34c6.9053 0.0759 15.242 4.5947 16.982 12.502l-2.2584 1.555c-2.2009-7.6329-6.6776-11.591-14.723-14.057z"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/split_node.svg b/freeplane/resources/images/split_node.svg
new file mode 100644
index 0000000..9fa2144
--- /dev/null
+++ b/freeplane/resources/images/split_node.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="split_node.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1076"
+     inkscape:window-height="480"
+     id="namedview45"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-1.4576271"
+     inkscape:cy="8"
+     inkscape:window-x="548"
+     inkscape:window-y="261"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="677.01"
+       gradientUnits="userSpaceOnUse"
+       x2="158.14"
+       gradientTransform="matrix(0.34993447,0.09735302,-0.14019114,0.50393686,48.803924,-350.27131)"
+       y1="673.53"
+       x1="150.2">
+      <stop
+         stop-color="#f00"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fffe21"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4466">
+    <rect
+       style="color:#000000;opacity:0.92510998;fill:none"
+       rx="0.070384003"
+       ry="0.092563003"
+       height="16"
+       width="16"
+       y="-0.0017829102"
+       x="-0.0091969483"
+       id="rect19" />
+    <rect
+       height="5.8220901"
+       rx="1.3487644"
+       ry="1.2839336"
+       width="11.927924"
+       y="9.7771845"
+       x="3.7208376"
+       id="rect25"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.67568988;stroke-linejoin:round" />
+    <g
+       id="text27"
+       style="font-style:italic;font-size:4.04566288px;fill:#000000">
+      <path
+         id="path4458"
+         style=""
+         d="m 7.1607168,14.115944 -0.4661994,0 -0.8039965,-2.631261 -0.6084298,2.631261 -0.3694037,0 0.6795449,-2.941402 0.5886755,0 0.7348568,2.402112 0.5550934,-2.402112 0.3694038,0 -0.679545,2.941402 z" />
+      <path
+         id="path4460"
+         style=""
+         d="m 10.08039,12.68969 q 0,0.296313 -0.09087,0.568921 -0.090869,0.272608 -0.2568048,0.474101 -0.1718616,0.209395 -0.3970597,0.32792 -0.225198,0.11655 -0.525462,0.11655 -0.3931089,0 -0.6143561,-0.223223 -0.2192717,-0.225198 -0.2192717,-0.620282 0,-0.296313 0.088894,-0.56497 0.090869,-0.268658 0.2607556,-0.478052 0.16396,-0.201493 0.4010106,-0.321994 0.2390259,-0.120501 0.5215112,-0.120501 0.3812563,0 0.6064543,0.217297 0.2251985,0.217296 0.2251985,0.624233 z m -0.6044794,0.833628 [...]
+      <path
+         id="path4462"
+         style=""
+         d="m 12.869684,11.042188 -0.711151,3.073756 -0.37138,0 0.05334,-0.231124 q -0.250879,0.171861 -0.404962,0.231124 -0.152107,0.06124 -0.33187,0.06124 -0.312117,0 -0.495831,-0.197542 -0.181739,-0.197542 -0.181739,-0.574848 0,-0.318043 0.09877,-0.600528 0.09877,-0.284461 0.268657,-0.497806 0.167911,-0.21137 0.39706,-0.333846 0.229149,-0.124452 0.485954,-0.124452 0.175812,0 0.323969,0.03753 0.148156,0.03753 0.276559,0.112599 l 0.221247,-0.956104 0.371379,0 z m -0.663741,1.26427 q -0. [...]
+      <path
+         id="path4464"
+         style=""
+         d="m 14.675219,12.772657 q 0.0099,-0.05729 0.01383,-0.0968 0.004,-0.03951 0.004,-0.08692 0,-0.21137 -0.11655,-0.329895 -0.114574,-0.118525 -0.369404,-0.118525 -0.280509,0 -0.497806,0.173837 -0.217296,0.173837 -0.294338,0.458297 l 1.260319,0 z m -0.742758,1.394648 q -0.458298,0 -0.719054,-0.215321 -0.260755,-0.215321 -0.260755,-0.630159 0,-0.606455 0.383232,-1.039072 0.383231,-0.434593 0.948202,-0.434593 0.37533,0 0.574847,0.187665 0.199518,0.18569 0.199518,0.523487 0,0.05926 -0. [...]
+    </g>
+    <rect
+       height="5.8220901"
+       rx="1.3487644"
+       ry="1.2839336"
+       width="11.927924"
+       y="1.1886749"
+       x="0.32446751"
+       id="rect35"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.67568988;stroke-linejoin:round" />
+    <g
+       id="text37"
+       style="font-style:italic;font-size:4.04566288px;fill:#000000">
+      <path
+         id="path4449"
+         style=""
+         d="m 3.7643468,5.5274343 -0.4661995,0 -0.8039964,-2.6312612 -0.6084298,2.6312612 -0.3694038,0 0.6795449,-2.9414023 0.5886756,0 0.7348567,2.4021123 0.5550934,-2.4021123 0.3694038,0 -0.6795449,2.9414023 z" />
+      <path
+         id="path4451"
+         style=""
+         d="m 6.6840195,4.1011802 q 0,0.2963131 -0.090869,0.5689213 -0.090869,0.2726081 -0.2568047,0.4741011 -0.1718617,0.2093947 -0.3970597,0.32792 -0.2251981,0.1165498 -0.5254621,0.1165498 -0.3931088,0 -0.614356,-0.2232226 -0.2192718,-0.225198 -0.2192718,-0.6202823 0,-0.2963132 0.088894,-0.5649705 0.090869,-0.2686573 0.2607556,-0.478052 0.1639599,-0.2014929 0.4010105,-0.3219936 0.239026,-0.1205007 0.5215112,-0.1205007 0.3812564,0 0.6064544,0.2172963 0.225198,0.2172964 0.225198,0.624233 [...]
+      <path
+         id="path4453"
+         style=""
+         d="m 9.4733142,2.4536788 -0.7111517,3.0737555 -0.3713792,0 0.053336,-0.2311242 Q 8.1932412,5.4681717 8.0391583,5.5274343 7.8870509,5.5886724 7.7072876,5.5886724 7.395171,5.5886724 7.2114568,5.3911303 7.029718,5.1935881 7.029718,4.8162827 q 0,-0.3180429 0.098771,-0.6005281 Q 7.2272602,3.9312939 7.3971464,3.7179484 7.5650572,3.5065783 7.7942061,3.3841022 8.023355,3.2596507 8.2801597,3.2596507 q 0.1758125,0 0.3239691,0.037533 0.1481566,0.037533 0.276559,0.112599 l 0.2212472,-0.9561 [...]
+      <path
+         id="path4455"
+         style=""
+         d="m 11.278849,4.1841478 q 0.0099,-0.057287 0.01383,-0.096796 0.004,-0.039508 0.004,-0.086918 0,-0.2113701 -0.11655,-0.3298954 -0.114574,-0.1185253 -0.369404,-0.1185253 -0.280509,0 -0.497806,0.1738371 -0.217296,0.1738371 -0.294338,0.4582977 l 1.260319,0 z m -0.742758,1.3946475 q -0.458298,0 -0.7190536,-0.2153209 Q 9.5562818,5.1481535 9.5562818,4.733315 q 0,-0.6064544 0.3832318,-1.0390716 0.3832314,-0.4345927 0.9482024,-0.4345927 0.37533,0 0.574847,0.187665 0.199518,0.1856896 0.1 [...]
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#a);fill-rule:evenodd;stroke:#b40000;stroke-width:0.66316205;stroke-linecap:round;stroke-linejoin:round"
+       id="path43"
+       d="M 11.316221,1.171949 8.9156575,5.7953972 10.880887,5.2632364 3.5117518,14.297425 7.9040276,5.1031777 6.0529602,5.5453174 9.0962906,0.42249037" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/spotlight.png b/freeplane/resources/images/spotlight.png
new file mode 100644
index 0000000..ea1f04f
Binary files /dev/null and b/freeplane/resources/images/spotlight.png differ
diff --git a/freeplane/resources/images/spotlight.svg b/freeplane/resources/images/spotlight.svg
new file mode 100644
index 0000000..bc3da4a
--- /dev/null
+++ b/freeplane/resources/images/spotlight.svg
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10.376901mm"
+   height="9.0616827mm"
+   viewBox="0 0 36.768543 32.108324"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="presentation_mode.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\presentation_mode.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         id="stop12498-6"
+         offset="0"
+         style="stop-color:#dcdcdc;stop-opacity:1" />
+      <stop
+         id="stop12500-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         id="stop15518-1-5"
+         offset="0"
+         style="stop-color:#dc7fcf;stop-opacity:1" />
+      <stop
+         id="stop15520-5-0"
+         offset="1"
+         style="stop-color:#a8bef9;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         id="stop20604-5"
+         offset="0"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+      <stop
+         id="stop20606-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop20576-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20578-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         style="stop-color:#a6a6c6;stop-opacity:1"
+         offset="0"
+         id="stop20586-8" />
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="1"
+         id="stop20588-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         style="stop-color:#2aa200;stop-opacity:1"
+         offset="0"
+         id="stop20411-3" />
+      <stop
+         style="stop-color:#5ffb57;stop-opacity:1"
+         offset="1"
+         id="stop20413-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         style="stop-color:#f1d103;stop-opacity:1;"
+         offset="0"
+         id="stop13708-7" />
+      <stop
+         style="stop-color:#f7cd03;stop-opacity:1"
+         offset="1"
+         id="stop13710-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient5069-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08411748,0,0,0.08023247,162.32863,750.19161)"
+       x1="268.63"
+       y1="238.03"
+       x2="219.96001"
+       y2="124.52" />
+    <linearGradient
+       id="linearGradient4710-3">
+      <stop
+         style="stop-color: rgb(242, 244, 241); stop-opacity: 1;"
+         offset="0"
+         id="stop4712-0" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4714-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4728-0">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4730-4" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop4732-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4750-3">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="0"
+         id="stop4752-1" />
+      <stop
+         id="stop4758-4"
+         offset="0.5"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4754-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33867-4">
+      <stop
+         style="stop-color:#8da6d8;stop-opacity:1"
+         offset="0"
+         id="stop33869-3" />
+      <stop
+         id="stop33871-5"
+         offset="0.25"
+         style="stop-color:#b4c5e5;stop-opacity:1" />
+      <stop
+         id="stop33873-5"
+         offset="0.5"
+         style="stop-color:#d8e1f2;stop-opacity:1" />
+      <stop
+         style="stop-color:#92aada;stop-opacity:1"
+         offset="0.75"
+         id="stop33875-2" />
+      <stop
+         style="stop-color:#8ea7d8;stop-opacity:1"
+         offset="1"
+         id="stop33877-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.2483733"
+     inkscape:cx="-14.060683"
+     inkscape:cy="15.063927"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-176.79695,-751.41864)">
+    <g
+       id="g4451">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#2ca02c;stroke:#2ca02c;stroke-width:0.73913711;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 185.87107,765.70096 c 2.54959,-0.0498 4.9048,2.28925 7.58137,0.19358 2.53334,-2.01963 6.03219,1.48948 8.19294,1.7239 -1.80627,-0.18205 -4.91018,-3.51108 -7.40616,-1.06208 -3.73994,3.62533 -5.74986,1.39686 -8.35358,1.44751 l -0.0146,-2.30291 z"
+         id="path4779-9" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#0034b0;stroke:#0034b0;stroke-width:0.73913711;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99738668"
+         d="m 181.8352,768.26756 c 2.54957,0.0498 4.90477,0.29675 7.58136,2.39242 2.53334,2.01963 5.77881,4.17507 7.93957,3.94054 -1.80626,0.18207 -4.65683,-2.15335 -7.15279,-4.60244 -3.73996,-3.62533 -5.74986,-3.98286 -8.35358,-4.03351 l -0.0146,2.3029 0,0 z"
+         id="path4781-3" />
+      <rect
+         id="rect4723-6"
+         x="194.97153"
+         y="773.56976"
+         width="10.417096"
+         height="5.5046148"
+         ry="1.2139158"
+         rx="1.1779279"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#0034b0;stroke-width:0.85292298;stroke-linejoin:round;stroke-opacity:0.99738668" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;block-progression:tb;fill:#ff0000;stroke:#ff0000;stroke-width:0.73913711;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+         d="m 181.81752,765.82115 c 2.54959,-0.0498 4.9048,-0.29676 7.58139,-2.39243 2.53331,-2.01963 5.7788,-4.17506 7.93954,-3.94055 -1.80624,-0.18207 -4.6568,2.15336 -7.15278,4.60245 -3.73995,3.62534 -5.74986,3.98286 -8.35357,4.0335 l -0.0146,-2.3029 0,0 z"
+         id="path4783-6" />
+      <path
+         style="font-size:61.54299927px;fill:url(#linearGradient5069-2);fill-rule:evenodd;stroke:#0034b0;stroke-width:0.96014065;stroke-opacity:0.99738668"
+         inkscape:connector-curvature="0"
+         font-size="61.543px"
+         d="m 188.2915,767.83554 a 4.30732,4.1083841 0 0 1 -4.30764,4.10872 4.30732,4.1083841 0 0 1 -4.30768,-4.10872 4.30732,4.1083841 0 0 1 4.30768,-4.10869 4.30732,4.1083841 0 0 1 4.30764,4.10869 z"
+         id="path4743-2" />
+      <rect
+         transform="scale(-1,-1)"
+         id="rect4729-7"
+         x="-205.07063"
+         y="-760.93884"
+         width="9.7074547"
+         height="5.2405291"
+         ry="1.1556531"
+         rx="1.097698"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.8127892;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         ry="1.907277"
+         rx="1.6588142"
+         y="751.41864"
+         x="176.79695"
+         height="32.108326"
+         width="36.768547"
+         id="rect4498-7-4"
+         style="opacity:0.69800002;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-opacity:1" />
+      <rect
+         transform="scale(-1,1)"
+         id="rect4717-9"
+         x="-209.43918"
+         y="764.18335"
+         width="11.000958"
+         height="5.8149004"
+         ry="1.2823358"
+         rx="1.2439464"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#2ca02c;stroke-width:0.89593834;stroke-linejoin:round;stroke-opacity:1" />
+      <rect
+         ry="1.862726"
+         rx="1.6249781"
+         y="751.79364"
+         x="177.17195"
+         height="31.358326"
+         width="36.018547"
+         id="rect4498-7"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.75;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/stock_text_indent.svg b/freeplane/resources/images/stock_text_indent.svg
new file mode 100644
index 0000000..6179561
--- /dev/null
+++ b/freeplane/resources/images/stock_text_indent.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="stock_text_indent.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="746"
+     id="namedview43"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-12.677966"
+     inkscape:cy="7.9322034"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="169.99"
+       gradientUnits="userSpaceOnUse"
+       x2="233.17"
+       y1="287.9"
+       x1="290.64"
+       gradientTransform="matrix(0.091997,0,0,0.091997,-13.95,-14.738)">
+      <stop
+         stop-color="#dc7fcf"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#a8bef9"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4478">
+    <rect
+       id="rect17"
+       x="3.6621093e-006"
+       y="-0.0080097653"
+       width="16"
+       height="16"
+       ry="0.092563003"
+       rx="0.070384003"
+       style="color:#000000;opacity:0.92510998;fill:none" />
+    <rect
+       height="7.3909001"
+       rx="1.7122"
+       ry="1.6299"
+       width="15.142"
+       y="7.6620221"
+       x="0.43000734"
+       id="rect21"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.85776001;stroke-linejoin:round" />
+    <g
+       id="text23"
+       style="font-style:italic;font-size:5.13579988px;fill:#000000">
+      <path
+         id="path4470"
+         style=""
+         d="m 2.63514,9.425877 0.6820985,0 1.0331784,3.209875 0.6269287,-3.209875 0.4940199,0 -0.729745,3.744018 -0.6846062,0 -1.0306708,-3.2299365 -0.6269287,3.2299365 -0.4940198,0 0.729745,-3.744018 z" />
+      <path
+         id="path4472"
+         style=""
+         d="m 6.9133015,13.242619 q -0.4940199,0 -0.7824071,-0.303434 -0.2858794,-0.305941 -0.2858794,-0.832561 0,-0.305941 0.097801,-0.621913 0.1003086,-0.31848 0.2582947,-0.534143 0.2482637,-0.336034 0.5542049,-0.496528 0.3059412,-0.160494 0.6921293,-0.160494 0.4789735,0 0.7723762,0.298418 0.2959103,0.298418 0.2959103,0.7799 0,0.333526 -0.097801,0.664544 -0.097801,0.331018 -0.2557869,0.54919 -0.245756,0.336033 -0.5516972,0.496527 -0.3059412,0.160494 -0.6971447,0.160494 z m -0.589313,-1 [...]
+      <path
+         id="path4474"
+         style=""
+         d="m 10.895552,12.748599 q -0.185571,0.243248 -0.43885,0.368634 -0.253279,0.125386 -0.5617279,0.125386 -0.4212961,0 -0.6670521,-0.28588 -0.2432484,-0.288387 -0.2432484,-0.787422 0,-0.416281 0.1479552,-0.792438 0.1479552,-0.378665 0.4288192,-0.677083 0.1855709,-0.198109 0.4187884,-0.300926 0.2332176,-0.105324 0.4890046,-0.105324 0.270833,0 0.476466,0.130401 0.20814,0.130402 0.320987,0.37365 l 0.300926,-1.529706 0.463927,0 -0.759837,3.902004 -0.463928,0 0.08777,-0.421296 z M 9.463 [...]
+      <path
+         id="path4476"
+         style=""
+         d="m 14.479077,11.514803 q 0.0075,-0.04012 0.01003,-0.08275 0.005,-0.04263 0.005,-0.08526 0,-0.305942 -0.180556,-0.483989 -0.178048,-0.178048 -0.486497,-0.178048 -0.343556,0 -0.606867,0.218171 -0.26331,0.215663 -0.398726,0.61439 l 1.657599,-0.0025 z m 0.401235,0.361111 -2.146604,0 q -0.01505,0.09529 -0.02006,0.150463 -0.005,0.05517 -0.005,0.09529 0,0.348573 0.213155,0.539159 0.215664,0.190586 0.606867,0.190586 0.300926,0 0.569252,-0.06771 0.268325,-0.06771 0.499035,-0.198109 l - [...]
+    </g>
+    <circle
+       style="fill:url(#a);fill-rule:evenodd;stroke:#9000e1;stroke-width:0.55019724;stroke-opacity:0.58332998"
+       id="circle29"
+       r="4.7107983"
+       cx="9.7337074"
+       cy="5.4930606" />
+    <path
+       inkscape:connector-curvature="0"
+       id="text33"
+       d="m 9.0510903,2.5418887 0,2.2695313 -2.1367188,0 0,1.3632812 2.1367188,0 0,2.2695313 1.3652337,0 0,-2.2695313 2.136719,0 0,-1.3632812 -2.136719,0 0,-2.2695313 -1.3652337,0 z"
+       style="font-size:16.90200043px;font-family:'Bitstream Vera Sans';fill:#ffffff;stroke:#ffffff;stroke-width:0.12138px" />
+    <rect
+       id="rect41"
+       x="3.6621093e-006"
+       y="-0.0080097653"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/svg/Progress_quarter_00.svg b/freeplane/resources/images/svg/Progress_quarter_00.svg
index 19043ad..e701e2a 100644
--- a/freeplane/resources/images/svg/Progress_quarter_00.svg
+++ b/freeplane/resources/images/svg/Progress_quarter_00.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_100_10.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_quarter_00.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -203,7 +144,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -211,38 +152,44 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.499068,30.5461 a 15.090909,16 0 0 1 0.03179,3.38e-4 l -0.167221,15.999018 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.7213635"
-       sodipodi:end="4.7234701" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="19.545898"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="19.545898"
-         y="36.732178">0 %</tspan></text>
+    <g
+       transform="translate(97.898073,-84.583866)"
+       id="g5088">
+      <g
+         transform="translate(-4.1584707,0.10984888)"
+         id="g4713">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -62.41662,84.589895 c -17.568015,-4.35e-4 -31.293957,13.692859 -31.363281,31.244135 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.05078,-1.01171 15.944881,15.944881 0 0 1 0.238281,-1.57422 15.944881,15.944881 0 0 1 0.394531,-1.54492 15.944881,15.944881 0 0 1 0.546875,-1.49805 15.944881,15.944881 0 0 1 0.693359,-1.4336 15.944881,15.944881 0 0 1 0.832032,-1.35937 15.944881,15.944881 0 0 1 0.964844,-1.26953 15.944881,15.944881 0 0 1 1.085937,-1.16602 15.944881,15.944881 0  [...]
+           id="path4699"
+           inkscape:connector-curvature="0" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-70.845467"
+           y="120.07955"
+           id="text6443-9-3-9-6"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3-2"
+             x="-70.845467"
+             y="120.07955">0%</tspan></text>
+        <path
+           id="path4707"
+           d="m -61.062584,84.589945 c 17.568015,-4.35e-4 31.293957,13.692859 31.363281,31.244135 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.05078,-1.01171 15.944881,15.944881 0 0 0 -0.238281,-1.57422 15.944881,15.944881 0 0 0 -0.394531,-1.54492 15.944881,15.944881 0 0 0 -0.546875,-1.49805 15.944881,15.944881 0 0 0 -0.693359,-1.4336 15.944881,15.944881 0 0 0 -0.832032,-1.35937 15.944881,15.944881 0 0 0 -0.964844,-1.26953 15.944881,15.944881 0 0 0 -1.085937,-1.16602 15.944881,15.94 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709"
+           d="m -62.41662,148.35804 c -17.568015,4.3e-4 -31.293957,-13.69286 -31.363281,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.05078,1.01171 15.944881,15.944881 0 0 0 0.238281,1.57422 15.944881,15.944881 0 0 0 0.394531,1.54492 15.944881,15.944881 0 0 0 0.546875,1.49805 15.944881,15.944881 0 0 0 0.693359,1.4336 15.944881,15.944881 0 0 0 0.832032,1.35937 15.944881,15.944881 0 0 0 0.964844,1.26953 15.944881,15.944881 0 0 0 1.085937,1.16602 15.944881,15.944881 0 0 0 1.197 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -61.062584,148.35804 c 17.568015,4.4e-4 31.293957,-13.69286 31.363281,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.05078,1.01171 15.944881,15.944881 0 0 1 -0.238281,1.57422 15.944881,15.944881 0 0 1 -0.394531,1.54492 15.944881,15.944881 0 0 1 -0.546875,1.49805 15.944881,15.944881 0 0 1 -0.693359,1.4336 15.944881,15.944881 0 0 1 -0.832032,1.35937 15.944881,15.944881 0 0 1 -0.964844,1.26953 15.944881,15.944881 0 0 1 -1.085937,1.16602 15.944881,15.944881 0 0  [...]
+           id="path4711" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_quarter_01.svg b/freeplane/resources/images/svg/Progress_quarter_01.svg
index d873b74..4c1ec16 100644
--- a/freeplane/resources/images/svg/Progress_quarter_01.svg
+++ b/freeplane/resources/images/svg/Progress_quarter_01.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_quarter_02.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_quarter_01.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -127,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -163,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -183,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -204,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -212,38 +154,58 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.363636,30.545456 a 15.090909,16 0 0 1 15.090909,16 l -15.090909,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="6.2831853" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.334229"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.334229"
-         y="36.732178">25 %</tspan></text>
+    <g
+       transform="translate(168.0212,-84.553646)"
+       id="g5076">
+      <g
+         id="g4803">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3" />
+      </g>
+      <g
+         transform="translate(-2.7058545,86.30921)"
+         id="g4754-6-14">
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-145.44922"
+           y="33.846947"
+           id="text6443-9-3-1-2"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-0-5"
+             x="-145.44922"
+             y="33.846947">25</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-131.90433"
+           y="33.846947"
+           id="text6443-9-3-9-0-9-2"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3-7-6-12"
+             x="-131.90433"
+             y="33.846947">%</tspan></text>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_quarter_02.svg b/freeplane/resources/images/svg/Progress_quarter_02.svg
index a22295f..d420d8a 100644
--- a/freeplane/resources/images/svg/Progress_quarter_02.svg
+++ b/freeplane/resources/images/svg/Progress_quarter_02.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_40_04.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_quarter_02.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,59 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.363636,30.545456 a 15.090909,16 0 0 1 10e-7,32 l -10e-7,-16 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="7.8539816" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.334229"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.334229"
-         y="36.732178">50 %</tspan></text>
+    <g
+       transform="translate(242.21457,-84.553643)"
+       id="g5064">
+      <g
+         id="g4803-4"
+         transform="translate(-74.193372,-2.4900087e-6)">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3-1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3-4"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2-7"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3-1" />
+      </g>
+      <g
+         transform="translate(-76.899222,86.309211)"
+         id="g4754-6-14-2">
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-145.44922"
+           y="33.846947"
+           id="text6443-9-3-1-2-7"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-0-5-1"
+             x="-145.44922"
+             y="33.846947">50</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-131.90433"
+           y="33.846947"
+           id="text6443-9-3-9-0-9-2-5"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3-7-6-12-8"
+             x="-131.90433"
+             y="33.846947">%</tspan></text>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_quarter_03.svg b/freeplane/resources/images/svg/Progress_quarter_03.svg
index 114c690..30147f5 100644
--- a/freeplane/resources/images/svg/Progress_quarter_03.svg
+++ b/freeplane/resources/images/svg/Progress_quarter_03.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_quarter_01.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_quarter_03.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -127,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -163,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -183,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="24.23356"
+     inkscape:cx="-4.4042649"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -204,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -212,38 +154,59 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 1 1 31.272727,46.545455 l 15.090909,1e-6 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="9.424778" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.30249"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.30249"
-         y="36.732178">75 %</tspan></text>
+    <g
+       transform="translate(388.5404,-81.977484)"
+       id="g5040">
+      <g
+         id="g4803-4-1-8"
+         transform="translate(-220.5192,-2.5761614)">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3-1-4-9"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3-4-5-3"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2-7-1-2"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3-1-8-4" />
+      </g>
+      <g
+         transform="translate(-223.22505,83.733053)"
+         id="g4754-6-14-2-5-1">
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-145.44922"
+           y="33.846947"
+           id="text6443-9-3-1-2-7-6-1"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-0-5-1-7-1"
+             x="-145.44922"
+             y="33.846947">75</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-131.90433"
+           y="33.846947"
+           id="text6443-9-3-9-0-9-2-5-4-7"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3-7-6-12-8-6-7"
+             x="-131.90433"
+             y="33.846947">%</tspan></text>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_quarter_04.svg b/freeplane/resources/images/svg/Progress_quarter_04.svg
index 1ac4668..038cf27 100644
--- a/freeplane/resources/images/svg/Progress_quarter_04.svg
+++ b/freeplane/resources/images/svg/Progress_quarter_04.svg
@@ -15,27 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 2">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_quarter_04.svg">
   <defs
      id="defs4101">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -86,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -117,17 +100,6 @@
        r="15.090909"
        gradientTransform="matrix(0.36220465,0.52594631,-0.80762604,0.62521886,60.715471,-4.1103057)"
        gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -137,16 +109,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -156,7 +128,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -164,26 +136,59 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="10.98291"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="10.98291"
-         y="36.732178">100 %</tspan></text>
+    <g
+       transform="translate(461.17355,-80.819402)"
+       id="g5028">
+      <g
+         id="g4803-4-1-8-9"
+         transform="translate(-293.15235,-3.7342434)">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3-1-4-9-9"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3-4-5-3-6"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2-7-1-2-5"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3-1-8-4-1" />
+      </g>
+      <g
+         id="g4995-9"
+         transform="translate(357.689,81.428691)">
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-801.62018"
+           y="34.846676"
+           id="text6443-9-3-1-3-4-3-4-6-8"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-0-8-6-9-3-2-8"
+             x="-801.62018"
+             y="34.846676">100</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-783.39392"
+           y="35.144608"
+           id="text6443-9-3-9-0-9-8-5-5-8-2-9"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3-7-6-3-4-0-9-92-4"
+             x="-783.39392"
+             y="35.144608">%</tspan></text>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_00.svg b/freeplane/resources/images/svg/Progress_tenth_00.svg
index 19043ad..792da1e 100644
--- a/freeplane/resources/images/svg/Progress_tenth_00.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_00.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_100_10.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_00.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="-10.679838"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -203,7 +144,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -211,38 +152,111 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.499068,30.5461 a 15.090909,16 0 0 1 0.03179,3.38e-4 l -0.167221,15.999018 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.7213635"
-       sodipodi:end="4.7234701" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="19.545898"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="19.545898"
-         y="36.732178">0 %</tspan></text>
+    <g
+       id="g4386">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4384"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-ren [...]
+      <g
+         transform="matrix(0.99979279,0,0,1.0006387,95.133278,0.73346078)"
+         id="g5459">
+        <g
+           id="g4593"
+           transform="translate(1.804445,-0.20218179)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2"
+             d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="-2.8899174"
+             inkscape:transform-center-x="-10.192477"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-3"
+             d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+             id="path4575"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="-8.3022863"
+             inkscape:transform-center-y="4.4195886" />
+          <path
+             inkscape:transform-center-y="10.052727"
+             inkscape:transform-center-x="-4.973598"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4577"
+             d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+             id="path4579"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.867977"
+             inkscape:transform-center-y="6.647614" />
+          <path
+             inkscape:transform-center-y="9.317552"
+             inkscape:transform-center-x="-0.392958"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4581"
+             d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="2.8879565"
+             inkscape:transform-center-x="10.192178"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4583"
+             d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+             id="path4585"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.3006892"
+             inkscape:transform-center-y="-4.4308125" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+             id="path4589"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="5.0044795"
+             inkscape:transform-center-y="-10.042343" />
+          <path
+             inkscape:transform-center-y="-9.3292917"
+             inkscape:transform-center-x="0.4364385"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4591"
+             d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+        </g>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-72.219643"
+           y="34.846676"
+           id="text6443-9-3-9"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3"
+             x="-72.219643"
+             y="34.846676">0%</tspan></text>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_01.svg b/freeplane/resources/images/svg/Progress_tenth_01.svg
index 9c90471..47ae77c 100644
--- a/freeplane/resources/images/svg/Progress_tenth_01.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_01.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_0_00.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_01.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="-10.679838"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -203,7 +144,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -211,38 +152,126 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.363636,30.545456 a 15.090909,16 0 0 1 8.870214,3.055728 l -8.870214,12.944272 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="5.3407075" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.121582"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.121582"
-         y="36.732178">10 %</tspan></text>
+    <g
+       id="g4389">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4387"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-ren [...]
+      <g
+         transform="matrix(0.99979279,0,0,1.0006387,165.46721,1.7338284)"
+         id="g4843">
+        <g
+           id="g4593-3"
+           transform="translate(-68.544066,-1.2019109)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-4"
+             d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="-2.8899174"
+             inkscape:transform-center-x="-10.192477"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-3-5"
+             d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+             id="path4575-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="-8.3022863"
+             inkscape:transform-center-y="4.4195886" />
+          <path
+             inkscape:transform-center-y="10.052727"
+             inkscape:transform-center-x="-4.973598"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4577-0"
+             d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+             id="path4579-2"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.867977"
+             inkscape:transform-center-y="6.647614" />
+          <path
+             inkscape:transform-center-y="9.317552"
+             inkscape:transform-center-x="-0.392958"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4581-4"
+             d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="2.8879565"
+             inkscape:transform-center-x="10.192178"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4583-1"
+             d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+             id="path4585-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.3006892"
+             inkscape:transform-center-y="-4.4308125" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+             id="path4589-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="5.0044795"
+             inkscape:transform-center-y="-10.042343" />
+          <path
+             inkscape:transform-center-y="-9.3292917"
+             inkscape:transform-center-x="0.4364385"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4591-8"
+             d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+        </g>
+        <g
+           id="g4754"
+           transform="translate(-0.46259966,-1.6087848e-6)">
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3"
+             y="33.846947"
+             x="-145.44922"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-145.44922"
+               id="tspan6445-6-3"
+               sodipodi:role="line">10</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-9-0"
+             y="33.846947"
+             x="-131.90433"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-131.90433"
+               id="tspan6445-6-3-3-7"
+               sodipodi:role="line">%</tspan></text>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_02.svg b/freeplane/resources/images/svg/Progress_tenth_02.svg
index 21d93a6..42975e3 100644
--- a/freeplane/resources/images/svg/Progress_tenth_02.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_02.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_10_01.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_02.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="-10.679838"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -203,7 +144,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -211,38 +152,126 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 0 1 60.715943,41.601183 L 46.363636,46.545456 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="5.969026" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.359619"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.359619"
-         y="36.732178">20 %</tspan></text>
+    <g
+       id="g4389">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4387"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-ren [...]
+      <g
+         id="g4843-5"
+         transform="translate(165.49487,1.7531471)">
+        <g
+           id="g4593-3-8"
+           transform="translate(-68.544066,-1.2019109)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-4-0"
+             d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="-2.8899174"
+             inkscape:transform-center-x="-10.192477"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-3-5-2"
+             d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+             id="path4575-7-3"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="-8.3022863"
+             inkscape:transform-center-y="4.4195886" />
+          <path
+             inkscape:transform-center-y="10.052727"
+             inkscape:transform-center-x="-4.973598"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4577-0-6"
+             d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+             id="path4579-2-8"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.867977"
+             inkscape:transform-center-y="6.647614" />
+          <path
+             inkscape:transform-center-y="9.317552"
+             inkscape:transform-center-x="-0.392958"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4581-4-2"
+             d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="2.8879565"
+             inkscape:transform-center-x="10.192178"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4583-1-4"
+             d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+             id="path4585-7-0"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.3006892"
+             inkscape:transform-center-y="-4.4308125" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+             id="path4589-7-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="5.0044795"
+             inkscape:transform-center-y="-10.042343" />
+          <path
+             inkscape:transform-center-y="-9.3292917"
+             inkscape:transform-center-x="0.4364385"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4591-8-9"
+             d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+        </g>
+        <g
+           id="g4754-6"
+           transform="translate(-0.46259966,-1.6087848e-6)">
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-1"
+             y="33.846947"
+             x="-145.44922"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-145.44922"
+               id="tspan6445-6-3-0"
+               sodipodi:role="line">20</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-9-0-9"
+             y="33.846947"
+             x="-131.90433"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-131.90433"
+               id="tspan6445-6-3-3-7-6"
+               sodipodi:role="line">%</tspan></text>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_03.svg b/freeplane/resources/images/svg/Progress_tenth_03.svg
index 9b8605d..2127155 100644
--- a/freeplane/resources/images/svg/Progress_tenth_03.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_03.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_20_02.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_03.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -203,7 +144,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -211,38 +152,131 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 0 1 60.715943,51.489728 L 46.363636,46.545456 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="6.5973446" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.340576"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.340576"
-         y="36.732178">30 %</tspan></text>
+    <g
+       id="g5797"
+       transform="translate(484.29215,-102.16594)">
+      <circle
+         r="32"
+         cy="134.16594"
+         cx="-452.29214"
+         id="path5795"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rend [...]
+      <g
+         id="g4843-5-4-8"
+         transform="translate(-318.20374,99.594533)">
+        <g
+           transform="translate(-0.59353444,4.3245463)"
+           id="g5555-2">
+          <g
+             transform="translate(-68.544066,-1.2019109)"
+             id="g4593-3-8-4-3">
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+               id="path4385-4-2-4-0-0-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+               id="path4385-4-2-3-5-2-6-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-10.192477"
+               inkscape:transform-center-y="-2.8899174" />
+            <path
+               inkscape:transform-center-y="4.4195886"
+               inkscape:transform-center-x="-8.3022863"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4575-7-3-8-8"
+               d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+               id="path4577-0-6-2-0"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-4.973598"
+               inkscape:transform-center-y="10.052727" />
+            <path
+               inkscape:transform-center-y="6.647614"
+               inkscape:transform-center-x="8.867977"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4579-2-8-3-5"
+               d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+               id="path4581-4-2-7-7"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-0.392958"
+               inkscape:transform-center-y="9.317552" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+               id="path4583-1-4-0-7"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="10.192178"
+               inkscape:transform-center-y="2.8879565" />
+            <path
+               inkscape:transform-center-y="-4.4308125"
+               inkscape:transform-center-x="8.3006892"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4585-7-0-0-9"
+               d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               inkscape:transform-center-y="-10.042343"
+               inkscape:transform-center-x="5.0044795"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4589-7-7-0-7"
+               d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+               id="path4591-8-9-0-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="0.4364385"
+               inkscape:transform-center-y="-9.3292917" />
+          </g>
+          <g
+             transform="translate(-0.46259966,-1.6087848e-6)"
+             id="g4754-6-4-8">
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-145.44922"
+               y="33.846947"
+               id="text6443-9-3-1-7-7"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-0-3-2"
+                 x="-145.44922"
+                 y="33.846947">30</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-131.90433"
+               y="33.846947"
+               id="text6443-9-3-9-0-9-1-6"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-3-7-6-1-1"
+                 x="-131.90433"
+                 y="33.846947">%</tspan></text>
+          </g>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_04.svg b/freeplane/resources/images/svg/Progress_tenth_04.svg
index eaaddc3..7edaba5 100644
--- a/freeplane/resources/images/svg/Progress_tenth_04.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_04.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_30_03.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_04.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,129 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 0 1 55.23385,59.489728 L 46.363636,46.545456 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="7.2256631" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.518311"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.518311"
-         y="36.732178">40 %</tspan></text>
+    <g
+       id="g4445">
+      <g
+         id="g4425">
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-r [...]
+           id="path4423"
+           cx="32"
+           cy="32"
+           r="32" />
+        <g
+           transform="translate(165.49487,1.7531471)"
+           id="g4843-5-3">
+          <g
+             transform="translate(-68.544066,-1.2019109)"
+             id="g4593-3-8-5">
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+               id="path4385-4-2-4-0-8"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+               id="path4385-4-2-3-5-2-1"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-10.192477"
+               inkscape:transform-center-y="-2.8899174" />
+            <path
+               inkscape:transform-center-y="4.4195886"
+               inkscape:transform-center-x="-8.3022863"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4575-7-3-4"
+               d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+               id="path4577-0-6-8"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-4.973598"
+               inkscape:transform-center-y="10.052727" />
+            <path
+               inkscape:transform-center-y="6.647614"
+               inkscape:transform-center-x="8.867977"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4579-2-8-7"
+               d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+               id="path4581-4-2-1"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-0.392958"
+               inkscape:transform-center-y="9.317552" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+               id="path4583-1-4-3"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="10.192178"
+               inkscape:transform-center-y="2.8879565" />
+            <path
+               inkscape:transform-center-y="-4.4308125"
+               inkscape:transform-center-x="8.3006892"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4585-7-0-4"
+               d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               inkscape:transform-center-y="-10.042343"
+               inkscape:transform-center-x="5.0044795"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4589-7-7-1"
+               d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+               id="path4591-8-9-6"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="0.4364385"
+               inkscape:transform-center-y="-9.3292917" />
+          </g>
+          <g
+             transform="translate(-0.46259966,-1.6087848e-6)"
+             id="g4754-6-1">
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-145.44922"
+               y="33.846947"
+               id="text6443-9-3-1-3"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-0-8"
+                 x="-145.44922"
+                 y="33.846947">40</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-131.90433"
+               y="33.846947"
+               id="text6443-9-3-9-0-9-8"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-3-7-6-3"
+                 x="-131.90433"
+                 y="33.846947">%</tspan></text>
+          </g>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_05.svg b/freeplane/resources/images/svg/Progress_tenth_05.svg
index a22295f..3d0d668 100644
--- a/freeplane/resources/images/svg/Progress_tenth_05.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_05.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_40_04.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_05.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,126 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.363636,30.545456 a 15.090909,16 0 0 1 10e-7,32 l -10e-7,-16 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="7.8539816" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.334229"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.334229"
-         y="36.732178">50 %</tspan></text>
+    <g
+       id="g4425">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4423"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-ren [...]
+      <g
+         id="g4843-5-3-5"
+         transform="translate(165.49487,1.7531471)">
+        <g
+           id="g4593-3-8-5-9"
+           transform="translate(-68.544066,-1.2019109)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-4-0-8-8"
+             d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="-2.8899174"
+             inkscape:transform-center-x="-10.192477"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-3-5-2-1-3"
+             d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+             id="path4575-7-3-4-1"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="-8.3022863"
+             inkscape:transform-center-y="4.4195886" />
+          <path
+             inkscape:transform-center-y="10.052727"
+             inkscape:transform-center-x="-4.973598"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4577-0-6-8-8"
+             d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+             id="path4579-2-8-7-8"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.867977"
+             inkscape:transform-center-y="6.647614" />
+          <path
+             inkscape:transform-center-y="9.317552"
+             inkscape:transform-center-x="-0.392958"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4581-4-2-1-3"
+             d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="2.8879565"
+             inkscape:transform-center-x="10.192178"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4583-1-4-3-9"
+             d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+             id="path4585-7-0-4-4"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.3006892"
+             inkscape:transform-center-y="-4.4308125" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+             id="path4589-7-7-1-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="5.0044795"
+             inkscape:transform-center-y="-10.042343" />
+          <path
+             inkscape:transform-center-y="-9.3292917"
+             inkscape:transform-center-x="0.4364385"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4591-8-9-6-3"
+             d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+        </g>
+        <g
+           id="g4754-6-1-0"
+           transform="translate(-0.46259966,-1.6087848e-6)">
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-1-3-4"
+             y="33.846947"
+             x="-145.44922"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-145.44922"
+               id="tspan6445-6-3-0-8-6"
+               sodipodi:role="line">50</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-9-0-9-8-5"
+             y="33.846947"
+             x="-131.90433"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-131.90433"
+               id="tspan6445-6-3-3-7-6-3-4"
+               sodipodi:role="line">%</tspan></text>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_06.svg b/freeplane/resources/images/svg/Progress_tenth_06.svg
index 68e924a..c14a319 100644
--- a/freeplane/resources/images/svg/Progress_tenth_06.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_06.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_50_05.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_06.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,129 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 1 1 37.493422,59.489728 L 46.363636,46.545456 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="8.4823002" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.381836"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.381836"
-         y="36.732178">60 %</tspan></text>
+    <g
+       id="g4445">
+      <g
+         id="g4425">
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-r [...]
+           id="path4423"
+           cx="32"
+           cy="32"
+           r="32" />
+        <g
+           transform="translate(165.49487,1.7531471)"
+           id="g4843-5-3-5-3">
+          <g
+             transform="translate(-68.544066,-1.2019109)"
+             id="g4593-3-8-5-9-0">
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+               id="path4385-4-2-4-0-8-8-3"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+               id="path4385-4-2-3-5-2-1-3-0"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-10.192477"
+               inkscape:transform-center-y="-2.8899174" />
+            <path
+               inkscape:transform-center-y="4.4195886"
+               inkscape:transform-center-x="-8.3022863"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4575-7-3-4-1-9"
+               d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+               id="path4577-0-6-8-8-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-4.973598"
+               inkscape:transform-center-y="10.052727" />
+            <path
+               inkscape:transform-center-y="6.647614"
+               inkscape:transform-center-x="8.867977"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4579-2-8-7-8-6"
+               d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+               id="path4581-4-2-1-3-3"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-0.392958"
+               inkscape:transform-center-y="9.317552" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+               id="path4583-1-4-3-9-8"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="10.192178"
+               inkscape:transform-center-y="2.8879565" />
+            <path
+               inkscape:transform-center-y="-4.4308125"
+               inkscape:transform-center-x="8.3006892"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4585-7-0-4-4-4"
+               d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               inkscape:transform-center-y="-10.042343"
+               inkscape:transform-center-x="5.0044795"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4589-7-7-1-7-7"
+               d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+               id="path4591-8-9-6-3-2"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="0.4364385"
+               inkscape:transform-center-y="-9.3292917" />
+          </g>
+          <g
+             transform="translate(-0.46259966,-1.6087848e-6)"
+             id="g4754-6-1-0-0">
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-145.44922"
+               y="33.846947"
+               id="text6443-9-3-1-3-4-3"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-0-8-6-9"
+                 x="-145.44922"
+                 y="33.846947">60</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-131.90433"
+               y="33.846947"
+               id="text6443-9-3-9-0-9-8-5-5"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-3-7-6-3-4-0"
+                 x="-131.90433"
+                 y="33.846947">%</tspan></text>
+          </g>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_07.svg b/freeplane/resources/images/svg/Progress_tenth_07.svg
index c6f94c7..8a87eaa 100644
--- a/freeplane/resources/images/svg/Progress_tenth_07.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_07.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_60_06.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_07.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,126 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 1 1 32.011329,51.489728 l 14.352307,-4.944272 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="9.1106187" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.30249"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.30249"
-         y="36.732178">70 %</tspan></text>
+    <g
+       id="g4425">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4423"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-ren [...]
+      <g
+         id="g4843-5-3-5-3-1"
+         transform="translate(165.49487,1.7531471)">
+        <g
+           id="g4593-3-8-5-9-0-3"
+           transform="translate(-68.544066,-1.2019109)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-4-0-8-8-3-1"
+             d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="-2.8899174"
+             inkscape:transform-center-x="-10.192477"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-3-5-2-1-3-0-3"
+             d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+             id="path4575-7-3-4-1-9-2"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="-8.3022863"
+             inkscape:transform-center-y="4.4195886" />
+          <path
+             inkscape:transform-center-y="10.052727"
+             inkscape:transform-center-x="-4.973598"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4577-0-6-8-8-2-7"
+             d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+             id="path4579-2-8-7-8-6-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.867977"
+             inkscape:transform-center-y="6.647614" />
+          <path
+             inkscape:transform-center-y="9.317552"
+             inkscape:transform-center-x="-0.392958"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4581-4-2-1-3-3-1"
+             d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="2.8879565"
+             inkscape:transform-center-x="10.192178"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4583-1-4-3-9-8-9"
+             d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+             id="path4585-7-0-4-4-4-6"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.3006892"
+             inkscape:transform-center-y="-4.4308125" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+             id="path4589-7-7-1-7-7-3"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="5.0044795"
+             inkscape:transform-center-y="-10.042343" />
+          <path
+             inkscape:transform-center-y="-9.3292917"
+             inkscape:transform-center-x="0.4364385"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4591-8-9-6-3-2-6"
+             d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+        </g>
+        <g
+           id="g4754-6-1-0-0-4"
+           transform="translate(-0.46259966,-1.6087848e-6)">
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-1-3-4-3-4"
+             y="33.846947"
+             x="-145.44922"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-145.44922"
+               id="tspan6445-6-3-0-8-6-9-3"
+               sodipodi:role="line">70</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-9-0-9-8-5-5-8"
+             y="33.846947"
+             x="-131.90433"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-131.90433"
+               id="tspan6445-6-3-3-7-6-3-4-0-9"
+               sodipodi:role="line">%</tspan></text>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_08.svg b/freeplane/resources/images/svg/Progress_tenth_08.svg
index 599656e..1479a0f 100644
--- a/freeplane/resources/images/svg/Progress_tenth_08.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_08.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_70_07.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_08.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,129 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="M 46.363636,30.545456 A 15.090909,16 0 1 1 32.011329,41.601184 l 14.352307,4.944272 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="9.7389372" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.394531"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.394531"
-         y="36.732178">80 %</tspan></text>
+    <g
+       id="g4445">
+      <g
+         id="g4425">
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-r [...]
+           id="path4423"
+           cx="32"
+           cy="32"
+           r="32" />
+        <g
+           transform="translate(165.49487,1.7531471)"
+           id="g4843-5-3-5-3-1-6">
+          <g
+             transform="translate(-68.544066,-1.2019109)"
+             id="g4593-3-8-5-9-0-3-4">
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+               id="path4385-4-2-4-0-8-8-3-1-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+               id="path4385-4-2-3-5-2-1-3-0-3-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-10.192477"
+               inkscape:transform-center-y="-2.8899174" />
+            <path
+               inkscape:transform-center-y="4.4195886"
+               inkscape:transform-center-x="-8.3022863"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4575-7-3-4-1-9-2-9"
+               d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+               id="path4577-0-6-8-8-2-7-9"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-4.973598"
+               inkscape:transform-center-y="10.052727" />
+            <path
+               inkscape:transform-center-y="6.647614"
+               inkscape:transform-center-x="8.867977"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4579-2-8-7-8-6-5-6"
+               d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+               id="path4581-4-2-1-3-3-1-6"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="-0.392958"
+               inkscape:transform-center-y="9.317552" />
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+               id="path4583-1-4-3-9-8-9-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="10.192178"
+               inkscape:transform-center-y="2.8879565" />
+            <path
+               inkscape:transform-center-y="-4.4308125"
+               inkscape:transform-center-x="8.3006892"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4585-7-0-4-4-4-6-1"
+               d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               inkscape:transform-center-y="-10.042343"
+               inkscape:transform-center-x="5.0044795"
+               sodipodi:nodetypes="ccccc"
+               inkscape:connector-curvature="0"
+               id="path4589-7-7-1-7-7-3-9"
+               d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+            <path
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-ru [...]
+               d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+               id="path4591-8-9-6-3-2-6-4"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccc"
+               inkscape:transform-center-x="0.4364385"
+               inkscape:transform-center-y="-9.3292917" />
+          </g>
+          <g
+             transform="translate(-0.46259966,-1.6087848e-6)"
+             id="g4754-6-1-0-0-4-0">
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-145.44922"
+               y="33.846947"
+               id="text6443-9-3-1-3-4-3-4-7"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-0-8-6-9-3-9"
+                 x="-145.44922"
+                 y="33.846947">80</tspan></text>
+            <text
+               xml:space="preserve"
+               style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+               x="-131.90433"
+               y="33.846947"
+               id="text6443-9-3-9-0-9-8-5-5-8-0"
+               sodipodi:linespacing="125%"><tspan
+                 sodipodi:role="line"
+                 id="tspan6445-6-3-3-7-6-3-4-0-9-4"
+                 x="-131.90433"
+                 y="33.846947">%</tspan></text>
+          </g>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_09.svg b/freeplane/resources/images/svg/Progress_tenth_09.svg
index e4eb1eb..1c10f4b 100644
--- a/freeplane/resources/images/svg/Progress_tenth_09.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_09.svg
@@ -15,47 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="Progress_80_08.svg">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_09.svg">
   <defs
      id="defs4101">
     <linearGradient
-       id="linearGradient6503"
-       inkscape:collect="always">
-      <stop
-         id="stop6505"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#999999;stop-opacity:1"
-         offset="0.95095879"
-         id="stop6511" />
-      <stop
-         style="stop-color:#ff00ff;stop-opacity:1"
-         offset="0.99891293"
-         id="stop6507" />
-      <stop
-         id="stop6509"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -106,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -128,17 +91,6 @@
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6429-0"
        id="radialGradient6435-8"
        cx="38.93148"
@@ -164,17 +116,6 @@
          offset="1"
          id="stop6433-3" />
     </linearGradient>
-    <radialGradient
-       r="15.090909"
-       fy="43.321198"
-       fx="38.93148"
-       cy="43.321198"
-       cx="38.93148"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6482"
-       xlink:href="#linearGradient6503"
-       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,16 +125,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -205,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,38 +154,126 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6482);fill-opacity:1;stroke:none"
-       id="path4107-7"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 46.363636,30.545456 a 15.090909,16 0 1 1 -8.870211,3.055726 l 8.870211,12.944274 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)"
-       sodipodi:start="4.712389"
-       sodipodi:end="10.367256" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="15.42627"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="15.42627"
-         y="36.732178">90 %</tspan></text>
+    <g
+       id="g4425">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4423"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-ren [...]
+      <g
+         id="g4843-5-3-5-3-1-8"
+         transform="translate(165.49487,1.7531471)">
+        <g
+           id="g4593-3-8-5-9-0-3-1"
+           transform="translate(-68.544066,-1.2019109)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-4-0-8-8-3-1-8"
+             d="m -64.458922,-0.53081036 0,16.01367236 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808593 c -5.08215,-3.592417 -11.23243,-5.75959706 -17.86133,-5.86328206 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="-2.8899174"
+             inkscape:transform-center-x="-10.192477"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4385-4-2-3-5-2-1-3-0-3-45"
+             d="m -45.757351,5.8542195 -9.387151,12.9737885 c 2.511882,1.934711 4.284736,4.446648 5.289018,7.197098 l 15.131795,-4.9504 C -36.735223,15.185105 -40.4476,9.8240542 -45.757351,5.8542195 Z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -34.35237,22.013891 -15.223524,4.968111 c 0.892907,3.042265 0.848621,6.116493 0.04253,8.931413 l 15.148348,4.899515 c 1.83847,-5.945897 1.990641,-12.465058 0.03265,-18.799039 z"
+             id="path4575-7-3-4-1-9-2-4"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="-8.3022863"
+             inkscape:transform-center-y="4.4195886" />
+          <path
+             inkscape:transform-center-y="10.052727"
+             inkscape:transform-center-x="-4.973598"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4577-0-6-8-8-2-7-1"
+             d="m -34.656795,41.85863 -15.209461,-5.011 c -1.081915,2.980288 -2.937979,5.431383 -5.254387,7.222421 l 9.305854,12.918156 c 5.002312,-3.702774 8.9852,-8.866031 11.157992,-15.129578 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -65.433659,63.428338 -0.0578,-16.013572 c -3.169492,-0.08355 -6.081866,-1.0689 -8.51371,-2.699759 l -9.310862,12.914547 c 5.095075,3.574056 11.253138,5.719023 17.882367,5.798782 z"
+             id="path4579-2-8-7-8-6-5-2"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.867977"
+             inkscape:transform-center-y="6.647614" />
+          <path
+             inkscape:transform-center-y="9.317552"
+             inkscape:transform-center-x="-0.392958"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4581-4-2-1-3-3-1-2"
+             d="m -46.608709,57.686223 -9.348209,-13.001877 c -2.628574,1.772923 -5.57164,2.662418 -8.498473,2.747346 l -0.07812,15.920791 c 6.223436,-0.05 12.482114,-1.880733 17.924798,-5.666262 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             inkscape:transform-center-y="2.8879565"
+             inkscape:transform-center-x="10.192178"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4583-1-4-3-9-8-9-4"
+             d="m -84.149151,57.077288 9.390616,-12.971282 c -2.511366,-1.935383 -4.283547,-4.447793 -5.287095,-7.198514 l -15.133109,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.029585,15.223433 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.556119,40.90532 15.227187,-4.956869 c -0.89066,-3.042924 -0.844103,-6.117117 -0.03593,-8.931441 l -15.144727,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+             id="path4585-7-0-4-4-4-6-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="8.3006892"
+             inkscape:transform-center-y="-4.4308125" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+             d="m -95.270999,21.105798 15.234693,4.933756 c 1.066779,-2.985741 2.910382,-5.44622 5.217672,-7.248988 L -84.189919,5.9197957 c -4.98346,3.7281025 -8.9401,8.9115003 -11.08105,15.1860163 z"
+             id="path4589-7-7-1-7-7-3-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="5.0044795"
+             inkscape:transform-center-y="-10.042343" />
+          <path
+             inkscape:transform-center-y="-9.3292917"
+             inkscape:transform-center-x="0.4364385"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4591-8-9-6-3-2-6-5"
+             d="M -83.363833,5.2217381 -73.9799,18.197856 c 2.62369,-1.780147 5.564297,-2.67773 8.490885,-2.770706 l 0.03437,-15.92094589 c -6.223273,0.0671106 -12.476894,1.91504159 -17.909136,5.71556319 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule [...]
+        </g>
+        <g
+           id="g4754-6-1-0-0-4-2"
+           transform="translate(-0.46259966,-1.6087848e-6)">
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-1-3-4-3-4-9"
+             y="33.846947"
+             x="-145.44922"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-145.44922"
+               id="tspan6445-6-3-0-8-6-9-3-3"
+               sodipodi:role="line">90</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text6443-9-3-9-0-9-8-5-5-8-00"
+             y="33.846947"
+             x="-131.90433"
+             style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="33.846947"
+               x="-131.90433"
+               id="tspan6445-6-3-3-7-6-3-4-0-9-9"
+               sodipodi:role="line">%</tspan></text>
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/svg/Progress_tenth_10.svg b/freeplane/resources/images/svg/Progress_tenth_10.svg
index 1ac4668..dc10d30 100644
--- a/freeplane/resources/images/svg/Progress_tenth_10.svg
+++ b/freeplane/resources/images/svg/Progress_tenth_10.svg
@@ -15,27 +15,11 @@
    height="64px"
    id="svg4099"
    version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="New document 2">
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Progress_tenth_10.svg">
   <defs
      id="defs4101">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6429">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6431" />
-      <stop
-         id="stop6437"
-         offset="0.99891293"
-         style="stop-color:#ff00ff;stop-opacity:1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop6433" />
-    </linearGradient>
-    <linearGradient
        osb:paint="gradient"
        id="linearGradient6405">
       <stop
@@ -86,7 +70,6 @@
          id="stop6339" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4885"
        osb:paint="gradient">
       <stop
@@ -117,17 +100,6 @@
        r="15.090909"
        gradientTransform="matrix(0.36220465,0.52594631,-0.80762604,0.62521886,60.715471,-4.1103057)"
        gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6429"
-       id="radialGradient6435"
-       cx="38.93148"
-       cy="43.321198"
-       fx="38.93148"
-       fy="43.321198"
-       r="15.090909"
-       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -137,16 +109,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="46.595812"
+     inkscape:cx="17.957987"
      inkscape:cy="38.125"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1304"
-     inkscape:window-height="713"
-     inkscape:window-x="60"
-     inkscape:window-y="32"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata4104">
@@ -156,7 +128,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -164,26 +136,118 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6435);fill-opacity:1;stroke:none"
-       id="path4107"
-       sodipodi:cx="46.363636"
-       sodipodi:cy="46.545456"
-       sodipodi:rx="15.090909"
-       sodipodi:ry="16"
-       d="m 61.454545,46.545456 a 15.090909,16 0 1 1 -30.181818,0 15.090909,16 0 1 1 30.181818,0 z"
-       transform="matrix(2.1204819,0,0,2,-66.313252,-61.090912)" />
-    <text
-       xml:space="preserve"
-       style="font-size:13px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="10.98291"
-       y="36.732178"
-       id="text6443"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan6445"
-         x="10.98291"
-         y="36.732178">100 %</tspan></text>
+    <g
+       id="g4408">
+      <circle
+         r="32"
+         cy="32"
+         cx="32"
+         id="path4107"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <g
+         id="g5603"
+         transform="translate(819.20321,0.75341807)">
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+           d="m -786.71132,-0.73299215 0,16.01367215 c 3.16917,0.09499 6.07797,1.090844 8.50391,2.730469 l 9.35742,-12.8808591 c -5.08215,-3.592417 -11.23243,-5.75959705 -17.86133,-5.86328205 z"
+           id="path4385-4-2-4-0-8-8-3-1-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+           d="m -768.00975,5.6520377 -9.38715,12.9737883 c 2.51188,1.934711 4.28473,4.446648 5.28902,7.197098 l 15.13179,-4.9504 C -758.98762,14.982923 -762.7,9.6218724 -768.00975,5.6520377 Z"
+           id="path4385-4-2-3-5-2-1-3-0-3-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:transform-center-x="-10.192477"
+           inkscape:transform-center-y="-2.8899174" />
+        <path
+           inkscape:transform-center-y="4.4195886"
+           inkscape:transform-center-x="-8.3022863"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4575-7-3-4-1-9-2-7"
+           d="m -756.60477,21.811709 -15.22352,4.968111 c 0.8929,3.042265 0.84862,6.116493 0.0425,8.931413 l 15.14834,4.899515 c 1.83847,-5.945897 1.99065,-12.465058 0.0326,-18.799039 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+           d="m -756.90919,41.656448 -15.20947,-5.011 c -1.08191,2.980288 -2.93797,5.431383 -5.25438,7.222421 l 9.30585,12.918156 c 5.00231,-3.702774 8.9852,-8.866031 11.15799,-15.129578 z"
+           id="path4577-0-6-8-8-2-7-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:transform-center-x="-4.973598"
+           inkscape:transform-center-y="10.052727" />
+        <path
+           inkscape:transform-center-y="6.647614"
+           inkscape:transform-center-x="8.867977"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4579-2-8-7-8-6-5-7"
+           d="m -787.68606,63.226156 -0.0578,-16.013572 c -3.16949,-0.08355 -6.08186,-1.0689 -8.51371,-2.699759 l -9.31086,12.914547 c 5.09507,3.574056 11.25314,5.719023 17.88237,5.798782 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+           d="m -768.86111,57.484041 -9.34821,-13.001877 c -2.62857,1.772923 -5.57164,2.662418 -8.49847,2.747346 l -0.0781,15.920791 c 6.22344,-0.05 12.48211,-1.880733 17.9248,-5.666262 z"
+           id="path4581-4-2-1-3-3-1-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:transform-center-x="-0.392958"
+           inkscape:transform-center-y="9.317552" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+           d="m -806.40155,56.875106 9.39061,-12.971282 c -2.51136,-1.935383 -4.28354,-4.447793 -5.28709,-7.198514 l -15.13311,4.946358 c 2.00995,5.890135 5.72089,11.252179 11.02959,15.223433 z"
+           id="path4583-1-4-3-9-8-9-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:transform-center-x="10.192178"
+           inkscape:transform-center-y="2.8879565" />
+        <path
+           inkscape:transform-center-y="-4.4308125"
+           inkscape:transform-center-x="8.3006892"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4585-7-0-4-4-4-6-3"
+           d="m -817.80852,40.703138 15.22719,-4.956869 c -0.89066,-3.042924 -0.8441,-6.117117 -0.0359,-8.931441 l -15.14473,-4.9107 c -1.84286,5.944529 -1.99985,12.463576 -0.0465,18.799006 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+        <path
+           inkscape:transform-center-y="-10.042343"
+           inkscape:transform-center-x="5.0044795"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4589-7-7-1-7-7-3-1"
+           d="m -817.5234,20.903616 15.23469,4.933756 c 1.06678,-2.985741 2.91039,-5.44622 5.21768,-7.248988 l -9.37129,-12.8707701 c -4.98346,3.7281025 -8.9401,8.9115001 -11.08105,15.1860161 z"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:n [...]
+           d="m -805.61623,5.0195563 9.38393,12.9761177 c 2.62369,-1.780147 5.5643,-2.67773 8.49089,-2.770706 l 0.0344,-15.92094568 c -6.22328,0.0671106 -12.4769,1.91504158 -17.90914,5.71556318 z"
+           id="path4591-8-9-6-3-2-6-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           inkscape:transform-center-x="0.4364385"
+           inkscape:transform-center-y="-9.3292917" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:-0.52999997px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-801.62018"
+           y="34.846676"
+           id="text6443-9-3-1-3-4-3-4-6"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-0-8-6-9-3-2"
+             x="-801.62018"
+             y="34.846676">100</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;font-size:9.90993118px;line-height:125%;font-family:'Bitstream Vera Sans';letter-spacing:1.23000002px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+           x="-783.39392"
+           y="35.144608"
+           id="text6443-9-3-9-0-9-8-5-5-8-2"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan6445-6-3-3-7-6-3-4-0-9-92"
+             x="-783.39392"
+             y="35.144608">%</tspan></text>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/freeplane/resources/images/table.png b/freeplane/resources/images/table.png
new file mode 100644
index 0000000..c76e7a8
Binary files /dev/null and b/freeplane/resources/images/table.png differ
diff --git a/freeplane/resources/images/table.svg b/freeplane/resources/images/table.svg
new file mode 100644
index 0000000..eb8814d
--- /dev/null
+++ b/freeplane/resources/images/table.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="table.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\table.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata41">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview39"
+     showgrid="false"
+     inkscape:zoom="38.944887"
+     inkscape:cx="9.8600877"
+     inkscape:cy="7.5876456"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="def0"
+       x1="55.228268"
+       x2="55.228268"
+       y1="1.5451168"
+       y2="109.70261"
+       gradientTransform="scale(1.1588185,0.86294789)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#B3E2FF"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#99CCFF"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <path
+     style="fill:#162d50"
+     inkscape:connector-curvature="0"
+     id="path13"
+     d="m 15.831708,15.183204 -15.66341616,0 0,-13.2976164 15.66341616,0 0,13.2976164 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#0055d4"
+     id="path15"
+     d="m 0.33145202,2.0702777 15.33713598,0 0,12.9282413 -15.33713598,0 0,-12.9282413 z" />
+  <path
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     id="path17"
+     d="m 0.49461342,2.2549649 15.01073258,0 0,12.5588571 -15.01073258,0 0,-12.5588571 z" />
+  <path
+     style="fill:#00ccff"
+     inkscape:connector-curvature="0"
+     id="path19"
+     d="m 15.479669,5.134725 -15.01073289,0 0,-2.9311147 15.01073289,0 0,2.9311147 z" />
+  <path
+     style="fill:#0055d4"
+     inkscape:connector-curvature="0"
+     id="path21"
+     d="m 0.46893611,5.2397743 15.11344189,0 0,-0.1801283 -15.11344189,0 0,0.1801283 z" />
+  <path
+     style="fill:#0055d4"
+     inkscape:connector-curvature="0"
+     id="path23"
+     d="m 4.1287141,14.842443 0.1631565,0 0,-12.6959969 -0.1631565,0 0,12.6959969 z" />
+  <path
+     style="fill:#0055d4"
+     inkscape:connector-curvature="0"
+     id="path25"
+     d="m 11.759483,14.91884 0.163157,0 0,-12.8271712 -0.163157,0 0,12.8271712 z" />
+  <path
+     style="fill:#0055d4"
+     inkscape:connector-curvature="0"
+     id="path29"
+     d="m 0.49461342,8.3234761 15.01073258,0 0,-0.1846845 -15.01073258,0 0,0.1846845 z" />
+  <path
+     style="fill:#0055d4"
+     inkscape:connector-curvature="0"
+     id="path33"
+     d="m 0.36622686,11.613389 15.29318314,0 0,-0.184879 -15.29318314,0 0,0.184879 z" />
+  <path
+     style="fill:#0055d4"
+     inkscape:connector-curvature="0"
+     id="path4398"
+     d="m 8.0090596,14.944517 0.163156,0 0,-12.7466769 -0.163156,0 0,12.7466769 z" />
+</svg>
diff --git a/freeplane/resources/images/ul.png b/freeplane/resources/images/ul.png
new file mode 100644
index 0000000..101b404
Binary files /dev/null and b/freeplane/resources/images/ul.png differ
diff --git a/freeplane/resources/images/ul.svg b/freeplane/resources/images/ul.svg
new file mode 100644
index 0000000..f748698
--- /dev/null
+++ b/freeplane/resources/images/ul.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ul.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="F:\Freeplane\freeplane\resources\images\ul.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-0.15607185"
+     inkscape:cy="8"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+    <linearGradient
+       x1="-300.92999"
+       y1="808.62"
+       gradientTransform="translate(319.04664,-809.90824)"
+       x2="-285.82999"
+       gradientUnits="userSpaceOnUse"
+       y2="823.71997"
+       id="b-3">
+      <stop
+         id="stop3538"
+         offset="0" />
+      <stop
+         id="stop3540"
+         offset="1"
+         stop-color="#ccc" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.17001"
+       y1="810.40002"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="813.87"
+       id="c-1">
+      <stop
+         id="stop3543"
+         offset="0"
+         stop-color="#f60" />
+      <stop
+         id="stop3545"
+         offset="1"
+         stop-color="#f9ac79" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="814.65002"
+       gradientTransform="matrix(0.97877023,0,0,0.97877023,304.91277,-792.30756)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="818.06"
+       id="d">
+      <stop
+         id="stop3548"
+         offset="0"
+         stop-color="#00f" />
+      <stop
+         id="stop3550"
+         offset="1"
+         stop-color="#6666fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-299.28"
+       y1="818.78998"
+       gradientTransform="translate(319.04664,-810.11324)"
+       x2="-295.78"
+       gradientUnits="userSpaceOnUse"
+       y2="822.23999"
+       id="e">
+      <stop
+         id="stop3553"
+         offset="0"
+         stop-color="#fc0" />
+      <stop
+         id="stop3555"
+         offset="1"
+         stop-color="#f7e28c" />
+    </linearGradient>
+    <linearGradient
+       x1="-292.20999"
+       y1="826.48999"
+       gradientTransform="translate(299.95945,-814.913)"
+       x2="-288.70999"
+       gradientUnits="userSpaceOnUse"
+       y2="829.98999"
+       id="f">
+      <stop
+         id="stop3558"
+         offset="0"
+         stop-color="#ce72fc" />
+      <stop
+         id="stop3560"
+         offset="1"
+         stop-color="#d893fa" />
+    </linearGradient>
+    <linearGradient
+       x1="-295.16"
+       y1="818.67999"
+       gradientTransform="translate(319.04664,-810.08524)"
+       x2="-291.66"
+       gradientUnits="userSpaceOnUse"
+       y2="822.19"
+       id="g">
+      <stop
+         id="stop3563"
+         offset="0"
+         stop-color="#008000" />
+      <stop
+         id="stop3565"
+         offset="1"
+         stop-color="#78b978" />
+    </linearGradient>
+    <linearGradient
+       x1="14.463"
+       y1="12.285"
+       gradientTransform="matrix(0.30262,0,0,0.30262,-240.46,727.85)"
+       x2="34.534"
+       gradientUnits="userSpaceOnUse"
+       y2="39.685001"
+       id="a-2">
+      <stop
+         id="stop3568"
+         offset="0"
+         stop-color="#dadada" />
+      <stop
+         id="stop3570"
+         offset="1"
+         stop-color="#f1f1f1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4646">
+    <circle
+       r="1.1812327"
+       cy="3.4216323"
+       cx="2.8968523"
+       id="path4586"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#003380;fill-opacity:1;fill-rule:evenodd;stroke:#003380;stroke-width:0.25622326;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-ren [...]
+    <circle
+       r="1.1812327"
+       cy="7.9322033"
+       cx="2.896852"
+       id="path4586-9"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#003380;fill-opacity:1;fill-rule:evenodd;stroke:#003380;stroke-width:0.25622326;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-ren [...]
+    <circle
+       r="1.1812327"
+       cy="12.442775"
+       cx="2.9663363"
+       id="path4586-4"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#003380;fill-opacity:1;fill-rule:evenodd;stroke:#003380;stroke-width:0.25622326;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-ren [...]
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609"
+       d="m 5.7378799,3.4216324 8.7391841,0"
+       style="fill:#003380;fill-rule:evenodd;stroke:#003380;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609-3"
+       d="m 5.7378799,8.1694918 8.7391841,0"
+       style="fill:#003380;fill-rule:evenodd;stroke:#003380;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4609-8"
+       d="m 5.7378799,12.442775 8.7391841,0"
+       style="fill:#003380;fill-rule:evenodd;stroke:#003380;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/freeplane/resources/images/uline.svg b/freeplane/resources/images/uline.svg
new file mode 100644
index 0000000..e174325
--- /dev/null
+++ b/freeplane/resources/images/uline.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExtractLinkFromTextAction.svg"
+   width="16"
+   height="16"
+   inkscape:export-filename="J:\Freeplane\editor\images\ExtractLinkFromTextAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1113"
+     inkscape:window-height="843"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.759182"
+     inkscape:cy="8"
+     inkscape:window-x="720"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4568-1-4">
+      <stop
+         style="stop-color:#e12b1c;stop-opacity:1;"
+         offset="0"
+         id="stop4570-9-2" />
+      <stop
+         style="stop-color:#980b00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4572-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4554-5-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4556-0-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop4558-9-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10396-80-5">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1;"
+         offset="0"
+         id="stop10398-8-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop10400-8-2" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g9894"
+     inkscape:export-filename="J:\FreePlane_radna_mapa\images\uline.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     transform="translate(-286.20724,-727.12158)">
+    <rect
+       y="727.12158"
+       x="286.20724"
+       height="16"
+       width="16"
+       id="rect6193-0-23-7-8-2-89-0-63-1-7-8"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+    <rect
+       y="727.12158"
+       x="286.20724"
+       height="16"
+       width="16"
+       id="rect6193-0-23-7-8-2-34-2-4-8"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+    <g
+       id="g9888">
+      <g
+         id="g9861"
+         transform="matrix(0.80642755,0,0,0.84110238,160.37198,64.779473)">
+        <g
+           transform="scale(0.95164112,1.0508163)"
+           style="font-style:normal;font-weight:normal;font-size:25.47897339px;font-family:Archeologicaps;-inkscape-font-specification:Archeologicaps;fill:#000000;fill-opacity:1;stroke:none"
+           id="text9845">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 166.00356,751.15853 4.71511,-0.18662 0,8.01195 c -1e-5,0.70499 0.0975,1.26483 0.29236,1.67952 0.1949,0.4147 0.49348,0.73609 0.89574,0.96417 0.40225,0.22808 0.87293,0.34213 1.41205,0.34212 0.6635,1e-5 1.41618,-0.17831 2.25802,-0.53495 0.84182,-0.35664 1.68158,-0.88745 2.51928,-1.59244 l 0,-5.79746 c -1e-5,-0.61374 -0.0456,-1.016 -0.13685,-1.20677 -0.0912,-0.19075 -0.25297,-0.34419 -0.48519,-0.46031 -0.23224,-0.11611 -0.59718,-0.17416 -1.0948,-0.17418 l -0.90819,0 0,-1.04 [...]
+             style="font-family:'Bookman Old Style';-inkscape-font-specification:'Bookman Old Style'"
+             id="path9886" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path9851"
+           d="m 158.26905,804.34415 15.38326,0"
+           style="fill:none;stroke:#000000;stroke-width:0.98668981px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/uline_on.png b/freeplane/resources/images/uline_on.png
deleted file mode 100644
index c35e146..0000000
Binary files a/freeplane/resources/images/uline_on.png and /dev/null differ
diff --git a/freeplane/resources/images/undo.svg b/freeplane/resources/images/undo.svg
new file mode 100644
index 0000000..92ee169
--- /dev/null
+++ b/freeplane/resources/images/undo.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.089 15.989" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2=".029297" gradientUnits="userSpaceOnUse" y1="8.4145" x2="-.13419" x1="12.978">
+<stop stop-color="#003a00" offset="0"/>
+<stop stop-color="#00d800" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-36.303 -257.05)">
+<g transform="translate(36.304 257.05)" stroke="#008000">
+<path d="m6.8344 2.3145c9.1116-0.0305 9.2026 13.622 9.2026 13.622" stroke-linecap="square" stroke-width=".10268" fill="none"/>
+<path d="m6.8731 7.5577c9.1639-0.0551 9.1639 8.3793 9.1639 8.3793" stroke-width=".097447" fill="none"/>
+<path d="m15.828 13.918c-0.04417-0.0012-0.08824 0.03624-0.07709 0.08282 0.01649 0.06229 0.02393 0.12816 0.04842 0.18767 0.02758 0.05273 0.11714 0.03995 0.12565-0.02028 0.0012-0.06518-0.01129-0.13063-0.01907-0.19538-0.0077-0.03491-0.04255-0.05906-0.07791-0.05483zm-0.07228-0.41032c-0.08234-0.003-0.12906 0.0819-0.08981 0.15232 0.0371 0.10056 0.03381 0.22471 0.10556 0.30694 0.06998 0.05137 0.14352-0.04469 0.11806-0.11482-0.02667-0.10564 0.000226-0.2319-0.0662-0.32315-0.01876-0.01605-0.04283- [...]
+</g>
+</g>
+</svg>
diff --git a/freeplane/resources/images/update.svg b/freeplane/resources/images/update.svg
new file mode 100644
index 0000000..d92ff98
--- /dev/null
+++ b/freeplane/resources/images/update.svg
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg18792"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs18794">
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         style="stop-color:#dc7fcf;stop-opacity:1"
+         offset="0"
+         id="stop15518-1-5" />
+      <stop
+         style="stop-color:#a8bef9;stop-opacity:1"
+         offset="1"
+         id="stop15520-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20602-6"
+       id="linearGradient20765-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-20.696529,3.477517)"
+       x1="33.45248"
+       y1="535.87061"
+       x2="45.104733"
+       y2="536.18604" />
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="0"
+         id="stop20604-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20606-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20574-8"
+       id="linearGradient20767-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-20.696529,3.477517)"
+       x1="31.407244"
+       y1="536.89319"
+       x2="38.103054"
+       y2="540.93713" />
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         id="stop20576-6"
+         offset="0"
+         style="stop-color:#cccccc;stop-opacity:1" />
+      <stop
+         id="stop20578-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20584-4"
+       id="linearGradient20769-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-20.696529,3.477517)"
+       x1="39.309288"
+       y1="540.37939"
+       x2="47.242931"
+       y2="537.59039" />
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         id="stop20586-8"
+         offset="0"
+         style="stop-color:#a6a6c6;stop-opacity:1" />
+      <stop
+         id="stop20588-6"
+         offset="1"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20551-0"
+       id="linearGradient20771-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7663521,0,0,0.7663521,-11.119763,129.67645)"
+       x1="25.6434"
+       y1="538.05524"
+       x2="47.260128"
+       y2="538.05524" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient20551-0">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop20553-9" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop20555-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20592-6"
+       id="linearGradient20773-0"
+       gradientUnits="userSpaceOnUse"
+       x1="11.146112"
+       y1="535.11847"
+       x2="17.871691"
+       y2="535.50909" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient20592-6">
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1;"
+         offset="0"
+         id="stop20594-1" />
+      <stop
+         style="stop-color:#fefefe;stop-opacity:1"
+         offset="1"
+         id="stop20596-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20409-9"
+       id="linearGradient13608"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-4.3915167e-4,-0.50500222,0.38598654,-5.2155247e-4,-143.58288,83.524252)"
+       x1="160.70036"
+       y1="388.92313"
+       x2="142.37976"
+       y2="377.60397" />
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         id="stop20411-3"
+         offset="0"
+         style="stop-color:#36d200;stop-opacity:1;" />
+      <stop
+         id="stop20413-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14418-6"
+       id="radialGradient13616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.01703715,0.01716114,-0.01637411,0.03935313,104.07251,618.45467)"
+       cx="-287.17224"
+       cy="762.15948"
+       fx="-287.17224"
+       fy="762.15948"
+       r="27.026775" />
+    <linearGradient
+       id="linearGradient14418-6"
+       inkscape:collect="always">
+      <stop
+         id="stop14420-0"
+         offset="0"
+         style="stop-color:#f5cd03;stop-opacity:1" />
+      <stop
+         id="stop14422-6"
+         offset="1"
+         style="stop-color:#f8d21d;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14412-1"
+       id="radialGradient13618"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.01884544,0.01898258,-0.01811202,0.04352999,104.28203,614.88086)"
+       cx="-286.68304"
+       cy="770.31897"
+       fx="-286.68304"
+       fy="770.31897"
+       r="27.026775" />
+    <linearGradient
+       id="linearGradient14412-1"
+       inkscape:collect="always">
+      <stop
+         id="stop14414-8"
+         offset="0"
+         style="stop-color:#f6cd03;stop-opacity:1" />
+      <stop
+         id="stop14416-49"
+         offset="1"
+         style="stop-color:#f8d21d;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13706-3"
+       id="radialGradient13620"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.03612763,0.02382057,-0.03472164,0.05462424,123.05215,607.84658)"
+       cx="-202.57784"
+       cy="767.94434"
+       fx="-202.57784"
+       fy="767.94434"
+       r="27.026775" />
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         id="stop13708-7"
+         offset="0"
+         style="stop-color:#f1d103;stop-opacity:1;" />
+      <stop
+         id="stop13710-8"
+         offset="1"
+         style="stop-color:#f7cd03;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.54430686"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1274"
+     inkscape:window-height="818"
+     inkscape:window-x="225"
+     inkscape:window-y="225"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g19684"
+       transform="matrix(1.0012474,0,0,1.0012474,5.6195343,0.99045029)">
+      <g
+         transform="matrix(0.84288653,0,0,0.82311012,-12.022544,-434.97484)"
+         id="g20608-2">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient20765-8);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.24999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 17.844696,536.98555 c 2.871768,0.85006 5.739437,1.71432 8.593904,2.62008 -2.630964,0.86787 -2.680877,0.97205 -8.183002,2.73796 -3.031118,-1.04976 -5.610722,-2.06349 -8.4187009,-3.20406 l 7.9129959,-2.10034 c 0.02051,-0.0393 0.06279,-0.0632 0.0948,-0.0536 z"
+           id="rect20539-9"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient20767-2);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.24999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 9.868105,539.19441 c 2.871767,0.85005 5.540415,2.19282 8.394882,3.09858 0.0088,1.84267 -0.07623,2.21693 0.05104,3.78911 -3.4399,-1.34174 -5.785914,-2.47226 -8.593893,-3.61283 0.064488,-1.11254 0.049507,-1.73978 0.147973,-3.27486 z"
+           id="path20542-1"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient20769-2);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.24999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 26.421058,539.56699 c -2.871767,0.85005 -5.294911,1.81919 -8.149378,2.72495 -0.05532,2.91177 0.05299,1.26404 -0.05104,3.78911 3.4399,-1.34174 5.376544,-2.59921 8.184523,-3.73978 -0.01801,-1.32171 0.02022,-1.6474 0.01589,-2.77428 z"
+           id="path20544-3"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient20771-5);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.191588;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 23.315524,541.02103 c -2.200785,0.65144 -2.384392,0.88283 -4.571919,1.57696 -0.04239,2.23144 0.04061,0.9687 -0.03911,2.90379 1.66004,-0.74934 2.168056,-1.10874 4.505886,-2.21523 -0.0138,-1.01289 0.108459,-1.40193 0.105146,-2.26552 z"
+           id="path20580-5"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <ellipse
+           ry="1.5571674"
+           rx="4.1369524"
+           cy="535.40582"
+           cx="14.037748"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient20773-0);fill-opacity:1;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="path20590-9"
+           transform="matrix(-1.0255962,-0.08417071,-0.1997343,0.9586505,139.4642,27.410825)"
+           inkscape:transform-center-y="-0.278872" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="path20665-8"
+         d="M 5.307628,13.15168 0.51414561,7.3017174 3.3552527,7.2728045 3.2633975,1.2292337 l 3.9924006,-0.00536 0.059229,6.0435977 2.7657909,-0.00358 -4.7731898,5.8879566 z"
+         style="fill:url(#linearGradient13608);fill-opacity:1;fill-rule:evenodd;stroke:#005200;stroke-width:0.44180018;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-filename="M:\FreeMind_RadnaMapa\FreeMind_Ikone\icons_32x32\down.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"
+         inkscape:connector-curvature="0" />
+      <g
+         inkscape:transform-center-y="-0.00037787375"
+         inkscape:transform-center-x="-0.51597674"
+         transform="matrix(-0.46494664,0.4423991,0.43821592,0.46938513,-229.82096,-346.22961)"
+         id="g20627-4">
+        <g
+           id="g20629-0"
+           transform="translate(28.12335,-0.2884447)">
+          <g
+             id="g20631-7"
+             transform="matrix(1.0113364,0,0,1.0113364,23.301944,-39.535806)">
+            <ellipse
+               ry="49.090908"
+               rx="52.159092"
+               cy="767.36218"
+               cx="-414.88635"
+               style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.67515802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               id="path20633-6"
+               transform="matrix(0.04289038,0.03192569,-0.03205293,0.04281077,99.578652,652.88436)" />
+            <path
+               style="display:inline;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 56.166554,670.6782 c -1.048995,-1.90454 -1.498839,-3.90593 -0.463328,-3.74615 1.051579,0.29153 -1.359239,0.44168 0.674266,3.59867"
+               id="path20635-3"
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0" />
+            <path
+               style="display:inline;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 54.927812,672.11708 c -2.971639,0.43229 -3.007167,2.35593 -2.322196,2.59771 1.13312,0.17562 -1.206259,-1.81029 2.278077,-2.38548"
+               id="path20637-6"
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0" />
+          </g>
+          <g
+             id="g20639-1">
+            <path
+               style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.01133645;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               d="m 90.60762,645.77677 c -0.86888,1.58346 -3.56208,1.75201 -6.20757,0.36615 -2.6455,-1.38587 -4.0874,-3.79573 -3.21851,-5.37919 0.86888,-1.58345 3.72114,-1.74381 6.36663,-0.35796 2.6455,1.38587 3.92833,3.78756 3.05945,5.371 z"
+               id="path20641-5"
+               sodipodi:nodetypes="csssc"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path20643-4"
+               d="m 85.67604,646.51175 c 0.08078,-0.98487 0.28894,-2.11435 0.77343,-2.99059 0.46517,-0.84129 1.04859,-1.35831 1.99622,-2.09151 0.29088,0.21263 0.53904,0.31427 0.87353,0.76197 -1.01842,0.44313 -1.51556,1.05099 -1.9199,1.82851 -0.34452,0.66991 -0.68711,2.07976 -0.68282,2.7261 -0.46246,-0.0343 -0.68615,-0.0385 -1.04046,-0.23448 z"
+               style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient13616);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21157539px;marker:none;enable-background:accumulate"
+               sodipodi:nodetypes="csccccc"
+               inkscape:connector-curvature="0" />
+            <path
+               sodipodi:nodetypes="cccccccc"
+               style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient13618);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21157539px;marker:none;enable-background:accumulate"
+               d="m 84.3848,645.71072 c -0.26154,-0.17817 -0.25435,-0.10277 -0.42771,-0.2875 0.07504,-1.08792 0.30065,-1.93998 0.63305,-2.68196 0.38565,-0.77759 1.68068,-1.67807 2.19257,-1.99484 0.30438,0.2352 0.60771,0.23852 0.96589,0.53149 -1.22234,0.70834 -1.890558,1.5958 -2.129018,2.22967 -0.39439,0.86524 -0.575022,1.81998 -0.570282,2.53492 -0.16837,-0.0629 -0.4527,-0.20259 -0.6645,-0.33178 z"
+               id="path20645-2"
+               inkscape:connector-curvature="0" />
+            <path
+               sodipodi:nodetypes="csssccsccc"
+               style="display:inline;overflow:visible;visibility:visible;fill:#f8d322;fill-opacity:1;fill-rule:evenodd;stroke:#f8d21d;stroke-width:0.25283411;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               d="m 82.82338,644.37031 c -0.64034,-0.82376 -0.91288,-1.71681 -0.75359,-2.46934 0.13878,-0.65559 0.58126,-1.17527 1.2556,-1.47462 0.44624,-0.19811 0.94145,-0.29059 1.53718,-0.28711 0.1377,8e-4 0.47255,0.0239 0.58013,0.04 l 0.6655,0.11542 c -1.14569,0.70649 -1.82674,1.37277 -2.22212,2.03976 -0.49024,0.82704 -0.62422,1.43732 -0.63534,2.51338 -0.0016,7.6e-4 -0.3828,-0.42015 -0.42736,-0.47749 l 0,0 z"
+               id="path20647-0"
+               inkscape:connector-curvature="0" />
+            <path
+               sodipodi:nodetypes="cccccz"
+               style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient13620);fill-opacity:1;fill-rule:evenodd;stroke:#f8d21d;stroke-width:0.25283411;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               d="m 88.00024,644.77003 c 0.21971,-0.56593 0.59689,-1.26681 1.87517,-1.93244 0.15118,0.20128 0.41828,0.65333 0.53982,0.97879 0.30341,0.87421 0.1821,1.67978 -0.45212,2.29918 -0.66414,0.54294 -1.52824,0.58167 -2.34748,0.63034 0.09722,-1.07518 0.15959,-1.39625 0.38461,-1.97587 z"
+               id="path20649-9"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+        <g
+           id="g20651-7"
+           transform="matrix(0.161163,-0.00240835,0.00240835,0.161163,57.043094,559.60069)">
+          <g
+             transform="translate(6.704198,-1.1173663)"
+             id="g20653-3">
+            <path
+               sodipodi:nodetypes="ccc"
+               id="path20655-7"
+               d="m 319.61598,514.60472 c 2.81804,8.29573 -7.10556,55.47896 -28.85763,41.13271 -21.60465,-16.63787 22.23411,-41.32495 28.85763,-41.13271 z"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               inkscape:connector-curvature="0" />
+            <path
+               style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               d="m 319.70637,514.39257 c 6.05084,3.89441 23.52104,36.84072 2.03626,37.12767 -22.55175,-1.1741 -6.45861,-34.48961 -2.03626,-37.12767 z"
+               id="path20657-2"
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0" />
+          </g>
+          <g
+             transform="translate(1.1173664,6.704198)"
+             id="g20659-6">
+            <path
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 326.92645,504.45071 c 8.64726,-1.40902 45.63939,-32.3334 22.75668,-44.79731 -24.83656,-11.25722 -26.03773,39.04034 -22.75668,44.79731 z"
+               id="path20661-0"
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0" />
+            <path
+               sodipodi:nodetypes="ccc"
+               id="path20663-1"
+               d="m 326.78164,504.63015 c 6.28031,3.51238 43.57193,3.45902 33.73301,-15.64265 -11.62994,-19.35727 -33.4815,10.4994 -33.73301,15.64265 z"
+               style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+      </g>
+      <rect
+         ry="0.061784901"
+         rx="0.061070628"
+         y="0.66536987"
+         x="-3.9273248"
+         height="14.287275"
+         width="14.287275"
+         id="rect20667-6"
+         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.65039879;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/images/xeyes.svg b/freeplane/resources/images/xeyes.svg
new file mode 100644
index 0000000..bd82f55
--- /dev/null
+++ b/freeplane/resources/images/xeyes.svg
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg18792"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs18794">
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         style="stop-color:#dc7fcf;stop-opacity:1"
+         offset="0"
+         id="stop15518-1-5" />
+      <stop
+         style="stop-color:#a8bef9;stop-opacity:1"
+         offset="1"
+         id="stop15520-5-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="0"
+         id="stop20604-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20606-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         id="stop20576-6"
+         offset="0"
+         style="stop-color:#cccccc;stop-opacity:1" />
+      <stop
+         id="stop20578-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         id="stop20586-8"
+         offset="0"
+         style="stop-color:#a6a6c6;stop-opacity:1" />
+      <stop
+         id="stop20588-6"
+         offset="1"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         id="stop20411-3"
+         offset="0"
+         style="stop-color:#36d200;stop-opacity:1;" />
+      <stop
+         id="stop20413-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         id="stop13708-7"
+         offset="0"
+         style="stop-color:#f1d103;stop-opacity:1;" />
+      <stop
+         id="stop13710-8"
+         offset="1"
+         style="stop-color:#f7cd03;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32966-6"
+       id="radialGradient9360-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.008765,1.590595,-0.5188665,-0.3290684,-2866.2265,2679.4356)"
+       cx="-1490.8113"
+       cy="235.84802"
+       fx="-1490.8113"
+       fy="235.84802"
+       r="12.630503" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient32966-6">
+      <stop
+         style="stop-color:#00d400;stop-opacity:1"
+         offset="0"
+         id="stop32968-0" />
+      <stop
+         style="stop-color:#86eb86;stop-opacity:1"
+         offset="1"
+         id="stop32970-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284-3-8"
+       id="linearGradient9362-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1723854,0,0,1.1723854,1406.5956,-12.664124)"
+       x1="-1498.6224"
+       y1="210.74893"
+       x2="-1508.4578"
+       y2="229.36067" />
+    <linearGradient
+       id="linearGradient4284-3-8"
+       inkscape:collect="always">
+      <stop
+         id="stop4286-4-65"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4288-4-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32960-0"
+       id="radialGradient9364-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.008765,1.590595,-0.5188665,-0.3290684,-2866.2265,2679.4356)"
+       cx="-1490.8113"
+       cy="235.84802"
+       fx="-1490.8113"
+       fy="235.84802"
+       r="12.630503" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient32960-0">
+      <stop
+         style="stop-color:#ff6600;stop-opacity:1"
+         offset="0"
+         id="stop32962-06" />
+      <stop
+         style="stop-color:#ffb686;stop-opacity:1"
+         offset="1"
+         id="stop32964-1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32950-8"
+       id="radialGradient9366-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.008765,1.590595,-0.5188665,-0.3290684,-2866.2265,2679.4356)"
+       cx="-1490.8113"
+       cy="235.84802"
+       fx="-1490.8113"
+       fy="235.84802"
+       r="12.630503" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient32950-8">
+      <stop
+         style="stop-color:#ed0000;stop-opacity:1"
+         offset="0"
+         id="stop32952-93" />
+      <stop
+         style="stop-color:#f68686;stop-opacity:1"
+         offset="1"
+         id="stop32954-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284-3-8"
+       id="linearGradient9368-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1723854,0,0,1.1723854,1474.7114,15.739403)"
+       x1="-1498.6224"
+       y1="210.74893"
+       x2="-1508.4578"
+       y2="229.36067" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32972-1"
+       id="radialGradient9370-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.008765,1.590595,-0.5188665,-0.3290684,-2866.2265,2679.4356)"
+       cx="-1490.8113"
+       cy="235.84802"
+       fx="-1490.8113"
+       fy="235.84802"
+       r="12.630503" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient32972-1">
+      <stop
+         style="stop-color:#2840d5;stop-opacity:1"
+         offset="0"
+         id="stop32974-8" />
+      <stop
+         style="stop-color:#99a5eb;stop-opacity:1"
+         offset="1"
+         id="stop32976-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284-3-8"
+       id="linearGradient9372-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1723854,0,0,1.1723854,1296.4973,-15.143291)"
+       x1="-1498.6224"
+       y1="210.74893"
+       x2="-1508.4578"
+       y2="229.36067" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4272-9-5-3-3"
+       id="radialGradient9374-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.008765,1.590595,-0.5188665,-0.3290684,-2866.2265,2679.4356)"
+       cx="-1490.8113"
+       cy="235.84802"
+       fx="-1490.8113"
+       fy="235.84802"
+       r="12.630503" />
+    <linearGradient
+       id="linearGradient4272-9-5-3-3"
+       inkscape:collect="always">
+      <stop
+         id="stop4274-2-9-8-7"
+         offset="0"
+         style="stop-color:#eda701;stop-opacity:1" />
+      <stop
+         id="stop4276-9-6-2-8"
+         offset="1"
+         style="stop-color:#fee806;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284-3-8"
+       id="linearGradient9376-8"
+       gradientUnits="userSpaceOnUse"
+       x1="-1498.6224"
+       y1="210.74893"
+       x2="-1508.4578"
+       y2="229.36067" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4318-5"
+       id="linearGradient9378-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-1497.5406"
+       y1="235.44496"
+       x2="-1489.2999"
+       y2="238.62369" />
+    <linearGradient
+       id="linearGradient4318-5">
+      <stop
+         id="stop4320-98"
+         offset="0"
+         style="stop-color:#ff9e3b;stop-opacity:1" />
+      <stop
+         id="stop4322-4"
+         offset="1"
+         style="stop-color:#e47800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4284-3-8"
+       id="linearGradient9380-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(26.782734,29.388042)"
+       x1="-1496.6399"
+       y1="205.97044"
+       x2="-1506.9835"
+       y2="227.73395" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.356199"
+     inkscape:cx="10.094914"
+     inkscape:cy="7.237277"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1274"
+     inkscape:window-height="818"
+     inkscape:window-x="219"
+     inkscape:window-y="185"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g19846"
+       transform="matrix(1.0108196,0,0,1.0108196,-0.08655594,-0.0865568)">
+      <g
+         transform="matrix(0.18908887,0,0,0.18908887,74.093317,-34.641919)"
+         id="g32994-4">
+        <path
+           transform="matrix(1.065647,0.48875774,-0.48875774,1.065647,1356.5003,726.83739)"
+           d="m -1480.3132,247.21582 -12.1305,5.57653 -10.8947,-7.71705 1.2358,-13.29359 12.1305,-5.57654 10.8947,7.71706 z"
+           inkscape:randomized="0"
+           inkscape:rounded="3.469447e-018"
+           inkscape:flatsided="true"
+           sodipodi:arg2="1.1398957"
+           sodipodi:arg1="0.61629694"
+           sodipodi:r2="11.562228"
+           sodipodi:r1="13.35091"
+           sodipodi:cy="239.49876"
+           sodipodi:cx="-1491.2079"
+           sodipodi:sides="6"
+           id="path4390-91"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9360-8);fill-opacity:1;fill-rule:evenodd;stroke:#007c00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           sodipodi:type="star" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           id="path4392-25"
+           d="m -341.85215,239.91423 -15.07899,0 -7.80562,13.65976 2.83846,3.72538 c 9.07895,-12.58112 15.16527,-15.99915 20.04615,-17.38514 z"
+           style="fill:url(#linearGradient9362-4);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <path
+         sodipodi:type="star"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9364-9);fill-opacity:1;fill-rule:evenodd;stroke:#ce6209;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91860465;marker:none;enable-background:accumulate"
+         id="path4370-3-0"
+         sodipodi:sides="6"
+         sodipodi:cx="-1491.2079"
+         sodipodi:cy="239.49876"
+         sodipodi:r1="13.35091"
+         sodipodi:r2="11.562228"
+         sodipodi:arg1="0.61629694"
+         sodipodi:arg2="1.1398957"
+         inkscape:flatsided="true"
+         inkscape:rounded="3.469447e-018"
+         inkscape:randomized="0"
+         d="m -1480.3132,247.21582 -12.1305,5.57653 -10.8947,-7.71705 1.2358,-13.29359 12.1305,-5.57654 10.8947,7.71706 z"
+         transform="matrix(0.20150199,0.09241865,-0.09241865,0.20150199,335.25861,100.22033)" />
+      <g
+         transform="matrix(0.18908887,0,0,0.18908887,56.593694,-42.585515)"
+         id="g33002-8">
+        <path
+           transform="matrix(1.065647,0.48875774,-0.48875774,1.065647,1424.6161,755.24092)"
+           d="m -1480.3132,247.21582 -12.1305,5.57653 -10.8947,-7.71705 1.2358,-13.29359 12.1305,-5.57654 10.8947,7.71706 z"
+           inkscape:randomized="0"
+           inkscape:rounded="3.469447e-018"
+           inkscape:flatsided="true"
+           sodipodi:arg2="1.1398957"
+           sodipodi:arg1="0.61629694"
+           sodipodi:r2="11.562228"
+           sodipodi:r1="13.35091"
+           sodipodi:cy="239.49876"
+           sodipodi:cx="-1491.2079"
+           sodipodi:sides="6"
+           id="path4380-3-39"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9366-3);fill-opacity:1;fill-rule:evenodd;stroke:#c60000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           sodipodi:type="star" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           id="path4382-5-3"
+           d="m -273.73635,268.31776 -15.07899,0 -7.80562,13.65976 2.83846,3.72538 c 9.07895,-12.58112 15.16527,-15.99916 20.04615,-17.38514 z"
+           style="fill:url(#linearGradient9368-4);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.18908887,0,0,0.18908887,94.917158,-44.651139)"
+         id="g32990-9">
+        <path
+           transform="matrix(1.065647,0.48875774,-0.48875774,1.065647,1246.402,724.35823)"
+           d="m -1480.3132,247.21582 -12.1305,5.57653 -10.8947,-7.71705 1.2358,-13.29359 12.1305,-5.57654 10.8947,7.71706 z"
+           inkscape:randomized="0"
+           inkscape:rounded="3.469447e-018"
+           inkscape:flatsided="true"
+           sodipodi:arg2="1.1398957"
+           sodipodi:arg1="0.61629694"
+           sodipodi:r2="11.562228"
+           sodipodi:r1="13.35091"
+           sodipodi:cy="239.49876"
+           sodipodi:cx="-1491.2079"
+           sodipodi:sides="6"
+           id="path4390-2-6"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9370-6);fill-opacity:1;fill-rule:evenodd;stroke:#17257c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           sodipodi:type="star" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           id="path4392-2-7"
+           d="m -451.95045,237.43507 -15.07899,0 -7.80562,13.65975 2.83846,3.72539 c 9.07895,-12.58113 15.16527,-15.99916 20.04615,-17.38514 z"
+           style="fill:url(#linearGradient9372-9);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         id="g4388-8-2-9"
+         transform="matrix(0.22168503,0,0,0.22168503,340.09133,-42.249561)">
+        <path
+           transform="matrix(0.9089562,0.4168917,-0.4168917,0.9089562,-42.729395,630.76657)"
+           d="m -1480.3132,247.21582 -12.1305,5.57653 -10.8947,-7.71705 1.2358,-13.29359 12.1305,-5.57654 10.8947,7.71706 z"
+           inkscape:randomized="0"
+           inkscape:rounded="3.469447e-018"
+           inkscape:flatsided="true"
+           sodipodi:arg2="1.1398957"
+           sodipodi:arg1="0.61629694"
+           sodipodi:r2="11.562228"
+           sodipodi:r1="13.35091"
+           sodipodi:cy="239.49876"
+           sodipodi:cx="-1491.2079"
+           sodipodi:sides="6"
+           id="path4390-7-6-97"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9374-6);fill-opacity:1;fill-rule:evenodd;stroke:#ce6209;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91860465;marker:none;enable-background:accumulate"
+           sodipodi:type="star" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           id="path4392-5-4-6"
+           d="m -1491.3592,215.4397 -12.8618,0 -6.6579,11.65125 2.4211,3.17761 c 7.744,-10.73122 12.9354,-13.64667 17.0986,-14.82886 z"
+           style="fill:url(#linearGradient9376-8);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.18908887,0,0,0.18908887,393.10663,274.97367)"
+         id="g7473-9">
+        <g
+           transform="matrix(1.1723854,0,0,1.1723854,-336.16761,-1726.0806)"
+           id="g4340-3">
+          <path
+             sodipodi:type="star"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9378-3);fill-opacity:1;fill-rule:evenodd;stroke:#ce6209;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91860465;marker:none;enable-background:accumulate"
+             id="path4298-5"
+             sodipodi:sides="6"
+             sodipodi:cx="-1491.2079"
+             sodipodi:cy="239.49876"
+             sodipodi:r1="13.35091"
+             sodipodi:r2="11.562228"
+             sodipodi:arg1="0.61629694"
+             sodipodi:arg2="1.1398957"
+             inkscape:flatsided="true"
+             inkscape:rounded="3.469447e-018"
+             inkscape:randomized="0"
+             d="m -1480.3132,247.21582 -12.1305,5.57653 -10.8947,-7.71705 1.2358,-13.29359 12.1305,-5.57654 10.8947,7.71706 z"
+             transform="matrix(0.9089562,0.4168917,-0.4168917,0.9089562,-16.09798,660.15462)" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient9380-0);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             d="m -1465.0847,244.77692 -12.8618,0.0508 -6.5563,11.09207 3.5844,6.15783 c 6.219,-7.22361 8.4253,-14.70231 15.8337,-17.30073 z"
+             id="path4300-7"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/resources/translations/Resources_af.properties b/freeplane/resources/translations/Resources_af.properties
new file mode 100644
index 0000000..cdee823
--- /dev/null
+++ b/freeplane/resources/translations/Resources_af.properties
@@ -0,0 +1,482 @@
+about_text=Freeplane - programmatuur vir maak van gratis breinkaarte en opbou van kennis
+AboutAction.text=Oorsig
+acceleratorPresets=Kortpadinstellings
+accelerators_loading_error=Kan nie versnellers oplaai van {0} nie
+accessories/plugins/ApplyFormatPlugin.dialog.title=Verander formaat van nodii
+accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Verander patroon
+accessories/plugins/EncryptNode.properties_0=Kies wagwoord vir beskermde (ge\u00EFnkripteerde) nodus
+accessories/plugins/EncryptNode.properties_1=Wagwoorde is nie gelyk nie of is te kort.
+accessories/plugins/EncryptNode.properties_2=Sleutel wagwoord in:
+accessories/plugins/EncryptNode.properties_3=Sleutel weer wagwoord in:
+accessories/plugins/EncryptNode.properties_4=Sleutel jou wagwoord in.
+accessories/plugins/EncryptNode.properties_5=<html> Let op: die sterkte van beveiliging<br> hang af van die kwaliteit van jou wagwoord.
+accessories/plugins/EncryptNode.properties_6=Reg
+accessories/plugins/EncryptNode.properties_7=Kanselleer
+accessories/plugins/EncryptNode.properties_select_me=Kies my om voort te gaan!
+accessories/plugins/EncryptNode.properties_wrong_password=Die wagwoord is nie reg nie.
+accessories/plugins/Export_JavaWebStart.text=Java Web Begin...
+accessories/plugins/Export_JavaWebStart.tooltip=Eksport die kaart vir Java Web begin.
+accessories/plugins/ExportWithTWiki.text=TWiki...
+accessories/plugins/ExportWithTWiki.tooltip=Eksport die kaart as 'n TWiki dokument.
+accessories/plugins/ExportWithXSLT.tooltip=Dit is 'n eenvormige eksport metode.
+accessories/plugins/ExportWithXSLT_Applet.text=Java-minitoepassing...
+accessories/plugins/ExportWithXSLT_Applet.tooltip=Eksport die kaart as 'n java blaaier minitoepassing.
+accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript weergawe)...
+accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Klikbare kaartbeeld weergawe)...
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Hulpbronne van RESOURCES nodus na TaskJuggler l\u00EAer...
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Voer hulpbronne van RESOURCES nodus af na Taskjuggler module.</html>
+accessories/plugins/ExportWithXSLT_TASKSTJI.text=Take van TAKE nodus na TaskJuggler l\u00EAer...
+accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Eksport take van TAKE nodus na Taskjuggler module.</html>
+action_keystroke_in_use_error=Sleuteldruk {0} aangevra vir aksie {1} is reeds in gebruik vir aksie {2}
+active=Aktief
+actual_map_styles=Kaart voorwaardelike style toegepas op nodus
+actual_node_styles=Nodus voorwaardelike style toegepas op nodus
+add=&Voeg
+AddConnectorAction.text=Koppel
+AddElementaryConditionAction.text=Voeg
+AddExecutionLinkAction.text=Voeg hiperskakel om 'n OS opdrag uit te voer...
+AddLocalLinkAction.text=Voeg plaaslike Hiperskakel
+AddMenuItemLinkAction.text=Voeg hiperskakel na kieslysitem...
+AddOnDetailsPanel.authored.by=Deur {0}
+AddOnDetailsPanel.header.function=Funksie
+AddOnDetailsPanel.header.menu=Kieslysligging
+AddOnDetailsPanel.header.shortcut=Kortpad
+AddOnDetailsPanel.homepage=Tuisblad:
+addons.installer.canceled=Installasie gekanselleer
+addons.installer.confirm.licence=<html><body><h1>Lisensie</h1>{0} <p><p><em>Aaanvaar jy hierdie lisensie?</em></p></body></html>
+addons.installer.failed=Installasie het misluk: {0}
+addons.installer.freeplaneversion.format.error=Formateringsfout in {0} (waarde: {1})
+addons.installer.html.script=Geskrewe inhoud kan nie geformateer word as HTML nie
+addons.installer.install=Installeer
+addons.installer.invalid.keyboard.shortcut=Ongeldige kortpad {0}.
+addons.installer.licence.unchanged=Lisensie is onveranderd
+addons.installer.map.structure=Fout in kaartstruktuur: {0}
+addons.installer.missing.child.nodes=Ontbrekende kindnodus: {0}
+addons.installer.missing.permission.attribute=Skrip {0}: vermiste toestemmings-eienskappe {1}
+addons.installer.missing.properties=Ontbrekende eienskappe: {0}
+addons.installer.missing.translation=Ontbrekende vertaling van {0} vir lokaliteit {1}
+addons.installer.no.scripts=Geen skrip gevind
+addons.installer.no.zipdata=Geen gekrimpte data gevind
+addons.installer.one.child.expected=Verwag presies een kind van {0} maar het {1}.
+addons.installer.script.name.suffix=Skrip naam {0} het nie ''n agtervoegsel soos ".groovy" nie
+addons.installer.script.no.execution_mode=Geen  "execution_mode" eienskap gedefinieer vir {0}
+addons.installer.script.no.menulocation=Geen  "menuLocation" eienskap gedefinieer vir {0}
+addons.installer.script.no.menutitle=Geen "menuTitleKey" kenmerk gedefinieer vir {0} nie
+addons.installer.script.no.permissions=Geen toestemming gedefinieer vir {0}
+addons.installer.success.update=Updatering van {0} na {1} is geslaagd.\nSommige funksies is beskikbaar na ''n herbegin.
+addons.installer.unknown.deinstallation.rules=Onbekende de\u00EFnstalleringsre\u00EBl(s) {0}
+addons.installer.update=Opdatering vanaf weergawe {0}
+addons.site=https://www.freeplane.org/addons/
+AddStyleAttributes.text=Styleienskappe
+AddStyleAttributes.tooltip=Voeg eienskappe van stylnodus
+AllMapsNodeListAction.text=Vind en vervan in al die kaarte
+always=Altyd
+antialias_all=Versag alles
+antialias_edges=Versag randte
+antialias_none=Geen versagting
+apply=&Pas toe
+ApplyAction.text=Pas toe
+ApplyFormatPlugin.text=Verander formaat...
+ApplyNoFilteringAction.text=Geen filtrering
+ApplySelectedViewConditionAction.text=Filtreer geselekteerde nodii
+ApplyToVisibleAction.text=Van toepassing op gefiltreerde nodus
+as_parent=As ouer
+AskForHelp.text=Vra vir hulp in die forum
+AssignAttributesAction.text=Vind en vervang eienskappe...
+attribute_delete=Verwyder alle waardes
+attribute_delete_value=Verwyder hierdie waarde
+attribute_font_size_tooltip=Eienskap lettergrootte
+attribute_list_box_label_text=Bestaande waardes
+attribute_name=Eienskapnaam
+attribute_name_or_value=Eienskapnaam of waarde
+attribute_replace=Vervang met
+attribute_top=Alle bekende eienskappe vir die gelaaide Kaarte
+attribute_value=Eienskapwaarde
+attributes_adding_empty_attribute_error=Eienskapnaam mag nie leeg wees nie
+attributes_all=Alle eienskappe
+attributes_assign_dialog=Uitgebreide eienskapredigeerder
+attributes_attribute=Eienskappe
+attributes_close=Maak toe
+attributes_deselect_all=Niks
+attributes_dialog_title=Eienskapbestuurder
+attributes_edit=Wysig
+attributes_edit_tooltip=Redigeer stel
+attributes_for_selected=Geselekteerde nodii
+attributes_for_visible=Alle sigbare nodii
+attributes_import=&Invoer
+attributes_import_tooltip=Importeer eienskappe vanuit die ander gelaaide kaarte
+attributes_no_import_candidates_found=Geen nuwe eienskappe gevind
+attributes_popup_delete=Verwyder
+attributes_popup_down=Af
+attributes_popup_edit=Wysig
+attributes_popup_hide=Versteek
+attributes_popup_new=Nuwe eienskap
+attributes_popup_optimal_width=Optimale breedte
+attributes_popup_up=Op
+attributes_refresh=Verfris
+attributes_RemoveAllAttributesAction.text=Verwyder alle eienskappe
+attributes_RemoveFirstAttributeAction.text=Verwyder eerste eienskap
+attributes_RemoveLastAttributeAction.text=Verwyder laaste eienskap
+attributes_restricted_attributes_tooltip=Beperk stel van eienskappe
+attributes_restricted_values_tooltip=Beperk stel van waardes vir die huidige eienskap
+attributes_restriction=Beperkte stel
+attributes_select_all=Alles
+attributes_show=Vertoon
+attributes_skip_root=Slaan wortelnodus oor
+attributes_visible=Gekose sigbaar
+attributes_visible_tooltip=Gekose sigbaar
+automatic_layout=Outomatiese uitl\u00EAg
+automatic_layout_disabled=Versperde
+automatically_save_message=Kaart word outomaties gestoor (gebruik die l\u00EAernaam {0})...
+AutomaticEdgeColor.FOR_BRANCHES=vir takke
+AutomaticEdgeColor.FOR_COLUMNS=vir kolomme
+AutomaticEdgeColor.FOR_LEVELS=vir vlakke
+AutomaticEdgeColor.ON_BRANCH_CREATION=op tak skepping
+AutomaticEdgeColorHookAction.text=Outomatiese randkleur
+AutomaticLayout.ALL=vir alle nodii
+AutomaticLayout.HEADINGS=vir nie-blaar nodii
+AutomaticLayout.level=Vlak {0}
+AutomaticLayout.level.root=Wortel
+AutomaticLayoutAction.text=Pas vlakstyle toe
+AutomaticLayoutControllerAction.ALL.text=vir alle nodii
+AutomaticLayoutControllerAction.COLUMNS.text=vir kolomme
+AutomaticLayoutControllerAction.HEADINGS.text=vir nie-blaar nodii
+AutomaticLayoutControllerAction.null.text=versperde
+BackAction.text=Gaan terug
+BackAction.tooltip=Spring terug in die kies ketting
+background=Agtergrond
+bitmaps=Beeld
+black=Swart
+BlinkingNodeHookAction.text=Flikkerende nodus
+blue=Blou
+BoldAction.text=Vetdruk
+boldify_branch=Vetdruk maak
+branch=Tak
+browse=Blaai...
+calendar_attributes_panel=Kalender en eienskappe
+calendar_panel=Kalender
+can_not_connect_to_info_server=Kan nie koppel aan inligtingsbediener
+cancel=&Kanselleer
+CancelAction.text=Kanselleer
+CenterAction.text=Sentreer
+ChangeConnectorArrowsAction.backward.text=Trek agtertoe pyl
+ChangeConnectorArrowsAction.both.text=Trek vorentoe en agtertoe pyl
+ChangeConnectorArrowsAction.forward.text=Trek vorentoe pyl
+ChangeConnectorArrowsAction.none.text=Geen
+ChangeConnectorArrowsAction.text=Verander pyle van verbindingslyn
+ChangeConnectorShapeAction.CUBIC_CURVE.text=Kromme
+ChangeConnectorShapeAction.EDGE_LIKE.text=Simuleer rand
+ChangeConnectorShapeAction.LINE.text=Lyn
+ChangeConnectorShapeAction.LINEAR_PATH.text=Reglynige pad
+choose_cloud_color=Kies wolkkleur:
+choose_edge_color=Kies randkleur
+choose_map_background_color=Kies kaart agtergrondkleur
+choose_node_background_color=Kies nodus agtergrondkleur:
+choose_node_color=Kies nodus kleur:
+ClearLinkAnchorAction.text=Wis skakelanker
+CloneAction.text=Plak kloon
+close_btn=&Maak toe
+CloseAction.text=Maak huidige kaart toe
+CloseAllMapsAction.text=Maak alle kaarte toe
+CloseAllOtherMapsAction.text=Maak alle ander kaarte toe
+cloud_shapes=Wolkvorms
+CloudAction.text=Voeg / verwyder wolk (verstek)
+CloudColorAction.text=Wolkkleur...
+CloudShapeAction.ARC.text=Boog
+CloudShapeAction.RECT.text=Reghoek
+CloudShapeAction.ROUND_RECT.text=Ronde reghoek
+CloudShapeAction.STAR.text=Ster
+collection.copy.presentation=Kopieer aanbieding
+collection.copy.slide=Kopieer skyfie
+collection.delete=Verwyder
+collection.down=Af
+collection.move=Skuif
+collection.moveTo=Skuif na posisie
+collection.new.presentation=Nuwe aanbieding
+collection.new.slide=Nuwe skyfie
+collection.up=Op
+ColorProperty.ResetColor=Herstel kleur
+combined=Gekombineer
+condition=Voorwaarde
+confirmation=Bevestiging
+connector=Verbinder
+connector_arrows=Verbinderpyle
+connector_label=Verbinderetiket
+connector_lines=Verbinderlyne
+connector_shapes=Verbindervorms
+ConnectorColorAction.text=Verbinderkleur...
+controls=Kontroles
+ConvertCloneToIndependentNodeAction.text=Ontkloon
+copy_name={0} (kopieer)
+CopyAction.text=Kopieer
+CopyAction.tooltip=Kopieer gekose tak
+CopyAttributes.text=Kopieer eienskappe
+CopyIDAction.text=Kopieer nodus ID
+CopyMapStylesAction.text=Kopieer kaart styl vanaf...
+CopyNodeURIAction.text=Kopieer nodus se URI
+copyright=Kopiereg \u00A9 2000-2017 Freeplane span en ander
+CopySingleAction.text=Kopieer nodus (enkel)
+CopySingleAction.tooltip=Kopieer slegs die gekose nodus
+CopyStyleExtensionsAction.text=Kopieer uitbreidings van stylnodus
+corrupt_map=Kaart se inhoud is beskadig
+CreateConjunctConditionAction.text=En
+CreateDisjunctConditionAction.text=Of
+CreateNotSatisfiedConditionAction.text=Nie
+CreationModificationPluginAction.text=Vertoon tye waarop verander
+current_dir=Kaarte
+CutAction.text=Sny
+decrease_branch_font_size=Kleiner lettertipe
+DecreaseNodeFontAction.text=Kleiner lettertipe
+default=Verstekwaarde
+defaultAuxiliaryWordList='n, die, van
+DefaultColorAction.text=Verstekkleur
+defaultstyle.attributes=Eienskappe
+defaultstyle.details=Besonderhede
+defaultstyle.floating=Swewende nodus
+defaultstyle.note=Nota
+delete=&Verwyder
+delete_child=Verwyder nodus
+DeleteAction.text=Verwyder nodus
+DeleteConditionAction.text=Verwyder
+DeleteDetailsAction.text=Verwyder nodus se besonderhede
+DeleteLevelStyleAction.text=Verwyder vlak styl
+DeleteStyleAction.text=Verwyder styl
+dialect_info.app=Breinkaart l\u00EAer {0} was geskep met program {1}.
+dialect_info.later_version=Geheuekaartl\u00EAer {0} was geskep met ''n latere weergawe van hierdie program.
+dialect_info.unknownApp=Breinkaart l\u00EAer {0} is geskep deur ''n onbekende program.
+dialect_info.unknownURL=Die webwerf is onbekend.
+dialect_info.url=Besoek program webwerf {0} vir meer inligting.
+DirectHtmlFlavorHandler=HTML as enkelnodus
+DocumentationAction.text=Dokumentasie
+down=A&f
+DownConditionAction.text=Af
+download=Aflaai
+edge=Rand
+edge_style=Rand styl
+edge_width=Randbreedte
+edge_widths=Randbreedtes
+EdgeColorAction.text=Randkleur...
+EdgeProperties=Rand eienskappe
+EdgeStyleAction.hide_edge.text=Versteek rand
+EdgeStyleAction.horizontal.text=Horisontaal
+EdgeStyleAction.linear.text=Line\u00EAre
+EdgeWidthAction_width_parent.text=Ouer
+EdgeWidthAction_width_thin.text=Dun
+edit=&Wysig
+edit.decision=HTML redigeerder
+edit_details=Wysig nodus besonderhede
+edit_end_label=<html>Verbinder <br>etiket
+edit_label_font_family=Karaktersoort
+edit_label_font_size=Karaktergrootte
+edit_link_manually=Wysig Hiperskakel met die hand ...
+edit_middle_label=<html>Middel <br>etiket
+edit_note=Wysig Nota
+edit_source_label=<html>Bron <br>etiket
+edit_target_label=<html>Teiken <br>etiket
+edit_transparency_label=Deursigtigheid
+edit_width_label=Breedte
+EditFilterAction.text=Stel filter saam
+EditScript=Wysig skrip...
+EditStylesAction.text=Wysig style
+EncryptedMap.tooltip=Nuwe beskermde kaart
+encryption=Enkripsie
+enter_command=Voer bevel in
+enter_confirms=&Enter bevestig
+enter_keyset_name=Sleutel kortpadsleutel naam in
+enter_map_url=Vul URL van breinkaart in
+enter_new_style_name=Tik nuwe stylnaam
+enter_node_id=Voeg nodus ID
+enter_zoom=Voeg Zoem
+EnterPassword.text=Sleutel wagwoord in
+error=Fout
+error_creating_directory=Kan nie gids vir afvoer skep nie.
+errornumber={0} foute
+ExecuteScript.available_modes_tooltip={0} is beskikbaar vir
+ExecuteScript.script=Skrip
+ExecuteScriptError.text=Fout met die uitvoering van die skrip:\n {0}
+ExecuteScriptForAllNodes.text=Voer alle skripte uit
+ExecuteScripts.noScriptsAvailable=Niks beskikbaar
+ExecuteScripts.text=Skripte
+export_failed=Uitvoer het misluk
+export_using_xslt=Freeplane afvoer na
+ExportAction.text=Kaart afvoer na ...
+ExportAllPresentationsAction.text=Voer alle aanbiedings uit na PNG-beelde
+ExportBranchAction.text=Skuif tak na nuwe kaart ...
+ExportBranchToHTMLAction.text=Tak as HTML
+exported_file={0} l\u00EAer
+ExportPdf.text=PDF
+ExportPresentationAction.text=Voer huidige aanbieding na PNG beelde
+ExportSvg.text=SVG
+ExportToHTMLAction.text=HTML
+ExportToImage.jpg.text=JPEG
+ExportToImage.png.text=PNG
+ExportToOoWriter.text=Open Office Writer Dokument...
+extension_menu=Fisiese styl
+ExternalImage_popupMenu_Change=Wysig...
+ExternalImage_popupMenu_Open=Maak oop in blaaier
+ExternalImage_popupMenu_Remove=Verwyder
+ExternalImage_popupMenu_ResetZoom=Herstel zoem
+ExternalImageAddAction.text=Voeg beeld...
+ExternalImageChangeAction.text=Verander beeld...
+ExternalImageRemoveAction.text=Verwyder beeld
+extras=&Gereedskap
+f_button_unassigned=<geen aksie >
+FaqOpenURLAction.text=VGV
+file=&L\u00EAer
+file_not_accessible=L\u00EAer {0} is nie toeganklik nie
+file_not_found=L\u00EAer {0} nie gevind nie
+FileListFlavorHandler=Skakels na l\u00EAers
+FileProperties_ChangesSinceLastSave=Veranderinge sedert laaste stoor:
+FileProperties_FileName=L\u00EAernaam:
+FileProperties_FileSaved=L\u00EAer gestoor:
+FileProperties_FileSize=L\u00EAergrootte:
+FileProperties_MainBranchCount=Aantal hooftakke:
+FileProperties_NeverSaved=Nooit gestoor nie
+FileProperties_NodeSelectionCount=Aantal uitgekose nodii:
+FileProperties_TotalNodeCount=Totale aantal nodii:
+FilePropertiesAction.text=Kaartstatistieke...
+FileRevisionsDialog.cancel=&Kanselleer
+FileRevisionsDialog.file_last_modified=Tydstempel
+FileRevisionsDialog.file_name=L\u00EAer
+FileRevisionsDialog.file_size=Grepe
+FileRevisionsDialog.open=&Maak Oop
+FileRevisionsDialog.question=Weergawes  gevind van {0}
+FileRevisionsDialog.restore=&Herstel
+FileRevisionsDialog.restore.tooltip=Vervang {0} met {1}
+FileRevisionsDialog.title=L\u00EAer weergawes
+filter=&Filter
+filter_add=&Voeg by
+filter_and=E&n
+filter_conditions=Filters
+filter_contains=Bevat
+filter_created_after=Geskep na
+filter_created_before=Geskep voor
+filter_delete=&Skrap
+filter_details=Besonderhede
+filter_dialog=Filter Samesteller
+filter_does_not_exist=Bestaan nie
+filter_enter_value=Sleutel waarde in
+filter_exist=Bestaan
+filter_icon=Ikoon
+filter_is_equal_to=Is gelyk aan
+filter_is_not_equal_to=Is nie gelyk aan nie
+filter_leaf=Blaarnodus
+filter_link=Hiperskakel
+filter_match_approximately=Benaderd
+filter_modified_after=Verander na
+filter_modified_before=Verander voor
+filter_no_filtering=Geen Filtrering (verwyder)
+filter_node=Kernteks
+filter_node_level=Nodusvlak
+filter_not=&Nie
+filter_note=Nota
+filter_or=&Of
+filter_periodic_level=Periodiek
+filter_priority=Prioriteit
+filter_reminder=Herinnering
+filter_reminder_after=geskeduleer na
+filter_reminder_before=geskeduleer voor
+filter_reminder_executed=reeds afgevuur
+filter_reminder_later=later geskeduleer
+filter_root=Wortelnodus
+filter_script=Skripfilter
+filter_select=&Kies
+filter_style=Styl
+filter_time=Datumfilter
+FilterCondition=Filtervoorwaardes
+filters_not_loaded=Filter kan nie gelaai word nie, l\u00EAer beskadig
+find=Soek
+find_what=Wat om te soek
+FindAction.text=Soek...
+FindNextAction.text=Soek volgende
+FindPreviousAction.text=Soek Vorige
+fit_background_to_page=Pas agtergrondbeeld op een bladsy
+fit_map_to_page=Pas op een bladsy
+fit_map_to_page_height=Pas &hoogte op een bladsy
+fit_map_to_page_width=Pas &breedte op een bladsy
+FitToPage.text=Zoem om bladsy te pas
+fold=Vou
+FoldAllAction.text=Vou almal
+FoldOneLevelAction.text=Vou een vlak
+follow_clone=Binne "{0}"
+follow_graphical_link=Gaan na "{0}"
+FollowLinkAction.text=Volg skakel
+font=Lettertipe
+FontFamilyAction.text=Lettertipenaam
+FontSizeAction.text=Lettertipegrootte
+format=F&ormaat
+format_invalid_pattern=Nie 'n geldige patroon nie
+format_panel=Formatteer
+formats_not_loaded=Formate kan nie gelaai word nie, l\u00EAer beskadig
+formula.EvaluateAllAction.text=Evalueer alles
+formula.menuname=Formules
+formula_editor=Wysig Formule
+ForwardAction.text=Gaan vorentoe
+Freeplane.progress.loadMaps=Laai kaarte...
+FreeplaneHelpStarter.text=Help...
+FreeplaneHelpStarter.tooltip=Freeplane uitgebreide hulp
+GettingStartedAction.text=Oefening
+help=&Help
+icon_gohome=Tuis
+ImageFlavorHandler=Beeld (gebruik aparte l\u00EAer)
+ImportXmlFile.text=Voer XML-l\u00EAer in
+invalid_export_file=Ongeldige uitvoerl\u00EAernaam
+invalid_file_msg=Kon nie l\u00EAer vir {0} vind nie
+ManageAddOnsDialog.select.tooltip=Kies l\u00EAer
+ManageAddOnsDialog.status.downloading=Laai tans l\u00EAer af...
+mode_File=L\u00EAermodus
+ModesMenuAction.File.text=L\u00EAersoeker
+MoveSelectedNodeAction.CENTER.text=Sentreer geselekteerde nodus
+NewerFileRevisionsFoundDialog.cancel.tooltip=Moenie hierdie l\u00EAer oopmaak nie
+NewerFileRevisionsFoundDialog.file_name=L\u00EAer
+NewerFileRevisionsFoundDialog.open.tooltip=Maak l\u00EAer oop selfs al is dit verouderd
+NewerFileRevisionsFoundDialog.title=Nuwer l\u00EAer weergawes gevind!
+OpenFreeplaneSiteAction.text=Freeplane se Tuisblad
+OpenPathAction.text=Maak l\u00EAer oop
+OptionPanel.backup_file_number=Aantal behoue rugsteunl\u00EAers
+OptionPanel.check_updates_automatically=Kontroleer vir bywerkings met program aanvang
+OptionPanel.experimental_file_locking_on=Eksperimentele l\u00EAer sluiting
+OptionPanel.Files=L\u00EAers
+OptionPanel.number_of_different_files_for_automatic_save=Aantal verskillende l\u00EAers vir outomatiese stoor
+OptionPanel.pasteImagesFromFiles=Plak beelde van l\u00EAers
+OptionPanel.separator.files=L\u00EAers
+OptionPanel.separator.org.freeplane.plugin.bugreport=Outomatiese foutverslag
+OptionPanel.separator.updates=Program bywerkings
+OptionPanel.single_backup_directory=Gebruik een gids vir rugsteunl\u00EAers
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=aantal nodii in ry
+org.freeplane.plugin.bugreport.dialog.title=Outomatiese foutverslag
+org.freeplane.plugin.bugreport.never=Moet my nooit vir hulp vra nie
+org.freeplane.plugin.bugreport.question=Freeplane het 'n outomatiese fout aanmeldingsenjin.
+plugins/TimeManagement.xml_WindowTitle=Bestuurtyd
+ReportBugAction.text=Rapporteer 'n fout
+simplyhtml.helpLabel=Help
+simplyhtml.imageFileDesc=Beeldl\u00EAers
+simplyhtml.unableToOpenFileError=L\u00EAer kan nie oopgemaak word nie
+slide.on_the_right.tooltip=aan die linkerkant
+uiTextChanger.replaceText=Vervang UI teks
+undefined_error='n Onverwagse fout het voorgekom. Probeer asseblief die fout aanmeld.
+update_failed=Bywerking het misluk met boodskap {0}
+UpdateCheckAction.text=Kontroleer vir bywerkings
+updatecheckdialog=Venster vir bywerkingskontrolering
+updater.version.noUpdateUrl=Geen bywerking URL of tuisblad vir hierdie byvoegsel.
+UsePlainTextAction.text=Gebruik gewone teks
+userScripts=Skripte
+version_up_to_date=Jy gebruik alreeds die nuutste programweergawe
+view=Besigtig
+web_resources=Webhulpbronne
+WebDocuAction.text=Web Dokumentasie
+WhatsNewAction.text=Wat is nuut in Freeplane 1.5.x
+width=Breedte
+xslt_export.html=HTML-dokument
+xslt_export.latex=Latex dokument
+xslt_export.latexbook=Latex boek
+xslt_export.mediawiki=Mediawiki
+xslt_export.ms_excel=Microsoft Excel 2003 XML
+xslt_export.ms_project=Microsoft Project 2003 XML
+xslt_export.ms_word=Microsoft Word 2003 XML
+xslt_export.text=Gewone teks
+xslt_export_not_possible=Freeplane XSLT eksport nie moontlik nie
+yes=Ja
+zoom=Zoem
+ZoomInAction.text=Zoem in
+ZoomOutAction.text=Zoem uit
diff --git a/freeplane/resources/translations/Resources_ca.properties b/freeplane/resources/translations/Resources_ca.properties
index 410fd7f..a911a2d 100644
--- a/freeplane/resources/translations/Resources_ca.properties
+++ b/freeplane/resources/translations/Resources_ca.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Cancel\u00B7la
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Nom\u00E9s \u00E9s possible alternar entre l'estat de xifratge pels nodes que es trobin xifrats. Si us plau inseriu un node d'aquest tipus mitjan\u00E7ant el men\u00FA d'eines.
 accessories/plugins/EncryptNode.properties_select_me=Trieu-me per continuar!
 accessories/plugins/EncryptNode.properties_wrong_password=La paraula de pas no \u00E9s correcta.
+accessories/plugins/Export_JavaWebStart.text=Inici de Java Web...
+accessories/plugins/Export_JavaWebStart.tooltip=Exporta el mapa per java web start.
 accessories/plugins/ExportWithTWiki.text=TWiki\u2026
 accessories/plugins/ExportWithTWiki.tooltip=Exporta el mapa com un document TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Aquest \u00E9s un m\u00E8tode d'exportaci\u00F3 utilitzant comandes XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Com un Applet Java...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporta el mapa com un applet java pel navegador.
-accessories/plugins/ExportWithXSLT_Flash.text=Com a Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporta com una aplicaci\u00F3 Flash.
 accessories/plugins/ExportWithXSLT_HTML.text=Com a XHTML (versi\u00F3 JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Com a XHTML (Mapa amb imatge)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Recursos del node RECURSOS verd un arxiu TaskJuggler\u2026
@@ -50,12 +50,49 @@ addons.installer.html.script=El contingut del script no pot tenir format HTML
 addons.installer.install=Instal\u00B7lar
 addons.installer.invalid.keyboard.shortcut=Drecera incorrecta {0}.
 addons.installer.licence.unchanged=La llic\u00E8ncia no s'ha modificat
+addons.installer.map.structure=Error en l''estructura del mapa: {0}
+addons.installer.missing.child.nodes=Manquen els nodes fill: {0}
+addons.installer.no.scripts=No s'ha trobat cap script
+addons.installer.no.zipdata=No s'han trobat dades comprimides
+addons.installer.nonstandard.permissions=Aquest script necessita els seg\u00FCents permissos que ara no estan activats: {0}.\nVoleu activar afegir aquests permissos als permissos est\u00E0ndar?
+addons.installer.script.no.permissions=No s''han definit permissos per {0}
+addons.installer.success=Instalaci\u00F3 complerta.\nEl nou complement estar\u00E0 disponible despr\u00E9s de reiniciar el programa.
+addons.installer.success.update=Actualitzaci\u00F3 des de {0} de {1} completa.\nAlgunes de les funcions potser nom\u00E9s estaran disponibles despr\u00E9s de reiniciar el programa.
+addons.installer.title=Instal\u00B7laci\u00F3 d'un complement
+addons.installer.update=Actualitzaci\u00F3 des de la versi\u00F3 {0}
+addons.site=https://www.freeplane.org/addons/
+AllMapsNodeListAction.text=Cercar i reempla\u00E7ar en tots els mapes
+always=Sempre
+AlwaysUnfoldedNodeAction.text=Node sempre desplegat (activar/desactivar)
 antialias_all=Anti\u00E0lies a Tots
 antialias_edges=Anti\u00E0lies als Cantells
 antialias_none=Sense anti\u00E0lies
+ApplyFormatPlugin.text=Canvia el format...
+ApplyFormatPlugin.tooltip=Presenta un di\u00E0leg en el qual els  atributs de node i vora poden ser canviats de cop.
+ApplySelectedViewConditionAction.text=Filtrar els nodes seleccionats
+ApplyToVisibleAction.text=S'aplica als nodes filtrats
 as_parent=Com a parent
+AskForHelp.text=Demanar ajuda al f\u00F2rum
+AssignAttributesAction.text=Cercar i reempla\u00E7ar atributs...
+attribute_delete=Esborrar tots els valors
+attribute_delete_value=Esborrar aquest valor
+attribute_font_size_tooltip=Mida de font de l'atribut
+attribute_list_box_label_text=Valors existents
+attribute_name=Nom d'atribut
+attribute_name_or_value=Nom d'atribut o valor
+attribute_replace=Reempla\u00E7a per
+attribute_top=Tots els atributs coneguts per als mapes carregats
+attribute_value=Valor d'atribut
+attributes_adding_empty_attribute_error=No es pot utilitzar una cadena buida com a nom de l'atribut
+attributes_all=Tots els  atributs
+attributes_attribute=Atributs
+attributes_close=Tancar
 attributes_deselect_all=Res
 attributes_dialog_title=Attribute Manager[translate me]
+attributes_edit=Editar
+attributes_edit_tooltip=Editar el conjunt
+attributes_for_selected=Nodes seleccionats
+attributes_for_visible=Tots els nodes visibles
 AutomaticLayoutAction.text=Disseny autom\u00E0tic
 AutomaticLayoutAction.tooltip=<html>Repara el disseny del mapa. <br>El primer nivell \u00E9s negre, el segon blau, etc.</html>
 BackAction.text=Enrera
@@ -66,7 +103,7 @@ BoldAction.text=Negreta
 boldify_branch=Ennegreix
 branch=Branca
 cancel=Cancel\u00B7la
-CancelAction.text=Cancel\u00B7la
+CancelAction.text=&Cancel\u00B7la
 cannot_add_parent_diff_parents=Tots els nodes cal que tinguin el mateix node pare per a utilitzar aquesta funci\u00F3.
 cannot_add_parent_to_root=El node arrel no pot afegir-se com un node pare.
 cannot_join_nodes_with_children=No es poden unir els nodes amb els fills
@@ -78,26 +115,26 @@ ChangeNodeLevelLeftsAction.text=Node esquerra
 ChangeNodeLevelLeftsAction.tooltip=On the left of root the node(s) is/are shifted downwards. It/they become children of its above sibling. On the right of root the node(s) are shifted upwards. Directly at root, the node(s) change sides.
 ChangeNodeLevelRightsAction.text=Node dret
 ChangeNodeLevelRightsAction.tooltip=On the right of root the node(s) is/are shifted downwards. It/they become children of its above sibling. On the left of root the node(s) are shifted upwards. Directly at root, the node(s) change sides.
-choose_background_color=Trieu el color de fons:
 choose_cloud_color=Trieu el color del n\u00FAvol:
 choose_edge_color=Tria el color del cantell
+choose_map_background_color=Tria el color del fons del mapa
 choose_node_background_color=Trieu el color de fons del node:
 choose_node_color=Trieu el color del node:
-CloseAction.text=Tanca
+CloseAction.text=&Tanca el mapa actual
 CloudAction.text=N\u00FAvol
 CloudColorAction.text=Color del n\u00FAvol...
 ColorProperty.ResetColor=Reestableix el color
 combined=Combinat
 connector=Connector[translate me]
-CopyAction.text=Copia
-CopySingleAction.text=C\u00F2pia simple
-CreationModificationPluginAction.text=Mostra la cronologia de modificacions
+CopyAction.text=&Copia
+CopySingleAction.text=C\u00F2pia node &sol
+CreationModificationPluginAction.text=Mostra la cronologia de &modificacions
 CreationModificationPluginAction.tooltip=<html>Aquesta funci\u00F3 realitza el seguiment de la creaci\u00F3 i modificaci\u00F3 dels nodes.</html>
-CutAction.text=Retalla
+CutAction.text=Re&talla
 decrease_branch_font_size=Lletra m\u00E9s petita
 DecreaseNodeFontAction.text=Lletra m\u00E9s petita
 delete_child=Esborra el node
-DeleteAction.text=Elimina el Node
+DeleteAction.text=Elimina el n&ode
 DocumentationAction.text=Documentaci\u00F3
 edge=Cantells
 edge_style=Estil del Cantell
@@ -114,7 +151,7 @@ edit=Edici\u00F3
 edit_link_manually=Edita l'hiperenlla\u00E7 manualment...
 EditAction.text=Edita el node
 EditLongAction.text=Edita el node llarg...
-EncryptedMap.text=Crea un mapa xifrat ...
+EncryptedMap.text=Crea un mapa &xifrat ...
 EncryptedMap.tooltip=Crea un nou mapa xifrat
 enter_base_url=Enganxar\u00E9 enlla\u00E7os relatius. Si et plau, introdueix l'adre\u00E7a base.
 enter_confirms=La tecla Retorn ho confirma
@@ -122,9 +159,8 @@ EnterPassword.text=Alterna entre Xifrat / Desxifrat
 error=Error[translate me]
 error_creating_directory=No es pot crear el directori per a exportar.
 ExecuteScripts.text=Scripts[translate me]
-export_pdf_text=Format de Document Portable(PDF)
-export_svg_text=Gr\u00E0fic Vectorial Escalable (SVG)
 ExportAction.text=Exporta mapa\u2026
+ExportBranchAction.text=Moure la branca a un mapa nou...
 ExportBranchToHTMLAction.text=Branca com HTML
 ExportPdf.text=Com a PDF...
 ExportSvg.text=Com a SVG...
@@ -143,7 +179,7 @@ file_not_found=Fitxer {0} no trobat
 find_what=Qu\u00E8 vols cercar
 FindAction.text=Cerca...
 fit_map_to_page=Imprimeix-lo en Una P\u00E0gina
-FitToPage.text=Amplia o redueix per a cabre en la p\u00E0gina
+FitToPage.text=Ajustar a la p\u00E0&gina
 FitToPage.tooltip=Ajusta l'ampliaci\u00F3 de forma que tot el mapa sigui visible en la finestra actual.
 fold=Contreu
 FoldAllAction.text=Contreu-los tots
@@ -174,7 +210,7 @@ GrabKeyDialog.grab-key.remove=Suprimeix
 GrabKeyDialog.grab-key.remove-ask=Esteu segurs de voler suprimir aquest text?
 GrabKeyDialog.grab-key.title=Introdu\u00EFu una nova clau
 help=Ajuda
-HierarchicalIconsAction.text=Mostra les icones jer\u00E0rquicament
+HierarchicalIconsAction.text=Mostra les icones &jer\u00E0rquicament
 HierarchicalIconsAction.tooltip=Si un dels fills tenen una icona, tamb\u00E9 mostrar\u00E9 aquella icona en format petit.
 html_export_based_on_headings=Exporta a HTML - Basant-se en les cap\u00E7aleres
 html_export_fold_all=Exporta a HTML - Contreu-los tots
@@ -235,10 +271,10 @@ icon_yes=Important
 IconGroupPopupAction.smiley.text=Smiley[translate me]
 IconSelectionPlugin.text=Trieu una icona...
 IconSelectionPlugin.tooltip=<html>Aqu\u00ED podeu triar una icona mitjan\u00E7ant la finestra addicional.</html>
-import=Importa
+import=I&mporta
 import_linked_branch_no_link=El node que heu triat no t\u00E9 enlla\u00E7os per importar.
-ImportBranchAction.text=Branca...
-ImportExplorerFavoritesAction.text=Explora els preferits...
+ImportBranchAction.text=&Branca...
+ImportExplorerFavoritesAction.text=&Explora els preferits...
 ImportFolderStructureAction.text=Estructura de carpetes...
 ImportLinkedBranchAction.text=Branca enlla\u00E7ada
 ImportLinkedBranchWithoutRootAction.text=(Branca enlla\u00E7ada) Sense Arrel...
@@ -273,11 +309,13 @@ MoveToRootAction.text=Mou-re a l'Arrel
 navigate=Navega
 NavigationNextMapAction.text=Mapa Seg\u00FCent
 NavigationPreviousMapAction.text=Mapa anterior
+new_map_from_user_templates.text=Mapa nou des de la plantilla...
 new_mindmap=Crea un Mindmap
 new_node=Crea un Node Nou
 new_node_as_sibling_not_possible_for_the_root=No \u00E9s possible crear un node germ\u00E0 si us trobeu a l'arrel
 NewChildAction.text=Crea un Node Fill
-NewMapAction.text=Nou
+NewMapAction.text=Nou mapa
+NewMapViewAction.text=Nova vista del mapa
 NewParentNode.text=Crea un node pare
 NewParentNode.tooltip=<html>Tots els seleccionats s'enviaran al pare.</html>
 NewPreviousSiblingAction.text=Crea un Node Germ\u00E0 Anterior
@@ -521,7 +559,7 @@ selection_method_direct=Puntejar per a seleccionar
 SetImageByFileChooserAction.text=Imatge (Trieu un fitxer o enlla\u00E7)...
 SetLinkByFileChooserAction.text=Hiperenlla\u00E7 (Trieu un fitxer)...
 SetLinkByTextFieldAction.text=Hipernella\u00E7 (Quadre de text)...
-simplyhtml.borderColorLabel=Color:[translate me]
+simplyhtml.borderColorLabel=Color:
 simplyhtml.borderWidthLabel=Amplada
 simplyhtml.cancelBtnName=Cancel\u00B7la
 simplyhtml.cellGenTabLabel=General[translate me]
diff --git a/freeplane/resources/translations/Resources_cs.properties b/freeplane/resources/translations/Resources_cs.properties
index fb34db6..3b85bba 100644
--- a/freeplane/resources/translations/Resources_cs.properties
+++ b/freeplane/resources/translations/Resources_cs.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Storno
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=M\u016F\u017Eete p\u0159epnout do stavu ochrany heslem (zak\u00F3dov\u00E1n\u00ED) pouze u zak\u00F3dovan\u00E9ho uzlu. Takov\u00FD uzel m\u016F\u017Eete vlo\u017Eit pomoc\u00ED menu N\u00E1stroje.
 accessories/plugins/EncryptNode.properties_select_me=Vyberte mn\u011B pro pokra\u010Dov\u00E1n\u00ED!
 accessories/plugins/EncryptNode.properties_wrong_password=Heslo nen\u00ED spr\u00E1vn\u00E9.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Exportuje mapu do form\u00E1tu Java Web Start.
 accessories/plugins/ExportWithTWiki.text=TWiki ...
 accessories/plugins/ExportWithTWiki.tooltip=Exportuje mapu jako TWiki dokument.
 accessories/plugins/ExportWithXSLT.tooltip=Toto je jednotn\u00E1 exportn\u00ED metoda.
 accessories/plugins/ExportWithXSLT_Applet.text=Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exportuje mapu jako applet prohl\u00ED\u017Ee\u010De java.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exportuje mapu jako flash aplikaci.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript verze)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (verze s klikac\u00ED mapou)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Zdroje z uzlu RESOURCES do souboru Taskjuggler...
@@ -84,7 +84,7 @@ antialias_edges=Vyhlazovat hrany
 antialias_none=Nevyhlazovat nic
 apply=Pou\u017E\u00EDt
 ApplyAction.text=Pou\u017E\u00EDt
-ApplyFormatPlugin.text=Zm\u011Bna form\u00E1tu
+ApplyFormatPlugin.text=Zm\u011Bnit form\u00E1t
 ApplyFormatPlugin.tooltip=Dialog, kde atributy uzl\u016F a hran mohou b\u00FDt m\u011Bn\u011Bn\u00E9 najednou.
 ApplyNoFilteringAction.text=Nefiltrov\u00E1no
 ApplySelectedViewConditionAction.text=Filtrovat vybran\u00E9 uzly
@@ -184,7 +184,6 @@ cannot_join_nodes_with_children=Nelze spojit uzly, kter\u00E9 maj\u00ED poduzly
 cannot_move_into_child_node=Nelze p\u0159esunout do dce\u0159inn\u00E9ho uzlu
 cannot_move_to_child=Nelze p\u0159esunout uzel do jednoho ze sv\u00FDch pod\u0159\u00EDzen\u00FDch uzl\u016F.
 CenterAction.text=St\u0159ed
-CenterSelectedNodeAction.text=Centrovat vybran\u00FD uzel
 ChangeConnectorArrowsAction.backward.text=Zp\u011Bt
 ChangeConnectorArrowsAction.both.text=Nakreslete \u0161ipky vp\u0159ed a zp\u011Bt
 ChangeConnectorArrowsAction.forward.text=Vp\u0159ed
@@ -198,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=Uzel doleva
 ChangeNodeLevelLeftsAction.tooltip=Nalevo od ko\u0159enov\u00E9ho uzlu jsou uzly posunut\u00E9 dol\u016F. Stanou se d\u011Btmi uzl\u016F na stejn\u00E9 \u00FArovni. Na prav\u00E9 stran\u011B jsou posunut\u00E9 nahoru. P\u0159\u00EDmo u ko\u0159enov\u00E9ho uzlu si uzly vym\u011Bn\u00ED strany.
 ChangeNodeLevelRightsAction.text=Uzel doprava
 ChangeNodeLevelRightsAction.tooltip=Napravo od ko\u0159enov\u00E9ho uzlu jsou uzly posunut\u00E9 dol\u016F. Stanou se d\u011Btmi uzl\u016F na stejn\u00E9 \u00FArovni. Na lev\u00E9 stran\u011B jsou posunut\u00E9 nahoru. P\u0159\u00EDmo u ko\u0159enov\u00E9ho uzlu si uzly vym\u011Bn\u00ED strany.
-choose_background_color=Vyberte barvu pozad\u00ED:
 choose_cloud_color=Vyberte barvu oblaku:
 choose_edge_color=Vyberte barvu hrany
 choose_map_background_color=Zvolte barvu pozad\u00ED mapy
@@ -209,6 +207,8 @@ ClearLinkAnchorAction.tooltip=<html>Vymazat d\u0159\u00EDve nastaven\u00E9 ukotv
 CloneAction.text=Vlo\u017Eit klonovan\u00FD uzel
 close_btn=&Zav\u0159\u00EDt
 CloseAction.text=Zav\u0159\u00EDt otev\u0159enou mapu
+CloseAllMapsAction.text=Zav\u0159\u00EDt v\u0161echny mapy
+CloseAllOtherMapsAction.text=Zav\u0159\u00EDt v\u0161echny mapy krom\u011B aktivn\u00ED
 cloud_shapes=Tvary oblak
 CloudAction.text=Oblak
 CloudColorAction.text=Barva oblaku...
@@ -216,6 +216,15 @@ CloudShapeAction.ARC.text=Oblouk
 CloudShapeAction.RECT.text=Obd\u00E9ln\u00EDk
 CloudShapeAction.ROUND_RECT.text=Zaoblen\u00FD obd\u00E9ln\u00EDk
 CloudShapeAction.STAR.text=Hv\u011Bzda
+collection.copy.presentation=Kop\u00EDruj prezentaci
+collection.copy.slide=Kop\u00EDruj sl\u00EDdu
+collection.delete=Smazat
+collection.down=Dol\u016F
+collection.move=P\u0159esu\u0148
+collection.moveTo=P\u0159esu\u0148 na pozici
+collection.new.presentation=Nov\u00E1 prezentace
+collection.new.slide=Nov\u00E1 sl\u00EDda
+collection.up=Nahoru
 ColorProperty.ResetColor=Vyresetovat barvu
 combined=Kombinovan\u00E9
 condition=Podm\u00EDnka
@@ -226,14 +235,16 @@ connector_label=Popisek konektoru
 connector_lines=Spojovac\u00ED \u010D\u00E1ry
 connector_shapes=Tvar konektoru
 ConnectorColorAction.text=Barva konektoru...
+controls=Ovl\u00E1d\u00E1n\u00ED
 ConvertCloneToIndependentNodeAction.text=Odklonovat
+copy_name={0} (kop\u00EDrovat)
 CopyAction.text=Kop\u00EDrovat
 CopyAction.tooltip=Kop\u00EDrovat vybranou v\u011Btev
 CopyAttributes.text=Kop\u00EDrovat atributy
 CopyIDAction.text=Kop\u00EDrovat ID uzlu
 CopyMapStylesAction.text=Kop\u00EDrovat styl mapy z...
 CopyNodeURIAction.text=Kop\u00EDrovat URI uzlu
-copyright=Copyright \u00A9 2000-2014 Freeplane t\u00FDm a dal\u0161\u00ED
+copyright=Copyright \u00A9 2000-2017 Freeplane t\u00FDm a dal\u0161\u00ED
 CopySingleAction.text=Kop\u00EDrovat samostatn\u011B
 CopySingleAction.tooltip=Kop\u00EDrovat vybran\u00FD uzel
 CopyStyleExtensionsAction.text=Kop\u00EDrovat roz\u0161\u00ED\u0159en\u00ED ze stylu uzlu
@@ -306,7 +317,7 @@ edit_label_font_family=P\u00EDsmo
 edit_label_font_size=Velikost p\u00EDsma
 edit_link_manually=Upravit odkaz manu\u00E1ln\u011B...
 edit_long_node=Upravit j\u00E1dro uzlu v dialogu
-edit_middle_label=<html>Middle<br>label
+edit_middle_label=<html>St\u0159edn\u00ED<br>\u0161t\u00EDtek
 edit_note=Editovat pozn\u00E1mku
 edit_source_label=<html>Zdrojov\u00FD<br>popisek
 edit_target_label=<html>C\u00EDlov\u00FD<br>popisek
@@ -316,6 +327,7 @@ EditAction.text=Upravit j\u00E1dro uzlu v \u0159\u00E1dku
 EditAttributesAction.text=Upravit atributy v \u0159\u00E1dku
 EditDetailsAction.text=Upravit detail uzlu v \u0159\u00E1dku
 EditDetailsInDialogAction.text=Upravit detail uzlu v dialogu
+editEdgeColors=Upravit barvy hran
 EditFilterAction.text=Upravit
 EditLongAction.text=Upravit j\u00E1dro uzlu v dialogu
 EditNoteInDialogAction.text=Upravit pozn\u00E1mku v dialogu
@@ -351,14 +363,14 @@ ExecuteScripts.noScriptsAvailable=Nen\u00ED k dispozici
 ExecuteScripts.text=Skripty
 ExecuteScriptSecurityError.text=Do\u0161lo k chyb\u011B b\u011Bhem vykon\u00E1n\u00ED skriptu: {0}
 export_failed=Export selhal
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Export z Freeplane
 ExportAction.text=Exportovat...
-ExportBranchAction.text=P\u0159esunete v\u011Btve do nov\u00E9 mapy...
+ExportAllPresentationsAction.text=Exportuj v\u0161echny prezentace do obr\u00E1zku form\u00E1tu PNG
+ExportBranchAction.text=P\u0159esunout v\u011Btve do nov\u00E9 mapy
 ExportBranchToHTMLAction.text=Exportovat v\u011Btev do HTML
 exported_file={0} soubor
 ExportPdf.text=Jako PDF
+ExportPresentationAction.text=Exportuj aktu\u00E1ln\u00ED prezentaci do obr\u00E1zku form\u00E1tu PNG
 ExportSvg.text=SVG
 ExportToHTMLAction.text=Exportovat do HTML
 ExportToImage.jpg.text=JPEG
@@ -380,6 +392,7 @@ f_button_unassigned=<no action>[translate me]
 FaqOpenURLAction.text=FAQ
 file=Soubor
 file_already_exists=Soubor {0} ji\u017E existuje. Chcete ho p\u0159epsat?
+file_not_accessible=Soubor {0} nen\u00ED p\u0159\u00EDstupn\u00FD
 file_not_found=Soubor {0} nenalezen
 FileListFlavorHandler=Odkazy na soubory
 FileProperties_BranchLeafCount=Po\u010Det koncov\u00FDch uzl\u016F ve vybran\u00FDch v\u011Btv\u00EDch:
@@ -452,7 +465,7 @@ filter_reminder_before=napl\u00E1nov\u00E1no p\u0159ed
 filter_reminder_executed=ji\u017E aktivov\u00E1no
 filter_reminder_later=pl\u00E1novan\u00E9 pozd\u011Bji
 filter_root=Ko\u0159enov\u00FD uzel
-filter_script=Filtr skript
+filter_script=Skriptov\u00FD filtr
 filter_select=Vybrat
 filter_selected_node_view=Aktu\u00E1ln\u011B vybran\u00E9 uzly
 filter_selected_node_view_snapshot=Ulo\u017Een\u00FD v\u00FDb\u011Br
@@ -540,7 +553,7 @@ HierarchicalIconsAction.text=Uk\u00E1zat ikony hierarchicky
 HierarchicalIconsAction.tooltip=Pokud jeden z poduzl\u016F m\u00E1 ikonu, uk\u00E1\u017Ee se ta ikona tak\u00E9 v mal\u00E9m form\u00E1tu.
 hot_keys=Kl\u00E1vesov\u00E9 zkratky
 hot_keys_table=Tabulka kl\u00E1vesov\u00FDch zkratek
-HotKeyInfoAction.text=Key Reference[translate me]
+HotKeyInfoAction.text=Seznam kl\u00E1vesov\u00FDch zkratek
 html_export_based_on_headings=HTML Export - Zalo\u017Eeno na nadpisech
 html_export_fold_all=HTML Export - Slo\u017Eit v\u0161e
 html_export_fold_currently_folded=HTML Export - Skl\u00E1dat moment\u00E1ln\u011B slo\u017Een\u00E9
@@ -635,6 +648,9 @@ icon_penguin=Linux
 icon_positive=Pozitivn\u00ED
 icon_prepare=\u017Dlut\u00FD semafor
 icon_revision=Revize
+icon_revision-green=Revize - zelen\u00E1
+icon_revision-pink=Revize - r\u016F\u017Eov\u00E1
+icon_revision-red=Revize - \u010Derven\u00E1
 icon_smiley-angry=Zlost
 icon_smiley-neutral=No Mind[translate me]
 icon_smiley-oh=P\u0159ekvapen\u00ED
@@ -709,7 +725,7 @@ latex_editor=Editace LaTeX vzorce
 LatexDeleteLatexAction.text=Odstran\u011Bn\u00ED LaTeX vzorce
 LatexEditLatexAction.text=Editace LaTeX vzorce...
 LatexInsertLatexAction.msg1=<html>Pokou\u0161\u00EDte se vlo\u017Eit <i>zastaral\u00E9</i> LaTeX vzorce. <br/>Nov\u00FD zp\u016Fsob, jak vytvo\u0159it text LaTeXu, je pops\u00E1n na t\u00E9to str\u00E1nce:</html>
-LatexInsertLatexAction.msg2=<html>Ve zkratce: <ul><li>pou\u017Eij p\u0159edponu "\\latex " v hlavn\u00EDm textu uzlu, nebo</li><li><i>Pohled->Vlastnosti</i>, pot\u00E9 <i>Hlavn\u00ED text->Form\u00E1t->Latex.</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>Ve zkratce:<ul><li>Pou\u017Eij kl\u00ED\u010Dov\u00E9 slovo "\\latex " v uzlu p\u0159ed vlastn\u00EDm textem, nebo</li><li><i>Zobrazit->Panel n\u00E1stroj\u016F</i>, pak <i>Text uzlu->Form\u00E1t->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=P\u0159id\u00E1n\u00ED LaTeX vzorce...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -839,10 +855,13 @@ ModesMenuAction.Browse.text=Prohl\u00ED\u017Ee\u010D map
 ModesMenuAction.File.text=Spr\u00E1vce soubor\u016F
 ModesMenuAction.MindMap.text=Mind Map Editor[translate me]
 most_recent_files=Posledn\u00ED soubory
-MoveAction.text=P\u0159esu\u0148
+MoveAction.text=P\u0159esunout
+MoveSelectedNodeAction.CENTER.text=Centrovat vybran\u00FD uzel
+MoveSelectedNodeAction.EAST.text=P\u0159esunout vybran\u00FD uzel vpravo
+MoveSelectedNodeAction.WEST.text=P\u0159esunout vybran\u00FD uzel vlevo
 MoveToRootAction.text=P\u0159esunout do ko\u0159ene
 NameConditionAction.text=Nastavit n\u00E1zev
-navigate=Navigovat
+navigate=&Navigovat
 NavigationNextMapAction.text=Dal\u0161\u00ED mapa
 NavigationPreviousMapAction.text=P\u0159ede\u0161l\u00E1 mapa
 new=&Nov\u00FD
@@ -858,7 +877,7 @@ NewerFileRevisionsFoundDialog.file_last_modified=\u010Casov\u00E1 zna\u010Dka
 NewerFileRevisionsFoundDialog.file_name=Soubor
 NewerFileRevisionsFoundDialog.file_size=bajt\u016F
 NewerFileRevisionsFoundDialog.open=&Otev\u0159\u00EDt
-NewerFileRevisionsFoundDialog.open.tooltip=Otev\u0159ete soubor, i kdy\u017E by mohl b\u00FDt zastaral\u00FD
+NewerFileRevisionsFoundDialog.open.tooltip=Otev\u0159\u00EDt soubor, i kdy\u017E by mohl b\u00FDt zastaral\u00FD
 NewerFileRevisionsFoundDialog.question=Nalezeny nov\u011Bj\u0161\u00ED revize {0}!
 NewerFileRevisionsFoundDialog.restore=Obn&ovit
 NewerFileRevisionsFoundDialog.restore.tooltip=Nahradit {0} za {1}
@@ -878,8 +897,8 @@ NewUserStyleAction.text=Nov\u00FD styl z v\u00FDb\u011Bru
 NextNodeAction.BACK.text=J\u00EDt na p\u0159edchoz\u00ED uzel
 NextNodeAction.BACK_N_FOLD.text=J\u00EDt na p\u0159edchoz\u00ED uzel (slo\u017Eit)
 NextNodeAction.FORWARD.text=J\u00EDt na dal\u0161\u00ED uzel
-NextNodeAction.FORWARD_N_FOLD.text=Goto dal\u0161\u00ED uzel (slo\u017Eit)
-NextPresentationItemAction.text=Rozlo\u017Eit dal\u0161\u00ED polo\u017Eku prezentace
+NextNodeAction.FORWARD_N_FOLD.text=J\u00EDt na dal\u0161\u00ED uzel (slo\u017Eit)
+NextPresentationItemAction.text=Rozlo\u017E dal\u0161\u00ED polo\u017Eku prezentace (slo\u017Eenou)
 no=Ne
 no_copy_attributes_before_paste_attributes=Nem\u016F\u017Eete vlo\u017Eit atributy, dokud n\u011Bjak\u00E9 nezkop\u00EDrujete.
 NO_FORMAT=Text
@@ -890,7 +909,7 @@ no_previous_find=P\u0159edchoz\u00ED nenalezen.
 no_styles_found_in_map=\u017D\u00E1dn\u00E9 styly nenalezeny v map\u011B
 no_translation_strings_found=Nenalezen \u017E\u00E1dn\u00FD p\u0159elo\u017Eiteln\u00FD \u0159et\u011Bzec
 node=Uzel
-node_changed_discard_changes=Zm\u011Bnil(a) jste uzel. Chcete zahodit zm\u011Bny?
+node_changed_discard_changes=Zm\u011Bnili jste uzel. Chcete zahodit zm\u011Bny?
 node_is_write_protected=C\u00EDlov\u00FD uzel je chr\u00E1n\u011Bn proti z\u00E1pisu.
 node_location_help=P\u0159eta\u017Een\u00ED zm\u011Bn\u00ED um\u00EDst\u011Bn\u00ED uzlu, Ctrl+ta\u017Een\u00ED zm\u011Bn\u00ED vzd\u00E1lenosti, dvojklik a Ctrl+dvojklik je resetuje.
 node_popup_scripting=Skripty
@@ -919,6 +938,7 @@ not_saved_for_image_error=Mapa mus\u00ED b\u00FDt ulo\u017Eena p\u0159ed t\u00ED
 not_saved_for_link_error=Mapa mus\u00ED b\u00FDt ulo\u017Eena p\u0159ed nastaven\u00EDm odkazu pomoc\u00ED v\u00FDb\u011Bru souboru
 note_window_location=Um\u00EDst\u011Bn\u00ED pozn\u00E1mkov\u00E9ho panelu
 notes=Pozn\u00E1mka
+NotFoldingNextPresentationItemAction.text=Rozlo\u017Eit dal\u0161\u00ED polo\u017Eku prezentace
 NotificationOptions.CLOSE=Zav\u0159i
 NotificationOptions.REMIND_ME_LATER=P\u0159ipome\u0148 pozd\u011Bji
 NotificationOptions.REMOVE_REMINDER=Odstra\u0148 p\u0159ipomenut\u00ED
@@ -945,6 +965,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Automa
 OptionPanel.ADD_CHILD=P\u0159idej potomka
 OptionPanel.ADD_SIBLING=P\u0159idej rovnocenn\u00FD uzel
 OptionPanel.addons=Roz\u0161\u00ED\u0159en\u00ED
+OptionPanel.af=Afrik\u00E1n\u0161tina
 OptionPanel.always_fold_all_after_load=Slo\u017E v\u0161echno
 OptionPanel.always_load_last_maps=Nahraj posledn\u00ED a nov\u00E9 mapy
 OptionPanel.always_load_last_maps.tooltip=Otev\u0159en\u00ED posledn\u00EDch soubor\u016F nastaveno v\u00FD\u0161e, nav\u00EDc startuje FP s vybranou mapou.
@@ -958,10 +979,12 @@ OptionPanel.antialias.tooltip=<html>Stanovuje kvalitu mapy. V\u00EDce vyhlazov\u
 OptionPanel.antialias_all=Vyhlazovat v\u0161e
 OptionPanel.antialias_edges=Vyhlazovat hrany
 OptionPanel.antialias_none=\u017D\u00E1dn\u00E9 vyhlazov\u00E1n\u00ED
+OptionPanel.antialias_svg=Vyhlazovat ikony typu SVG
+OptionPanel.antialias_svg.tooltip=<html>Ur\u010Duje kvalitu zobrazov\u00E1n\u00ED ikon typu SVG. Zapnut\u00E9 vyhlazov\u00E1n\u00ED vy\u017Eaduje v\u00EDce \u010Dasu.</html>
 OptionPanel.Appearance=Vzhled
 OptionPanel.approximate_search_threshold=Pr\u00E1h pro p\u0159ibli\u017Enou shodu
 OptionPanel.approximate_search_threshold.tooltip=<html> Pr\u00E1h pro p\u0159ibli\u017Enou shodu<br/><font size="2"> Viz http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(\u010D\u00EDm vy\u0161\u0161\u00ED \u010D\u00EDslo, t\u00EDm p\u0159esn\u011Bj\u0161\u00ED shoda<br/>hledan\u00E9ho term\u00EDnu bude nalezena).</html>
-OptionPanel.ar=Ar
+OptionPanel.ar=Arabsky / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=Oblouk
 OptionPanel.as_parent=Jako rodi\u010D
 OptionPanel.ask=Zeptat se
@@ -972,6 +995,12 @@ OptionPanel.automaticFormat_level2=Form\u00E1t uzlu 1. \u00FArovn\u011B
 OptionPanel.backup_file_number=Po\u010Det ponechan\u00FDch z\u00E1lo\u017En\u00EDch soubor\u016F
 OptionPanel.Behaviour=Chov\u00E1n\u00ED
 OptionPanel.bezier=Hladk\u00E1 k\u0159ivka (Bezier)
+OptionPanel.border_color=Barva
+OptionPanel.border_color_matches_edge_color=Pou\u017E\u00EDt barvu hrany
+OptionPanel.border_dash=Typ linie ohrani\u010Den\u00ED
+OptionPanel.border_dash_matches_edge_dash=Pou\u017E\u00EDt typ p\u0159\u00EDmky hrany
+OptionPanel.border_width=\u0160\u00ED\u0159ka p\u0159\u00EDmky
+OptionPanel.border_width_matches_edge_width=Pou\u017E\u00EDt hranu s
 OptionPanel.bubble=Bubble[translate me]
 OptionPanel.ca=Katal\u00E1nsky
 OptionPanel.Cancel=Storno
@@ -986,13 +1015,16 @@ OptionPanel.cloudcolor=Barva oblaku
 OptionPanel.cloudshape=Tvar oblaku
 OptionPanel.combined=Kombinovan\u00E9
 OptionPanel.compare_as_number=Porovnej jako \u010D\u00EDsla
+OptionPanel.connector_arrows=\u0160ipky konektor\u016F
+OptionPanel.connector_dash=Typ \u010D\u00E1ry
 OptionPanel.convert_to_current_version=<html>Automaticky p\u0159ev\u00E1d\u011Bt mapy ze star\u0161\u00EDch verz\u00ED Freeplanu <br>do form\u00E1tu sou\u010Dasn\u00E9 verze?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Pouze pro velmi velk\u00E9 mapy, kter\u00E9 nemus\u00ED b\u00FDt konvertov\u00E1ny <br>(co\u017E je pokro\u010Dil\u00E1 znalost), m\u016F\u017Ee\u0161 otev\u0159\u00EDt mapu bez p\u0159evodu .</html>
 OptionPanel.copyFormatToNewSibling=Kop\u00EDruj form\u00E1t na nov\u00E9 uzly stejn\u00E9 \u00FArovn\u011B
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Kop\u00EDruj form\u00E1t s ikonami
-OptionPanel.cs=Cs
+OptionPanel.cs=\u010Cesky
 OptionPanel.cut_nodes_without_question=Vyjmout uzly bez potvrzen\u00ED?
 OptionPanel.cut_nodes_without_question.tooltip=Je-li zatr\u017Eeno, uzly budou vyjmuty bez potvrzen\u00ED. To m\u016F\u017Ee zp\u016Fsobit ztr\u00E1tu informac\u00ED p\u0159i necht\u011Bn\u00E9m u\u017Eit\u00ED.
+OptionPanel.cut_out_pictures_when_pasting_html=Odebrat obr\u00E1zky z HTML
 OptionPanel.da=Dk
 OptionPanel.date_format=Standradn\u00ED form\u00E1t data
 OptionPanel.date_format.tooltip=Mo\u017Eno pou\u017E\u00EDt SHORT (kr\u00E1tk\u00E9), MEDIUM (st\u0159edn\u00ED), LONG (dlouh\u00E9), \u010Di FULL (pln\u00E9), anebo vzor typu "MM/dd/yyyy"
@@ -1017,12 +1049,13 @@ OptionPanel.delete_automatic_saves_at_exit=Smazat automatick\u00E9 ulo\u017Een\u
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> Zda maj\u00ED b\u00FDt soubory smazan\u00E9 automaticky p\u0159i norm\u00E1ln\u00EDm ukon\u010Den\u00ED Freeplaneu.</html>
 OptionPanel.delete_nodes_without_question=Smazat uzly bez potvrzen\u00ED?
 OptionPanel.delete_nodes_without_question.tooltip=Je-li zatr\u017Eeno, uzly jsou maz\u00E1ny bez potvrzen\u00ED. V p\u0159\u00EDpad\u011B necht\u011Bn\u00E9ho u\u017Eit\u00ED m\u016F\u017Ee v\u00E9st ke ztr\u00E1t\u011B informace.
-OptionPanel.disable_cursor_move_paper=Zak\u00E1zat kurzoru v pohybu pap\u00EDru
+OptionPanel.disable_cursor_move_paper=Zak\u00E1zat kurzor p\u0159i pohybu pap\u00EDru
 OptionPanel.disable_cursor_move_paper.tooltip=<html>Neukazovat 'move' kurzor p\u0159i tah\u00E1n\u00ED pap\u00EDru.</html>
 OptionPanel.display_inline_editor_for_all_new_nodes=Zobraz do mapy vlo\u017Een\u00FD editor pro v\u0161echny nov\u00E9 uzly
 OptionPanel.display_node_id=Zobraz ID uzlu
 OptionPanel.edgecolor=Barva hrany
 OptionPanel.edgecolor.tooltip=Vlastnost hrany nad\u0159azen\u00E9ho uzlu (je tak\u00E9 aplikovan\u00E1 na v\u0161echny potomky)
+OptionPanel.edgedash=Typ \u010D\u00E1ry hrany
 OptionPanel.edgestyle=Styl hrany
 OptionPanel.edgestyle.tooltip=Vlastnost hrany nad\u0159azen\u00E9ho uzlu (je tak\u00E9 aplikovan\u00E1 na v\u0161echny potomky)
 OptionPanel.edgewidth=\u0160\u00ED\u0159ka hrany
@@ -1031,13 +1064,13 @@ OptionPanel.EDIT_CURRENT=P\u0159epi\u0161 obsah
 OptionPanel.edit_on_double_click=Edituj na dvojit\u00E9 kliknut\u00ED
 OptionPanel.editor_extra_width=Krok p\u0159idan\u00E9 \u0161\u00ED\u0159ky
 OptionPanel.editor_extra_width.tooltip=<html>Ur\u010Duje po\u010Det pixel\u016F, o kter\u00E9 se uzel roz\u0161\u00ED\u0159\u00ED, pakli\u017Ee \u0161\u00ED\u0159e textu p\u0159ekro\u010D\u00ED sou\u010Dasnou \u0161\u00ED\u0159i uzlu.</html>
-OptionPanel.el=El[translate me]
+OptionPanel.el=\u0158ecky / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__buttons_above=Tla\u010D\u00EDtka na vrchu
 OptionPanel.el__enter_confirms_by_default=Enter defaultn\u011B potvrzuje
-OptionPanel.el__max_default_window_height=Maxim\u00E1ln\u00ED defaultn\u00ED v\u00FD\u0161ka okna
-OptionPanel.el__max_default_window_width=Maxim\u00E1ln\u00ED defaultn\u00ED \u0161\u00ED\u0159ka okna
-OptionPanel.el__min_default_window_height=Minim\u00E1ln\u00ED defaultn\u00ED v\u00FD\u0161ka okna
-OptionPanel.el__min_default_window_width=Minim\u00E1ln\u00ED defaultn\u00ED \u0161\u00ED\u0159ka okna
+OptionPanel.el__max_default_window_height=Maxim\u00E1ln\u00ED v\u00FDchoz\u00ED v\u00FD\u0161ka okna
+OptionPanel.el__max_default_window_width=Maxim\u00E1ln\u00ED v\u00FDchoz\u00ED \u0161\u00ED\u0159ka okna
+OptionPanel.el__min_default_window_height=Minim\u00E1ln\u00ED v\u00FDchoz\u00ED v\u00FD\u0161ka okna
+OptionPanel.el__min_default_window_width=Minim\u00E1ln\u00ED v\u00FDchoz\u00ED \u0161\u00ED\u0159ka okna
 OptionPanel.el__position_window_below_node=Pozice okna pod uzlem
 OptionPanel.en=En
 OptionPanel.Environment=Prost\u0159ed\u00ED
@@ -1079,6 +1112,7 @@ OptionPanel.groovy_editor_font.tooltip=Pou\u017Eijte "Dialog", nebo "Monospaced"
 OptionPanel.groovy_editor_font_size=Velikost fontu pro editor jazyka Groovy se zv\u00FDrazn\u011Bn\u00EDm syntaxe
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Skr\u00FDt hranu
+OptionPanel.hide_single_end_connectors=Skr\u00FDt konec konektoru
 OptionPanel.highlight_formulas=Zv\u00FDraznit vzorce
 OptionPanel.horizontal=Horizont\u00E1ln\u011B
 OptionPanel.hr=Hr
@@ -1094,6 +1128,7 @@ OptionPanel.ic_file=Pou\u017Eit\u00ED disku
 OptionPanel.ic_ram=V RAM
 OptionPanel.icon=Ikona
 OptionPanel.icon.tooltip=Pokud se aplikuje, dan\u00FD uzel bude m\u00EDt p\u0159esn\u011B tuto ikonu.
+OptionPanel.icon_size=Velikost ikony
 OptionPanel.icons.list=Seznam standardn\u00EDch ikon
 OptionPanel.icons.list.tooltip=Zde m\u016F\u017Eete \u0159adit, nebo vyp\u00EDnat standardn\u00ED ikony. Ikony odd\u011Blujte pomoc\u00ED st\u0159edn\u00EDku.
 OptionPanel.id=Id[translate me]
@@ -1102,11 +1137,11 @@ OptionPanel.il__enter_confirms_by_default=Enter potvrzuje jako v\u00FDchoz\u00ED
 OptionPanel.image_cache=pro obr\u00E1zky
 OptionPanel.indentationUsesTabsInTextOutput=Ve v\u00FDstupn\u00EDm textu pou\u017E\u00EDvej tabul\u00E1tory
 OptionPanel.it=It
-OptionPanel.ja=Ja
+OptionPanel.ja=Japonsky / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Odd\u011Blova\u010D textu
 OptionPanel.key_type_action=P\u0159i stisknut\u00ED kl\u00E1vesy
 OptionPanel.Keystrokes=Kl\u00E1vesov\u00E9 zkratky
-OptionPanel.ko=Kr
+OptionPanel.ko=Korejsky / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Rodina p\u00EDsem
 OptionPanel.label_font_size=Velikost p\u00EDsma
 OptionPanel.language=Jazyk
@@ -1135,6 +1170,8 @@ OptionPanel.lookandfeel.scaleuifonts=\u0160k\u00E1luj p\u00EDsma u\u017Eivatelsk
 OptionPanel.lookandfeel.scaleuifonts.tooltip=U\u017Eite\u010Dn\u00E9 pro monitory s vy\u0161\u0161\u00EDm rozli\u0161en\u00EDm
 OptionPanel.lookandfeel.tooltip=<html>Vzhled a t\u00E9ma k pou\u017Eit\u00ED.'metal', 'windows', 'motif', 'gtk' jsou podporovan\u00E9, 'mac' je dostupn\u00FD pouze na MacOS. default znamen\u00E1, \u017Ee je pou\u017Eit\u00FD vzhled dan\u00E9 platformy. Pokud chcete d\u00E1t sv\u016Fj vlastn\u00ED vzhled, vlo\u017Ete n\u00E1zev t\u0159\u00EDdy a zajist\u011Bte, \u017Ee odpov\u00EDdaj\u00EDc\u00ED jar soubor(y) jsou nahran\u00E9. Kdy\u017E nastanou n\u011Bjak\u00E9 probl\u00E9my se vzhlede [...]
 OptionPanel.lt=Litev\u0161tina / kalba
+OptionPanel.markClones=Kreslit symbol klonovan\u00E9ho uzlu
+OptionPanel.markSelectedClones=Kreslit symbol klonovan\u00E9ho uzlu pro v\u00FDb\u011Br
 OptionPanel.max_displayed_node_count=Maxim\u00E1ln\u00ED po\u010Det zobrazen\u00FDch uzl\u016F
 OptionPanel.max_image_width=Max v\u00FDchoz\u00ED \u0161\u00ED\u0159ka obrazu
 OptionPanel.max_image_width.tooltip=Nov\u00E9 obr\u00E1zky jsou zmen\u0161eny na tuto \u0161\u00ED\u0159ku
@@ -1143,12 +1180,15 @@ OptionPanel.max_menu_item_count.tooltip=Ohrani\u010Den\u00ED po\u010Dtu polo\u01
 OptionPanel.max_node_width=Maxim\u00E1ln\u00ED \u0161\u00ED\u0159ka uzlu
 OptionPanel.max_node_width.tooltip=<html>Defaultn\u00ED maxim\u00E1ln\u00ED \u0161\u00ED\u0159ka uzlu v pixelech</html>
 OptionPanel.max_shortened_text_length=Nejvy\u0161\u0161\u00ED \u0161\u00ED\u0159ka textu zkr\u00E1cen\u00E9ho uzlu
+OptionPanel.menuItemFontSize=Velikost p\u00EDsma v polo\u017Ek\u00E1ch menu
 OptionPanel.metal=Kov
-OptionPanel.min_node_width=Min. \u0161\u00ED\u0159ka uzlu
+OptionPanel.min_node_width=Minim\u00E1ln\u00ED \u0161\u00ED\u0159ka uzlu
+OptionPanel.monitor_size_inches=Rozm\u011Br obrazovky (v palc\u00EDch)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Tenk\u00FD \u0161esti\u00FAheln\u00EDk
 OptionPanel.nb=Nb[translate me]
 OptionPanel.never_save_folding=Nikdy
+OptionPanel.neverShowSurvey=Nikdy neukazuj dotazy, pr\u016Fzkumy a tipy
 OptionPanel.nl=Nl
 OptionPanel.nn=Nn
 OptionPanel.nodebackgroundcolor=Barva pozad\u00ED uzlu
@@ -1177,19 +1217,21 @@ OptionPanel.org.freeplane.plugin.bugreport=Pravidla
 OptionPanel.org.freeplane.plugin.bugreport.allowed=V\u017Edy odes\u00EDlat
 OptionPanel.org.freeplane.plugin.bugreport.ask=Uka\u017E okno zpr\u00E1vy
 OptionPanel.org.freeplane.plugin.bugreport.denied=Nikdy neodes\u00EDlat
-OptionPanel.org.freeplane.plugin.bugreport.userid=Voliteln\u00ED identifik\u00E1tor k odesl\u00E1n\u00ED
+OptionPanel.org.freeplane.plugin.bugreport.userid=Voliteln\u00FD identifik\u00E1tor k odesl\u00E1n\u00ED
 OptionPanel.outline_hgap=Vodorovn\u00E1 vzd\u00E1lenost
 OptionPanel.outline_vgap=Svisl\u00E1 vzd\u00E1lenost
 OptionPanel.oval=Ov\u00E1l
 OptionPanel.paint_connectors_behind=Konektory vykresleny pod uzly
 OptionPanel.parse_data=Rozpoznat vstup \u010D\u00EDsel a data a \u010Dasu
-OptionPanel.parse_data.tooltip=Zkus analyzovat datum, datum-\u010Das a \u010D\u00EDseln\u00FD vstup a pou\u017E\u00EDt standardn\u00ED form\u00E1tov\u00E1n\u00ED. P\u0159\u00EDklady: 100,000.00, 12/31, 12/31/99, 1999-12-31 a 1999-12-31 23:59
-OptionPanel.parse_formulas=Rozpozn\u00E1vej vzorce
-OptionPanel.parse_formulas.tooltip=Analyzuj vzorce v uzlech za\u010D\u00EDnaj\u00EDc\u00EDch rovn\u00EDtkem. Viz http://www.freeplane.org/wiki/index.php/Formulas.
-OptionPanel.parse_latex=Rozpozn\u00E1vej p\u0159\u00EDkazy jazyka LaTeX
-OptionPanel.parse_latex.tooltip=Rozpozn\u00E1vej p\u0159\u00EDkazy jazyka LaTeX pomoc\u00ED form\u00E1tu, nebo p\u0159edpony. Viz http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
+OptionPanel.parse_data.tooltip=Zkusit analyzovat datum, datum-\u010Das a \u010D\u00EDseln\u00FD vstup a pou\u017E\u00EDt standardn\u00ED form\u00E1tov\u00E1n\u00ED. P\u0159\u00EDklady: 100,000.00, 12/31, 12/31/99, 1999-12-31 a 1999-12-31 23:59
+OptionPanel.parse_formulas=Rozpoznat vzorce
+OptionPanel.parse_formulas.tooltip=Analyzovat vzorce v uzlech za\u010D\u00EDnaj\u00EDc\u00EDch rovn\u00EDtkem. Viz http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_latex=Rozpoznat p\u0159\u00EDkazy jazyka LaTeX
+OptionPanel.parse_latex.tooltip=Rozpoznat p\u0159\u00EDkazy jazyka LaTeX pomoc\u00ED form\u00E1tu, nebo p\u0159edpony. Viz http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Vlo\u017Eit jako HTML
 OptionPanel.PASTE_PLAIN_TEXT=Vlo\u017Eit jako prost\u00FD text
+OptionPanel.pasteImagesFromFiles=Vlo\u017Eit obr\u00E1zky ze soubor\u016F
+OptionPanel.pasteImagesFromFiles.tooltip=Vlo\u017Eit obr\u00E1zek ze souboru, je-li tento p\u0159eta\u017Een do mapy
 OptionPanel.path_property_may_not_be_empty=Vlastnost cesty nem\u016F\u017Ee b\u00FDt pr\u00E1zdn\u00E1! Zm\u011Bny jsou vr\u00E1ceny zp\u011Bt.
 OptionPanel.patternname=N\u00E1zev
 OptionPanel.patternname.tooltip=Unik\u00E1tn\u00ED jm\u00E9no vzoru
@@ -1198,8 +1240,18 @@ OptionPanel.placenewbranches=Um\u00EDstit nov\u00E9 v\u011Btve
 OptionPanel.placenewbranches.tooltip=<html>Kde um\u00EDstit nov\u00E9 v\u011Btve. Platn\u00E9 hodnoty jsou 'first' a 'last'. </html>
 OptionPanel.plugin.tooltip=Ostatn\u00ED roz\u0161\u00ED\u0159en\u00ED.
 OptionPanel.plugins=Pluginy
-OptionPanel.presentation_dimmer_transparency=Prezentace miz\u00ED do pr\u016Fhlednosti
-OptionPanel.presentation_mode=Prezenta\u010Dn\u00ED re\u017Eim
+OptionPanel.Presentation=Prezentace
+OptionPanel.presentation.combineAll=Kombinovat v\u0161echny prezentace
+OptionPanel.presentation.exportDirectory=Jm\u00E9no adres\u00E1\u0159e pro export prezentace
+OptionPanel.presentation.maxDropBoxRowCount=Nejvy\u0161\u0161\u00ED po\u010Det \u0159\u00E1dk\u016F v drop-down boxu
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Pou\u017E\u00EDt na prezentaci a v\u00FDb\u011Br sl\u00EDd
+OptionPanel.presentation.processesEscapeKey=Stisk "Esc" ukon\u010D\u00ED prezentaci
+OptionPanel.presentation.processesNavigationKeys=Pou\u017E\u00EDt \u0161ipky pro proch\u00E1zen\u00ED prezentac\u00ED
+OptionPanel.presentation.slideDisplaysAllNodes=Automaticky rozlo\u017Eit v\u0161echny uzly na sl\u00EDd\u011B
+OptionPanel.presentation.slowMotion=Pomal\u00FD pohyb
+OptionPanel.presentation.switchToFullScreen=Spus\u0165 celoobrazovkov\u00FD re\u017Eim
+OptionPanel.presentation.switchToSpotlight=Spus\u0165 bodov\u00E9 osv\u011Btlen\u00ED
+OptionPanel.presentation.zoom=Pou\u017Eij zv\u011Bt\u0161en\u00ED mapy
 OptionPanel.printonwhitebackground=<html>B\u00EDl\u00E9 pozad\u00ED pro tisk</html>
 OptionPanel.printonwhitebackground.tooltip=<html>V\u017Edy pou\u017E\u00EDvejte b\u00EDl\u00E9 pozad\u00ED pro tisk</html>
 OptionPanel.pt_BR=Pt BR
@@ -1219,8 +1271,8 @@ OptionPanel.resources_use_margin_top_zero_for_notes=Odeber horn\u00ED okraj pozn
 OptionPanel.revision_color=Barva revize
 OptionPanel.revision_color.tooltip=Barva pozad\u00ED pro zm\u011Bn\u011Bn\u00E9 uzly.
 OptionPanel.ROUND_RECT=Zaoblen\u00FD obd\u00E9ln\u00EDk
-OptionPanel.ru=Ru
-OptionPanel.save_folding=Ulo\u017Eit, skl\u00E1d\u00E1n\u00ED
+OptionPanel.ru=Rusky / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
+OptionPanel.save_folding=Ulo\u017Eit skl\u00E1d\u00E1n\u00ED
 OptionPanel.save_folding_if_map_is_changed=Pokud je mapa zm\u011Bn\u011Bna
 OptionPanel.save_last_visited_node=Ulo\u017E posledn\u00ED pozici v map\u011B
 OptionPanel.save_modification_times=Ulo\u017Eit \u010Das zm\u011Bny
@@ -1232,7 +1284,7 @@ OptionPanel.script_directories=Cesta, ve kter\u00E9 jsou hled\u00E1ny skripty (v
 OptionPanel.script_directories.tooltip=<html>Seznam adres\u00E1\u0159\u016F (dopln\u011Bk "skript\u016F").<br> Pou\u017Eijte st\u0159edn\u00EDk (na Windows), nebo dvojte\u010Dku (na Linuxu a Macu) k odd\u011Blen\u00ED polo\u017Eek.<br>Relativn\u00ED cesty jsou uva\u017Eov\u00E1ny k u\u017Eivatelsk\u00E9mu adres\u00E1\u0159i Freeplanu.</html>
 OptionPanel.script_user_key_name_for_signing=Voliteln\u00FD u\u017Eivatelsk\u00FD pseudonym podpisov\u00E9ho kl\u00ED\u010De skript\u016F
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Jestli\u017Ee chcete podepsat sv\u00E9 skripty, zapi\u0161te pseudonym pro kl\u00ED\u010D zde.<br>P\u0159edpokl\u00E1d\u00E1 se, \u017Ee je kl\u00ED\u010D ulo\u017Een ve v\u00FDchoz\u00ED kl\u00ED\u010Dence.<br>Heslo kl\u00ED\u010De mus\u00ED odpov\u00EDdat heslu kl\u00ED\u010Denky (co\u017E je v\u00FDchoz\u00ED nastaven\u00ED).</html>
-OptionPanel.scrollbar_increment=Speed[translate me]
+OptionPanel.scrollbar_increment=Rychlost
 OptionPanel.scrolling_speed=Rychlost automatick\u00E9ho rolov\u00E1n\u00ED
 OptionPanel.scrollOnUnfold=Posu\u0148 mapu po rozlo\u017Een\u00ED uzlu
 OptionPanel.selection_method=Metoda v\u00FDb\u011Bru
@@ -1247,11 +1299,13 @@ OptionPanel.separator.automatic_save=Automatick\u00E9 ukl\u00E1d\u00E1n\u00ED
 OptionPanel.separator.behaviour=Chov\u00E1n\u00ED
 OptionPanel.separator.browser=Prohl\u00ED\u017Ee\u010D
 OptionPanel.separator.cache=Mezipam\u011B\u0165
+OptionPanel.separator.clones=Klony
+OptionPanel.separator.cloud=Oblak
 OptionPanel.separator.CloudControls=Mraky
 OptionPanel.separator.commands_for_the_program=P\u0159\u00EDkazy pro program
 OptionPanel.separator.connectors=Konektory
 OptionPanel.separator.data_formats=Form\u00E1tov\u00E1n\u00ED
-OptionPanel.separator.default_colors=Defaultn\u00ED barvy
+OptionPanel.separator.default_colors=V\u00FDchoz\u00ED barvy
 OptionPanel.separator.default_fonts=Defaultn\u00ED p\u00EDsma
 OptionPanel.separator.default_styles=Defaultn\u00ED styly
 OptionPanel.separator.EdgeControls=Hrany
@@ -1265,7 +1319,9 @@ OptionPanel.separator.html_export=Export Html
 OptionPanel.separator.html_import=Import Html
 OptionPanel.separator.hyperlink_types=Typy hyperlink\u016F
 OptionPanel.separator.icon_properties=Ikony
+OptionPanel.separator.IconControls=Ikony
 OptionPanel.separator.icons=Ikony ve "Vyber ikonu..."
+OptionPanel.separator.Icons=Ikony
 OptionPanel.separator.initial_map_size=\u00DAvodn\u00ED velikost mapy
 OptionPanel.separator.inline_editor=Editor uzlu v \u0159\u00E1dku
 OptionPanel.separator.JoinNodesAction=Spojov\u00E1n\u00ED uzl\u016F
@@ -1278,6 +1334,7 @@ OptionPanel.separator.mouse_wheel=Kole\u010Dko my\u0161i
 OptionPanel.separator.new_node_commands=P\u0159\u00EDkazy nov\u00E9ho uzlu
 OptionPanel.separator.node_editing_commands=P\u0159\u00EDkazy pro \u00FApravu uzl\u016F
 OptionPanel.separator.node_navigation_commands=P\u0159\u00EDkazy pro navigaci
+OptionPanel.separator.NodeBorder=Okraj uzlu
 OptionPanel.separator.NodeColors=Barvy uzlu
 OptionPanel.separator.NodeFont=P\u00EDsmo uzlu
 OptionPanel.separator.NodeShape=Tvar uzlu
@@ -1289,12 +1346,13 @@ OptionPanel.separator.other_defaults=Ostatn\u00ED defaultn\u00ED nastaven\u00ED
 OptionPanel.separator.others=Jin\u00E1 nav\u00E1z\u00E1n\u00ED kl\u00E1ves
 OptionPanel.separator.outline_view=Zobraz sch\u00E9ma
 OptionPanel.separator.patterns=Vzory
+OptionPanel.separator.presentation=Prezentace
 OptionPanel.separator.reminderOptions=Volby p\u0159ipom\u00EDnek
-OptionPanel.separator.RichTextEditor=Bohat\u00FD textov\u00FD editor
+OptionPanel.separator.RichTextEditor=Editor form\u00E1tovan\u00E9ho textu
 OptionPanel.separator.root_node_appearance=Chov\u00E1n\u00ED ko\u0159enov\u00E9ho uzlu
 OptionPanel.separator.save=Ulo\u017Eit
 OptionPanel.separator.scripting=Skriptov\u00E1n\u00ED
-OptionPanel.separator.scrollbar=Scrollbar[translate me]
+OptionPanel.separator.scrollbar=Skrolovac\u00ED li\u0161ta
 OptionPanel.separator.search=Vyhled\u00E1v\u00E1n\u00ED
 OptionPanel.separator.selection_colors=Barvy v\u00FDb\u011Bru
 OptionPanel.separator.selection_method=Metoda v\u00FDb\u011Bru
@@ -1303,7 +1361,9 @@ OptionPanel.separator.size_limits=Ohrani\u010Den\u00ED velikosti
 OptionPanel.separator.spelling=Volby kontroly pravopisu
 OptionPanel.separator.SplitToWordsAction=Rozd\u011Blov\u00E1n\u00ED uzlu podle slov
 OptionPanel.separator.status=Stavov\u00FD \u0159\u00E1dek
-OptionPanel.separator.tooltip=Doba zobrazen\u00ED n\u00E1strojov\u00E9ho tipu
+OptionPanel.separator.surveys=Pr\u016Fzkumy
+OptionPanel.separator.svg_icons=Ikony typu SVG
+OptionPanel.separator.tooltip=N\u00E1strojov\u00E9 tipy
 OptionPanel.separator.undo=Zp\u011Bt
 OptionPanel.separator.updates=Aktualizace programu
 OptionPanel.set_property_text=Zm\u011Bna
@@ -1315,9 +1375,12 @@ OptionPanel.shape_vertical_margin=Svisl\u00FD okraj
 OptionPanel.sharp_bezier=ostr\u00FD bezier
 OptionPanel.sharp_linear=ostr\u00FD line\u00E1rn\u00ED
 OptionPanel.shouldCenterSmallMaps=Vyst\u0159e\u010F mal\u00E9 mapy
+OptionPanel.show_connectors=Uk\u00E1zat konektory
 OptionPanel.show_icon_for_attributes=Ukazovat ikonu atribut\u016F
+OptionPanel.show_icons=Uk\u00E1zat ikony
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Na\u010Dti z mapy, nebo rozlo\u017E n\u011Bjak\u00E9 uzly
 OptionPanel.show_node_tooltips=Zobrazuj n\u00E1strojov\u00E9 tipy
+OptionPanel.show_note_icon_in_tooltip=Uka\u017E ikonu pozn\u00E1mky v n\u00E1strojov\u00E9m tipu
 OptionPanel.show_note_icons=Zobrazuj ikonu pozn\u00E1mky
 OptionPanel.show_styles_in_tooltip=Zobrazuj styly uzl\u016F v n\u00E1strojov\u00FDch tipech
 OptionPanel.signed_script_are_trusted=V\u011B\u0159it podepsan\u00FDm skript\u016Fm (doporu\u010Deno).
@@ -1330,10 +1393,10 @@ OptionPanel.single_backup_directory_path.tooltip=<html>Potla\u010D\u00ED v\u00FD
 OptionPanel.single_instance=Otev\u00EDrej soubory v b\u011B\u017E\u00EDc\u00ED instanci Freeplanu
 OptionPanel.single_instance_force=Nepovol \u017E\u00E1dnou dal\u0161\u00ED instanci Freeplanu
 OptionPanel.single_instance_force.tooltip=Nepovol\u00ED dal\u0161\u00ED instanci, i kdy\u017E nechcete na\u010D\u00EDst \u017E\u00E1dn\u00FD ulo\u017Een\u00FD soubor
-OptionPanel.sk=Sk[translate me]
+OptionPanel.sk=Sloven\u0161tina / sloven\u010Dina
 OptionPanel.skip_template_selection=P\u0159esko\u010D dialog v\u00FDb\u011Bru \u0161ablony
-OptionPanel.sl=Sl
-OptionPanel.slow_scroll_selected_node=Pomal\u00E9 naj\u00ED\u017Ed\u011Bn\u00ED na vybran\u00FD uzel
+OptionPanel.sl=Slovinsky / sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Hladce naj\u00ED\u017Ed\u011Bt na vybran\u00FD uzel
 OptionPanel.spelling_opt_case_sensitive=Citliv\u00E9 na velikost p\u00EDsmen
 OptionPanel.spelling_opt_ignore_all_caps_words=Ignoruj v\u0161echna slova zapsan\u00E1 VELK\u00DDMI P\u00CDSMENY.
 OptionPanel.spelling_opt_ignore_capitalization=Ignoruj velk\u00E1 p\u00EDsmena na po\u010D\u00E1tku slova
@@ -1345,7 +1408,9 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=znaky ve slovech
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=ponech p\u016Fvodn\u00ED uzel pr\u00E1zdn\u00FD
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u010D\u00EDslo uzlu v \u0159\u00E1dku
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=ulo\u017E p\u016Fvodn\u00ED text do detailu uzlu
-OptionPanel.sr=Srbsky
+OptionPanel.spotlight=Bodov\u00E9 sv\u011Btlo
+OptionPanel.spotlight_background_color=Barva bodov\u00E9ho sv\u011Btla
+OptionPanel.sr=Srbsky / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=V\u00FDchoz\u00ED \u0161ablona mapy
 OptionPanel.standardbackgroundcolor=Standardn\u00ED barva pozad\u00ED
 OptionPanel.standardbackgroundcolor.tooltip=<html>Standardn\u00ED barva pozad\u00ED v html notaci </html>
@@ -1353,6 +1418,7 @@ OptionPanel.standardcloudcolor=Standardn\u00ED barva oblaku
 OptionPanel.standardcloudcolor.tooltip=<html>Standardn\u00ED barva oblaku v html notaci </html>
 OptionPanel.standardcloudestyle=Standardn\u00ED styl oblaku
 OptionPanel.standardcloudestyle.tooltip=<html>Standardn\u00ED styl oblaku.</html>
+OptionPanel.standardcloudshape=Standardn\u00ED tvar oblaku
 OptionPanel.standarddrawrectangleforselection=Zobrazit vybran\u00E9 uzly v bublin\u00E1ch
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Ozna\u010D vybran\u00E9 uzly bublinou okolo.</html>
 OptionPanel.standardlinkcolor=Standardn\u00ED barva odkazu
@@ -1375,6 +1441,7 @@ OptionPanel.time_for_automatic_save=Interval automatick\u00E9ho ukl\u00E1d\u00E1
 OptionPanel.time_for_automatic_save.tooltip=<html> Interval mezi dv\u011Bma n\u00E1sleduj\u00EDc\u00EDmi automatick\u00FDmi akcemi ulo\u017Een\u00ED (v msec): Pro vypnut\u00ED automatick\u00E9ho ukl\u00E1d\u00E1n\u00ED zadejte \u010D\u00EDslo 2000000000.</html>
 OptionPanel.time_for_delayed_selection=\u010Cas pro opo\u017Ed\u011Bn\u00FD v\u00FDb\u011Br
 OptionPanel.time_for_delayed_selection.tooltip=<html> \u010Casov\u00E9 zpo\u017Ed\u011Bn\u00ED v\u00FDb\u011Bru uzlu p\u0159i najet\u00ED my\u0161i (v msec). Zm\u011B\u0148te hodnotu na 1, pokud chcete p\u0159\u00EDm\u00FD v\u00FDb\u011Br p\u0159i najet\u00ED my\u0161i.</html>
+OptionPanel.toolbar_icon_height=Velikost ikon n\u00E1strojov\u00FDch li\u0161t
 OptionPanel.toolTipManager.dismissDelay=Prodleva opu\u0161t\u011Bn\u00ED, ms
 OptionPanel.toolTipManager.initialDelay=Po\u010D\u00E1te\u010Dn\u00ED prodleva, ms
 OptionPanel.toolTipManager.max_tooltip_height=Nejvy\u0161\u0161\u00ED v\u00FD\u0161ka n\u00E1strojov\u00E9ho tipu uzlu
@@ -1383,7 +1450,7 @@ OptionPanel.toolTipManager.max_tooltip_width=Nejvy\u0161\u0161\u00ED \u0161\u00E
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=Nejvy\u0161\u0161\u00ED \u0161\u00ED\u0159ka n\u00E1strojov\u00E9ho tipu v pixelech.
 OptionPanel.toolTipManager.reshowDelay=Prodleva p\u0159ed znovuzobrazen\u00EDm, ms
 OptionPanel.tr=Tr
-OptionPanel.uk_UA=Uk UA[translate me]
+OptionPanel.uk_UA=Ukrajinsky / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Nedefinovan\u00E9 p\u00EDsmo
 OptionPanel.undo_levels=\u00DArovn\u011B zp\u011Bt
 OptionPanel.undo_levels.tooltip=<html>Ur\u010Duje kolik krok\u016F zp\u011Bt je ulo\u017Eeno a m\u016F\u017Ee b\u00FDt vr\u00E1ceno pomoc\u00ED "Zp\u011Bt".</html>
@@ -1392,9 +1459,10 @@ OptionPanel.unfold_on_paste.tooltip=Rozlo\u017E uzel p\u0159i vkl\u00E1d\u00E1n\
 OptionPanel.uniform_shape=Jednotn\u00FD
 OptionPanel.use_common_out_point_for_root_node=Hrany vych\u00E1z\u00ED z jedin\u00E9ho bodu v ko\u0159enov\u00E9m uzlu
 OptionPanel.use_common_out_point_for_root_node.tooltip=Hrany vych\u00E1z\u00ED z jedin\u00E9ho bodu v ko\u0159enov\u00E9m uzlu
+OptionPanel.use_svg_icons=Pou\u017E\u00EDvat ikony typu SVG
+OptionPanel.use_svg_icons.tooltip=<html>Ur\u010Duje kvalitu zobrazov\u00E1n\u00ED ikon. Ikony typu SVG vy\u017Eaduj\u00ED pro sv\u00E9 zobrazen\u00ED v\u00EDce \u010Dasu.</html>
 OptionPanel.use_tabbed_pane=Pou\u017E\u00EDvej karty
 OptionPanel.use_tabbed_pane.tooltip=Je-li zatr\u017Eeno, mapy se budou zobrazovat v samostatn\u00FDch kart\u00E1ch (jako ve Firefoxu).
-OptionPanel.user_defined_screen_resolution=U\u017Eivatelsky ur\u010Den\u00E9 rozli\u0161en\u00ED obrazovky (v DPI)
 OptionPanel.validate_classpath_needs_readaccess=Skriptov\u00E1n\u00ED: P\u0159i nastavovan\u00ED cesty k soubor\u016Fm .class mus\u00EDte m\u00EDt opr\u00E1vn\u011Bn\u00ED ke \u010Dten\u00ED soubor\u016F!
 OptionPanel.validate_invalid_date_format=Nedopustn\u00FD standardn\u00ED form\u00E1t data
 OptionPanel.validate_invalid_datetime_format=Nedopustn\u00FD standardn\u00ED form\u00E1t data a \u010Dasu
@@ -1404,13 +1472,13 @@ OptionPanel.validation_error=<html><body>Chyba/y validace:<p><em>{0}</em><p>Pro
 OptionPanel.validation_warning=<html><body>Varov\u00E1n\u00ED validace:<p><em>{0}</em></body></html>
 OptionPanel.vertical_child_gap=Svisl\u00E1 mezera mezi potomky
 OptionPanel.vertical_child_gap.tooltip=Svisl\u00E1 vzd\u00E1lenost mezi uzly-potomky
-OptionPanel.vi=Vi[translate me]
-OptionPanel.wheel_velocity=Speed[translate me]
+OptionPanel.vi=Vietnamsky / Ti\u1EBFng Vi\u1EC7t
+OptionPanel.wheel_velocity=Rychlost
 OptionPanel.wheel_velocity.tooltip=Vy\u0161\u0161\u00ED hodnota zp\u016Fsob\u00ED rychlej\u0161\u00ED pohyb v map\u011B kole\u010Dkem my\u0161i.
 OptionPanel.wide_hexagon=\u0160irok\u00FD \u0161esti\u00FAheln\u00EDk
 OptionPanel.windows=Windows
-OptionPanel.zh_CN=Zh CN
-OptionPanel.zh_TW=Zh
+OptionPanel.zh_CN=\u010C\u00EDn\u0161tina (zjednodu\u0161en\u00E1) / \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=\u010C\u00EDn\u0161tina (tradi\u010Dn\u00ED) / \u7E41\u9AD4\u5B57
 org.freeplane.plugin.bugreport.agree=Odeslat
 org.freeplane.plugin.bugreport.always_agree=Odeslat v\u017Edy
 org.freeplane.plugin.bugreport.always_deny=Nikdy neodes\u00EDlat
@@ -1449,7 +1517,7 @@ PeriodUnit.MONTH=m\u011Bs\u00EDc
 PeriodUnit.WEEK=t\u00FDden
 PeriodUnit.YEAR=rok
 plugins/latex/LatexNodeHook.editorTitle=Edituj vzorec v jazyce LaTeX
-plugins/script_filter=Filtr skript\u016F {0}
+plugins/script_filter=Skriptov\u00FD filtr {0}
 plugins/script_filter_error={0} m\u00E1 navr\u00E1tit logickou hodnotu na {1}, ale navr\u00E1til {2}
 plugins/script_filter_execute_error=Chyba vykon\u00E1n\u00ED {0}\npro uzel {1}:\n{2}
 plugins/ScriptEditor.cancel=&Neukl\u00E1dat zm\u011Bny a skon\u010Dit
@@ -1495,11 +1563,14 @@ plugins/TimeManagement.xml_todayButton=Dnes
 plugins/TimeManagement.xml_WindowTitle=Kalend\u00E1\u0159
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Naj\u00EDt a nahradit
 preferences=Nastaven\u00ED
+presentation=Prezentace
+presentation.combineAll=Kombinovat v\u0161echny prezentace
 print_preview_title=N\u00E1hled tisku
 PrintAction.text=Tisknout mapu
 PrintDirectAction.text=Tisk
 printing_settings=Nastaven\u00ED tisku
 PrintPreviewAction.text=N\u00E1hled tisku
+program_terminates=Vnit\u0159n\u00ED chyba programu, program se ukon\u010D\u00ED.
 progress=Ikona pr\u016Fb\u011Bhu (%)
 PropertyAction.dialog=Nastaven\u00ED
 PropertyAction.text=Mo\u017Enosti ...
@@ -1554,11 +1625,11 @@ save=&Ulo\u017Eit
 save_failed=Pokus ulo\u017Eit soubor mapy {0} selhal.
 save_unsaved=Ulo\u017Eit n\u00E1sleduj\u00EDc\u00ED mapu?
 save_unsaved_styles=Ulo\u017Eit styly?
-SaveAcceleratorPresetsAction.text=Ulo\u017E seznam kl\u00E1vesov\u00FDch zkratek
+SaveAcceleratorPresetsAction.text=Ulo\u017Eit seznam kl\u00E1vesov\u00FDch zkratek
 SaveAction.text=Ulo\u017Eit
 SaveAction_readonlyMsg=Tato mapa je pouze ke \u010Dten\u00ED. Pro editaci mapu nejprve ulo\u017Ete.
 SaveAction_readonlyTitle=Pokus o ulo\u017Een\u00ED mapy otev\u0159en\u00E9 v re\u017Eimu pouze ke \u010Dten\u00ED
-SaveAll.text=Ulo\u017Eit v\u0161echny otev\u0159en\u00E9 mapy
+SaveAll.text=Ulo\u017Eit v\u0161echny mapy
 SaveAll.tooltip=Ulo\u017Eit v\u0161echny otev\u0159en\u00E9 mapy
 SaveAs_toReadonlyMsg={0} je pouze ke \u010Dten\u00ED. Pros\u00EDm, ulo\u017Ete do jin\u00E9ho souboru.
 SaveAs_toReadonlyTitle=Pokus o ulo\u017Een\u00ED souboru otev\u0159en\u00E9ho v re\u017Eimu pouze ke \u010Dten\u00ED
@@ -1595,6 +1666,7 @@ selection_method_delayed=Opo\u017Ed\u011Bn\u00FD automatick\u00FD v\u00FDb\u011B
 selection_method_direct=V\u00FDb\u011Br uk\u00E1z\u00E1n\u00EDm
 SelectNoteAction.text=P\u0159epnout editor pozn\u00E1mek
 SelectNoteAction.tooltip=P\u0159epnout se z/do okna s pozn\u00E1mkou
+set_accelerator_on_next_click_helpmessage=K vytvo\u0159en\u00ED nov\u00E9 kl\u00E1vesov\u00E9 zkratky klikni na p\u0159\u00EDslu\u0161nou polo\u017Eku v menu.
 SetAccelerator.dialogTitle=P\u0159i\u0159azen\u00ED kl\u00E1vesov\u00FDch zkratek
 SetAccelerator.keystrokeDetected=Kl\u00E1vesov\u00E1 zkratka "{0}" nen\u00ED p\u0159i\u0159azena k \u017E\u00E1dn\u00E9 polo\u017Ece menu.
 SetAcceleratorOnNextClickAction.text=P\u0159i\u0159adit kl\u00E1vesovou zkratku
@@ -1614,20 +1686,25 @@ SetNoteWindowPosition.top.text=Vr\u0161ek
 SetShortenerStateAction.text=Minimalizuj uzel
 sf_login_required=Je zapot\u0159eb\u00ED login do Source Forge. Pokra\u010Dovat?
 ShowAllAttributesAction.text=Uk\u00E1zat v\u0161echny atributy
-ShowAncestorsAction.text=Uk\u00E1zat p\u0159edch\u016Fdce
+ShowAncestorsAction.text=Uk\u00E1zat rodi\u010De
 ShowAttributeDialogAction.text=Mana\u017Eer atribut\u016F...
-ShowDescendantsAction.text=Uk\u00E1zat n\u00E1sledovn\u00EDky
+ShowDescendantsAction.text=Uk\u00E1zat potomky
 ShowFilterToolbarAction.text=N\u00E1strojov\u00E1 li\u0161ta filtr\u016F
-ShowFormatPanel.text=Panel vlastnost\u00ED
+ShowFirstSlideAction.text=Prvn\u00ED sl\u00EDda
+ShowFirstSlideAndStartPresentationAction.text=Spustit prezentaci od za\u010D\u00E1tku
+ShowFormatPanel.text=Panel n\u00E1stroj\u016F
 ShowFormatPanel.tooltip=Otev\u0159e dialog, ve kter\u00E9m je mo\u017Eno najednou upravit atributy uzlu i hrany.
 ShowHideNoteAction.text=Uk\u00E1zat/schovat okno s pozn\u00E1mkou
 ShowHideNoteAction.tooltip=Menu zkratka pro mal\u00E9 \u0161ipky na rozd\u011Blen\u00E9 \u0159\u00E1dce.
+ShowLastSlideAction.text=Posledn\u00ED sl\u00EDda
 ShowNextChildAction.text=Uk\u00E1zat dal\u0161\u00EDho potomka
+ShowNextSlideAction.text=Dal\u0161\u00ED sl\u00EDda
 ShowNotesInMapAction.text=Zobrazovat pozn\u00E1mky v map\u011B
+ShowPreviousSlideAction.text=P\u0159edchoz\u00ED sl\u00EDda
 ShowSelectedAttributesAction.text=Uk\u00E1zat vybran\u00E9 atributy
 ShowSelectionAsRectangleAction.text=V\u00FDb\u011Br obd\u00E9ln\u00EDkem
 simplyhtml.aboutFrameTitle=O aplikaci
-simplyhtml.aboutLabel=O SimplyHTML
+simplyhtml.aboutLabel=O SimplyHTML...
 simplyhtml.alignCenter=na st\u0159ed
 simplyhtml.alignLabel=Zarovn\u00E1n\u00ED:
 simplyhtml.alignLeft=vlevo
@@ -1812,6 +1889,42 @@ simplyhtml.valignMiddle=na st\u0159ed
 simplyhtml.valignTop=nahoru
 simplyhtml.wholeWordsOnly=Hledat pouze cel\u00E1 slova
 simplyhtml.wholeWordsOnly.tooltip=Omez shodu na cel\u00E1 slova.
+slide.add=P\u0159idat
+slide.add.tooltip=P\u0159idat aktu\u00E1ln\u011B vybran\u00E9 uzly na sl\u00EDdu
+slide.at_center.tooltip=ve st\u0159edu
+slide.content=Obsah sl\u00EDdy
+slide.descendants=Uka\u017E potomky
+slide.edge=na okraji
+slide.filter=Filtr
+slide.first=Prvn\u00ED
+slide.last=Posledn\u00ED
+slide.next=Dal\u0161\u00ED
+slide.nofilter=Bez filtru
+slide.on_the_left.tooltip=nalevo
+slide.on_the_right.tooltip=nalevo
+slide.placenode=Um\u00EDstit vybran\u00FD uzel
+slide.placenode.tooltip=kdy\u017E je sl\u00EDda prezentov\u00E1na
+slide.present=Prezentuj
+slide.presentation=Prezentace
+slide.presentations=Prezentace
+slide.previous=P\u0159edchoz\u00ED
+slide.remove=Odstranit
+slide.remove.tooltip=Odstranit vybran\u00E9 uzly ze sl\u00EDdy
+slide.select=Vybrat
+slide.select.tooltip=Vybrat uzly ze sl\u00EDdy v map\u011B
+slide.set=Nastavit
+slide.set.tooltip=Ud\u011Blat vybran\u00E9 uzly obsahem sl\u00EDdy
+slide.setfilter=Nastav filtr
+slide.setfilter.tooltip=Nastavit, nebo odstranit filtr, kter\u00FD m\u00E1 b\u00FDt pou\u017Eit, kdy\u017E je sl\u00EDda zobrazena
+slide.setfoldingstate=Nastavit skl\u00E1d\u00E1n\u00ED
+slide.setfoldingstate.tooltip=Obnovit aktu\u00E1ln\u00ED skl\u00E1d\u00E1n\u00ED, kdy\u017E je sl\u00EDda zobrazena
+slide.setzoom=Nastavit p\u0159ibl\u00ED\u017Een\u00ED
+slide.setzoom.tooltip=Nastavit, nebo odstranit p\u0159ibl\u00ED\u017Een\u00ED mapy, kter\u00E9 bude provedeno, kdy\u017E bude sl\u00EDda zobrazena
+slide.showancestors=Zobrazit p\u0159edky
+slide.showonlyselected=Uk\u00E1zat pouze vybran\u00E9 uzly
+slide.showonlyselected.tooltip=Skr\u00FDt ostatn\u00ED uzly, kdy\u017E se sl\u00EDda zobraz\u00ED
+slide.slides=Sl\u00EDdy
+slide.stop=Zastavit
 SortNodes.text=Set\u0159\u00EDdit potomky
 SortNodes.tooltip=Abecedn\u011B set\u0159\u00EDd\u00ED v\u0161echny potomky uzlu.
 split=&Rozd\u011Blit
@@ -1820,7 +1933,10 @@ SplitNode.text=Rozd\u011Blit uzlel
 SplitNode.tooltip=<html>Uzel je rozd\u011Blen</html>
 SplitToWordsAction.text=Rozd\u011Bl v \u0159\u00E1dku s pou\u017Eit\u00EDm slov {0}
 STANDARD_FORMAT=Standardn\u00ED
+StartPresentationAction.text=Spustit prezentaci
+StartPresentationOrShowNextSlideAction.text=Spustit prezentaci/dal\u0161\u00ED sn\u00EDmek
 stop_processing=Stop
+StopPresentationAction.text=Zastavit prezentaci
 StringFlavorHandler=Prost\u00FD text jako hierarchie uzl\u016F
 StructuredHtmlFlavorHandler=HTML jako hierarchie uzl\u016F
 style=Styl
@@ -1828,7 +1944,7 @@ style_already_exists=Styl u\u017E existuje.
 styledialog.cancel.text=Zru\u0161it
 styledialog.ok.text=V po\u0159\u00E1dku
 styles=St&yly
-styles.AutomaticLayout=Pou\u017Eij styly dle \u00FArovn\u011B
+styles.AutomaticLayout=Pou\u017E\u00EDt styly dle \u00FArovn\u011B
 styles.connection=Spoj
 styles.date=Datum
 styles.definition=Definice
@@ -1841,7 +1957,7 @@ styles.list=Seznam
 styles.needs_action=Vy\u017Eaduje akci
 styles.note=Pozn\u00E1mka
 styles.ok=V po\u0159\u00E1dku
-styles.pending=Prob\u00EDhaj\u00EDc\u00ED
+styles.pending=\u010Cekaj\u00EDc\u00ED
 styles.predefined=P\u0159eddefinovan\u00E9 styly
 styles.question=Ot\u00E1zka
 styles.quotation=Citace
@@ -1856,7 +1972,7 @@ styles_menu=Dostupn\u00E9 styly
 submenu_keystroke_in_use_error=Kl\u00E1vesu {0} nen\u00ED mo\u017En\u00E9 pou\u017E\u00EDt pro submenu {1}. Kl\u00E1vesa odstran\u011Bna.
 summary_nodes=Souhrnn\u00E9 uzly
 summary_not_possible=Pro vybran\u00E9 uzly nen\u00ED mo\u017Eno vytvo\u0159it souhrnn\u00FD uzel
-svg=SVG[translate me]
+svg=SVG
 template_dir=Standardn\u00ED \u0161ablony
 TextAlignAction.CENTER.text=Vyst\u0159ed\u011Bn\u00FD text
 TextAlignAction.DEFAULT.text=V\u00FDchoz\u00ED
@@ -1864,9 +1980,9 @@ TextAlignAction.LEFT.text=Text zarovnan\u00FD vlevo
 TextAlignAction.RIGHT.text=Text zarovnan\u00FD vpravo
 textalignment=Zarovn\u00E1n\u00ED textu
 TextChangeHotKeyAction.text=Nastav kl\u00E1vesovou zkratku zm\u011Bny textu
-TimeListAction.text=Uk\u00E1zat seznam napl\u00E1novan\u00FDch \u010Das\u016F ...
+TimeListAction.text=Spravovat \u016Fkoly ...
 TimeListAction.tooltip=Uk\u00E1zat v\u0161echny napl\u00E1novan\u00E9 datumy a odpov\u00EDdaj\u00EDc\u00ED uzly.
-TimeManagementAction.text=Uk\u00E1zat kalend\u00E1\u0159 ...
+TimeManagementAction.text=Spravovat \u010Das...
 TimeManagementAction.tooltip=<html>Uk\u00E1\u017Ee modul kalend\u00E1\u0159 od Kaie Toedtera.</html>
 TimePeriodUnits.days=dny
 TimePeriodUnits.hours=hodiny
@@ -1875,46 +1991,45 @@ TimePeriodUnits.ms=ms
 TimePeriodUnits.seconds=sekundy
 TimePeriodUnits.weeks=t\u00FDdny
 ToggleChildrenFoldedAction.text=(Roz)slo\u017Eit poduzly
-ToggleDetailsAction.text=Skr\u00FDt detaily
-ToggleFBarAction.text=F-Bar[translate me]
-ToggleFoldedAction.text=(Roz)slo\u017Eit
+ToggleDetailsAction.text=Skr\u00FDt podrobnosti
+ToggleFBarAction.text=Li\u0161ta funk\u010Dn\u00EDch kl\u00E1ves
+ToggleFoldedAction.text=Sbalit/Rozvinout
 ToggleFullScreenAction.text=Re\u017Eim cel\u00E9 obrazovky
 ToggleLeftToolbarAction.text=Panel ikon
 ToggleMenubarAction.text=P\u0159epnout Menu
 ToggleScrollbarsAction.text=Skrolovac\u00ED li\u0161ty
-ToggleStatusAction.text=Zobrazit stavovou \u0159\u00E1dku
+ToggleStatusAction.text=Zobrazit stavov\u00FD \u0159\u00E1dek
 ToggleToolbarAction.text=N\u00E1strojov\u00FD panel
-toolbars=N\u00E1strojov\u00E9 li\u0161ty
 TranslatedElement.BORDER=Hrani\u010Dn\u00ED text
 TranslatedElement.TEXT=Text
-TranslatedElement.TOOLTIP=N\u00E1strojov\u00FD tip
+TranslatedElement.TOOLTIP=N\u00E1pov\u011Bda
 uiTextChanger.originalTextIsNotDefined=P\u016Fvodn\u00ED text nen\u00ED definov\u00E1n
-uiTextChanger.replaceText=Nahra\u010F text u\u017Eivatelsk\u00E9ho rozhran\u00ED
-undefined_error=Nastala neo\u010Dek\u00E1van\u00E1 chyba. Pros\u00EDme, pokuste se zaslat report o chyb\u011B.
-underline=Podtr\u017Een\u00ED
+uiTextChanger.replaceText=Nahradit text u\u017Eivatelsk\u00E9ho rozhran\u00ED
+undefined_error=Nastala neo\u010Dek\u00E1van\u00E1 chyba. Pokuste se pros\u00EDm zaslat zpr\u00E1vu o chyb\u011B.
+underline=Podtrhnout
 UnderlineAction.text=Podtr\u017Een\u00ED
 underlined=Podtrhnut\u00E9
 UndoAction.text=Zp\u011Bt
 UndoFilterAction.text=Zp\u011Bt
-unfold=Rozlo\u017Eit
-UnfoldAllAction.text=Rozlo\u017Eit v\u0161e
-UnfoldAllAction.tooltip=<html>Rozlo\u017Eit vybran\u00E9 uzly a v\u0161echny jejich poduzly.</html>
-UnfoldOneLevelAction.text=Rozlo\u017Eit jednu \u00FArove\u0148
-UnfoldOneLevelAction.tooltip=Rozlo\u017E\u00ED vybran\u00E9 uzly o jednu \u00FArove\u0148.
+unfold=Rozvinout
+UnfoldAllAction.text=Rozvinout v\u0161e
+UnfoldAllAction.tooltip=<html>Rozvinout vybran\u00E9 uzly a v\u0161echny jejich poduzly.</html>
+UnfoldOneLevelAction.text=Rozvinout jednu \u00FArove\u0148
+UnfoldOneLevelAction.tooltip=Rozvine vybran\u00E9 uzly o jednu \u00FArove\u0148.
 unparsedLatexPatternFormat=Neparsovan\u00FD LaTeX
-up=Nahoru
+up=Nahor&u
 UpConditionAction.text=Nahoru
 update_failed=Aktualizace selhala se zpr\u00E1vou {0}
-UpdateCheckAction.text=Zkontroluj aktualizace
+UpdateCheckAction.text=Zkontrolovat aktualizace
 updatecheckdialog=Dialog kontroly aktualizace
 updater.component=Komponenta
-updater.goToDownload=P\u0159ejdi na sta\u017Een\u00ED
+updater.goToDownload=P\u0159ej\u00EDt na sta\u017Een\u00ED
 updater.version.installed=Instalovan\u00E1 verze
 updater.version.latest=Posledn\u00ED verze
 updater.version.noUpdateUrl=Tento dopln\u011Bk nem\u00E1 pro aktualizace URL, nebo domovskou str\u00E1nku.
 updater.version.unknown=nezn\u00E1m\u00FD
 updater.version.unreachable=Nedostupn\u00FD zdroj:
-updater.viewChangelog=Zobraz seznam zm\u011Bn
+updater.viewChangelog=Zobrazit seznam zm\u011Bn
 url_error=Toto URL nen\u00ED v po\u0159\u00E1dku!
 url_load_error=Nemohl jsem na\u010D\u00EDst mapu z URL:
 url_open_error=Nen\u00ED mo\u017Eno otev\u0159\u00EDt URL {0}.
diff --git a/freeplane/resources/translations/Resources_da.properties b/freeplane/resources/translations/Resources_da.properties
index ec60841..1c81200 100644
--- a/freeplane/resources/translations/Resources_da.properties
+++ b/freeplane/resources/translations/Resources_da.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Annuller
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Du kan kun skifte krypteringsstatus p\u00E5 et krypteret knudepunkt. Inds\u00E6t s\u00E5dan et knudepunktved ved brug af v\u00E6rkt\u00F8jsmenuen.
 accessories/plugins/EncryptNode.properties_select_me=V\u00E6lg mig for at forts\u00E6tte!
 accessories/plugins/EncryptNode.properties_wrong_password=Adgangskoden er ikke korrekt.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Eksport af kort til java web start.
 accessories/plugins/ExportWithTWiki.text=TWiki\u2026
 accessories/plugins/ExportWithTWiki.tooltip=Eksporterer MindMap som et TWiki dokument.
 accessories/plugins/ExportWithXSLT.tooltip=Dette er en uniform eksportmetode der bruger XSLT scripts.
 accessories/plugins/ExportWithXSLT_Applet.text=Som Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Eksporterer MindMap som en java browser applet.
-accessories/plugins/ExportWithXSLT_Flash.text=Som Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Eksporerer MindMap som en Flash aplikation.
 accessories/plugins/ExportWithXSLT_HTML.text=Som XHTML (JavaScript version)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Som XHTML (Klikbar MindMap billed version)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Resourser fra RESOURCER knudepunkttil TaskJuggler filen\u2026
@@ -186,7 +186,6 @@ cannot_join_nodes_with_children=Kan ikke forbinde knudepunkter med underknudepun
 cannot_move_into_child_node=Kan ikke flytte til underordnet node
 cannot_move_to_child=Kan ikke flytte et knudepunkt til en af dens underknudepunkter.
 CenterAction.text=Centrer
-CenterSelectedNodeAction.text=Centrer valgte knudepunkt
 ChangeConnectorArrowsAction.backward.text=Tr\u00E6k pilen tilbage
 ChangeConnectorArrowsAction.both.text=Tr\u00E6k pilen frem og tilbage
 ChangeConnectorArrowsAction.forward.text=Tr\u00E6k pilen tilbage
@@ -200,7 +199,6 @@ ChangeNodeLevelLeftsAction.text=Flyt knudepunnkt (for\u00E6ldre s\u00F8skende)
 ChangeNodeLevelLeftsAction.tooltip=Til venstre fra roden skiftes knudepunkterne nedad. De bliver underknudepunkter af knudepunkterne ovenover. Til h\u00F8jre for roden skiftes knudepunkter opad. Direkte ved roden, skifter knudepunkterne side.
 ChangeNodeLevelRightsAction.text=Flyt knudepunkt (s\u00F8skende barn)
 ChangeNodeLevelRightsAction.tooltip=Til venstre fra roden skiftes knudepunkterne nedad. De bliver underknudepunkter af knudepunkterne ovenover. Til h\u00F8jre for roden skiftes knudepunkter opad. Direkte ved roden, skifter knudepunkterne side.
-choose_background_color=V\u00E6lg baggrundsfarve:
 choose_cloud_color=V\u00E6lg sky farve:
 choose_edge_color=V\u00E6lg kantfarve
 choose_map_background_color=V\u00E6lg MindMap baggrundsfarve
@@ -211,6 +209,8 @@ ClearLinkAnchorAction.tooltip=<html>slet tidligere angivet knudepunktsanker</htm
 CloneAction.text=Inds\u00E6t klon
 close_btn=Luk
 CloseAction.text=Luk aktuelle MindMap
+CloseAllMapsAction.text=Luk alle kort
+CloseAllOtherMapsAction.text=Luk alle andre kort
 cloud_shapes=Skyfigurer
 CloudAction.text=Tilf\u00F8j/fjern sky(standard)
 CloudColorAction.text=Skyfarve\u2026
@@ -218,6 +218,13 @@ CloudShapeAction.ARC.text=Bue
 CloudShapeAction.RECT.text=Rektangel
 CloudShapeAction.ROUND_RECT.text=Rund rektangel
 CloudShapeAction.STAR.text=Stjerne
+collection.delete=Slet
+collection.down=Ned
+collection.move=Flyt
+collection.moveTo=Flyt til position
+collection.new.presentation=Ny pr\u00E6sentation
+collection.new.slide=Nyt dias
+collection.up=Op
 ColorProperty.ResetColor=Reset farve
 combined=Kombineret
 condition=Betingelse
@@ -234,7 +241,7 @@ CopyAttributes.text=Kopier attributter
 CopyIDAction.text=Kopiere knudepunkt ID
 CopyMapStylesAction.text=Kopier MindMap typografi fra\u2026
 CopyNodeURIAction.text=Kopiere knudepunkt URL
-copyright=Copyright \u00A9 2000-2016 Freeplane holdet og andre
+copyright=Copyright \u00A9 2000-2017 Freeplane holdet og andre
 CopySingleAction.text=Kopiere knudepunkt (enkelt)
 CopySingleAction.tooltip=Kopier kun det valgte knudepunkt
 CopyStyleExtensionsAction.text=Kopiere udvidelser fra stil knudepunkt
@@ -317,6 +324,7 @@ EditAction.text=Rediger knudepunkt
 EditAttributesAction.text=Rediger Atributter
 EditDetailsAction.text=Rediger knudepunkt detaljer inline
 EditDetailsInDialogAction.text=Redigere knudepunkt detaljer i dialogboksen
+editEdgeColors=Rediger kantfarver
 EditFilterAction.text=Rediger
 EditLongAction.text=Rediger kerne knudepunkt i dialogboksen
 EditNoteInDialogAction.text=Rediger note i dialogboksen
@@ -352,8 +360,6 @@ ExecuteScripts.noScriptsAvailable=Ingen tilg\u00E6ngelige
 ExecuteScripts.text=Skripts
 ExecuteScriptSecurityError.text=Der opstod en fejl under skript-udf\u00F8relsen: {0}
 export_failed=Eksport mislykkedes
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Freeplane eksport
 ExportAction.text=Eksporter kort\u2026
 ExportBranchAction.text=Flyt forgrening til ny MindMap\u2026
@@ -381,6 +387,7 @@ f_button_unassigned=<ingen handling >
 FaqOpenURLAction.text=FAQ (ofte stillede sp\u00F8rgsm\u00E5l)
 file=&Filer
 file_already_exists=Filen {0} eksisterer allerede. \u00D8nsker du at overskrive den?
+file_not_accessible=Filen {0} er ikke tilg\u00E6ngelig
 file_not_found=Filen {0} findes ikke
 FileListFlavorHandler=Henvisninger til filer
 FileProperties_BranchLeafCount=Antallet af bladknudepunkter i valgte forgreninger:
@@ -636,6 +643,9 @@ icon_penguin=Linux
 icon_positive=Positiv
 icon_prepare=Gult lys
 icon_revision=Revision
+icon_revision-green=Revision gr\u00F8n
+icon_revision-pink=Revision lyser\u00F8d
+icon_revision-red=Revision r\u00F8d
 icon_smiley-angry=Vred
 icon_smiley-neutral=Neutral
 icon_smiley-oh=Overrasket
@@ -709,7 +719,6 @@ latex_editor=Rediger LaTeX formel
 LatexDeleteLatexAction.text=Fjern LaTeX-formular
 LatexEditLatexAction.text=Redig\u00E9r LaTeX-formular...
 LatexInsertLatexAction.msg1=<html>Du fors\u00F8ger at inds\u00E6tte en <i>\u00E6ldre</i> LaTeX formel.<br/>Den nye m\u00E5de at skabe LaTeX tekst/formler er beskrevet p\u00E5 denne side:</html>
-LatexInsertLatexAction.msg2=<html>Kort sagt: <ul><li>brug "\\latex" pr\u00E6fiks i knudepunktsteksten eller </li><li><i> panel Vis-> Egenskaber</i>, derefter<i>Core tekst ->Format->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=Tilf\u00F8j LaTeX-formular...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -726,6 +735,7 @@ link_not_found=Linket {0} blev ikke fundet.
 links=Link
 load=Indl\u00E6s
 load_accelerator_presets=Indl\u00E6s
+load_accelerator_presets.noActions=Ingen forudindstillinger
 LoadAcceleratorPresetsAction.textPatterns.text=Tekstm\u00F8nstre
 locking_failed_by_open=L\u00E5sning af MindMap {0} mislykkedes. \u00C5bner som skrivebeskyttet.
 locking_failed_by_save_as=L\u00E5sning af MindMap {0} mislykkedes. Gem som afbrudt.
@@ -839,6 +849,7 @@ ModesMenuAction.File.text=Filh\u00E5ndtering
 ModesMenuAction.MindMap.text=MindMap editor
 most_recent_files=Seneste MindMap
 MoveAction.text=Flyt
+MoveSelectedNodeAction.CENTER.text=Centrer valgte knudepunkt
 MoveToRootAction.text=G\u00E5 til roden
 NameConditionAction.text=Angiv navn
 navigate=Naviger
@@ -878,7 +889,6 @@ NextNodeAction.BACK.text=G\u00E5 til forrige knudepunkt
 NextNodeAction.BACK_N_FOLD.text=G\u00E5 til forrige knudepunkt (fold)
 NextNodeAction.FORWARD.text=G\u00E5 til n\u00E6ste knudepunkt
 NextNodeAction.FORWARD_N_FOLD.text=G\u00E5 til n\u00E6ste knudepunkt (fold)
-NextPresentationItemAction.text=Folde n\u00E6ste pr\u00E6sentation element ud
 no=Nej
 no_copy_attributes_before_paste_attributes=Du kan ikke inds\u00E6tte attributter, f\u00F8r du har kopieret nogle.
 NO_FORMAT=Tekst
@@ -922,6 +932,7 @@ not_saved_for_image_error=MindMap skal gemmes, f\u00F8r du kan angive et billede
 not_saved_for_link_error=MindMap skal gemmes, f\u00F8r du kan angive et link med filh\u00E5ndtering
 note_window_location=Notepanel placering
 notes=Note
+NotFoldingNextPresentationItemAction.text=Folde n\u00E6ste pr\u00E6sentation element ud
 NotificationOptions.CLOSE=Luk
 NotificationOptions.REMIND_ME_LATER=P\u00E5mind senere
 NotificationOptions.REMOVE_REMINDER=Fjern p\u00E5mindelse
@@ -948,6 +959,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Niveau
 OptionPanel.ADD_CHILD=Tilf\u00F8j underknudepunkt
 OptionPanel.ADD_SIBLING=Tilf\u00F8j sidestillet knudepunkt
 OptionPanel.addons=Tilf\u00F8jelser
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Fold alle ind
 OptionPanel.always_load_last_maps=Indl\u00E6s sidste og nye MindMap
 OptionPanel.always_load_last_maps.tooltip=\u00C5ben seneste filer fastsat af ovenn\u00E6vnte indstillinger, selvom FreePlane starter med et valgt MindMap.
@@ -975,6 +987,12 @@ OptionPanel.automaticFormat_level2=1. Niveau knudepunkts format
 OptionPanel.backup_file_number=Antallet af bevarede sikkerhedskopi filer
 OptionPanel.Behaviour=Opf\u00F8rsel
 OptionPanel.bezier=J\u00E6vnbue (bezier)
+OptionPanel.border_color=Farve
+OptionPanel.border_color_matches_edge_color=Brug kantfarve
+OptionPanel.border_dash=Kant linjetype
+OptionPanel.border_dash_matches_edge_dash=Brug kant linetype
+OptionPanel.border_width=Stregbredde
+OptionPanel.border_width_matches_edge_width=Brug kantbredde
 OptionPanel.bubble=Boble
 OptionPanel.ca=Catalansk, valenciansk/Catal\u00E0
 OptionPanel.Cancel=Annuller
@@ -990,6 +1008,7 @@ OptionPanel.cloudcolor=Sky farve
 OptionPanel.cloudshape=Sky form
 OptionPanel.combined=Kombineret
 OptionPanel.compare_as_number=Sammenlign som tal
+OptionPanel.connector_dash=Linjetype
 OptionPanel.convert_to_current_version=<html>Konverter automatisk MindMaps fra \u00E6ldre Freeplane versioner<br>til den aktuelle version?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Kun for meget store MindMaps, der ikke beh\u00F8ver at blive konverteret <br>(dette er ekspertviden) kan de \u00E5bnes uden konvertering.</html>
 OptionPanel.copyFormatToNewSibling=Kopier format til nye s\u00F8skende
@@ -997,6 +1016,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopier format med ikoner
 OptionPanel.cs=Tjekkisk/\u010Desky
 OptionPanel.cut_nodes_without_question=Klip knudepunkter uden bekr\u00E6ftelse?
 OptionPanel.cut_nodes_without_question.tooltip=Hvis afkrydsningsfeltet er sat klippes knudepunnkter uden bekr\u00E6ftelse. Kan medf\u00F8re tab af information, hvis der trykkes ved en fejl.
+OptionPanel.cut_out_pictures_when_pasting_html=Fjern billeder fra HTML
 OptionPanel.da=Danish/dansk
 OptionPanel.date_format=Standard datoformat
 OptionPanel.date_format.tooltip=Enten kort, MEDIUM, lange eller fulde eller et m\u00F8nster som "DD/MM/\u00C5\u00C5\u00C5\u00C5"
@@ -1027,6 +1047,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Vis indbyggede editor for al
 OptionPanel.display_node_id=Vis knudepunkt ID
 OptionPanel.edgecolor=Kant farve
 OptionPanel.edgecolor.tooltip=Egenskab for kanten til forrige knudepunkt (tilf\u00F8jes ogs\u00E5 til alle underknudepunkter)
+OptionPanel.edgedash=Kant linjetype
 OptionPanel.edgestyle=Kant stil
 OptionPanel.edgestyle.tooltip=Egenskab for kanten til forrige knudepunkt (tilf\u00F8jes ogs\u00E5 til alle underknudepunkter)
 OptionPanel.edgewidth=Kantbredde
@@ -1100,6 +1121,7 @@ OptionPanel.ic_file=Brug disk
 OptionPanel.ic_ram=I RAM
 OptionPanel.icon=Ikon
 OptionPanel.icon.tooltip=Hvis anvendt vil knudepunktet have pr\u00E6sis dette ikon.
+OptionPanel.icon_size=Ikonst\u00F8rrelse
 OptionPanel.icons.list=Liste over viste standardikoner
 OptionPanel.icons.list.tooltip=Her kan du sortere eller deaktivere standardikoner. Ikonerne skal v\u00E6re adskilt af ';'.
 OptionPanel.id=Indonesisk/Bahasa Indonesia
@@ -1149,12 +1171,15 @@ OptionPanel.max_menu_item_count.tooltip=Ber\u00E6ns antallet af elementer i en u
 OptionPanel.max_node_width=Max bredde for knudepunkt
 OptionPanel.max_node_width.tooltip=<html>Maximum default Node bredde i pixels</html>
 OptionPanel.max_shortened_text_length=Maksimalt forkortet tekstbredde
+OptionPanel.menuItemFontSize=Menu element skriftst\u00F8rrelse
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=Min knudepunktsbredde
+OptionPanel.monitor_size_inches=Sk\u00E6rmst\u00F8rrelse (tommer)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Smal sekskant
 OptionPanel.nb=Norsk Bokm\u00E5l/Norsk bokm\u00E5l
 OptionPanel.never_save_folding=Aldrig
+OptionPanel.neverShowSurvey=Vis aldrig sp\u00F8rgsm\u00E5l, unders\u00F8gelser og tips
 OptionPanel.nl=Hollandsk, flamsk/Nederlands, Vlaams
 OptionPanel.nn=Norsk Nynorsk/Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Baggrund
@@ -1196,6 +1221,7 @@ OptionPanel.parse_latex=Genkend LaTeX
 OptionPanel.parse_latex.tooltip=Genkend LaTeX formler efter format eller pr\u00E6fiks: Se http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Inds\u00E6t som HTML
 OptionPanel.PASTE_PLAIN_TEXT=Inds\u00E6t som almindelig tekst
+OptionPanel.pasteImagesFromFiles=Inds\u00E6t billeder fra filer
 OptionPanel.path_property_may_not_be_empty=Sti egenskab kan ikke v\u00E6re tom! \u00C6ndring er gendannet.
 OptionPanel.patternname=Navn
 OptionPanel.patternname.tooltip=Unik m\u00F8nster navn
@@ -1204,8 +1230,10 @@ OptionPanel.placenewbranches=Placer nye grene
 OptionPanel.placenewbranches.tooltip=<html>Hvor nye grene skal placeres. Gyldige v\u00E6rdier er 'f\u00F8rst' og 'sidst'</html>
 OptionPanel.plugin.tooltip=Ikke kerne udvidelsesmoduler.
 OptionPanel.plugins=Udvidelser
-OptionPanel.presentation_dimmer_transparency=Gennemsigtighed for Pr\u00E6sentation
-OptionPanel.presentation_mode=Pr\u00E6sentationstilstand
+OptionPanel.Presentation=Pr\u00E6sentation
+OptionPanel.presentation.combineAll=Kombinere alle pr\u00E6sentationer
+OptionPanel.presentation.slowMotion=Slowmotion
+OptionPanel.presentation.switchToFullScreen=Aktiv\u00E9r fuldsk\u00E6rm
 OptionPanel.printonwhitebackground=<html>Hvid baggrund for udskrivning</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Brug altid hvid baggrund for udskrivning</html>
 OptionPanel.pt_BR=Portugisisk (Brasilien)/Portugu\u00EAs (Brasil)
@@ -1253,6 +1281,7 @@ OptionPanel.separator.automatic_save=Automatisk gem
 OptionPanel.separator.behaviour=Opf\u00F8rsel
 OptionPanel.separator.browser=Browser
 OptionPanel.separator.cache=Cache
+OptionPanel.separator.clones=Kloner
 OptionPanel.separator.CloudControls=Skyer
 OptionPanel.separator.commands_for_the_program=Kommandoer for programmet
 OptionPanel.separator.connectors=Forbindelser
@@ -1271,7 +1300,9 @@ OptionPanel.separator.html_export=HTML eksport
 OptionPanel.separator.html_import=HTML-Import
 OptionPanel.separator.hyperlink_types=Hyperlink typer
 OptionPanel.separator.icon_properties=Ikoner
+OptionPanel.separator.IconControls=Ikoner
 OptionPanel.separator.icons=Ikoner i "V\u00E6lg ikon\u2026"
+OptionPanel.separator.Icons=Ikoner
 OptionPanel.separator.initial_map_size=Initial MindMap st\u00F8rrelse
 OptionPanel.separator.inline_editor=I linje knudepunkt editor
 OptionPanel.separator.JoinNodesAction=Sammenf\u00F8jer knudepunkter
@@ -1295,6 +1326,7 @@ OptionPanel.separator.other_defaults=Andre standarter
 OptionPanel.separator.others=Andre tastebindinger
 OptionPanel.separator.outline_view=Dispositionsvisning
 OptionPanel.separator.patterns=M\u00F8nstre
+OptionPanel.separator.presentation=Pr\u00E6sentation
 OptionPanel.separator.reminderOptions=P\u00E5mindelsesindstillinger
 OptionPanel.separator.RichTextEditor=Rich-Text editor
 OptionPanel.separator.root_node_appearance=Rod knudepunkt format
@@ -1309,7 +1341,9 @@ OptionPanel.separator.size_limits=St\u00F8rrelsesgr\u00E6nse
 OptionPanel.separator.spelling=Stavekontrol
 OptionPanel.separator.SplitToWordsAction=Opdel node til ord
 OptionPanel.separator.status=Statuslinje
-OptionPanel.separator.tooltip=V\u00E6rkt\u00F8jstip tidsintetval
+OptionPanel.separator.surveys=Unders\u00F8gelser
+OptionPanel.separator.svg_icons=SVG ikoner
+OptionPanel.separator.tooltip=V\u00E6rkt\u00F8jstip
 OptionPanel.separator.undo=Fortryd
 OptionPanel.separator.updates=Programopdateringer
 OptionPanel.set_property_text=\u00C6ndre
@@ -1322,6 +1356,7 @@ OptionPanel.sharp_bezier=Skarp bezier
 OptionPanel.sharp_linear=Skarp line\u00E6r
 OptionPanel.shouldCenterSmallMaps=Centrer sm\u00E5 kort
 OptionPanel.show_icon_for_attributes=Vis ikon for atributter
+OptionPanel.show_icons=Vis ikoner
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Indl\u00E6s fra kort eller udfold nogle noder
 OptionPanel.show_node_tooltips=Vis v\u00E6rkt\u00F8jstip
 OptionPanel.show_note_icons=Vis note ikoner
@@ -1399,9 +1434,9 @@ OptionPanel.unfold_on_paste.tooltip=Udfold knudepunkt ved inds\u00E6t eller tr\u
 OptionPanel.uniform_shape=Uniform
 OptionPanel.use_common_out_point_for_root_node=Kanter starter fra et punkt p\u00E5 root knudepunkt
 OptionPanel.use_common_out_point_for_root_node.tooltip=Kanter starter fra et punkt p\u00E5 root knudepunkt
+OptionPanel.use_svg_icons=Brug SVG ikoner
 OptionPanel.use_tabbed_pane=Brug faner
 OptionPanel.use_tabbed_pane.tooltip=Hvis valgt vises MindMap i faner (ligesom i FireFox :-)).
-OptionPanel.user_defined_screen_resolution=Brugerdefineret sk\u00E6rmopl\u00F8sning (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Skripting: N\u00E5r du indstiller classpath du n\u00F8dt til at tillade l\u00E6seadgang p\u00E5 filer!
 OptionPanel.validate_invalid_date_format=Ugyldig standard datoformat
 OptionPanel.validate_invalid_datetime_format=Ugyldig standard dato og klokkesl\u00E6t-format
@@ -1502,11 +1537,14 @@ plugins/TimeManagement.xml_todayButton=I dag
 plugins/TimeManagement.xml_WindowTitle=Time Management
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=S\u00F8g & Erstat
 preferences=Indstillinger
+presentation=Pr\u00E6sentation
+presentation.combineAll=Kombiner alle pr\u00E6sentationer
 print_preview_title=Vis udskrift
 PrintAction.text=Udskriv MindMap\u2026
 PrintDirectAction.text=Udskriv
 printing_settings=Udskriftskalering
 PrintPreviewAction.text=Vis udskrift...
+program_terminates=Intern fejl: programmet afsluttes.
 progress=Udviklingsikon (%)
 PropertyAction.dialog=Indstillinger
 PropertyAction.text=Indstillinger...
@@ -1593,6 +1631,7 @@ select_folder_for_importing=V\u00E6lg mappen som skal importeres
 select_icon=V\u00E6lg et ikon
 select_menu_item_dialog=V\u00E6lg et menupunkt
 select_menu_item_root_node=Menu
+select_template=V\u00E6lg skabelon
 SelectAllAction.text=V\u00E6lg alle synlige knudepunkter
 SelectBranchAction.text=V\u00E6lg synlig forgrening
 SelectedPasteAction.text=Inds\u00E6t som\u2026
@@ -1624,7 +1663,6 @@ ShowAncestorsAction.text=Vis Forf\u00E6dre
 ShowAttributeDialogAction.text=Attribut administrator\u2026
 ShowDescendantsAction.text=Vis efterkommere
 ShowFilterToolbarAction.text=Filter v\u00E6rkt\u00F8jslinie
-ShowFormatPanel.text=Egenskabspanel
 ShowFormatPanel.tooltip=Pr\u00E6senterer en dialogboks i hvilken knudepunkt og kant attributter kan \u00E6ndres med det samme.
 ShowHideNoteAction.text=Vis/Skjul Note vindue
 ShowHideNoteAction.tooltip=Er en menu genvej for de sm\u00E5 pile i opdelingslinien.
@@ -1818,6 +1856,16 @@ simplyhtml.valignMiddle=midte
 simplyhtml.valignTop=top
 simplyhtml.wholeWordsOnly=Kun hele ord
 simplyhtml.wholeWordsOnly.tooltip=Begr\u00E6ns tr\u00E6f til hele ord.
+slide.add=Tilf\u00F8j
+slide.filter=Filter
+slide.first=F\u00F8rste
+slide.last=Sidste
+slide.next=N\u00E6ste
+slide.nofilter=Intet filter
+slide.previous=Forrige
+slide.remove=Fjern
+slide.select=V\u00E6lg
+slide.stop=Stop
 SortNodes.text=Sorter b\u00F8rn
 SortNodes.tooltip=Sorter alle underknudepunkter alfabetisk.
 split=&Opdel
@@ -1889,7 +1937,9 @@ ToggleMenubarAction.text=Menulinien
 ToggleScrollbarsAction.text=Rullepaneler
 ToggleStatusAction.text=Vis statuslinje
 ToggleToolbarAction.text=V\u00E6rkt\u00F8jslinie
-toolbars=V\u00E6rkt\u00F8jslinjer
+TranslatedElement.TEXT=Tekst
+TranslatedElement.TOOLTIP=V\u00E6rkt\u00F8jstip
+uiTextChanger.originalTextIsNotDefined=Original tekst er ikke defineret
 undefined_error=En uventet fejl opstod. Pr\u00F8v venligt at lave en fejlrapport.
 underline=Understregning
 UnderlineAction.text=Understregning
diff --git a/freeplane/resources/translations/Resources_de.properties b/freeplane/resources/translations/Resources_de.properties
index 7c59fee..691793b 100644
--- a/freeplane/resources/translations/Resources_de.properties
+++ b/freeplane/resources/translations/Resources_de.properties
@@ -13,16 +13,16 @@ accessories/plugins/EncryptNode.properties_4=Bitte geben Sie das Passwort ein.
 accessories/plugins/EncryptNode.properties_5=<html>Bitte beachten Sie, dass die St\u00E4rke der Verschl\u00FCsselung<br> fast vollst\u00E4ndig von der Qualit\u00E4t Ihres Passwortes abh\u00E4ngt.
 accessories/plugins/EncryptNode.properties_6=OK
 accessories/plugins/EncryptNode.properties_7=Abbrechen
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Sie k\u00F6nnen den zustand des Kennwortschutzes (Verschl\u00FCsselung) nur bei bereits verschl\u00FCsselten Knoten \u00E4ndern. Bitte f\u00FCgen Sie einen solchen Knoten \u00FCber das Werkzeug-Men\u00FC ein.
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Sie k\u00F6nnen den Zustand des Kennwortschutzes (Verschl\u00FCsselung) nur bei bereits verschl\u00FCsselten Knoten \u00E4ndern. Bitte f\u00FCgen Sie einen solchen Knoten \u00FCber das Werkzeug-Men\u00FC ein.
 accessories/plugins/EncryptNode.properties_select_me=Zum Weitermachen hier klicken!
 accessories/plugins/EncryptNode.properties_wrong_password=Das Passwort ist falsch.
-accessories/plugins/ExportWithTWiki.text=TWi...
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Export der Mindmap f\u00FCr den Java Web Start.
+accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exportiert die ganze Mindmap als TWiki Dokument.
 accessories/plugins/ExportWithXSLT.tooltip=Eine allgemeine Exportmethode, die XSLT Skripte verwendet.
 accessories/plugins/ExportWithXSLT_Applet.text=Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exportiert die ganze Mindmap als Java Browser Applet.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exportiert die ganze Mindmap als Flash Anwendung.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript Version)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Mit verlinktem Bild der Mindmap)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Ressourcen nach Taskjuggler...
@@ -59,9 +59,9 @@ addons.installer.missing.child.nodes=Fehlende Unterknoten: {0}
 addons.installer.missing.permission.attribute=Skript {0}: fehlende Berechtigungsattribute {1}
 addons.installer.missing.properties=Fehlende "properties"-Attribute: {0}
 addons.installer.missing.translation=\u00DCbersetzung von {0} fehlt f\u00FCr {1}
-addons.installer.no.scripts=Keine Skripte definiert
-addons.installer.no.zipdata=es wurden keine ZIP-Daten gefunden
-addons.installer.nonstandard.permissions=Das Skript ben\u00F6tigt die folgenden Berechtigungen, die zz. nicht gesetzt sind: {0}.\nSollen diese zu den Standardberechtigungen hinzugef\u00FCgt werden?
+addons.installer.no.scripts=Keine Skripte gefunden
+addons.installer.no.zipdata=Es wurden keine ZIP-Daten gefunden
+addons.installer.nonstandard.permissions=Das Skript ben\u00F6tigt die folgenden Berechtigungen, die zur Zeit nicht gesetzt sind: {0}.\nSollen diese zu den Standardberechtigungen hinzugef\u00FCgt werden?
 addons.installer.one.child.expected=Erwartet wurde nur genau ein Unterknoten von {0}, bekam jedoch {1}.
 addons.installer.script.name.suffix=Der Skript-Name {0} hat keine Dateiendung wie z.B. ".groovy"
 addons.installer.script.no.execution_mode=f\u00FCr {0} ist das Attribut "execution_mode" nicht definiert
@@ -75,11 +75,11 @@ addons.installer.too.new=Die aktuelle Freeplane-Version {0} ist zu neu. Dieses A
 addons.installer.too.old=Die aktuelle Freeplane-Version {0} ist zu alt. Dieses Add-on braucht mindestens {1}.
 addons.installer.unknown.deinstallation.rules=Unbekannte Deinstallations-Regel(n): {0}
 addons.installer.update=Update von Version {0}
-addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">die Installation von AddOns sollte nur von vertrauensw\u00FCrdigen Quellen erfolgen. Schadsoftware k\u00F6nnte sonst einen Datenverlust hervorrufen oder zur Verletzung der Privatsph\u00E4re f\u00FChren.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Die Installation von AddOns sollte nur von vertrauensw\u00FCrdigen Quellen erfolgen. Schadsoftware k\u00F6nnte sonst einen Datenverlust hervorrufen oder zur Verletzung der Privatsph\u00E4re f\u00FChren.</strong></body></html>
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Attribute von Stil
 AddStyleAttributes.tooltip=F\u00FCgt die Attribute der Stildefinition ein
-AllMapsNodeListAction.text=Suchen und Ersetzen in allen Karten
+AllMapsNodeListAction.text=Suchen und ersetzen in allen Mindmaps
 always=Immer
 AlwaysUnfoldedNodeAction.text=Knoten st\u00E4ndig ausklappen
 antialias_all=Kantengl\u00E4ttung f\u00FCr Alles verwenden
@@ -92,7 +92,7 @@ ApplyFormatPlugin.tooltip=Dialog, in dem Knoten- und Kantenformate ge\u00E4ndert
 ApplyNoFilteringAction.text=Filter deaktivieren
 ApplySelectedViewConditionAction.text=Ausgew\u00E4hlte Knoten filtern
 ApplyToVisibleAction.text=Auf gefilterte Knoten anwenden
-as_parent=Wie Oberknoten
+as_parent=Wie \u00FCbergeordneter Knoten
 AskForHelp.text=Hilfe im Forum anfordern
 AssignAttributesAction.text=Attribute zuweisen...
 attachments=Anh\u00E4nge
@@ -130,9 +130,9 @@ attributes_popup_new=Neues Attribut
 attributes_popup_optimal_width=Optimale Breite
 attributes_popup_up=Nach Oben
 attributes_refresh=Aktualisieren
-attributes_RemoveAllAttributesAction.text=alle
-attributes_RemoveFirstAttributeAction.text=erstes
-attributes_RemoveLastAttributeAction.text=letztes
+attributes_RemoveAllAttributesAction.text=Alle Attribute entfernen
+attributes_RemoveFirstAttributeAction.text=Erstes Attribut entfernen
+attributes_RemoveLastAttributeAction.text=Letztes Attribut entfernen
 attributes_restricted_attributes_tooltip=Auswahl auf eine vordefinierte Liste von Attributen begrenzen
 attributes_restricted_values_tooltip=M\u00F6gliche Werte f\u00FCr dieses Attribut beschr\u00E4nken
 attributes_restriction=Beschr\u00E4nkte Menge
@@ -142,7 +142,7 @@ attributes_show=Zeigen
 attributes_skip_root=&Ohne Wurzelknoten
 attributes_visible=Auswahl f\u00FCr Ansicht->Attribute->Ausgew\u00E4hlte Attribute Anzeigen
 attributes_visible_tooltip=Auswahl f\u00FCr Ansicht->Attribute->Ausgew\u00E4hlte Attribute anzeigen
-automatic_layout=Hierarchiebezogener Knotenstil
+automatic_layout=Automatisches Layout (hierarchiebezogen)
 automatic_layout_disabled=(deaktiviert)
 automatically_save_message=Mindmap wurde automatisch unter dem Dateinamen {0} gespeichert...
 AutomaticEdgeColor.FOR_BRANCHES=f\u00FCr Zweige
@@ -155,10 +155,10 @@ AutomaticLayout.HEADINGS=f\u00FCr Knoten, die keine Bl\u00E4tter sind
 AutomaticLayout.level=Level {0}
 AutomaticLayout.level.root=Wurzel-Knoten
 AutomaticLayoutAction.text=Automatisches Layout
-AutomaticLayoutAction.tooltip=<html>Formatiert die Knoten entsprechend  Extras->Einstellungen...->Automatisches Layout</html>
+AutomaticLayoutAction.tooltip=<html>Formatiert die Knoten entsprechend  den Vorgaben f\u00FCr das Automatische Layout</html>
 AutomaticLayoutControllerAction.ALL.text=f\u00FCr alle Knoten
 AutomaticLayoutControllerAction.COLUMNS.text=f\u00FCr Spalten
-AutomaticLayoutControllerAction.HEADINGS.text=f\u00FCr alle Knoten, die keine Bl\u00E4tter sind
+AutomaticLayoutControllerAction.HEADINGS.text=f\u00FCr alle Knoten, mit Ausnahme der letzten Ebene
 AutomaticLayoutControllerAction.null.text=(deaktiviert)
 BackAction.text=Sprung zum Vorg\u00E4nger-Knoten
 BackAction.tooltip=<html>Springt zum vorhergehenden Knoten aus der<br/>Selektions-Historie der aktuellen Mindmap</html>
@@ -175,37 +175,35 @@ branch=Zweig
 browse=Durchsuchen...
 calendar_attributes_panel=Kalender und Attribute
 calendar_panel=Kalender
-can_not_clone_encrypted_node=Kann verschl\u00FCsselte Knoten nicht klonen
+can_not_clone_encrypted_node=Verschl\u00FCsselte Knoten k\u00F6nnen nicht geklont werden
 can_not_connect_to_info_server=Verbindung zum Informations-Server nicht m\u00F6glich
 can_not_delete_predefined_style=Standard-Knotenstile k\u00F6nnen nicht gel\u00F6scht werden
-can_not_delete_root_style=Der Stil des Wurzelknotens kann nicht gel\u00F6scht werden
+can_not_delete_root_style=Der Stil des Wurzel-Knotens kann nicht gel\u00F6scht werden
 can_not_delete_style_group=Knotenstil-Gruppe kann nicht gel\u00F6scht werden
-can_not_encrypt_cloned_node=Kann geklonte Knoten nicht verschl\u00FCsseln
+can_not_encrypt_cloned_node=Geklonte Knoten k\u00F6nnen nicht verschl\u00FCsseln werden
 can_not_save_key_set=Kann Tastaturk\u00FCrzel nicht speichern
 cancel=&Abbrechen
 CancelAction.text=Abbrechen
 cannot_add_parent_diff_parents=Alle Knoten m\u00FCssen zum selben Oberknoten geh\u00F6ren, um diese Funktion auszuf\u00FChren.
-cannot_add_parent_to_root=Der Wurzelknoten kann nicht ver\u00E4ndert werden.
-cannot_delete_root=Der Wurzelknoten kann nicht gel\u00F6scht oder ausgeschnitten werden.
+cannot_add_parent_to_root=Der Wurzel-Knoten kann nicht ver\u00E4ndert werden.
+cannot_delete_root=Der Wurzel-Knoten kann nicht gel\u00F6scht oder ausgeschnitten werden.
 cannot_join_nodes_with_children=Knoten k\u00F6nnen nicht mit ihren Unterknoten verbunden werden
-cannot_move_into_child_node=Kann nicht in Kindknoten verschoben werden
+cannot_move_into_child_node=Kann nicht in den untergeordneten Knoten verschoben werden
 cannot_move_to_child=Ein Knoten kann nicht auf seine Unterknoten verschoben werden.
 CenterAction.text=Zentrieren
-CenterSelectedNodeAction.text=Auf Knoten zentrieren
-ChangeConnectorArrowsAction.backward.text=Zur\u00FCck
-ChangeConnectorArrowsAction.both.text=Beide
-ChangeConnectorArrowsAction.forward.text=Vorw\u00E4rts
-ChangeConnectorArrowsAction.none.text=Keinen
-ChangeConnectorArrowsAction.text=\u00C4ndern der Pfeile der Verbindung
+ChangeConnectorArrowsAction.backward.text=Pfeilspitze hinten
+ChangeConnectorArrowsAction.both.text=Pfeilspitze vorne und hinten
+ChangeConnectorArrowsAction.forward.text=Pfeilspitze vorne
+ChangeConnectorArrowsAction.none.text=Keine Pfeilspitzen
+ChangeConnectorArrowsAction.text=\u00C4nderung der Verbindungspfeile
 ChangeConnectorShapeAction.CUBIC_CURVE.text=Kurve
-ChangeConnectorShapeAction.EDGE_LIKE.text=Wie Knotenlinie
+ChangeConnectorShapeAction.EDGE_LIKE.text=wie Knotenlinie
 ChangeConnectorShapeAction.LINE.text=Gerade
 ChangeConnectorShapeAction.LINEAR_PATH.text=Linearer Pfad
 ChangeNodeLevelLeftsAction.text=Nach links schieben
 ChangeNodeLevelLeftsAction.tooltip=Links des Wurzelknotens werden die Knoten zu Unterknoten ihrer ehemals benachbarten Knoten. Rechts des Wurzelknotens rutschen sie eine Hierarchieebene h\u00F6her. Direkt rechts vom Wurzelknoten tauschen sie die Seite nach links.
 ChangeNodeLevelRightsAction.text=Nach rechts schieben
 ChangeNodeLevelRightsAction.tooltip=Rechts des Wurzelknotens werden die Knoten zu Unterknoten ihrer ehemals benachbarten Knoten. Links vom Wurzelknoten rutschen sie eine Hierarchieebene h\u00F6her. Direkt links vom Wurzelknoten tauschen sie die Seite nach rechts.
-choose_background_color=Hintergrundfarbe ausw\u00E4hlen:
 choose_cloud_color=Farbe der Wolke ausw\u00E4hlen:
 choose_edge_color=Randfarbe w\u00E4hlen
 choose_map_background_color=Hintergrundfarbe der Mindmap ausw\u00E4hlen
@@ -215,37 +213,50 @@ ClearLinkAnchorAction.text=L\u00F6sche Anker
 ClearLinkAnchorAction.tooltip=<html>l\u00F6schen des Hyperlink-Bezugspunktes</html>
 CloneAction.text=Klon einf\u00FCgen
 close_btn=S&chlie\u00DFen
-CloseAction.text=Mindmap schlie\u00DFen
+CloseAction.text=Aktuelle Mindmap schlie\u00DFen
+CloseAllMapsAction.text=Alle Mindmaps schlie\u00DFen
+CloseAllOtherMapsAction.text=Alle anderen Mindmaps schlie\u00DFen
 cloud=Wolke
 cloud_shapes=Wolkenformen
-CloudAction.text=Wolke um Knotenauswahl
+CloudAction.text=Wolke um Knotenauswahl erzeugen
 CloudColorAction.text=Wolkenfarbe...
 CloudShapeAction.ARC.text=Bogen
 CloudShapeAction.RECT.text=Rechteck
 CloudShapeAction.ROUND_RECT.text=Abgerundetes Rechteck
 CloudShapeAction.STAR.text=Stern
+collection.copy.presentation=Pr\u00E4sentation kopieren
+collection.copy.slide=Folie kopieren
+collection.delete=L\u00F6schen
+collection.down=Nach Unten
+collection.move=Bewegen
+collection.moveTo=Zu Position bewegen
+collection.new.presentation=Neue Pr\u00E4sentation
+collection.new.slide=Neue Folie
+collection.up=Nach oben
 ColorProperty.ResetColor=Farbe zur\u00FCcksetzen
 combined=Kombiniert
 condition=Bedingung
 confirmation=Sicherheitsbest\u00E4tigung
 connector=Verbindung
-connector_arrows=Verbindung &Pfeile
+connector_arrows=Verbindungspfeile
 connector_label=Beschriftung der Verbindung
-connector_lines=Verbindung &Linien
-connector_shapes=Verbindung &Formen
+connector_lines=Verbindung & Linien
+connector_shapes=Verbindung & Formen
 ConnectorColorAction.text=Farbe der Verbindung...
 contact=Kontakt
+controls=Symbolleisten
 ConvertCloneToIndependentNodeAction.text=Klonen aufheben
+copy_name={0} (Kopie)
 CopyAction.text=Kopieren
-CopyAction.tooltip=Kopiert den markierten Knoten und seine Nachfolger
+CopyAction.tooltip=Kopiert den markierten Knoten und seine untergeordneten Knoten
 CopyAttributes.text=Attribute kopieren
 CopyIDAction.text=Knoten-ID kopieren
 CopyMapStylesAction.text=Knotenstile importieren...
 CopyNodeURIAction.text=Knoten-URI kopieren
-copyright=Copyright \u00A9 2000-2016 Freeplane Entwicklungsteam und andere
+copyright=Copyright \u00A9 2000-2017 Freeplane Entwicklungsteam und andere
 CopySingleAction.text=Kopieren (einzeln)
 CopySingleAction.tooltip=Kopiert nur den markierten Knoten
-CopyStyleExtensionsAction.text=Erweiterungen des Stilknotens einf\u00FCgen
+CopyStyleExtensionsAction.text=Erweiterungen aus Knoten-Stil einf\u00FCgen
 corrupt_map=Die Datei ist besch\u00E4digt
 CreateConjunctConditionAction.text=Und
 CreateDisjunctConditionAction.text=Oder
@@ -271,12 +282,12 @@ DeleteDetailsAction.text=Knotendetails l\u00F6schen
 DeleteLevelStyleAction.text=Entferne Ebene vom automatischen Knotenstil
 DeleteStyleAction.text=Entferne Knotenstil
 DeleteUserStyleAction.text=Entferne benutzerdefinierten Knotenstil
-dialect_info.app=die Mindmap-Datei {0} wurde mit dem Programm {1} erzeugt.
-dialect_info.later_version=die Mindmap-Datei {0} wurde mit einer sp?teren Version dieses Programms erzeugt.
-dialect_info.unknownApp=die eingelesene Mindmap wurde mit einem unbekannten Programm erzeugt.
-dialect_info.unknownURL=Diese Webseite ist unbekannt.
+dialect_info.app=Die Mindmap-Datei {0} wurde mit dem Programm {1} erzeugt.
+dialect_info.later_version=Die Mindmap-Datei {0} wurde mit einer sp\u00E4teren Version dieses Programms erzeugt.
+dialect_info.unknownApp=Die eingelesene Mindmap wurde mit einem unbekannten Programm erzeugt.
+dialect_info.unknownURL=Die Webseite zu diesem Programm ist unbekannt.
 dialect_info.url=F\u00FCr weitere Informationen die Programm-Webseite {0} aufrufen.
-dialect_info.warning=Freeplane kann m\u00F6glicherweise nicht korrekt \u00F6ffnen, speichern oder anzeigen.
+dialect_info.warning=Freeplane kann die Datei m\u00F6glicherweise nicht korrekt \u00F6ffnen, speichern oder anzeigen.
 DirectHtmlFlavorHandler=HTML als einzelnen Knoten
 DocumentationAction.text=Dokumentation
 down=Ab
@@ -290,9 +301,9 @@ edge_width=Linienbreite
 edge_widths=Kantenbreiten
 EdgeColorAction.text=Linienfarbe...
 EdgeProperties=Linieneigenschaften
-EdgeStyleAction.bezier.text=geschwungen
+EdgeStyleAction.bezier.text=geschwungen (Bezier)
 EdgeStyleAction.bezier.tooltip=<html>Stellt die Verbindung zwischen den Knoten<br>als geschwungene Linie dar.</html>
-EdgeStyleAction.hide_edge.text=(deaktiviert)
+EdgeStyleAction.hide_edge.text=Linie verstecken
 EdgeStyleAction.hide_edge.tooltip=<html>Wenn der Knoten selektiert ist, wird die<br>Verbindung zum Oberknoten gepunktet dargestellt.<br>Ist er nicht selektiert, so wird die Linie ausgeblendet.</html>
 EdgeStyleAction.horizontal.text=horizontal
 EdgeStyleAction.horizontal.tooltip=<html>Stellt die Verbindung zwischen den Knoten<br>als horizontale und vertikale Linien dar.</html>
@@ -302,7 +313,7 @@ EdgeStyleAction.sharp_bezier.text=spitz und geschwungen
 EdgeStyleAction.sharp_bezier.tooltip=<html>Stellt die Verbindung zwischen den Knoten<br>als geschwungene, spitz zulaufende Linie dar.</html>
 EdgeStyleAction.sharp_linear.text=gerade und spitz
 EdgeStyleAction.sharp_linear.tooltip=<html>Stellt die Verbindung zwischen den Knoten<br>als gerade, spitz zulaufende Linie dar.</html>
-EdgeStyleAsParentAction.text=geerbt
+EdgeStyleAsParentAction.text=wie \u00FCbergeordneter Knoten
 EdgeStyleAsParentAction.tooltip=<html>\u00DCbernimmt die Darstellung des Linientyps von seinem Oberknoten.</html>
 EdgeWidthAction_width_parent.text=geerbt
 EdgeWidthAction_width_thin.text=d\u00FCnn
@@ -313,7 +324,7 @@ edit_details=Knoten-Details bearbeiten
 edit_end_label=<html>Verbindung<br/>Beschriftung</html>
 edit_label_font_family=Schriftart
 edit_label_font_size=Schriftgr\u00F6\u00DFe
-edit_link_manually=Link Manuell bearbeiten...
+edit_link_manually=Link manuell bearbeiten...
 edit_long_node=Knoten mit Fliesstext bearbeiten
 edit_middle_label=Text in der Mitte
 edit_node=Knoten bearbeiten
@@ -326,8 +337,9 @@ EditAction.text=Knoten-Text in-line bearbeiten
 EditAttributesAction.text=Attribute in-line bearbeiten
 EditDetailsAction.text=Knoten-Details in-line bearbeiten
 EditDetailsInDialogAction.text=Details im Editor bearbeiten
+editEdgeColors=Rahmenfarbe \u00E4ndern
 EditFilterAction.text=Filter erstellen
-EditLongAction.text=Konten-Text im Editor bearbeiten
+EditLongAction.text=Knoten-Text im Editor bearbeiten
 EditNoteInDialogAction.text=Notiz im Editor bearbeiten
 EditScript=Skript bearbeiten...
 EditStylesAction.text=Knoten-Stile bearbeiten
@@ -335,15 +347,15 @@ elements=Elemente
 EncryptedMap.text=Neue verschl\u00FCsselte Mindmap...
 EncryptedMap.tooltip=Neue verschl\u00FCsselte Mindmap
 encryption=Verschl\u00FCsselung
-enter_base_url=Freeplane wird realtive Links einf\u00FCgen. Bitte geben sie die Basis-URL an.
+enter_base_url=Freeplane wird relative Links einf\u00FCgen. Bitte geben sie die Basis-URL an.
 enter_command=Befehl eingeben
 enter_condition_name=Name f\u00FCr neue Bedingung zuweisen
 enter_confirms=&Eingabetaste best\u00E4tigt
 enter_keyset_name=Bitte geben sie einen Namen f\u00FCr die Tastaturk\u00FCrzel-Sammlung an
 enter_map_url=Bitte die URL der Mindmap eingeben
 enter_new_style_name=Name f\u00FCr neuen Knotenstil
-enter_node_id=Konten ID eingeben
-enter_zoom=Vergr\u00F6\u00DFerung bearbeiten
+enter_node_id=Knoten-ID eingeben
+enter_zoom=Vergr\u00F6\u00DFerung eingeben
 EnterPassword.text=Passwort eingeben
 error=Fehler
 error_applying_template=Fehler beim Anwenden des XSL-Templates.
@@ -358,60 +370,61 @@ ExecuteScriptForSelectionAction.text=Alle Skripte dieses Knotens ausf\u00FChren
 ExecuteScriptOnSelectedNode.text={0} f\u00FCr alle ausgew\u00E4hlten Knoten ausf\u00FChren
 ExecuteScriptOnSelectedNodeRecursively.text={0} rekursiv f\u00FCr ausgew\u00E4hlte Knoten ausf\u00FChren
 ExecuteScriptOnSingleNode.text={0} f\u00FCr einen ausgew\u00E4hlten Knoten ausf\u00FChren
-ExecuteScripts.noScriptsAvailable=Kein Script vorhanden
+ExecuteScripts.noScriptsAvailable=Kein Skript vorhanden
 ExecuteScripts.text=Skripte
 ExecuteScriptSecurityError.text=Beim Ausf\u00FChren des Skripts ist ein Fehler aufgetreten:\n{0}
 export=Exportieren
 export_failed=Export fehlgeschlagen
-export_pdf_text=Portables Dokumentenformat (PDF)
-export_svg_text=Skalierbare Vektorgrafik (SVG)
 export_using_xslt=Freeplane Export mittels XSLT
 ExportAction.text=Export...
+ExportAllPresentationsAction.text=Alle Pr\u00E4sentationen als PNG-Bild exportieren
 ExportBranchAction.text=Zweig als neue Mindmap speichern...
 ExportBranchToHTMLAction.text=Zweig als HTML
 exported_file={0} Datei
-ExportPdf.text=Als PDF
-ExportSvg.text=Als SVG
-ExportToHTMLAction.text=Als HTML
-ExportToImage.jpg.text=Als JPEG
-ExportToImage.png.text=Als PNG - Portable Network Graphic
+ExportPdf.text=PDF
+ExportPresentationAction.text=Aktuelle Pr\u00E4sentation als PNG-Bild exportieren
+ExportSvg.text=SVG
+ExportToHTMLAction.text=HTML
+ExportToImage.jpg.text=JPEG
+ExportToImage.png.text=PNG
 ExportToOoWriter.text=LibreOffice Writer Dokument...
 extension_menu=&Stile
-ExternalImage_popupMenu_Change=Tauschen...
-ExternalImage_popupMenu_Open=In Bildbetrachter \u00F6ffnen
+ExternalImage_popupMenu_Change=Austauschen...
+ExternalImage_popupMenu_Open=im externen Bildbetrachter \u00F6ffnen
 ExternalImage_popupMenu_Remove=Entfernen
 ExternalImage_popupMenu_ResetZoom=Zoom zur\u00FCcksetzen
 ExternalImageAddAction.text=Bild hinzuf\u00FCgen...
-ExternalImageChangeAction.text=Bild tauschen...
+ExternalImageChangeAction.text=Bild austauschen...
 ExternalImageRemoveAction.text=Bild entfernen
 ExtractLinkFromTextAction.text=Link aus Knotentext erzeugen
-ExtractLinkFromTextAction.tooltip=<html>Erzeugt aus einem Knotentext, der eine g\u00FCltige URL einth\u00E4lt <br> (z.B. http://www.google.de) einen Hyperlink </html>
+ExtractLinkFromTextAction.tooltip=Erzeugt aus einem Knotentext, der eine g\u00FCltige URL enth\u00E4lt <br> (z.B. http://www.google.de) einen Hyperlink
 extras=&Werkzeuge
 f_button_unassigned=<nicht zugewiesen>
 FaqOpenURLAction.text=FAQ (H\u00E4ufig gestellte Fragen)
 file=&Datei
 file_already_exists=Die Datei {0} existiert bereits. Soll sie \u00FCberschrieben werden?
 file_management=Dateiverwaltung
+file_not_accessible=Auf die Datei {0} kann nicht zugegriffen werden
 file_not_found=Datei {0} nicht gefunden
 FileListFlavorHandler=Links zu Dateien
-FileProperties_BranchLeafCount=Anzahl der Blatt-Knoten in selektieren Zweig(en):
-FileProperties_BranchNodeCount=Anzahl der Knoten in selektierten Zweig(en):
-FileProperties_ChangesSinceLastSave=\u00C4nderungen seit letztem Speichern:
+FileProperties_BranchLeafCount=Anzahl der Knoten in letzter Ebene des selektierten Zweiges:
+FileProperties_BranchNodeCount=Anzahl der Knoten in selektierten Zweigen:
+FileProperties_ChangesSinceLastSave=\u00C4nderungen seit dem letztem Speichern:
 FileProperties_FileName=Dateiname:
-FileProperties_FileSaved=Datei gespeichert:
+FileProperties_FileSaved=Datei zuletzt gespeichert:
 FileProperties_FileSize=Dateigr\u00F6\u00DFe:
 FileProperties_MainBranchCount=Anzahl der Hauptzweige:
 FileProperties_NeverSaved=Nicht gespeichert
 FileProperties_NodeChildCount=Anzahl der Unterknoten der selektierten Knoten:
 FileProperties_NodeSelectionCount=Anzahl der selektierten Knoten:
 FileProperties_TotalFilteredCount=Anzahl der Knoten, die Filterkriterien erf\u00FCllen:
-FileProperties_TotalLeafCount=Gesamtzahl der Blatt-Knoten:
+FileProperties_TotalLeafCount=Gesamtzahl der Knoten auf der untersten Ebene:
 FileProperties_TotalNodeCount=Gesamtzahl der Knoten:
-FilePropertiesAction.text=Mindmap Statistik...
+FilePropertiesAction.text=Mindmap-Statistik...
 FileRevisionsDialog.cancel=Abbru&ch
 FileRevisionsDialog.file_last_modified=Zeitstempel
 FileRevisionsDialog.file_name=Dateiname
-FileRevisionsDialog.file_size=Dateigr\u00F6\u00DFe
+FileRevisionsDialog.file_size=Bytes
 FileRevisionsDialog.open=&\u00D6ffnen
 FileRevisionsDialog.open.tooltip=Datei \u00F6ffnen, selbst wenn diese veraltet ist
 FileRevisionsDialog.question=Revisionen von {0} gefunden
@@ -422,24 +435,24 @@ filter=F&ilter
 filter_add=&Hinzuf\u00FCgen
 filter_and=&Und
 filter_any_text=Text, Details oder Notiz
-filter_clone_snapshot=Speichere angew\u00E4hlte Nachbildungen
-filter_clones=Angew\u00E4hlte Nachbildungen
+filter_clone_snapshot=Klone der Auswahl  (Filter)
+filter_clones=Klone der Auswahl
 filter_conditions=Filter
-filter_contains=beinhaltet
-filter_created_after=Erzeugt nach dem
-filter_created_before=Erzeugt vor dem
+filter_contains=enth\u00E4lt
+filter_created_after=erzeugt nach dem
+filter_created_before=erzeugt vor dem
 filter_delete=&Entfernen
 filter_details=Details
 filter_dialog=Filter definieren
 filter_does_not_exist=fehlt
 filter_edit_description=Filterliste bearbeiten
-filter_enter_value=Einen Wert eingeben
+filter_enter_value=Wert eingeben
 filter_even_level=Knoten einer geraden Ebene
 filter_exist=existiert
 filter_icon=Icon
 filter_is_equal_to=ist gleich
 filter_is_not_equal_to=ist ungleich
-filter_leaf=Blatt Knoten
+filter_leaf=Knoten der untersten Ebene
 filter_link=Hyperlink
 filter_match_approximately=\u00C4hnlichkeit
 filter_match_approximately_tooltip=<html>Legt fest, ob bei der Auswertung des Filterkriteriums<br/>auch das Auffinden \u00E4hnlicher Ausdr\u00FCcke zul\u00E4ssig ist<br/>z.B. w\u00FCrde das Suchen nach 'files' auch 'flies' finden</html>
@@ -447,32 +460,32 @@ filter_match_case=&Gro\u00DF-/Kleinschreibung
 filter_match_case_tooltip=Ob bei der Auswertung Gro\u00DF- und Kleinschreibung beachtet werden soll.
 filter_modified_after=ver\u00E4ndert nach dem
 filter_modified_before=ver\u00E4ndert vor dem
-filter_no_filtering=Kein Filter
-filter_node=Text
-filter_node_level=Knoten Ebene
+filter_no_filtering=Kein Filter angewendet
+filter_node=Knotentext
+filter_node_level=Knoten-Ebene
 filter_not=&Nicht
 filter_note=Notiz
-filter_odd_level=Knoten einer ungeraden Ebene
+filter_odd_level=Knoten auf gleicher Ebene
 filter_or=Ode&r
 filter_parent=Text des Oberknotens
 filter_periodic_level=Periodisch
 filter_priority=Priorit\u00E4t
-filter_regexp_matches=passt auf RegExp
+filter_regexp_matches=passt auf regul\u00E4re Ausdr\u00FCcke
 filter_reminder=Erinnerung
 filter_reminder_after=f\u00E4llig nach
 filter_reminder_before=f\u00E4llig vor
 filter_reminder_executed=bereits ausgef\u00FChrt
 filter_reminder_later=noch nicht f\u00E4llig
-filter_root=Wurzelknoten
-filter_script=Script-Filter
+filter_root=Wurzel-Knoten
+filter_script=Skript-Filter
 filter_select=&Ausw\u00E4hlen
 filter_selected_node_view=Selektierte Knoten
 filter_selected_node_view_snapshot=Gespeicherte Auswahl
 filter_style=Knotenstil
 filter_time=\u00C4nderungstag
 FilterCondition=Filterbedingungen
-filterConditions=Benutzerdefinierte Filter
-filterConditions.noActions=Keine benannten Filter
+filterConditions=benutzerdefinierte Filter
+filterConditions.noActions=keine gespeicherten Filter
 filters_not_loaded=Filter konnte nicht geladen werden, die Datei ist besch\u00E4digt
 find=Finden
 find_what=Suchbegriff
@@ -485,8 +498,8 @@ fit_map_to_page_height=Mindmap auf Seiten&h\u00F6he einpassen
 fit_map_to_page_width=Mindmap auf Seiten&breite einpassen
 FitToPage.text=Auf Seite einpassen
 FitToPage.tooltip=Stellt die Vergr\u00F6\u00DFerung so ein, dass die gesamte Mindmap in das aktuellen Fenster passt.
-fold=Falten
-FoldAllAction.text=Zweig zuklappen
+fold=Einklappen
+FoldAllAction.text=Alles einklappen
 FoldAllAction.tooltip=<html>Klappt alle Unterknoten des selektierten Zweigs zu</html>
 FoldOneLevelAction.text=Letzte Ebene zuklappen
 FoldOneLevelAction.tooltip=<html>Klappt letzten Unterknoten des selektierten Zweigs um eine Ebene zu</html>
@@ -498,19 +511,19 @@ FontFamilyAction.text=Schriftart
 FontSizeAction.text=Schriftgr\u00F6\u00DFe
 format=&Format
 format_invalid_pattern=kein g\u00FCltiges Format
-format_menu_cloud_shapes=Wolken
+format_menu_cloud_shapes=Wolke erstellen oder anpassen
 format_menu_edge_styles=Linienf&ormen
 format_menu_edge_widths=&Linienbreite
 format_panel=Format
 FormatCopy.text=Knotenstil kopieren
-FormatCopy.tooltip=<html>Kopiert die Formatierung des Knotens in den Zwischenspeicher</html>
+FormatCopy.tooltip=<html>Kopiert die Formatierung des Knotens in die Zwischenablage</html>
 FormatPaste.text=Knotenstil einf\u00FCgen
 FormatPaste.tooltip=<html>F\u00FCgt die zwischengespeicherte Formatierung in den Knoten ein</html>
 formats_not_loaded=Die Formate konnten nicht geladen werden, da die Datei besch\u00E4digt ist
 formatting=Formatierung
 formula.error.attributeValueIsNull=Das Attribut "{0}" hat den Wert NULL (ist nicht definiert).
 formula.error.circularReference=Zirkelbezug: Die Formel im Knoten "{0}" nimmt Bezug auf sich selbst.
-formula.EvaluateAllAction.text=Alle auswerten
+formula.EvaluateAllAction.text=Alle Formeln auswerten
 formula.EvaluateAllAction.tooltip=Wertet alle Formeln der aktuellen Mindmap aus
 formula.menuname=&Formeln
 formula_editor=Formel bearbeiten
@@ -525,10 +538,10 @@ Freeplane.progress.endStartup=Start beendet.
 Freeplane.progress.gettingPreferenceDirectories=Ermittle Verzeichnisse...
 Freeplane.progress.gettingPreferences=Lese Voreinstellungen...
 Freeplane.progress.loadMaps=Mindmaps laden...
-Freeplane.progress.propagateLookAndFeel=Look-and-feel \u00FCbernehmen...
+Freeplane.progress.propagateLookAndFeel=Erscheinungsbild \u00FCbernehmen...
 Freeplane.progress.settingPreferences=Voreinstellungen setzen...
 Freeplane.progress.startCreateController=Controller starten...
-Freeplane.progress.updateLookAndFeel=Look-and-feel aktualisieren...
+Freeplane.progress.updateLookAndFeel=Erscheinungsbild aktualisieren...
 freeplane_reverted=Freeplane_Wiederhergestellt_
 FreeplaneHelpStarter.text=Hilfeseiten...
 FreeplaneHelpStarter.tooltip=Freeplane Hilfe
@@ -563,7 +576,7 @@ html_export_based_on_headings=HTML-Export - \u00DCberschriftenbasiert
 html_export_fold_all=HTML-Export - alles eingeklappt
 html_export_fold_currently_folded=HTML-Export - mit aktueller Faltung
 html_export_no_folding=HTML-Export - ohne Faltung
-html_problem=<html>kann HTML nicht verarbeiten<br><br>{0}
+html_problem=<html>Kann HTML nicht verarbeiten<br><br>{0}
 icon_0%=&0%
 icon_100%=&100%
 icon_25%=&25%
@@ -593,7 +606,7 @@ icon_edit=&Verfeinern
 icon_encrypted=&Verschlossen
 icon_executable=Ausf\u00FChrbar
 icon_family=&Familie
-icon_fema=Mann&/ Frau
+icon_fema=Mann und Frau
 icon_female1=&Frau1
 icon_female2=&Frau2
 icon_females=Fraue&n
@@ -653,9 +666,12 @@ icon_penguin=&Linux
 icon_positive=&Positiv
 icon_prepare=G&elbe Ampel
 icon_revision=Revision
+icon_revision-green=Revision gr\u00FCn
+icon_revision-pink=Revision pink
+icon_revision-red=Revision rot
 icon_smiley-angry=&W\u00FCtend
 icon_smiley-neutral=&Keine Meinung
-icon_smiley-oh=\u00FC&beraschung
+icon_smiley-oh=\u00DC&berraschung
 icon_smily_bad=&Nicht gut
 icon_stop=&Rote Ampel
 icon_stop-sign=&Stopp
@@ -693,7 +709,7 @@ IconProgressIconDownAction.tooltip=Reduziert/  F\u00FCgt ein/ Entfernt Fortschri
 IconProgressIconUpAction.text=Fortschritt erh\u00F6hen
 IconProgressIconUpAction.tooltip=Erh\u00F6ht/ F\u00FCgt Fortschritts-Icon ein (0% -> 25% -> 50% -> 75% -> 100% + OK).
 IconProgressRemoveAction.text=Entferne Fortschritts-Icon
-IconProgressRemoveAction.tooltip=Entfernt Fortschritts-Icon und Erweitertes Fortschritts-Icon.
+IconProgressRemoveAction.tooltip=Entfernt Fortschritts-Icon und erweitertes Fortschritts-Icon.
 icons=Icons
 IconSelectionPlugin.text=Icon w\u00E4hlen...
 IconSelectionPlugin.tooltip=<html>Ein Fenster erscheint, in dem ein Icon ausgew\u00E4hlt werden kann.</html>
@@ -702,7 +718,7 @@ ImageFlavorHandler=Bild (als separate Datei)
 images=Bilder
 import=Zweig i&mportieren
 import_export=Konvertieren
-import_linked_branch_no_link=Der ausgew\u00E4hlte Knoten ist mit keiner anderen Freeplane Datei verkn\u00FCpft, die importiert werden k\u00F6nnte.
+import_linked_branch_no_link=Der ausgew\u00E4hlte Knoten ist mit keiner anderen Freeplane-Datei verkn\u00FCpft, die importiert werden k\u00F6nnte.
 ImportAction.text=Importieren
 ImportBranchAction.text=aus Datei...
 ImportExplorerFavoritesAction.text=aus Explorer-Favoriten...
@@ -714,7 +730,7 @@ ImportXmlFile.text=XML-Datei importieren
 increase_branch_font_size=Schrift des Zweigs vergr\u00F6ssern
 IncreaseNodeFontAction.text=Gr\u00F6\u00DFere Schrift
 internal_error_tooltip=Interne Fehler sind aufgetreten. Details im Logfile {0}.
-invalid_export_file=ung\u00FCltiger Dateiname f\u00FCr Export
+invalid_export_file=Ung\u00FCltiger Dateiname f\u00FCr Export
 invalid_file_msg=Konnte Datei {0} nicht finden
 invalid_uri={0} ist keine g\u00FCltige URI
 invalid_url=Konnte keine g\u00FCltige URL erstellen
@@ -723,13 +739,13 @@ ItalicAction.text=Kursiv
 italicise_branch=Zweig kursiv
 java_version=Java-Version: {0}
 JoinNodesAction.separator.format=Verschmelze Knoten mit "{0}"
-lastOpenedMaps=Zuvor ge\u00F6ffnete Karten
-lastOpenedMaps.noActions=Keine Karten im Verlauf
+lastOpenedMaps=Zuletzt ge\u00F6ffnete Mindmaps
+lastOpenedMaps.noActions=Keine Mindmaps im Verlauf
 latex_editor=LaTeX-Formel bearbeiten
 LatexDeleteLatexAction.text=LaTeX Formel entfernen
 LatexEditLatexAction.text=LaTeX-Formel bearbeiten...
 LatexInsertLatexAction.msg1=<html>Sie versuchen gerade, eine <i>veraltete</i> LaTeX-Formel einzuf\u00FCgen.<br/>Die neue Art, um LaTeX Text/Formeln einzuf\u00FCgen, ist hier beschrieben:</html>
-LatexInsertLatexAction.msg2=<html>Kurzfassung: <ul><li>benutzen Sie ein "\\latex "-Pr\u00E4fix im Knotentext oder</li><li><i>Ansicht->Format \u00E4ndern...</i>, dann <i>Knotentext->Format->LaTeX</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>Kurzfassung: <ul><li>benutzen Sie ein "\\latex "-Pr\u00E4fix im Knotentext oder</li><li><i>Ansicht->Werkzeugtafel</i>, dann <i>Knotentext->Format->LaTeX</i></li></ul></html>
 LatexInsertLatexAction.text=LaTeX-Formel einf\u00FCgen...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -748,7 +764,7 @@ links=Hyper&link
 load=&Laden
 load_accelerator_presets=Sammlung laden
 load_accelerator_presets.noActions=Keine Voreinstellungen
-LoadAcceleratorPresetsAction.textPatterns.text=Text Muster
+LoadAcceleratorPresetsAction.textPatterns.text=Textmuster
 locking_failed_by_open=Die Mindmap {0} ist in Benutzung. Daher wird sie schreibgesch\u00FCtzt ge\u00F6ffnet.
 locking_failed_by_save_as=Die Mindmap {0} ist in Benutzung. Daher wurde die Aktion "Speichern unter..." abgebrochen.
 locking_old_lock_removed=Die Mindmap {0} war in Benutzung durch den Benutzer {1}. Die Dateisperrung wurde aufgehoben, da sie veraltet war.
@@ -760,7 +776,7 @@ main_menu=Men\u00FC
 main_resource_directory=Installationsverzeichnis: {0}
 MainView.errorUpdateText=Fehler beim Zuweisen des Textes der Eingabe: {0}.
 MakeLinkFromAnchorAction.text=Link von Anker hierher
-MakeLinkFromAnchorAction.tooltip=<html>erstellt einen lokalen bzw. globalen Hyperlink<br/>vom Bezugsknoten zum selektierten Knoten</html>
+MakeLinkFromAnchorAction.tooltip=<html>Erstellt einen lokalen bzw. globalen Hyperlink<br/>vom Bezugsknoten zum selektierten Knoten</html>
 MakeLinkToAnchorAction.text=Link von hier zum Anker
 MakeLinkToAnchorAction.tooltip=<html>erstellt einen lokalen bzw. globalen Hyperlink<br/>vom selektierten Knoten zum Bezugsknoten</html>
 manage_styles=Knotenstile verwalten
@@ -779,28 +795,28 @@ ManageAddOnsDialog.deinstall=Deinstallieren
 ManageAddOnsDialog.deinstallation.success={0} wird bei einem Neustart deinstalliert.
 ManageAddOnsDialog.error=Fehler bei der Installation: {0}.
 ManageAddOnsDialog.install=&Installieren
-ManageAddOnsDialog.install.from.known.location=Add-on von einem bekannten Ort installieren
-ManageAddOnsDialog.install.tooltip=Hier die URL einer Add-on-Datei eintragen
+ManageAddOnsDialog.install.from.known.location=Add-On von einem bekannten Ort installieren
+ManageAddOnsDialog.install.tooltip=Hier die URL einer Add-On-Datei eintragen
 ManageAddOnsDialog.map.not.opened=Mindmap {0} scheint nicht ge\u00F6ffnet zu sein.
-ManageAddOnsDialog.really.deinstall={0} wirklich deinstalliern?
-ManageAddOnsDialog.search=Add-ons suchen
+ManageAddOnsDialog.really.deinstall={0} wirklich deinstallieren?
+ManageAddOnsDialog.search=Add-Ons suchen
 ManageAddOnsDialog.search.file=Durchsuchen
 ManageAddOnsDialog.select.tooltip=Datei ausw\u00E4hlen
 ManageAddOnsDialog.status.downloading=Datei wird heruntergeladen...
-ManageAddOnsDialog.status.installing=Add-on wird installiert...
+ManageAddOnsDialog.status.installing=Add-On wird installiert...
 ManageAddOnsDialog.status.success={0} erfolgreich installiert.
 ManageAddOnsDialog.tab.install=Suchen und installieren
 ManageAddOnsDialog.tab.install.tooltip=Suchen und installieren von neuen Add-ons
-ManageAddOnsDialog.tab.manage=Add-ons
+ManageAddOnsDialog.tab.manage=Add-Ons
 ManageAddOnsDialog.tab.manage.themes=Themen
 ManageAddOnsDialog.tab.manage.themes.tooltip=Verwaltung installierter Themen
-ManageAddOnsDialog.tab.manage.tooltip=Installierte Add-ons verwalten
-ManageAddOnsDialog.visit.addon.page=Add-on Seite besuchen...
-ManageConditionalStylesAction.text=Bedingte Formatierung f\u00FCr die Map
+ManageAddOnsDialog.tab.manage.tooltip=Installierte Add-Ons verwalten
+ManageAddOnsDialog.visit.addon.page=Add-On-Seite besuchen...
+ManageConditionalStylesAction.text=Bedingte Formatierung f\u00FCr die Mindmap
 ManageNodeConditionalStylesAction.text=Bedingte Formatierung f\u00FCr den Knoten
 map_already_exists=Die Mindmap existiert bereits. Soll sie \u00FCberschrieben werden?
 map_background=Hintergrund der Mindmap
-map_background_image=Hintergrungbild
+map_background_image=Hintergrundbild
 map_corrupted=Die Mindmap ist nicht lesbar. M\u00F6chten Sie die Details sehen?
 map_load_error=Mindmap {0} konnte nicht geladen werden
 map_locked_by_open=Die Mindmap {0} ist in Benutzung durch den Benutzer {1}. Daher wird sie schreibgesch\u00FCtzt ge\u00F6ffnet.
@@ -810,7 +826,7 @@ MapBackgroundClearAction.text=Leeren
 MapBackgroundColorAction.text=Hintergrundfarbe
 MapBackgroundImageAction.text=Hintergrundbild\u2026
 maps=Mindmaps
-MaxNodeWidth.text=Maximalen Breite eines Knoten festlegen
+MaxNodeWidth.text=Maximale Breite eines Knoten festlegen
 menu_applyStyle=Knotenstil anwenden
 menu_attributes=&Attribute
 menu_clouds=Wolken
@@ -819,7 +835,7 @@ menu_coreFormat=&Knoten
 menu_details=Details
 menu_displayAttributes=Knoten-&Attribute
 menu_encryption=&Passwort
-menu_error=Fehler in nutzerdefinierter Men\u00FC-Struktur {0}:\n{1}\nAbbruch
+menu_error=Fehler in benutzerdefinierter Men\u00FC-Struktur {0}:\n{1}\nAbbruch
 menu_extensions=Knoten-&Erweiterungen
 menu_group=&Gruppierung
 menu_hoverView=Tooltips
@@ -856,7 +872,7 @@ misc=Verschiedenes
 miscellaneous=Verschiedenes
 mode_Browse=Ansichtsmodus
 mode_File=Dateimodus
-mode_MindMap=Mindmapmodus
+mode_MindMap=Mindmap-Modus
 mode_na=Modus nicht vorhanden
 mode_status=Modus ge\u00E4ndert zu {0}
 mode_StyleMap=Formatierung bearbeiten
@@ -867,9 +883,12 @@ ModesMenuAction.File.text=Datei-Explorer-Ansicht
 ModesMenuAction.MindMap.text=Editor-Ansicht
 most_recent_files=&Zuletzt ge\u00F6ffnete Dateien
 MoveAction.text=Verschieben
+MoveSelectedNodeAction.CENTER.text=Auf Knoten zentrieren
+MoveSelectedNodeAction.EAST.text=Bewege ausgew\u00E4hlten Knoten nach rechts
+MoveSelectedNodeAction.WEST.text=Bewege ausgew\u00E4hlten Knoten nach links
 MoveToRootAction.text=Wurzelknoten zentrieren
 NameConditionAction.text=Name zuweisen
-navigate=&Navigieren
+navigate=&Navigation
 navigate_main=Start
 navigate_nodes=Knoten
 navigate_select=Ausw\u00E4hlen
@@ -892,11 +911,11 @@ NewerFileRevisionsFoundDialog.open.tooltip=Datei \u00F6ffnen, auch falls sie ver
 NewerFileRevisionsFoundDialog.question=Neuere Versionen von {0} gefunden!
 NewerFileRevisionsFoundDialog.restore=&Wiederherstellen
 NewerFileRevisionsFoundDialog.restore.tooltip={0} mit {1} ersetzen
-NewerFileRevisionsFoundDialog.title=Neuere Dateiversionen gefunden!
+NewerFileRevisionsFoundDialog.title=Neuere Dateiversion gefunden!
 NewFreeNodeAction.text=Neuer schwebender Knoten
-NewLevelStyleAction.text=Neue Automatisches Layout Ebene
-newmap.install.addon.question={0} scheint ein Add-on Paket zu sein.\nM\u00F6chten Sie es installieren?\n(W\u00E4hlen Sie "Nein" zum normalem \u00D6ffnen.)
-newmap.install.addon.title=Add-on installieren?
+NewLevelStyleAction.text=Neue "Automatisches Layout"-Ebene
+newmap.install.addon.question={0} scheint ein Add-On Paket zu sein.\nM\u00F6chten Sie es installieren?\n(W\u00E4hlen Sie "Nein" zum normalem \u00D6ffnen.)
+newmap.install.addon.title=Add-On installieren?
 NewMapAction.text=Neue Mindmap
 NewMapViewAction.text=Neue Mindmap Ansicht
 NewParentNode.text=Oberknoten (vor)
@@ -909,7 +928,7 @@ NextNodeAction.BACK.text=Zum vorherigen Knoten
 NextNodeAction.BACK_N_FOLD.text=Zum vorherigen Knoten (Unterknoten falten)
 NextNodeAction.FORWARD.text=Zum n\u00E4chsten Knoten
 NextNodeAction.FORWARD_N_FOLD.text=Zum n\u00E4chsten Knoten (Unterknoten falten)
-NextPresentationItemAction.text=N\u00E4chsten Presentationsknoten aufklappen
+NextPresentationItemAction.text=N\u00E4chsten Pr\u00E4sentationspunkt aufklappen
 no=Nein
 no_copy_attributes_before_paste_attributes=Sie k\u00F6nnen ein Attribut erst dann einf\u00FCgen, wenn Sie ein anderes kopiert haben.
 NO_FORMAT=Text
@@ -917,7 +936,7 @@ no_format_copy_before_format_paste=Sie k\u00F6nnen ein Format erst dann einf\u00
 no_found_from=<html><u>{0}</u> wurde von "{1}" aus nicht gefunden.</html>
 no_more_found_from=<html> Keine weiteren Fundstellen von<u>{0}</u> beginnend von "{1}" aus.</html>
 no_previous_find=Keine vorherigen Fundstellen.
-no_styles_found_in_map=es wurden in der Mindmap keine Stile gefunden
+no_styles_found_in_map=Es wurden in der Mindmap keine Stile gefunden
 no_translation_strings_found=Keine \u00FCbersetzbare Zeichenkette gefunden
 node=Knoten
 node_changed_discard_changes=Knoten wurde ver\u00E4ndert. Wollen Sie diese \u00C4nderungen verwerfen?
@@ -952,6 +971,7 @@ not_saved_for_image_error=Die Mindmap muss gespeichert werden, bevor man ein Bil
 not_saved_for_link_error=Die Mindmap muss gespeichert werden, bevor ein Link per Dateiauswahl gesetzt werden kann
 note_window_location=Editor-&Position
 notes=Noti&z
+NotFoldingNextPresentationItemAction.text=N\u00E4chsten Pr\u00E4sentationsknoten aufklappen
 NotificationOptions.CLOSE=Schlie\u00DFen
 NotificationOptions.REMIND_ME_LATER=Erinnere mich sp\u00E4ter
 NotificationOptions.REMOVE_REMINDER=Erinnerung entfernen
@@ -964,7 +984,7 @@ open_asMindMap=Mindmap
 OpenAction.text=\u00D6ffnen...
 OpenFreeplaneSiteAction.text=Freeplanes Webseite \u00F6ffnen
 OpenMapsAddLocation.text=Ort aus Landkarte hinzuf\u00FCgen...
-OpenMapsRemoveLocation.text=Landkarteeintrag entfernen
+OpenMapsRemoveLocation.text=Landkarteneintrag entfernen
 OpenMapsViewLocation.text=Ort auf Landkarte anzeigen...
 OpenPathAction.text=Datei \u00F6ffnen
 OpenURLMapAction.text=\u00D6ffnen aus URL...
@@ -978,10 +998,11 @@ OptionPanel.absolute=Absolut
 OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Automatisches Layout
 OptionPanel.ADD_CHILD=Unterknoten hinzuf\u00FCgen
 OptionPanel.ADD_SIBLING=Knoten auf gleicher Ebene hinzuf\u00FCgen
-OptionPanel.addons=Add-ons
+OptionPanel.addons=Add-Ons
+OptionPanel.af=Afrikanisch
 OptionPanel.always_fold_all_after_load=Alle Knoten falten
 OptionPanel.always_load_last_maps=Mit neuer Mindmap auch alle zuvor ge\u00F6ffneten laden
-OptionPanel.always_load_last_maps.tooltip=Mindmaps nach obigen Einstellungen \u00F6ffenen, auch wenn gew\u00E4hlte Mindmap Freeplane startet.
+OptionPanel.always_load_last_maps.tooltip=Mindmaps nach obigen Einstellungen \u00F6ffnen, auch wenn gew\u00E4hlte Mindmap Freeplane startet.
 OptionPanel.always_save_folding=immer
 OptionPanel.always_save_folding_state=Aktuelle Faltung immer speichern
 OptionPanel.always_save_folding_state.tooltip=Wenn diese Option ausgew\u00E4hlt wird, f\u00FChrt jedes Auf- bzw. Zuklappen einer Ebene dazu, dass die Mindmap als ver\u00E4ndert betrachtet wird. Beim Schlie\u00DFen von Freeplane wird dann nach dem Speicherwunsch gefragt.
@@ -992,9 +1013,11 @@ OptionPanel.antialias.tooltip=<html>Bestimmt das Aussehen der Mindmap. Bitte bea
 OptionPanel.antialias_all=Kantengl\u00E4ttung auf alles anwenden
 OptionPanel.antialias_edges=Kantengl\u00E4ttung nur auf die Verbindungslinien der Knoten anwenden
 OptionPanel.antialias_none=Keine Kantengl\u00E4ttung anwenden
+OptionPanel.antialias_svg=Kantengl\u00E4ttung f\u00FCr SVGs
+OptionPanel.antialias_svg.tooltip=<html>Bestimmt das Aussehen der Icons. Bitte beachten:<br>Je h\u00F6her die Kantengl\u00E4ttung ist, desto mehr Rechenzeit wird f\u00FCr die Darstellung ben\u00F6tigt.</html>
 OptionPanel.Appearance=Aussehen
 OptionPanel.approximate_search_threshold=Schwelle f\u00FCr \u00C4hnlichkeitsvergleich
-OptionPanel.approximate_search_threshold.tooltip=<html>Schwelle f\u00FCr \u00C4hnlichkeitserkennung beim Vergleichen festlegen.<br/><font size="2">siehe http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(je gr\u00F6\u00DFer der Wert desto enger die zul\u00E4ssige<br/>Variationsbreite f\u00FCr das Suchergebnis)</html>
+OptionPanel.approximate_search_threshold.tooltip=<html>Schwelle f\u00FCr \u00C4hnlichkeitserkennung beim Vergleichen festlegen.<br/><font size="2">siehe http://freeplane.sourceforge.net/wiki/index.php/Approximate_search</font><br/>(je gr\u00F6\u00DFer der Wert desto enger die zul\u00E4ssige<br/>Variationsbreite f\u00FCr das Suchergebnis)</html>
 OptionPanel.ar=Arabisch / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=Bogen
 OptionPanel.as_parent=wie der Oberknoten
@@ -1006,9 +1029,11 @@ OptionPanel.automaticFormat_level1=Format des Wurzelknotens
 OptionPanel.automaticFormat_level2=Format der 1. Ebene
 OptionPanel.backup_file_number=Anzahl der Backup-Dateien
 OptionPanel.Behaviour=Verhalten
-OptionPanel.bezier=Bezier
+OptionPanel.bezier=Bezier-Kurve
 OptionPanel.border_color=Farbe
 OptionPanel.border_color_matches_edge_color=Benutze Kantenfarbe
+OptionPanel.border_dash=Rahmenlinientyp
+OptionPanel.border_dash_matches_edge_dash=Benutze Rahmenlinientyp
 OptionPanel.border_width=Linienst\u00E4rke
 OptionPanel.border_width_matches_edge_width=Benutze Kantenst\u00E4rke
 OptionPanel.bubble=Blase
@@ -1021,17 +1046,20 @@ OptionPanel.childpattern.tooltip=Das gew\u00E4hlte Muster wird auf alle Unterkno
 OptionPanel.clear_all_setters=Alle ver\u00E4ndern
 OptionPanel.clear_all_setters.tooltip=Schaltet alle \u00C4nderungshinweise ein oder aus.
 OptionPanel.cloud=Wolke
-OptionPanel.cloudcolor=Wolke und Farbe
+OptionPanel.cloudcolor=Wolkenfarbe
 OptionPanel.cloudshape=Wolkenformen
 OptionPanel.combined=Kombiniert
 OptionPanel.compare_as_number=Als Zahl vergleichen
-OptionPanel.convert_to_current_version=<html>Sollen Mindmaps von \u00E4lteren Freeplane Versionen<br>automatisch zur aktuellen Version konvertiert werden?</html>
+OptionPanel.connector_arrows=Verbindungspfeile
+OptionPanel.connector_dash=Linienart
+OptionPanel.convert_to_current_version=<html>Sollen Mindmaps von \u00E4lteren Freeplane-Versionen<br>automatisch zur aktuellen Version konvertiert werden?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Nur sehr gro\u00DFe Mindmaps, die nicht konvertiert werden sollen<br>(hierzu braucht man Expertenwissen), kann man ohne Umwandlung \u00F6ffnen.</html>
 OptionPanel.copyFormatToNewSibling=Kopiere Formatierung auf neue Geschwister
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopiere Format mit Symbolen
 OptionPanel.cs=Tschechisch / \u010Desky
 OptionPanel.cut_nodes_without_question=Knoten ohne Best\u00E4tigung ausschneiden?
 OptionPanel.cut_nodes_without_question.tooltip=Wenn diese Option ausgew\u00E4hlt wird, werden die Knoten ohne Best\u00E4tigung ausgeschnitten. Ein versehentliches Dr\u00FCcken kann zu Datenverlust f\u00FChren.
+OptionPanel.cut_out_pictures_when_pasting_html=Bilder von HTML entfernen
 OptionPanel.da=D\u00E4nisch / dansk
 OptionPanel.date_format=Standard Datumsformat
 OptionPanel.date_format.tooltip=M\u00F6gliche Werte sind: Entweder "SHORT" (kurzes Format), "MEDIUM" (mittellanges Format), "FULL" (alles) oder ein Muster wie "dd.MM.yyyy".
@@ -1050,7 +1078,7 @@ OptionPanel.default_browser_command_windows_9x.tooltip=<html>F\u00FCr Windows (d
 OptionPanel.default_browser_command_windows_nt=Standard Browser Befehl Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>F\u00FCr Windows (die Anf\u00FChrungszeichen sind notwendig, da Links Gleichheitszeichen enthalten k\u00F6nnen).</html>
 OptionPanel.default_charset=Zeichensatz
-OptionPanel.default_save_dir=Standardverzeichnis f\u00FCr neue Maps
+OptionPanel.default_save_dir=Standardverzeichnis f\u00FCr neue Mindmaps
 OptionPanel.Defaults=Standards
 OptionPanel.delete_automatic_saves_at_exit=L\u00F6schen der automatisch gespeicherten Mindmaps beim Verlassen
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> Wenn diese Option ausgew\u00E4hlt ist, werden beim<br>Schlie\u00DFen von Freeplane alle automatisch erstellten Sicherungen gel\u00F6scht.</html>
@@ -1059,9 +1087,10 @@ OptionPanel.delete_nodes_without_question.tooltip=Wenn diese Option ausgew\u00E4
 OptionPanel.disable_cursor_move_paper=Normaler Maus-Cursor beim Verschieben
 OptionPanel.disable_cursor_move_paper.tooltip=<html>Kein speziellen Cursor w\u00E4hrend des Verschiebe-Vorgangs angezeigen.</html>
 OptionPanel.display_inline_editor_for_all_new_nodes=Eingebetteter Editor f\u00FCr neue Knoten
-OptionPanel.display_node_id=Knoten ID anzeigen
+OptionPanel.display_node_id=Knoten-ID anzeigen
 OptionPanel.edgecolor=Linienfarbe
 OptionPanel.edgecolor.tooltip=Linieneigenschaft der Verbindung zum Oberknoten (wird auch auf alle Unterknoten angewendet)
+OptionPanel.edgedash=Rahmenlinientyp
 OptionPanel.edgestyle=Linientyp
 OptionPanel.edgestyle.tooltip=Linieneigenschaft der Verbindung zum Oberknoten (wird auch auf alle Unterknoten angewendet)
 OptionPanel.edgewidth=Linienbreite
@@ -1071,7 +1100,7 @@ OptionPanel.edit_on_double_click=Text bei &Doppel-Klick bearbeiten
 OptionPanel.editor_extra_width=Vergr\u00F6\u00DFerungsschritte des Knotens bei Texteingabe [px]
 OptionPanel.editor_extra_width.tooltip=<html>Legt fest, um wie viele Pixel der Knoten verbreitert wird, wenn bei der Texteingabe der Rand erreicht wird.</html>
 OptionPanel.el=Griechisch / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
-OptionPanel.el__buttons_above=Kn\u00F6pfe oben anzeigen
+OptionPanel.el__buttons_above=Schaltfl\u00E4chen oben anzeigen
 OptionPanel.el__enter_confirms_by_default=<ENTER> beendet den Dialog
 OptionPanel.el__max_default_window_height=Maximale Fensterh\u00F6he
 OptionPanel.el__max_default_window_width=Maximale Fensterbreite
@@ -1084,7 +1113,7 @@ OptionPanel.es=Spanisch (Kastilien)/  espa\u00F1ol, castellano
 OptionPanel.et=Estnisch / eesti, eesti keel
 OptionPanel.eu=Baskisch
 OptionPanel.execute_scripts_without_asking=Skripte ohne Nachfragen ausf\u00FChren?
-OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripte sind in Freeplane nicht beschr\u00E4nkt und k\u00F6nnen daher auf alle Resourcen des Rechners zugreifen.<br>Sie sollten daher nur dann ausgef\u00FChrt werden, wenn eine zuverl?ssige Quelle sichergestellt ist.</html>
+OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripte sind in Freeplane nicht beschr\u00E4nkt und k\u00F6nnen daher auf alle Ressourcen des Rechners zugreifen.<br>Sie sollten daher nur dann ausgef\u00FChrt werden, wenn eine zuverl\u00E4ssige Quelle sichergestellt ist.</html>
 OptionPanel.execute_scripts_without_exec_restriction=Ausf\u00FChren anderer Applikationen erlauben (NICHT empfohlen)
 OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html>Diese Option ist dann zu aktivieren, wenn Groovy-Skripte auch andere Anwendungen<br>(wie z.B. den Browser) ohne Nachfrage ausf\u00FChren k\u00F6nnen sollen.<br><b>VORSICHT: b\u00F6sartige Skripte k\u00F6nnen dann den Computer besch\u00E4digen!</b></html>
 OptionPanel.execute_scripts_without_file_restriction=Lesenden Zugriff auf Dateien erlauben (NICHT empfohlen)
@@ -1100,7 +1129,7 @@ OptionPanel.export_icons_in_html.tooltip=<html>Gibt an, ob die Icons auch nach H
 OptionPanel.exported_image_resolution_dpi=Exportierte Bildaufl\u00F6sung (in DPI)
 OptionPanel.Files=Dateien
 OptionPanel.first=Am Anfang
-OptionPanel.fit_to_viewport=Hintegrundbild auf Fenstergr\u00F6e anpassen
+OptionPanel.fit_to_viewport=Hintergrundbild auf Fenstergr\u00F6\u00DFe anpassen
 OptionPanel.fold_on_click_inside=Knoten beim Hineinklicken falten/entfalten
 OptionPanel.foldingsymbolwidth=Gr\u00F6\u00DFe des Symbols, das die Faltung anzeigt
 OptionPanel.foldingsymbolwidth.tooltip=<html>Gr\u00F6\u00DFe des Kreises, der die Faltung symbolisiert</html>
@@ -1112,12 +1141,13 @@ OptionPanel.formula_disable_plugin=Formelauswertung deaktivieren
 OptionPanel.fr=Franz\u00F6sisch / Fran\u00E7ais
 OptionPanel.gl=Gallizisch / Galego
 OptionPanel.goto_note_end_on_edit=Bewegt den Cursor ans Ende
-OptionPanel.grid_size=Punktabstand f\u00F6r Platzierungsraster
+OptionPanel.grid_size=Punktabstand f\u00FCr Platzierungsraster
 OptionPanel.groovy_editor_font=Schrift f\u00FCr den Groovy Syntax-Highlighting Editor
 OptionPanel.groovy_editor_font.tooltip=Benutze z.B. 'Dialog' or 'Monospaced' wenn du Unicode-Zeichen benutzt!
 OptionPanel.groovy_editor_font_size=Schriftgr\u00F6\u00DFe f\u00FCr den Groovy Syntax-Highlighting Editor
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Linie verstecken
+OptionPanel.hide_single_end_connectors=Einseitige Verbindung ausblenden
 OptionPanel.highlight_formulas=Formeln hervorheben
 OptionPanel.horizontal=Horizontal
 OptionPanel.hr=Kroatisch / hrvatski
@@ -1128,11 +1158,12 @@ OptionPanel.html_export_fold_currently_folded=Aktuelle Faltung
 OptionPanel.html_export_folding=HTML-Export des Faltungszustands
 OptionPanel.html_export_no_folding=Ohne Faltung
 OptionPanel.hu=Ungarisch / Magyar
-OptionPanel.ic_disable=(deaktiviert)
+OptionPanel.ic_disable=Deaktiviert
 OptionPanel.ic_file=Verwende Festplatte
 OptionPanel.ic_ram=Verwende Arbeitsspeicher
 OptionPanel.icon=Icon
 OptionPanel.icon.tooltip=Falls angewendet, hat der Knoten nur genau dieses Icon.
+OptionPanel.icon_size=Icongr\u00F6\u00DFe
 OptionPanel.icons.list=Liste der angezeigten Standard-Icons
 OptionPanel.icons.list.tooltip=Hier k\u00F6nnen die Standard-Icons sortieren oder deaktivieren werden. Die Eintr\u00E4ge m\u00FCssen dabei mit einem ";" getrennt sein.
 OptionPanel.id=Indonesisch / Bahasa Indonesia
@@ -1146,12 +1177,12 @@ OptionPanel.JoinNodesAction.textSeparators=Texttrennzeichen
 OptionPanel.key_type_action=Bei Tastendruck
 OptionPanel.Keystrokes=Tasten
 OptionPanel.ko=Koreanisch / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
-OptionPanel.label_font_family=Zeichensatz
+OptionPanel.label_font_family=Schriftart
 OptionPanel.label_font_size=Schriftgr\u00F6\u00DFe
 OptionPanel.language=Sprache
 OptionPanel.language.tooltip=<html>Dies ist die Sprache, die im Programm verwendet wird. 'Automatisch' bedeutet, dass die Sprache des Benutzers geladen wird, soweit vorhanden.</html>
 OptionPanel.last=Am Ende
-OptionPanel.last_opened_list_length=Anzahl der zuletzt ge\u00F6ffneten Dateien unter Datei -> Zuletzt ge\u00F6ffnete Dateien
+OptionPanel.last_opened_list_length=Anzahl der zuletzt ge\u00F6ffneten Dateien unter Datei -> Zuletzt ge\u00F6ffnete Mindmaps
 OptionPanel.latex_disable_editor=Deaktiviere den LaTeX Syntax-Highlighting Editor
 OptionPanel.latex_disable_editor.tooltip=Aktivieren, falls du Probleme mit dem LaTeX Editor hast
 OptionPanel.latex_editor_font=Schrift f\u00FCr den LaTeX Syntax-Highlighting Editor
@@ -1167,13 +1198,15 @@ OptionPanel.load_folding=Faltungszustand der Mindmap laden
 OptionPanel.load_folding_from_map_default_fold_all=Von Mindmap laden oder alles einklappen
 OptionPanel.load_folding_from_map_default_unfold_all=Von Mindmap laden oder alles ausklappen
 OptionPanel.load_last_map=Automatisch letzte Mindmap laden
-OptionPanel.load_last_map.tooltip=<html>Wenn selektiert, l\u00E4d Freeplane beim Start, automatisch die zuletzt ge\u00F6ffnete Mindmap.</html>
+OptionPanel.load_last_map.tooltip=<html>Wenn selektiert, l\u00E4dt Freeplane beim Start, automatisch die zuletzt ge\u00F6ffnete Mindmap.</html>
 OptionPanel.load_last_maps=Alle zuletzt ge\u00F6ffneten Mindmaps laden
-OptionPanel.lookandfeel=Look-and-feel
+OptionPanel.lookandfeel=Erscheinigungsbild
 OptionPanel.lookandfeel.scaleuifonts=Schriftarten skalieren
 OptionPanel.lookandfeel.scaleuifonts.tooltip=N\u00FCtzlich f\u00FCr Bildschirme mit hoher Aufl\u00F6sung
 OptionPanel.lookandfeel.tooltip=<html>Bei Problemen bitte einfach 'Standard' w\u00E4hlen.</html>
 OptionPanel.lt=Litauisch / kalba
+OptionPanel.markClones=Farbige Klon-Markierung
+OptionPanel.markSelectedClones=Farbige Klon-Markierung bei Auswahl
 OptionPanel.max_displayed_node_count=Maximale Anzahl angezeigter Knoten
 OptionPanel.max_image_width=Maximale Anzeigebreite f\u00FCr Abbildungen
 OptionPanel.max_image_width.tooltip=Neu eingef\u00FCgte Abbildungen werden entsprechend herunterskaliert
@@ -1181,12 +1214,15 @@ OptionPanel.max_menu_item_count=Maximale Anzahl an Men\u00FC-Eintr\u00E4gen
 OptionPanel.max_menu_item_count.tooltip=Limitiert die Anzahl von Elementen des Untermen\u00FCs (mindestens 10)
 OptionPanel.max_node_width=Maximale Knotenbreite
 OptionPanel.max_shortened_text_length=Maximale L\u00E4nge des gek\u00FCrzten Knotentexts
+OptionPanel.menuItemFontSize=Men\u00FC Schriftgr\u00F6\u00DFe
 OptionPanel.metal=Metall
 OptionPanel.min_node_width=Minimale Knotenbreite
+OptionPanel.monitor_size_inches=Monitorgr\u00F6\u00DFe (inches)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Schmales Sechseck
 OptionPanel.nb=Norwegisch Bokm\u00E5l / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=nie
+OptionPanel.neverShowSurvey=Nie Fragen, Umfragen und Tipps zeigen
 OptionPanel.nl=Niederl\u00E4ndisch, Fl\u00E4misch / Nederlands, Vlaams
 OptionPanel.nn=Norwegisch Nynorsk / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Knotenhintergrundfarbe
@@ -1213,7 +1249,7 @@ OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>Legt fest
 OptionPanel.OK=Speichern
 OptionPanel.org.freeplane.plugin.bugreport=Fehlerberichte senden
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Immer senden
-OptionPanel.org.freeplane.plugin.bugreport.ask=Report Dialog zeigen
+OptionPanel.org.freeplane.plugin.bugreport.ask=Report-Dialog zeigen
 OptionPanel.org.freeplane.plugin.bugreport.denied=Nie senden
 OptionPanel.org.freeplane.plugin.bugreport.userid=Optional \u00FCbertragbare ID
 OptionPanel.outline_hgap=Horizontaler Abstand
@@ -1228,16 +1264,28 @@ OptionPanel.parse_latex=Erkenne LaTeX
 OptionPanel.parse_latex.tooltip=Interpretiere LaTeX-Formeln per Format oder Pr\u00E4fix: Siehe http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Einf\u00FCgen als HTML
 OptionPanel.PASTE_PLAIN_TEXT=Einf\u00FCgen als Text
+OptionPanel.pasteImagesFromFiles=Bilder von Datei kopieren
+OptionPanel.pasteImagesFromFiles.tooltip=Bild einf\u00FCgen, wenn es in die Mindmap gezogen wurde
 OptionPanel.path_property_may_not_be_empty=Der Pfad darf nicht leer sein! Die \u00C4nderungen wurden r\u00FCckg\u00E4ngig gemacht.
 OptionPanel.patternname=Name
 OptionPanel.patternname.tooltip=Eindeutiger Name des Stils
 OptionPanel.pl=Polnisch / polski
-OptionPanel.placenewbranches=Neue Knoten einf\u00FCgen
-OptionPanel.placenewbranches.tooltip=<html>Legt fest, wo neue Knoten eingef\u00FCgt werden.</html>
+OptionPanel.placenewbranches=Neuen Zweig einf\u00FCgen
+OptionPanel.placenewbranches.tooltip=<html>Legt fest, wo neue Zweige eingef\u00FCgt werden.</html>
 OptionPanel.plugin.tooltip=Nicht mitgelieferte Plugins.
 OptionPanel.plugins=Plugins
-OptionPanel.presentation_dimmer_transparency=Transparenz f\u00FCr Presentation
-OptionPanel.presentation_mode=Pr\u00E4sentations-Modus
+OptionPanel.Presentation=Pr\u00E4sentation
+OptionPanel.presentation.combineAll=Alle Pr\u00E4sentationen verbinden
+OptionPanel.presentation.exportDirectory=Verzeichnisname exportierter Pr\u00E4sentationen
+OptionPanel.presentation.maxDropBoxRowCount=Maximale Reihen in Ausklappbox
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Anwenden f\u00FCr Pr\u00E4sentations- und Folienauswahl
+OptionPanel.presentation.processesEscapeKey=Pr\u00E4sentation mit <ESCAPE> beenden
+OptionPanel.presentation.processesNavigationKeys=Navigationstasten f\u00FCr die Steuerung der Pr\u00E4sentation
+OptionPanel.presentation.slideDisplaysAllNodes=Alle Foliennotizen automatisch aufklappen
+OptionPanel.presentation.slowMotion=Zeitlupe
+OptionPanel.presentation.switchToFullScreen=Vollbild aktivieren
+OptionPanel.presentation.switchToSpotlight=Rampenlicht aktivieren
+OptionPanel.presentation.zoom=Zoom aktivieren
 OptionPanel.printonwhitebackground=<html>Wei\u00DFen Hintergrund zum Drucken verwenden</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Legt fest, dass immer weiss als Hintergrund beim Drucken verwendet wird.</html>
 OptionPanel.pt_BR=Protugiesisch (Brasilien)/ Portugu\u00EAs (Brasil)
@@ -1254,26 +1302,26 @@ OptionPanel.remove_notes_without_question=Notizen ohne Nachfrage l\u00F6schen?
 OptionPanel.remove_notes_without_question.tooltip=Wenn diese Option gew\u00E4hlt ist, werden die Notizen des Knotens ohne Warnung gel\u00F6scht. Dies kann bei unbeabsichtigtem L\u00F6schen zu Datenverlust f\u00FChren.
 OptionPanel.resources_use_default_font_for_notes_too=Standard Zeichensatz f\u00FCr Notizen verwenden
 OptionPanel.resources_use_margin_top_zero_for_notes=Oberen Rand f\u00FCr Notizen entfernen
-OptionPanel.revision_color=Revisionfarbe
+OptionPanel.revision_color=Revisionsfarbe
 OptionPanel.revision_color.tooltip=Hintergrundfarbe f\u00FCr ge\u00E4nderte Knoten.
 OptionPanel.ROUND_RECT=Abgerundetes Rechteck
 OptionPanel.ru=Russisch / \u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A
 OptionPanel.save_folding=Faltung speichern
 OptionPanel.save_folding_if_map_is_changed=Wenn Mindmap ver\u00E4ndert wurde
 OptionPanel.save_last_position_in_map=Letzte Position in Mindmap speichern
-OptionPanel.save_last_visited_node=Speichere die letzte Position auf der Karte
+OptionPanel.save_last_visited_node=Letzte Selektion in Mindmap merken
 OptionPanel.save_modification_times=\u00C4nderungszeiten speichern
 OptionPanel.script_classpath=Skripte Klassenpfad: Verzeichnisse, die Klassen und/oder JARs enthalten
-OptionPanel.script_classpath.tooltip=<html>Eine Liste von JARs und/oder Verzeichnissen, die zum Klassenpfad der Skripte/Formeln hinzugef\u00FCgt wird. <br> Verwenden Sie ";" (Windows) oder ":" (Linux, Mac), um die Eintr\u00E4ge der Liste voneinander zu trennen.<br>Verzeichnisse werden nach JAR- und .class-Dateien durchsucht.<br>Relative Pfade werden als relativ zum Freeplane Benutzerverzeichnis angesehen.<br> Wenn Sie den Klassenpfad angeben, muss er lesbar sein.</html>
+OptionPanel.script_classpath.tooltip=<html>Eine Liste von JARs und/oder Verzeichnissen, die zum Klassenpfad der Skripte/Formeln hinzugef\u00FCgt wird. <br> Verwenden Sie ";" (Windows) oder ":" (Linux, Mac), um die Eintr\u00E4ge der Liste voneinander zu trennen.<br>Verzeichnisse werden nach JAR- und .class-Dateien durchsucht.<br>Relative Pfade werden als relativ zum Freeplane-Benutzerverzeichnis angesehen.<br> Wenn Sie den Klassenpfad angeben, muss er lesbar sein.</html>
 OptionPanel.script_compilation_disabled_extensions=Dateiendungen, f\u00FCr die nicht kompiliert werden soll (Siehe Tooltip)
 OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Wenn alle Skripte einer zus\u00E4tzlich installierten Sprache<br>(au\u00DFer Groovy und JavaScript) grunds\u00E4tzliche Kompilationsfehler<br>haben, kann das Hinzuf\u00FCgen der Dateiendung hier helfen<br>(kommaseparierte Liste).</html>
 OptionPanel.script_directories=Suchpfad f\u00FCr Skripte
-OptionPanel.script_directories.tooltip=<html>Eine Liste von Skript-Verzeichnissen (zus\u00E4tzlich zu "scripts").<br>Verwende ";"(Windows) oder ":" (Linux, Mac) um die Eintr\u00E4ge voneinander zu trennen.<br>Relative Pfadangaben beziehen sich auf das Freeplane Benutzerverzeichnis.</html>
-OptionPanel.script_user_key_name_for_signing=Optionaler Aliasname eines private Schl\u00FCssels, um Skripte zu signieren
+OptionPanel.script_directories.tooltip=<html>Eine Liste von Skript-Verzeichnissen (zus\u00E4tzlich zu "scripts").<br>Verwende ";"(Windows) oder ":" (Linux, Mac) um die Eintr\u00E4ge voneinander zu trennen.<br>Relative Pfadangaben beziehen sich auf das Freeplane-Benutzerverzeichnis.</html>
+OptionPanel.script_user_key_name_for_signing=Optionaler Aliasname eines privaten Schl\u00FCssels, um Skripte zu signieren
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Wenn Sie Ihre Skripte selbst signieren wollen, dann geben Sie hier einen Alias f\u00FCr den Schl\u00FCssel ein.<br>Es wird erwartet, dass der Schl\u00FCssel im Standard-Schl\u00FCsselspeicher ist.<br>Das geheime Passwort des Schl\u00FCssels muss mit dem Passwort des Schl\u00FCsselspeichers \u00FCbereinstimmen.</html>
 OptionPanel.scrollbar_increment=Geschwindigkeit
 OptionPanel.scrolling_speed=Geschwindigkeit beim Scrollen
-OptionPanel.scrollOnUnfold=Karte nach dem Aufklappen eines Knotens zentrieren
+OptionPanel.scrollOnUnfold=Mindmap nach dem Aufklappen eines Knotens neu zentrieren
 OptionPanel.selection_method=Auswahlmodus
 OptionPanel.selection_method.tooltip=<html>Mit dem folgenden Schalter kann die verz\u00F6gerte Auswahl eines Schemas aktiviert bzw. deaktiviert werden.<br>\u00C4ndern Sie diese Option nicht, da sie ohnehin in auto.properties gespeichert werden.</html>
 OptionPanel.selection_method_by_click=Durch Mausklick
@@ -1286,6 +1334,8 @@ OptionPanel.separator.automatic_save=Automatisches Speichern
 OptionPanel.separator.behaviour=Verhalten
 OptionPanel.separator.browser=Browser
 OptionPanel.separator.cache=Cache
+OptionPanel.separator.clones=Klone
+OptionPanel.separator.cloud=Wolke
 OptionPanel.separator.CloudControls=Wolken
 OptionPanel.separator.commands_for_the_program=Programm
 OptionPanel.separator.connectors=Verbindungen
@@ -1294,7 +1344,7 @@ OptionPanel.separator.default_colors=Standard-Farben
 OptionPanel.separator.default_fonts=Standard-Schriftarten
 OptionPanel.separator.default_styles=Standard-Stile
 OptionPanel.separator.edge_colors=Automatische Randfarbe
-OptionPanel.separator.EdgeControls=Linieneigenschaften
+OptionPanel.separator.EdgeControls=Linien
 OptionPanel.separator.edit_long_node_window=Externer Editor f\u00FCr gro\u00DFe Knoten
 OptionPanel.separator.editing=Editor-Einstellungen
 OptionPanel.separator.export=Export
@@ -1305,6 +1355,8 @@ OptionPanel.separator.html_export=HTML-Export
 OptionPanel.separator.html_import=HTML-Import
 OptionPanel.separator.hyperlink_types=Hyperlink-Typen
 OptionPanel.separator.icon_properties=Icons
+OptionPanel.separator.IconControls=Icons
+OptionPanel.separator.Icons=Icons
 OptionPanel.separator.icons=Piktogramme in "Icon W\u00E4hlen..."
 OptionPanel.separator.initial_map_size=Anf\u00E4ngliche Gr\u00F6\u00DFe der Mindmap
 OptionPanel.separator.inline_editor=Texteingabe im Knoten
@@ -1313,7 +1365,7 @@ OptionPanel.separator.key_typing=Tastatureingabe
 OptionPanel.separator.language=Sprache
 OptionPanel.separator.latex=LaTeX
 OptionPanel.separator.load=Laden
-OptionPanel.separator.look_and_feel=Look-and-feel
+OptionPanel.separator.look_and_feel=Erscheinungsbild
 OptionPanel.separator.mouse_wheel=Mausrad
 OptionPanel.separator.new_node_commands=Knotenerzeugung
 OptionPanel.separator.node_editing_commands=Knotenver\u00E4nderung
@@ -1325,11 +1377,12 @@ OptionPanel.separator.NodeShape=Knotenform
 OptionPanel.separator.NodeStyle=Knotenstil
 OptionPanel.separator.NodeText=Knotentext
 OptionPanel.separator.notifications=Nachfragen
-OptionPanel.separator.org.freeplane.plugin.bugreport=Automatischer Fehler Bericht
+OptionPanel.separator.org.freeplane.plugin.bugreport=Automatischer Fehlerbericht
 OptionPanel.separator.other_defaults=Andere Standards
 OptionPanel.separator.others=Andere Tastenkombinationen
 OptionPanel.separator.outline_view=Gliederungsansicht
 OptionPanel.separator.patterns=Stile
+OptionPanel.separator.presentation=Pr\u00E4sentation
 OptionPanel.separator.reminderOptions=Erinnerungseinstellungen
 OptionPanel.separator.RichTextEditor=Rich-Text-Editor
 OptionPanel.separator.root_node_appearance=Stil des Wurzel-Knotens
@@ -1337,16 +1390,18 @@ OptionPanel.separator.save=Speichern
 OptionPanel.separator.scripting=Skripte
 OptionPanel.separator.scrollbar=Bildlaufleiste
 OptionPanel.separator.search=Suchen
-OptionPanel.separator.selection_colors=Selektion Farben
+OptionPanel.separator.selection_colors=Selektionsfarben
 OptionPanel.separator.selection_method=Auswahlmodus
-OptionPanel.separator.single_instance_mode=Freeplane Instanzen
+OptionPanel.separator.single_instance_mode=Freeplane-Instanzen
 OptionPanel.separator.size_limits=Gr\u00F6\u00DFenbeschr\u00E4nkung
 OptionPanel.separator.spelling=Rechtschreibpr\u00FCfung
 OptionPanel.separator.SplitToWordsAction=Knoten in Worte teilen
 OptionPanel.separator.status=Status-Zeile
-OptionPanel.separator.tooltip=Tooltip
+OptionPanel.separator.surveys=Umfragen
+OptionPanel.separator.svg_icons=SVG Icons
+OptionPanel.separator.tooltip=Tooltips
 OptionPanel.separator.undo=R\u00FCckg\u00E4ngig
-OptionPanel.separator.updates=Programm Aktualisierungen
+OptionPanel.separator.updates=Programm-Aktualisierungen
 OptionPanel.set_property_text=Ver\u00E4ndern
 OptionPanel.set_property_text.tooltip=<html><ul><li>Leer=Nicht \u00E4ndern </li><li>Minus=Eigenschaft l\u00F6schen (also auf den Standard zur\u00FCcksetzen)</li><li>Plus=Eigenschaft setzen.</li></ul></html>
 OptionPanel.setscript=Ver\u00E4ndern?
@@ -1355,20 +1410,23 @@ OptionPanel.shape_horizontal_margin=Horizontaler Abstand
 OptionPanel.shape_vertical_margin=Vertikaler Abstand
 OptionPanel.sharp_bezier=Geschwungen und spitz
 OptionPanel.sharp_linear=Spitze gerade Linie
-OptionPanel.shouldCenterSmallMaps=Kleine Karten zentrieren
+OptionPanel.shouldCenterSmallMaps=Kleine Mindmaps zentrieren
+OptionPanel.show_connectors=Verbindungslinien zeigen
 OptionPanel.show_icon_for_attributes=Icon f\u00FCr Attribut anzeigen
-OptionPanel.show_less_than_N_nodes_by_default_after_load=Von Karte laden oder manche Knoten aufklappen
+OptionPanel.show_icons=Symbole zeigen
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Gespeicherten Knotendarstellung von Mindmap laden bzw. manche Knoten aufklappen
 OptionPanel.show_node_tooltips=Notiz anzeigen
+OptionPanel.show_note_icon_in_tooltip=Notizsymbol in Tooltip zeigen
 OptionPanel.show_note_icons=Icon f\u00FCr Notiz anzeigen
 OptionPanel.show_styles_in_tooltip=Stil-Name anzeigen
 OptionPanel.signed_script_are_trusted=Signierten Skripts vertrauen (empfohlen).
 OptionPanel.signed_script_are_trusted.tooltip=Wenn Skripte von einer vertrauensw\u00FCrdigen Stelle (z.B. von den Freeplane Entwicklern, oder von Ihnen selbst) signiert sind werden sie ohne Restriktionen ausgef\u00FChrt.
 OptionPanel.simplyhtml.default_paste_mode=Standard-Einf\u00FCgemodus
 OptionPanel.single_backup_directory=Nur ein Verzeichnis f\u00FCr Backup-Dateien verwenden
-OptionPanel.single_backup_directory.tooltip=<html>Backup Dateien und Automatisch gespeicherte Dateien werden gemeinsam in ein Verzeichnis gespeichert.</html>
+OptionPanel.single_backup_directory.tooltip=<html>Backup-Dateien und automatisch gespeicherte Dateien werden gemeinsam in einem Verzeichnis gespeichert.</html>
 OptionPanel.single_backup_directory_path=Backup-Verzeichnis (falls vorherige Option gew\u00E4hlt ist)
 OptionPanel.single_backup_directory_path.tooltip=<html>\u00DCberschreibt den Standardpfad <freeplaneuserdir>/.backup</html>
-OptionPanel.single_instance=Dateien in einer aktiven Freeplane Instanz \u00F6ffnen
+OptionPanel.single_instance=Dateien in einer aktiven Freeplane-Instanz \u00F6ffnen
 OptionPanel.single_instance_force=Eine zweite Instanz von Freeplane in jedem Fall verhindern
 OptionPanel.single_instance_force.tooltip=Vermeidet eine zweite Instanz, selbst wenn keine ladbare Datei existiert
 OptionPanel.sk=Slovakisch / sloven\u010Dina
@@ -1376,7 +1434,7 @@ OptionPanel.skip_template_selection=Vorlagenauswahl-Dialog \u00FCberspringen
 OptionPanel.sl=Slovenisch / sloven\u0161\u010Dina
 OptionPanel.slow_scroll_selected_node=Langsames Scrollen zum selektierten Knoten
 OptionPanel.spelling_opt_case_sensitive=Gro\u00DF-/Kleinschreibung
-OptionPanel.spelling_opt_ignore_all_caps_words=W\u00F6rter aus GROSSBUCHSTABEN ignorieren.
+OptionPanel.spelling_opt_ignore_all_caps_words=W\u00F6rter aus Gro\u00DFbuchstaben ignorieren
 OptionPanel.spelling_opt_ignore_capitalization=Gro\u00DFbuchstaben am Wortbeginn ignorieren
 OptionPanel.spelling_opt_ignore_words_with_numbers=W\u00F6rter mit Ziffern ignorieren
 OptionPanel.spelling_opt_suggestions_limit_dialog=Maximale Anzahl der Vorschl\u00E4ge im Dialog
@@ -1386,19 +1444,22 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Zeichen in W\u00F6rtern
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=Ursprungsknoten leer lassen
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=Knotennummer in der Zeile
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=Speichere Originaltext als Zusatz
+OptionPanel.spotlight=Rampenlicht
+OptionPanel.spotlight_background_color=Hintergrundfarbe des Rampenlichtes
 OptionPanel.sr=Serbisch / \u0441\u0440\u043F\u0441\u043A\u0438
-OptionPanel.standard_template=Standard Vorlage
-OptionPanel.standardbackgroundcolor=Standard Hintergrundfarbe
+OptionPanel.standard_template=Standardvorlage
+OptionPanel.standardbackgroundcolor=Standard-Hintergrundfarbe
 OptionPanel.standardbackgroundcolor.tooltip=<html>Legt die Standardfarbe des Hintergrundes fest (in HTML-Notation)</html>
 OptionPanel.standardcloudcolor=Standard Wolkenfarbe
 OptionPanel.standardcloudcolor.tooltip=<html>Legt die Standard Wolkenfarbe fest (in HTML-Notation)</html>
 OptionPanel.standardcloudestyle=Standard Wolkenstil
 OptionPanel.standardcloudestyle.tooltip=<html>Legt den Standard Wolkenstil fest.<br>Im Moment wird nur die geschwungene Form (Bezier)unterst\u00FCtzt.</html>
+OptionPanel.standardcloudshape=Standard-Wolkenform
 OptionPanel.standarddrawrectangleforselection=Selektierten Knoten durch Rechteck anzeigen
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Zeigt den selektierten Knoten an, indem ein Rechteck um ihn gezeichnet wird.</html>
 OptionPanel.standardlinkcolor=Standard Verbindung-Farbe
 OptionPanel.standardlinkcolor.tooltip=<html>Legt die Standardfarbe der Verbindung fest (in HTML-Notation). </html>
-OptionPanel.standardlinkestyle=Standard Verbindung-Stil
+OptionPanel.standardlinkestyle=Standard-Verbindungs-Stil
 OptionPanel.standardlinkestyle.tooltip=<html>Legt den Standardstil f\u00FCr die Verbindung fest. </html>
 OptionPanel.standardselectednodecolor=Standard-Farbe f\u00FCr ausgew\u00E4hlte Knoten
 OptionPanel.standardselectednodecolor.tooltip=<html>Legt die Standardfarbe f\u00FCr selektierte Knoten fest (in HTML-Notation).<br>Gilt nur, wenn die Option "Selektierten Knoten durch Rechteck anzeigen"<br><b>nicht</b> selektiert ist.</html>
@@ -1410,13 +1471,14 @@ OptionPanel.structured_html_import=Importiere HTML als Knotenhierarchie
 OptionPanel.structured_icon_toolbar=Strukturierte Icon-Toolbar
 OptionPanel.summary=Zusammenfassung
 OptionPanel.sv=Schwedisch / svenska
-OptionPanel.text.use_ctrl_key=<html>Um den Programm-Funktionen ein Tastaturk\u00FCrzel zuzuweisen,<br> verwende die Men\u00FCfunktion "Extras -> Tastaturk\u00FCrzel zuweisen"</html>
+OptionPanel.text.use_ctrl_key=<html>Um den Programm-Funktionen ein Tastaturk\u00FCrzel zuzuweisen,<br> verwenden Sie die Men\u00FCfunktion "Extras -> Tastaturk\u00FCrzel zuweisen"</html>
 OptionPanel.textalignment=Textausrichtung
 OptionPanel.time_for_automatic_save=Zeitabstand f\u00FCr automatisches Speichern (in Millisekunden)
 OptionPanel.time_for_automatic_save.tooltip=<html>Legt die Zeit zwischen zwei aufeinanderfolgenden automatischen Speicherungen in Millisekunden fest <br>Wenn Sie diese Funktion deaktivieren wollen, dann setzen Sie die Zeit auf 200.00.00.000.</html>
 OptionPanel.time_for_delayed_selection=Zeit f\u00FCr die verz\u00F6gerte Auswahl (in Millisekunden)
 OptionPanel.time_for_delayed_selection.tooltip=<html>Legt fest, wie lange die Maus \u00FCber dem Knoten sein muss, bevor er ausgew\u00E4hlt wird.<br>Ein Wert von 1 bedeutet direkte Auswahl mit der Maus (ohne Klick).</html>
-OptionPanel.toolTipManager.dismissDelay=Ausblenden des ToolTips (in Millisekunden)
+OptionPanel.toolbar_icon_height=H\u00F6he des Symbols in der Symbolleiste
+OptionPanel.toolTipManager.dismissDelay=Ausblenden des Tooltips (in Millisekunden)
 OptionPanel.toolTipManager.initialDelay=Anf\u00E4ngliche Verz\u00F6gerung (in Millisekunden)
 OptionPanel.toolTipManager.max_tooltip_height=Maximale H\u00F6he der Kurzinformation
 OptionPanel.toolTipManager.max_tooltip_height.tooltip=Die maximale H\u00F6he der Kurzinformation in Pixeln.
@@ -1432,11 +1494,12 @@ OptionPanel.unfold_on_paste=Knoten beim Einf\u00FCgen entfalten
 OptionPanel.unfold_on_paste.tooltip=Knoten beim Einf\u00FCgen und beim Drag-And-Drop entfalten
 OptionPanel.uniform_shape=Einheitlich
 OptionPanel.use_auto_edge_color=Farbe {0} verwenden
-OptionPanel.use_common_out_point_for_root_node=Alle Linien am Wurzelknoten starten aus einem Punkt
-OptionPanel.use_common_out_point_for_root_node.tooltip=<html>Wenn selektiert starten alle Linien am Wurzelknoten aus einem Punkt.</html>
+OptionPanel.use_common_out_point_for_root_node=Alle Linien am Wurzel-Knoten starten aus einem Punkt
+OptionPanel.use_common_out_point_for_root_node.tooltip=<html>Wenn selektiert, starten alle Linien am Wurzelknoten aus einem Punkt.</html>
+OptionPanel.use_svg_icons=Benutze SVG-Icons
+OptionPanel.use_svg_icons.tooltip=<html>Bestimmt das Aussehen der Icons. Bitte beachten:<br>Bei Verwendung von SVGs wird mehr Rechenzeit f\u00FCr die Darstellung ben\u00F6tigt.</html>
 OptionPanel.use_tabbed_pane=Karteireiter verwenden
 OptionPanel.use_tabbed_pane.tooltip=Wenn selektiert, werden Mindmaps in Tabs angezeigt (wie in Firefox :-) ).
-OptionPanel.user_defined_screen_resolution=Bildschirm-Aufl\u00F6sung (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Skripte: Wenn Sie den Classpath definieren, m\u00FCssen sie den lesenden Zugriff auf Dateien erlauben!
 OptionPanel.validate_invalid_date_format=Standard-Format f\u00FCr Datum ist ung\u00FCltig
 OptionPanel.validate_invalid_datetime_format=Standard-Format f\u00FCr Datum-Zeit ist ung\u00FCltig
@@ -1458,12 +1521,12 @@ org.freeplane.plugin.bugreport.always_agree=Immer senden
 org.freeplane.plugin.bugreport.always_deny=Niemals senden
 org.freeplane.plugin.bugreport.deny=Nicht senden
 org.freeplane.plugin.bugreport.dialog.title=Automatischer Fehlerreport
-org.freeplane.plugin.bugreport.freeplane_team=Nachricht vom Freeplane Team
-org.freeplane.plugin.bugreport.lastreport=Letzer Empfangener Report
+org.freeplane.plugin.bugreport.freeplane_team=Nachricht vom Freeplane-Team
+org.freeplane.plugin.bugreport.lastreport=Letzter empfangener Report
 org.freeplane.plugin.bugreport.never=Niemals nach Hilfe fragen
 org.freeplane.plugin.bugreport.question=Freeplane hat eine automatische Fehlerr\u00FCckverfolgungs-Funktion.
 org.freeplane.plugin.bugreport.report=Derzeitiger Report
-org.freeplane.plugin.bugreport.wanted_bug=Ein Fehler ist aufgetreten und wurde automatisch weitergemeldet.\nWir brauchen aber noch mehr Informationen, um dieses unerwartete Verhalten reproduzieren zu k\u00F6nnen.\n\nBitte helfen Sie uns dabei, indem Sie einen Fehlerbericht in unserem Fehlerverfolgungstool eingeben.\nErkl\u00E4ren Sie auch, was Sie getan haben, als der Fehler auftrat, so dass wir Ihn reproduzieren k\u00F6nnen.\n\nWenn Sie OK dr\u00FCcken, wird automatisch das Fehlerverfol [...]
+org.freeplane.plugin.bugreport.wanted_bug=Ein Fehler ist aufgetreten und wurde automatisch weitergemeldet.\nWir brauchen aber noch mehr Informationen, um dieses unerwartete Verhalten reproduzieren zu k\u00F6nnen.\n\nBitte helfen Sie uns dabei, indem Sie einen Fehlerbericht in unserem Fehlerverfolgungstool eingeben.\nErkl\u00E4ren Sie auch, was Sie getan haben, als der Fehler auftrat, so dass wir Ihn reproduzieren k\u00F6nnen.\n\nWenn Sie OK dr\u00FCcken, wird automatisch das Fehlerverfol [...]
 org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=Der Knoten {0} ist nicht definiert
 out_of_memory=Zu wenig Speicher.
 overwrite_keyset_question=Bestehende Tastaturk\u00FCrzel-Sammlung \u00FCberschrieben?
@@ -1490,15 +1553,15 @@ PeriodUnit.MINUTE=Minuten
 PeriodUnit.MONTH=Monate
 PeriodUnit.WEEK=Wochen
 PeriodUnit.YEAR=Jahre
-plugins/latex/LatexNodeHook.editorTitle=Latex bearbeiten
-plugins/script_filter=Skript Filter {0}
+plugins/latex/LatexNodeHook.editorTitle=LaTex bearbeiten
+plugins/script_filter=Skript-Filter {0}
 plugins/script_filter_error={0} soll einen Boolean zur\u00FCckgeben von {1}. Der R\u00FCckgabewert ist aber {2}
-plugins/script_filter_execute_error=Beim Ausf\u00FChren des {0}\nf\u00FCr Konten {1}\nist ein Fehler aufgetreten:\n{2}
-plugins/ScriptEditor.cancel=\u00C4nderungen Verwerfen und &abbrechen
+plugins/script_filter_execute_error=Beim Ausf\u00FChren des {0}\nf\u00FCr Knoten {1}\nist ein Fehler aufgetreten:\n{2}
+plugins/ScriptEditor.cancel=\u00C4nderungen verwerfen und &abbrechen
 plugins/ScriptEditor.exit=\u00C4nderungen &speichern und schlie\u00DFen
-plugins/ScriptEditor.FORBIDDEN_ACTION=In Freeplane sind Groovy Skripte eingeschr\u00E4nkt. Die folgenden {0,choice,0#File|1#Network|2#Exec} Operationen sind verboten: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write}. Sie k\u00F6nnen dies in den Programmeinstellungen \u00E4ndern.
+plugins/ScriptEditor.FORBIDDEN_ACTION=In Freeplane sind Groovy-Skripte eingeschr\u00E4nkt. Die folgenden {0,choice,0#File|1#Network|2#Exec} Operationen sind verboten: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write}. Sie k\u00F6nnen dies in den Programmeinstellungen \u00E4ndern.
 plugins/ScriptEditor.menu_actions=&Aktionen
-plugins/ScriptEditor.new_script=&Neues Script
+plugins/ScriptEditor.new_script=&Neues Skript
 plugins/ScriptEditor.run=&Starten
 plugins/ScriptEditor.sign=Skript s&ignieren...
 plugins/ScriptEditor/window.Result=Ergebnis:
@@ -1517,7 +1580,7 @@ plugins/TimeManagement.xml_cancelButton=Abbrechen
 plugins/TimeManagement.xml_closeButton=Schlie\u00DFen
 plugins/TimeManagement.xml_Export=Markierte Knoten Exportieren
 plugins/TimeManagement.xml_Find=Suchen
-plugins/TimeManagement.xml_Goto=Selektieren und Schlie\u00DFen
+plugins/TimeManagement.xml_Goto=Selektieren und schlie\u00DFen
 plugins/TimeManagement.xml_hour=Stunde:
 plugins/TimeManagement.xml_menu_actions=Aktionen
 plugins/TimeManagement.xml_minute=Minute:
@@ -1530,20 +1593,23 @@ plugins/TimeManagement.xml_remindLaterButton_tooltip=sp\u00E4tere Erinnerung
 plugins/TimeManagement.xml_removeReminderButton=Wiedervorlage &entfernen
 plugins/TimeManagement.xml_removeReminderButton_tooltip=Entfernt alle Wiedervorlagen der ausgew\u00E4hlten Knoten.
 plugins/TimeManagement.xml_Replace=Ersetzen
-plugins/TimeManagement.xml_Replace_All=Alle Ersetzen
-plugins/TimeManagement.xml_Replace_Selected=Markierte Ersetzen
+plugins/TimeManagement.xml_Replace_All=Alle ersetzen
+plugins/TimeManagement.xml_Replace_Selected=Markierte ersetzen
 plugins/TimeManagement.xml_Select=Ausw\u00E4hlen
 plugins/TimeManagement.xml_todayButton=Heute
-plugins/TimeManagement.xml_WindowTitle=Zeit Management
+plugins/TimeManagement.xml_WindowTitle=Zeitmanagement
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Suchen & Ersetzen
 preferences=Einstellungen
+presentation=Pr\u00E4sentation
+presentation.combineAll=Alle Pr\u00E4sentationen verbinden
 print=Drucken
 print_preview_title=Vorschau
 PrintAction.text=Drucken...
 PrintDirectAction.text=Drucken
 printing_settings=Druckskalierung
 PrintPreviewAction.text=Vorschau...
-progress=Fortschrittsicon (%)
+program_terminates=Interner Fehler, Programm wird beendet.
+progress=Fortschritts-Icon (%)
 PropertyAction.dialog=Einstellungen
 PropertyAction.text=Einstellungen...
 QuickFilterAction.text=Schneller Filter
@@ -1568,7 +1634,7 @@ regular_expressions=Regul\u00E4re Ausdr\u00FCcke
 ReminderHookAction.text=Wiedervorlage entfernen
 ReminderHookAction.tooltip=Entfernt eine Wiedervorlage.
 reminderNotification=Erinnerungsbenachrichtigung
-remove_file_from_list_on_error=Konnte Datei {0} nicht \u00F6ffnen. Soll sie aus der Liste der zuletzt ge\u00F6ffneten Dateien entfernt werden?
+remove_file_from_list_on_error=Konnte Datei {0} nicht \u00F6ffnen. Soll sie aus der Liste der zuletzt ge\u00F6ffneten Mindmaps entfernt werden?
 remove_shortcut_question=Tastaturk\u00FCrzel ersetzen?
 RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Ausgeklappte Knoten zur\u00FCcksetzen
 RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Erlaubt das Auf-/Zuklappen f\u00FCr jeden Knoten
@@ -1587,8 +1653,8 @@ replace=Ersetzen
 replace_shortcut_question=Dieses Tastaturk\u00FCrzel ist bereits zugewiesen an:\n{0}\nSoll die Zuweisung ge\u00E4ndert werden?
 replace_shortcut_title=Tastaturk\u00FCrzel ersetzen?
 ReportBugAction.text=Programm-Fehler melden
-RequestFeatureAction.text=Verbesserungs-Vorschlag machen
-reset_to_default=Default benutzen
+RequestFeatureAction.text=Verbesserungsvorschlag machen
+reset_to_default=Standard benutzen
 ResetNodeLocationAction.text=Position zur\u00FCcksetzen
 ResetStyleAction.text=Knotenstil zur\u00FCcksetzen
 resources=Ressourcen
@@ -1610,16 +1676,16 @@ save_failed=Der Versuch, {0} zu speichern, ist fehlgeschlagen.
 save_unsaved=Soll die folgende Mindmap gespeichert werden?
 save_unsaved_styles=Knotenstile speichern?
 SaveAcceleratorPresetsAction.text=Sammlung speichern...
-SaveAction.text=Karte speichern
-SaveAction_readonlyMsg=Diese Karte ist schreibgesch\u00FCtzt. Bitte benutzen Sie 'Datei->Karte speichern unter...'.
-SaveAction_readonlyTitle=Versuche eine read-only Mindmap zu speichern
-SaveAll.text=Alle ge\u00F6ffneten Mindmaps speichern
+SaveAction.text=Mindmap speichern
+SaveAction_readonlyMsg=Diese Mindmap ist schreibgesch\u00FCtzt. Bitte benutzen Sie 'Datei->Mindmap speichern unter...'.
+SaveAction_readonlyTitle=Versuche eine Nur-Lese-Mindmap zu speichern
+SaveAll.text=Alle Mindmaps speichern
 SaveAll.tooltip=Speichert alle ge\u00F6ffneten Mindmaps
 SaveAs_toReadonlyMsg={0} ist schreibgesch\u00FCtzt. Bitte eine andere Datei zum Speichern ausw\u00E4hlen.
-SaveAs_toReadonlyTitle=Versuch in eine schreibgesch\u00FCtzte Datei zu speichern
+SaveAs_toReadonlyTitle=Versuche in eine schreibgesch\u00FCtzte Datei zu speichern
 SaveAsAction.text=Speichern unter...
 saved=Gespeichert
-saving_canceled=Speicher Vorgang abgebrochen
+saving_canceled=Speichervorgang abgebrochen
 scanners_not_loaded=Scanner konnten nicht geladen werden, Datei korrupt
 scheme_evaluate=Auswerten!
 script_execution_disabled=Ausf\u00FChrung von Skripten ist deaktiviert, s. Extras/Einstellungen/Plugins
@@ -1654,13 +1720,13 @@ SelectNoteAction.tooltip=Wechselt vom bzw. zum Notiz-Editor
 set_accelerator_on_next_click_helpmessage=Um ein neues Tastaturk\u00FCrzel zu erstellen, klicken Sie auf den gew\u00FCnschten Men\u00FCeintrag.
 SetAccelerator.dialogTitle=Tastaturk\u00FCrzel zuweisen
 SetAccelerator.keystrokeDetected=Tastaturk\u00FCrzel {0} ist keinem Men\u00FCeintrag zugeordnet.
-SetAcceleratorOnNextClickAction.text=Tastaturk\u00FCrzel zuweisen...
+SetAcceleratorOnNextClickAction.text=Tastaturk\u00FCrzel zuweisen
 SetAlwaysUnfoldedNodeFlagsAction.text=Behalte zugeklappte Knoten
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Verhindert das Zuklappen f\u00FCr gegenw\u00E4rtig aufgeklappte Knoten
 SetImageByFileChooserAction.text=Bildverkn\u00FCpfung erstellen...
 SetLinkAnchorAction.text=Setze Anker
-SetLinkAnchorAction.tooltip=<html>gew\u00E4hlten Knoten als k\u00FCnftigen Bezugspunkt<br/>zu lokalen oder globalen Verkn\u00FCpfungen machen.
-SetLinkAnchorAction.tooltip_anchored=<html>setzt aktuellen Knoten als Bezugspunkt von dem aus<br/>bzw. zu dem ein lokaler bzw. datei\u00FCbergreifender<br/>Hyperlink erstellt werden kann.<br/>Aktuell: {0}</html>
+SetLinkAnchorAction.tooltip=<html>Gew\u00E4hlten Knoten als k\u00FCnftigen Bezugspunkt<br/>zu lokalen oder globalen Verkn\u00FCpfungen machen.
+SetLinkAnchorAction.tooltip_anchored=<html>Setzt aktuellen Knoten als Bezugspunkt von dem aus<br/>bzw. zu dem ein lokaler bzw. datei\u00FCbergreifender<br/>Hyperlink erstellt werden kann.<br/>Aktuell: {0}</html>
 SetLinkByFileChooserAction.text=Link auf Datei...
 SetLinkByTextFieldAction.text=Link per Textfeldeingabe...
 SetNodeLink.text=Link auf Knoten...
@@ -1668,19 +1734,24 @@ SetNoteWindowPosition.bottom.text=Unten
 SetNoteWindowPosition.left.text=Links
 SetNoteWindowPosition.right.text=Rechts
 SetNoteWindowPosition.top.text=Oben
-SetShortenerStateAction.text=Verk\u00FCrzte Knotenansicht
-sf_login_required=Source Forge login ben\u00F6tigt. Weitermachen?
+SetShortenerStateAction.text=Knoten verk\u00FCrzt anzeigen
+sf_login_required=SourceForge-Login ben\u00F6tigt. Weitermachen?
 ShowAllAttributesAction.text=Alle anzeigen
 ShowAncestorsAction.text=Zeige Vorg\u00E4nger
 ShowAttributeDialogAction.text=Attribute verwalten...
 ShowDescendantsAction.text=Zeige Nachfolger
-ShowFilterToolbarAction.text=Filter
-ShowFormatPanel.text=Format und Eigenschaften
+ShowFilterToolbarAction.text=Filter-Symbolleiste
+ShowFirstSlideAction.text=Erste Folie
+ShowFirstSlideAndStartPresentationAction.text=Pr\u00E4sentation von Beginn starten
+ShowFormatPanel.text=Werkzeugtafel
 ShowFormatPanel.tooltip=Dialog, in dem Knoten- und Kantenformate auf einmal ge\u00E4ndert werden k\u00F6nnen.
 ShowHideNoteAction.text=Editor einblenden
 ShowHideNoteAction.tooltip=Damit kann man das Notizfenster verbergen bzw. wieder anzeigen.
+ShowLastSlideAction.text=Letzte Folie
 ShowNextChildAction.text=N\u00E4chsten Unterknoten anzeigen
+ShowNextSlideAction.text=N\u00E4chste Folie
 ShowNotesInMapAction.text=Notiz immer einblenden
+ShowPreviousSlideAction.text=Vorherige Folie
 ShowSelectedAttributesAction.text=Nur ausgew\u00E4hlte anzeigen
 ShowSelectionAsRectangleAction.text=Rechteck als Auswahlmarkierung
 simplyhtml.aboutFrameTitle=\u00DCber dieses Programm
@@ -1690,7 +1761,7 @@ simplyhtml.alignLabel=Ausrichtung:
 simplyhtml.alignLeft=Links
 simplyhtml.alignRight=Rechts
 simplyhtml.allCellsRangeLabel=Alle Zellen
-simplyhtml.allOccurrencesReplaced=Alle ersetzt
+simplyhtml.allOccurrencesReplaced=Alle \u00DCbereinstimmungen ersetzt
 simplyhtml.appendTableColLabel=Spalte anh\u00E4ngen
 simplyhtml.appendTableRowLabel=Zeile anh\u00E4ngen
 simplyhtml.applyCellAttrLabel=Anwenden auf
@@ -1745,11 +1816,11 @@ simplyhtml.fontColorLabel=Textfarbe
 simplyhtml.fontColorTip=Textfarbe
 simplyhtml.fontDialogTitle=Zeichen formatieren
 simplyhtml.fontItalicLabel=Kursiv
-simplyhtml.fontItalicTip=kursiv an- und ausschalten
+simplyhtml.fontItalicTip=Kursiv an- und ausschalten
 simplyhtml.fontLabel=Zeichen...
 simplyhtml.fontTabLabel=Schriftart
 simplyhtml.fontTip=Zeichen formatieren...
-simplyhtml.fontUnderlineLabel=Unterstrichen
+simplyhtml.fontUnderlineLabel=Unterstreichen
 simplyhtml.fontUnderlineTip=Unterstreichen an- und ausschalten
 simplyhtml.foregroundLabel=Vordergrund:
 simplyhtml.formatLabel=Format
@@ -1789,13 +1860,13 @@ simplyhtml.listTypeUpperAlpha=A.,B.,C.,D.
 simplyhtml.listTypeUpperRoman=I.,II.,III.,IV.
 simplyhtml.marginLabel=Au\u00DFen
 simplyhtml.matchApproximately=\u00C4hnlichkeitssuche
-simplyhtml.matchApproximately.tooltip=<html>Gibt an, ob approximative Treffer angezeigt werden sollen,<br/>z.B. Suche nach 'files' findet 'flies'.</html>
+simplyhtml.matchApproximately.tooltip=<html>Gibt an, ob \u00E4hnliche Treffer angezeigt werden sollen,<br/>z.B. Suche nach 'files' findet 'flies'.</html>
 simplyhtml.matchCase=Gro\u00DF-/Kleinschreibung
 simplyhtml.matchCase.tooltip=Gibt an, ob Gro\u00DF/Kleinschreibung bei der Suche beachtet werden soll.
 simplyhtml.newStyleDefaultName=Neue Formatvorlage
 simplyhtml.nextTableCellLabel=N\u00E4chste Zelle
 simplyhtml.noLineLabel=Keine
-simplyhtml.noMoreOccurrencesFound=Keine (weiteren) gefunden
+simplyhtml.noMoreOccurrencesFound=Keine (weiteren) \u00DCbereinstimmungen gefunden
 simplyhtml.okBtnName=OK
 simplyhtml.paddingLabel=Innen
 simplyhtml.paraAlignCenterLabel=Zentriert
@@ -1816,7 +1887,7 @@ simplyhtml.previewText=Dies ist ein Test
 simplyhtml.prevTableCellLabel=Vorige Zelle
 simplyhtml.printLabel=Drucken...
 simplyhtml.redFontColorLabel=Rot
-simplyhtml.redoLabel=Wiederherstellen
+simplyhtml.redoLabel=Wiederholen
 simplyhtml.redoTip=Wiederholen
 simplyhtml.removeFontColorLabel=Farbe entfernen
 simplyhtml.replace=Ersetzen...
@@ -1833,7 +1904,7 @@ simplyhtml.searchFromStart=Vom Anfang an suchen
 simplyhtml.searchFromStart.tooltip=Von Anfang an (und nicht ab der Cursorposition) suchen.
 simplyhtml.searchUp=Nach oben suchen
 simplyhtml.searchUp.tooltip=Von unten nach oben suchen.
-simplyhtml.selectAllLabel=Alles Ausw\u00E4hlen
+simplyhtml.selectAllLabel=Alles ausw\u00E4hlen
 simplyhtml.selectedFontColorLabel=Selektierte Textfarbe
 simplyhtml.sizeLabel=Gr\u00F6\u00DFe
 simplyhtml.standardStyleName=Standard
@@ -1862,13 +1933,49 @@ simplyhtml.unableToRedoError=Wiederholen nicht m\u00F6glich:
 simplyhtml.unableToUndoError=R\u00FCckg\u00E4ngig nicht m\u00F6glich:
 simplyhtml.undoLabel=R\u00FCckg\u00E4ngig
 simplyhtml.undoTip=R\u00FCckg\u00E4ngig
-simplyhtml.valignBaseline=An Basislinie
+simplyhtml.valignBaseline=Basislinie
 simplyhtml.valignBottom=Unten
 simplyhtml.valignLabel=Vert. Ausrichtung:
 simplyhtml.valignMiddle=Mittig
 simplyhtml.valignTop=Oben
 simplyhtml.wholeWordsOnly=Nur ganze Worte
-simplyhtml.wholeWordsOnly.tooltip=Treffer auf ganze W?rter beschr?nken.
+simplyhtml.wholeWordsOnly.tooltip=Treffer auf ganze W\u00F6rter beschr\u00E4nken.
+slide.add=Hinzuf\u00FCgen
+slide.add.tooltip=Aktuell ausgew\u00E4hlte Knoten zur Pr\u00E4sentation hinzuf\u00FCgen
+slide.at_center.tooltip=im Zentrum
+slide.content=Folieninhalt
+slide.descendants=Unterknoten zeigen
+slide.edge=am Rand
+slide.filter=Filter
+slide.first=Erster
+slide.last=Letzter
+slide.next=N\u00E4chster
+slide.nofilter=Kein Filter
+slide.on_the_left.tooltip=auf der linken Seite
+slide.on_the_right.tooltip=auf der linken Seite
+slide.placenode=Markierten Knoten platzieren
+slide.placenode.tooltip=wenn die Folie pr\u00E4sentiert wird
+slide.present=Pr\u00E4sentation starten
+slide.presentation=Pr\u00E4sentation
+slide.presentations=Pr\u00E4sentationen
+slide.previous=Vorheriger
+slide.remove=Entfernen
+slide.remove.tooltip=Aktuell ausgew\u00E4hlte Knoten von Folie entfernen
+slide.select=Ausw\u00E4hlen
+slide.select.tooltip=Folienknoten in Mindmap ausw\u00E4hlen
+slide.set=Setzen
+slide.set.tooltip=Aktuell ausgew\u00E4hlter Knoten zur Folie hinzuf\u00FCgen
+slide.setfilter=Filter setzen
+slide.setfilter.tooltip=Filter setzen / entfernen, wenn Folie gezeigt wird
+slide.setfoldingstate=Falten einstellen
+slide.setfoldingstate.tooltip=Faltung wiederherstellen, wenn Folie gezeigt wird
+slide.setzoom=Zoom einstellen
+slide.setzoom.tooltip=Zoom setzen / entfernen, wenn Folie gezeigt wird
+slide.showancestors=\u00DCbergeordnete Knoten zeigen
+slide.showonlyselected=Nur ausgew\u00E4hlte Knoten zeigen
+slide.showonlyselected.tooltip=Verstecke andere Knoten, wenn Folie gezeigt wird
+slide.slides=Folien
+slide.stop=Beenden
 sort=Sortieren
 SortNodes.text=Unterknoten alphabetisch sortieren
 SortNodes.tooltip=Unterknoten eines Knotens alphabetisch sortieren.
@@ -1878,7 +1985,10 @@ SplitNode.text=Text aufteilen
 SplitNode.tooltip=<html>Knoteninhalt wird auf mehrere Knoten verteilt.</html>
 SplitToWordsAction.text=Nach {0} W\u00F6rtern pro Zeile teilen
 STANDARD_FORMAT=Standard
+StartPresentationAction.text=Pr\u00E4sentation starten
+StartPresentationOrShowNextSlideAction.text=Pr\u00E4sentation starten / n\u00E4chste Folie
 stop_processing=Stop
+StopPresentationAction.text=Pr\u00E4sentation beenden
 StringFlavorHandler=Knotenhierarchie als einfacher Text
 StructuredHtmlFlavorHandler=Knotenhierarchie als HTML
 style=Stil
@@ -1923,7 +2033,7 @@ task.nodes=Knoten
 task.resources=Ressourcen
 task.tools_and_settings=Werkzeuge und Einstellungen
 task.view=Ansicht
-template_dir=Standard Vorlagen
+template_dir=Standardvorlagen
 TextAlignAction.CENTER.text=Zentrierter Text
 TextAlignAction.DEFAULT.text=Voreinstellung
 TextAlignAction.LEFT.text=Links ausgerichteter Text
@@ -1933,16 +2043,16 @@ TextChangeHotKeyAction.text=Tastenk\u00FCrzel f\u00FCr Text\u00E4nderung setzen
 TimeListAction.text=Zeitplan...
 TimeListAction.tooltip=Zeigt alle Wiedervorlagezeiten und die dazugeh\u00F6rigen Knoten.
 TimeManagementAction.text=Kalender anzeigen...
-TimeManagementAction.tooltip=<html>Zeigt das Kalender Modul von Kai Toedter.</html>
+TimeManagementAction.tooltip=<html>Zeigt das Kalender-Modul von Kai Toedter.</html>
 TimePeriodUnits.days=Tage
 TimePeriodUnits.hours=Stunden
 TimePeriodUnits.minutes=Minuten
-TimePeriodUnits.ms=ms
+TimePeriodUnits.ms=Millisekunden
 TimePeriodUnits.seconds=Sekunden
 TimePeriodUnits.weeks=Wochen
 ToggleChildrenFoldedAction.text=Unterknoten falten/entfalten
 ToggleDetailsAction.text=Knotendetails ein-/ausblenden
-ToggleFBarAction.text=F-Tasten
+ToggleFBarAction.text=Funktionstasten
 ToggleFoldedAction.text=Knoten falten/entfalten
 ToggleFullScreenAction.text=Vollbildmodus
 ToggleLeftToolbarAction.text=Icons
@@ -1951,16 +2061,15 @@ ToggleRibbonAction.text=Multifunktionsleiste minimieren
 ToggleScrollbarsAction.text=Rollbalken
 ToggleStatusAction.text=Statuszeile
 ToggleToolbarAction.text=Werkzeuge
-toolbars=Symbol&leisten
 tools_and_settings=Werkzeuge und Einstellungen
 tools_misc=Verschiedenes
 tooltips=Schnellinfos
 TranslatedElement.BORDER=Textrand
 TranslatedElement.TEXT=Text
-TranslatedElement.TOOLTIP=Kurzinfo
+TranslatedElement.TOOLTIP=Tooltip
 uiTextChanger.originalTextIsNotDefined=Ursprungstext ist nicht definiert
 uiTextChanger.replaceText=Ersetze Text
-undefined_error=Ein unerwarteter Fehler ist aufgetreten. Eine Fehlernachricht im Forum w\u00E4re sch\u00F6n.
+undefined_error=Ein unerwarteter Fehler ist aufgetreten. Eine Fehlernachricht im Forum w\u00E4re hilfreich.
 underline=Unterstrich
 UnderlineAction.text=Unterstreichen
 underlined=Unterstrichen
@@ -1981,7 +2090,7 @@ updater.component=Komponente
 updater.goToDownload=Gehe zu Download
 updater.version.installed=Installierte Version
 updater.version.latest=Aktuellste Version
-updater.version.noUpdateUrl=Keine Update-URL bzw. Homepage f\u00FCr dieses Add-on.
+updater.version.noUpdateUrl=Keine Update-URL bzw. Homepage f\u00FCr dieses Add-On.
 updater.version.unknown=unbekannt
 updater.version.unreachable=Unerreichbare Quelle:
 updater.viewChangelog=Zeige Changelog
@@ -2009,8 +2118,8 @@ web_resources=Web-Ressourcen
 WebDocuAction.text=Web Dokumentation
 WhatsNewAction.text=Was ist neu in Freeplane 1.5.x
 width=Breite
-wrong_regexp=Der Regul\u00E4re Ausdruck "{0}" ist fehlerhaft (Fehler {1})
-xslt_export.html=Html Dokument
+wrong_regexp=Der regul\u00E4re Ausdruck "{0}" ist fehlerhaft (Fehler {1})
+xslt_export.html=HTML-Dokument
 xslt_export.latex=LaTex Dokument
 xslt_export.latexbook=LaTex Buch
 xslt_export.mediawiki=Mediawiki
diff --git a/freeplane/resources/translations/Resources_el.properties b/freeplane/resources/translations/Resources_el.properties
index 4157b1c..a05b311 100644
--- a/freeplane/resources/translations/Resources_el.properties
+++ b/freeplane/resources/translations/Resources_el.properties
@@ -20,8 +20,6 @@ accessories/plugins/ExportWithTWiki.tooltip=\u0395\u03BE\u03B1\u03B3\u03C9\u03B3
 accessories/plugins/ExportWithXSLT.tooltip=\u0391\u03C5\u03C4\u03AE \u03B5\u03AF\u03BD\u03B1\u03B9 \u03BC\u03AF\u03B1 \u03BF\u03BC\u03BF\u03B9\u03CC\u03BC\u03BF\u03C1\u03C6\u03B7 \u03BC\u03AD\u03B8\u03BF\u03B4\u03BF\u03C2 \u03B5\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2 \u03BC\u03B5 \u03C4\u03B7 \u03C7\u03C1\u03AE\u03C3\u03B7 XSLT scripts.
 accessories/plugins/ExportWithXSLT_Applet.text=\u03C9\u03C2 \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AF\u03B4\u03B9\u03BF java...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\u0395\u03BE\u03AC\u03B3\u03B5\u03B9 \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C9\u03C2 \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AF\u03B4\u03B9\u03BF java.
-accessories/plugins/ExportWithXSLT_Flash.text=\u03C9\u03C2 Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\u0395\u03BE\u03AC\u03B3\u03B5\u03B9 \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C9\u03C2 \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AE flash.
 accessories/plugins/ExportWithXSLT_HTML.text=\u03A9\u03C2 XHTML (\u03B5\u03BA\u03B4\u03BF\u03C7\u03AE JavaScript )...
 accessories/plugins/ExportWithXSLT_HTML3.text=\u03A9\u03C2 XHTML (Clickable map image version)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u03A0\u03CC\u03C1\u03BF\u03B9 \u03B1\u03C0\u03BF \u03C4\u03BF\u03BD RESOURCES \u03C3\u03B5 \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF TaskJuggler...
@@ -174,7 +172,6 @@ cannot_delete_root=\u039F \u039A\u03CC\u03BC\u03B2\u03BF\u03C2 \u03C1\u03AF\u03B
 cannot_join_nodes_with_children=\u0394\u03B5\u03BD \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03B5\u03BD\u03C9\u03B8\u03B5\u03AF \u03BF \u03BA\u03CC\u03BC\u03B2\u03BF\u03C2 \u03BC\u03B5 \u03C4\u03BF\u03C5\u03C2 \u03B1\u03C0\u03BF\u03B3\u03CC\u03BD\u03BF\u03C5\u03C2
 cannot_move_to_child=\u0394\u03B5\u03BD \u03BC\u03C0\u03BF\u03C1\u03CE \u03BD\u03B1 \u03BC\u03B5\u03C4\u03B1\u03BA\u03B9\u03BD\u03AE\u03C3\u03C9 \u03AD\u03BD\u03B1 \u03BA\u03CC\u03BC\u03B2\u03BF \u03C3\u03B5 \u03AD\u03BD\u03B1 \u03B1\u03C0\u03CC \u03C4\u03BF\u03C5\u03C2 \u03B1\u03C0\u03BF\u03B3\u03CC\u03BD\u03BF\u03C5\u03C2 \u03C4\u03BF\u03C5.
 CenterAction.text=\u03A3\u03C4\u03BF \u03BA\u03AD\u03BD\u03C4\u03C1\u03BF
-CenterSelectedNodeAction.text=\u039A\u03B5\u03BD\u03C4\u03C1\u03AC\u03C1\u03B9\u03C3\u03BC\u03B1 \u03C3\u03C4\u03BF\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF \u039A\u03CC\u03BC\u03B2\u03BF
 ChangeConnectorArrowsAction.backward.text=\u0395\u03C0\u03B9\u03C3\u03C4\u03C1\u03BF\u03C6\u03AE
 ChangeConnectorArrowsAction.both.text=\u03A3\u03C7\u03B5\u03B4\u03AF\u03B1\u03C3\u03B7 \u03B2\u03AD\u03BB\u03BF\u03C5\u03C2 \u03BC\u03C0\u03C1\u03BF\u03C2 \u03C0\u03AF\u03C3\u03C9
 ChangeConnectorArrowsAction.forward.text=\u0395\u03BC\u03C0\u03C1\u03CC\u03C2
@@ -188,7 +185,6 @@ ChangeNodeLevelLeftsAction.text=\u039A\u03CC\u03BC\u03B2\u03BF\u03C2 \u03B1\u03C
 ChangeNodeLevelLeftsAction.tooltip=\u03A3\u03C4\u03B1 \u03B1\u03C1\u03B9\u03C3\u03C4\u03B5\u03C1\u03AC \u03C4\u03B7\u03C2 \u03C1\u03AF\u03B6\u03B1\u03C2 \u03BF\u03B9 \u039A\u03CC\u03BC\u03B2\u03BF\u03B9 \u03BC\u03B5\u03C4\u03B1\u03C4\u03BF\u03C0\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03BA\u03AC\u03C4\u03C9. \u0391\u03BD \u03B3\u03AF\u03BD\u03BF\u03C5\u03BD \u03C4\u03AD\u03BA\u03BD\u03B1 \u03C4\u03BF\u03C5 \u03B1\u03BD\u03C9\u03C4\u03AD\u03C1\u03C9 \u03B4\u03B5\u03C3\u03BC\u03BF\u03C [...]
 ChangeNodeLevelRightsAction.text=\u039A\u03CC\u03BC\u03B2\u03BF\u03C2 \u03B1\u03C1\u03B9\u03C3\u03C4\u03B5\u03C1\u03AC
 ChangeNodeLevelRightsAction.tooltip=\u03A3\u03C4\u03B1 \u03B4\u03B5\u03BE\u03B9\u03AC \u03C4\u03B7\u03C2 \u03C1\u03AF\u03B6\u03B1\u03C2 \u03BF\u03B9 \u039A\u03CC\u03BC\u03B2\u03BF\u03B9 \u03BC\u03B5\u03C4\u03B1\u03C4\u03BF\u03C0\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03BA\u03AC\u03C4\u03C9. \u0391\u03BD \u03B3\u03AF\u03BD\u03BF\u03C5\u03BD \u03C4\u03AD\u03BA\u03BD\u03B1 \u03C4\u03BF\u03C5 \u03B1\u03BD\u03C9\u03C4\u03AD\u03C1\u03C9 \u03B4\u03B5\u03C3\u03BC\u03BF\u03CD. \u03A3\u03C4\u [...]
-choose_background_color=\u0394\u03B9\u03AC\u03BB\u03B5\u03BE\u03B5 \u03C7\u03C1\u03CE\u03BC\u03B1 \u03C5\u03C0\u03CC\u03B2\u03B1\u03B8\u03C1\u03BF\u03C5:
 choose_cloud_color=\u0394\u03B9\u03AC\u03BB\u03B5\u03BE\u03B5 \u03C7\u03C1\u03CE\u03BC\u03B1 \u03BD\u03AD\u03C6\u03BF\u03C5\u03C2:
 choose_edge_color=\u0394\u03B9\u03AC\u03BB\u03B5\u03BE\u03B5 \u03C7\u03C1\u03CE\u03BC\u03B1 \u03C0\u03B5\u03C1\u03B9\u03B3\u03C1\u03AC\u03BC\u03BC\u03B1\u03C4\u03BF\u03C2
 choose_map_background_color=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03C7\u03C1\u03CE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C6\u03CC\u03BD\u03C4\u03BF\u03C5 \u03C7\u03AC\u03C1\u03C4\u03B7
@@ -328,8 +324,6 @@ ExecuteScripts.noScriptsAvailable=\u039A\u03B1\u03BD\u03AD\u03BD\u03BF \u03B4\u0
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=\u03A3\u03C6\u03AC\u03BB\u03BC\u03B1 \u03BA\u03B1\u03C4\u03AC \u03C4\u03B7\u03BD \u03B5\u03BA\u03C4\u03AD\u03BB\u03B5\u03C3\u03B7 \u03C4\u03BF\u03C5 script: {0}
 export_failed=\u0397 \u03B5\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE \u03B1\u03C0\u03AD\u03C4\u03C5\u03C7\u03B5
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=\u0395\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE Freeplane
 ExportAction.text=\u0395\u03BE\u03B1\u03B3\u03C9\u03B3\u03AE
 ExportBranchAction.text=\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7 \u03BA\u03BB\u03B1\u03B4\u03B9\u03BF\u03CD \u03C3\u03B5 \u03BD\u03AD\u03BF \u03C7\u03AC\u03C1\u03C4\u03B7...
@@ -765,6 +759,7 @@ ModesMenuAction.Browse.text=\u03A0\u03B5\u03C1\u03B9\u03AE\u03B3\u03B7\u03C3\u03
 ModesMenuAction.File.text=\u0391\u03BD\u03B1\u03B6\u03AE\u03C4\u03B7\u03C3\u03B7 \u03B1\u03C1\u03C7\u03B5\u03AF\u03C9\u03BD
 ModesMenuAction.MindMap.text=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03AE\u03C2 Mind Map
 most_recent_files=\u03A0\u03C1\u03CC\u03C3\u03C6\u03B1\u03C4\u03B1 \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1
+MoveSelectedNodeAction.CENTER.text=\u039A\u03B5\u03BD\u03C4\u03C1\u03AC\u03C1\u03B9\u03C3\u03BC\u03B1 \u03C3\u03C4\u03BF\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF \u039A\u03CC\u03BC\u03B2\u03BF
 MoveToRootAction.text=\u039C\u03B5\u03C4\u03B1\u03BA\u03AF\u03BD\u03B7\u03C3\u03B7 \u03C3\u03C4\u03B7\u03BD \u0391\u03C1\u03C7\u03AE
 NameConditionAction.text=\u039F\u03C1\u03B9\u03C3\u03BC\u03CC\u03C2 \u03BF\u03BD\u03CC\u03BC\u03B1\u03C4\u03BF\u03C2
 navigate=\u03A0\u03BB\u03BF\u03AE\u03B3\u03B7\u03C3\u03B7
@@ -803,7 +798,6 @@ NextNodeAction.BACK.text=\u03A3\u03C4\u03BF\u03BD \u03C0\u03C1\u03BF\u03B7\u03B3
 NextNodeAction.BACK_N_FOLD.text=\u03A3\u03C4\u03BF\u03BD \u03C0\u03C1\u03BF\u03B7\u03B3\u03BF\u03CD\u03BC\u03B5\u03BD\u03BF \u03BA\u03CC\u03BC\u03B2\u03BF (\u03BC\u03B5 \u03B4\u03AF\u03C0\u03BB\u03C9\u03BC\u03B1)
 NextNodeAction.FORWARD.text=\u03C3\u03C4\u03BF\u03BD \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03BF \u03BA\u03CC\u03BC\u03B2\u03BF
 NextNodeAction.FORWARD_N_FOLD.text=\u03C3\u03C4\u03BF\u03BD \u03B1\u03C0\u03CC\u03BC\u03B5\u03BD\u03BF \u03BA\u03CC\u03BC\u03B2\u03BF (\u03BC\u03B5 \u03B4\u03AF\u03C0\u03BB\u03C9\u03BC\u03B1)
-NextPresentationItemAction.text=\u039E\u03B5\u03B4\u03AF\u03C0\u03BB\u03C9\u03BC\u03B1 \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03BF\u03C5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF\u03C5 \u03B1\u03C0\u03B5\u03B9\u03BA\u03CC\u03BD\u03B9\u03C3\u03B7\u03C2
 no=\u039F\u03C7\u03B9
 no_copy_attributes_before_paste_attributes=\u0391\u03BD\u03C4\u03B9\u03B3\u03C1\u03AC\u03C8\u03C4\u03B5 \u03C0\u03C1\u03CE\u03C4\u03B1 \u03BA\u03AC\u03C4\u03B9.
 NO_FORMAT=\u039A\u03B5\u03AF\u03BC\u03B5\u03BD\u03BF
@@ -837,6 +831,7 @@ not_saved_for_image_error=\u039F \u03C7\u03AC\u03C1\u03C4\u03B7\u03C2 \u03C0\u03
 not_saved_for_link_error=\u03A4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B1\u03C0\u03BF\u03B8\u03B7\u03BA\u03B5\u03C5\u03B8\u03B5\u03AF, \u03C0\u03C1\u03B9\u03BD \u03BD\u03B1 \u03BC\u03C0\u03BF\u03C1\u03AD\u03C3\u03B5\u03C4\u03B5 \u03BD\u03B1 \u03BF\u03C1\u03AF\u03C3\u03B5\u03C4\u03B5 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 \u03B3\u03C1\u03B1\u03C6\u03B9\u03BA\u03AC
 note_window_location=\u0398\u03AD\u03C3\u03B7 \u03C0\u03B5\u03B4\u03AF\u03BF\u03C5 \u03C3\u03C7\u03BF\u03BB\u03AF\u03C9\u03BD
 notes=\u03A3\u03B7\u03BC\u03B5\u03AF\u03C9\u03C3\u03B7
+NotFoldingNextPresentationItemAction.text=\u039E\u03B5\u03B4\u03AF\u03C0\u03BB\u03C9\u03BC\u03B1 \u03B5\u03C0\u03CC\u03BC\u03B5\u03BD\u03BF\u03C5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF\u03C5 \u03B1\u03C0\u03B5\u03B9\u03BA\u03CC\u03BD\u03B9\u03C3\u03B7\u03C2
 ok=\u0395\u03BD\u03C4\u03AC\u03BE\u03B5\u03B9
 OKAction.text=\u0395\u03BD\u03C4\u03AC\u03BE\u03B5\u03B9
 OnlineReference.text=\u039F\u03B4\u03B7\u03B3\u03AF\u03B5\u03C2 \u03C7\u03C1\u03AE\u03C3\u03B7\u03C2 \u03C3\u03C4\u03BF \u03B4\u03B9\u03B1\u03B4\u03AF\u03BA\u03C4\u03C5\u03BF
@@ -1081,8 +1076,6 @@ OptionPanel.placenewbranches=\u03A4\u03BF\u03C0\u03BF\u03B8\u03AD\u03C4\u03B7\u0
 OptionPanel.placenewbranches.tooltip=<html>\u0395\u03B4\u03CE \u03C4\u03BF\u03C0\u03BF\u03B8\u03B5\u03C4\u03B5\u03AF\u03C2 \u03BD\u03AD\u03B5\u03C2 \u03B4\u03B9\u03B1\u03BA\u03BB\u03B1\u03B4\u03CE\u03C3\u03B5\u03B9\u03C2. \u0395\u03B3\u03BA\u03C5\u03C1\u03B5\u03C2 \u03C4\u03B9\u03BC\u03AD\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 'first' \u03BA\u03B1\u03B9 'last' </html>
 OptionPanel.plugin.tooltip=\u0394\u03B5\u03C5\u03C4\u03B5\u03C1\u03B5\u03CD\u03BF\u03BD\u03C4\u03B1 \u03C0\u03C1\u03CC\u03C3\u03B8\u03B5\u03C4\u03B1.
 OptionPanel.plugins=\u03A0\u03C1\u03CC\u03C3\u03B8\u03B5\u03C4\u03B1
-OptionPanel.presentation_dimmer_transparency=\u0397 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03AF\u03B1\u03C3\u03B7 \u03C3\u03B2\u03AE\u03BD\u03B5\u03B9 \u03B4\u03B9\u03AC\u03C6\u03B1\u03BD\u03B1
-OptionPanel.presentation_mode=\u039A\u03B1\u03C4\u03AC\u03C3\u03C4\u03B1\u03B7 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03AF\u03B1\u03C3\u03B7\u03C2
 OptionPanel.printonwhitebackground=<html>\u039B\u03B5\u03C5\u03BA\u03CC \u03C6\u03CC\u03BD\u03C4\u03BF \u03B3\u03B9\u03B1 \u03C4\u03B7\u03BD \u03B5\u03BA\u03C4\u03CD\u03C0\u03C9\u03C3\u03B7</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u039D\u03B1 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B5\u03AF\u03C4\u03B1\u03B9 \u03C0\u03AC\u03BD\u03C4\u03B1 \u03BB\u03B5\u03C5\u03BA\u03CC \u03C6\u03CC\u03BD\u03C4\u03BF \u03B3\u03B9\u03B1 \u03C4\u03B7\u03BD \u03B5\u03BA\u03C4\u03CD\u03C0\u03C9\u03C3\u03B7</html>
 OptionPanel.pt_BR=Pt BR
@@ -1173,7 +1166,6 @@ OptionPanel.separator.single_instance_mode=\u039C\u03BF\u03BD\u03B1\u03B4\u03B9\
 OptionPanel.separator.size_limits=\u038C\u03C1\u03B9\u03B1 \u03BC\u03B5\u03B3\u03B5\u03B8\u03CE\u03BD
 OptionPanel.separator.spelling=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03AD\u03C2 \u03B3\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03B9\u03BA\u03BF\u03CD \u03B5\u03BB\u03AD\u03B3\u03C7\u03BF\u03C5
 OptionPanel.separator.status=\u0393\u03C1\u03B1\u03BC\u03BC\u03AE \u03BA\u03B1\u03C4\u03AC\u03C3\u03C4\u03B1\u03C3\u03B7\u03C2
-OptionPanel.separator.tooltip=\u03A7\u03C1\u03CC\u03BD\u03BF\u03B9 \u03B5\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5\u03B9\u03C2 \u03C3\u03C7\u03BF\u03BB\u03AF\u03C9\u03BD
 OptionPanel.separator.undo=\u0391\u03BD\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7
 OptionPanel.separator.updates=\u0391\u03BD\u03B1\u03B2\u03B1\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03C0\u03C1\u03BF\u03B3\u03C1\u03AC\u03BC\u03BC\u03B1\u03C4\u03BF\u03C2
 OptionPanel.set_property_text=\u0391\u03BB\u03BB\u03B1\u03B3\u03AE
@@ -1248,7 +1240,6 @@ OptionPanel.use_common_out_point_for_root_node=\u03A4\u03B1 \u03AC\u03BA\u03C1\u
 OptionPanel.use_common_out_point_for_root_node.tooltip=\u03A4\u03B1 \u03AC\u03BA\u03C1\u03B1 \u03BE\u03B5\u03BA\u03B9\u03BD\u03AC\u03BD\u03B5 \u03B1\u03C0\u03CC \u03AD\u03BD\u03B1 \u03C3\u03B7\u03BC\u03B5\u03AF\u03BF \u03C3\u03C4\u03BF\u03BD \u03B1\u03C1\u03C7\u03B9\u03BA\u03CC \u03BA\u03CC\u03BC\u03B2\u03BF
 OptionPanel.use_tabbed_pane=\u03A7\u03C1\u03AE\u03C3\u03B7 tabs
 OptionPanel.use_tabbed_pane.tooltip=\u0391\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03B5\u03AF \u03BF\u03B9 \u03C7\u03AC\u03C4\u03B5\u03C2 \u03B8\u03B1 \u03B5\u03BC\u03C6\u03B1\u03BD\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 tabs (\u03CC\u03C0\u03C9\u03C2 \u03C3\u03C4\u03BF\u03BD Firefox).
-OptionPanel.user_defined_screen_resolution=\u0391\u03BD\u03AC\u03BB\u03C5\u03C3\u03B7 \u03BF\u03B8\u03CC\u03BD\u03B7\u03C2 \u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03B7 \u03B1\u03C0\u03CC \u03C4\u03BF \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7 (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripting: \u038C\u03C4\u03B1\u03BD \u03BF\u03C1\u03AF\u03B6\u03B5\u03B9\u03C2 classpath \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03C4\u03C1\u03AD\u03C0\u03B5\u03C4\u03B1\u03B9 \u03B7 \u03B1\u03BD\u03AC\u03B3\u03BD\u03C9\u03C3\u03B7 \u03B1\u03C1\u03C7\u03B5\u03AF\u03C9\u03BD !
 OptionPanel.validate_invalid_date_format=\u039B\u03AC\u03B8\u03BF\u03C2 \u03BC\u03BF\u03C1\u03C6\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\u03C2
 OptionPanel.validate_invalid_datetime_format=\u039B\u03AC\u03B8\u03BF\u03C2 \u03BC\u03BF\u03C1\u03C6\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\u03C2 - \u03CE\u03C1\u03B1\u03C2
@@ -1452,7 +1443,6 @@ ShowAncestorsAction.text=\u0394\u03B5\u03AF\u03BE\u03B5 \u03C4\u03BF\u03C5\u03C2
 ShowAttributeDialogAction.text=\u0394\u03B9\u03B1\u03C7\u03B5\u03B9\u03C1\u03B9\u03C3\u03C4\u03AE\u03C2 \u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03B7\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03CE\u03BD
 ShowDescendantsAction.text=\u0394\u03B5\u03AF\u03BE\u03B5 \u03C4\u03BF\u03C5\u03C2 \u03B1\u03C0\u03BF\u03B3\u03CC\u03BD\u03BF\u03C5\u03C2
 ShowFilterToolbarAction.text=\u039C\u03C0\u03AC\u03C1\u03B1 \u03A6\u03AF\u03BB\u03C4\u03C1\u03C9\u03BD
-ShowFormatPanel.text=\u039F\u03B8\u03CC\u03BD\u03B7 \u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03CE\u03BD
 ShowFormatPanel.tooltip=\u0395\u03BC\u03C6\u03B1\u03BD\u03AF\u03B6\u03B5\u03B9 \u03AD\u03BD\u03B1 \u03B4\u03B9\u03AC\u03BB\u03BF\u03B3\u03BF \u03C0\u03BF\u03C5 \u03C4\u03B1 \u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03B7\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03AC \u03C4\u03BF\u03C5 \u039A\u03CC\u03BC\u03B2\u03BF\u03C5 \u03BA\u03B1\u03B9 \u03C4\u03C9\u03BD \u0386\u03BA\u03C1\u03C9\u03BD \u03B1\u03BB\u03BB\u03AC\u03BE\u03BF\u03C5\u03BD \u03AC\u03BC\u03BC\u03B5\u03C3\u03B1.
 ShowHideNoteAction.text=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B5/\u039A\u03C1\u03CD\u03C8\u03B5 \u03C4\u03BF \u03C0\u03B1\u03C1\u03AC\u03B8\u03C5\u03C1\u03BF \u03C3\u03B7\u03BC\u03B5\u03AF\u03C9\u03C3\u03B7\u03C2
 ShowHideNoteAction.tooltip=\u0395\u03AF\u03BD\u03B1\u03B9 \u03BC\u03B9\u03B1 \u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03BC\u03B5\u03BD\u03BF\u03CD \u03B3\u03B9\u03B1 \u03C4\u03B1 \u03BC\u03B9\u03BA\u03C1\u03AC \u03B2\u03AD\u03BB\u03B7 \u03C3\u03C4\u03B7 \u03B4\u03B9\u03B1\u03C7\u03C9\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B3\u03C1\u03B1\u03BC\u03BC\u03AE.
@@ -1695,7 +1685,6 @@ ToggleLeftToolbarAction.text=\u0395\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AE \u
 ToggleMenubarAction.text=\u0395\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AE \u03B3\u03C1\u03B1\u03BC\u03BC\u03AE\u03C2 \u03BC\u03B5\u03BD\u03BF\u03CD
 ToggleStatusAction.text=\u0395\u03BC\u03C6\u03AC\u03BD\u03B9\u03C3\u03B7 \u03B3\u03C1\u03B1\u03BC\u03BC\u03AE\u03C2 \u03BA\u03B1\u03C4\u03AC\u03C3\u03C4\u03B1\u03C3\u03B7\u03C2
 ToggleToolbarAction.text=\u0395\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AE \u03B3\u03C1\u03B1\u03BC\u03BC\u03AE\u03C2 \u03B5\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03C9\u03BD
-toolbars=\u039C\u03C0\u03AC\u03C1\u03B5\u03C2 \u03B5\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03C9\u03BD
 undefined_error=\u03A3\u03C5\u03BD\u03AD\u03B2\u03B7 \u03AD\u03BD\u03B1 \u03B1\u03BD\u03B1\u03C0\u03AC\u03BD\u03C4\u03B5\u03C7\u03BF \u03BB\u03AC\u03B8\u03BF\u03C2! \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03C0\u03C1\u03BF\u03C3\u03C0\u03B1\u03B8\u03AE\u03C3\u03C4\u03B5 \u03BD\u03B1 \u03BA\u03AC\u03BD\u03B5\u03C4\u03B5 \u03BC\u03AF\u03B1 \u03B1\u03BD\u03B1\u03C6\u03BF\u03C1\u03AC \u03C3\u03C6\u03AC\u03BB\u03BC\u03B1\u03C4\u03BF\u03C2.
 underline=\u03A5\u03C0\u03BF\u03B3\u03C1\u03AC\u03BC\u03BC\u03B9\u03C3\u03B7
 UnderlineAction.text=\u03A5\u03C0\u03BF\u03B3\u03C1\u03AC\u03BC\u03BC\u03B9\u03C3\u03B7
diff --git a/freeplane/resources/translations/Resources_es.properties b/freeplane/resources/translations/Resources_es.properties
index de6f13b..5c9a527 100644
--- a/freeplane/resources/translations/Resources_es.properties
+++ b/freeplane/resources/translations/Resources_es.properties
@@ -7,7 +7,7 @@ accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Cambiar patr\u00
 accessories/plugins/EncryptNode.properties_0=Elija contrase\u00F1a para cifrar nodo
 accessories/plugins/EncryptNode.properties_1=Las contrase\u00F1as no son iguales o son muy cortas.
 accessories/plugins/EncryptNode.properties_2=Escriba la Contrase\u00F1a:
-accessories/plugins/EncryptNode.properties_3=Vuelva a escribir la Contrase\u00F1a:
+accessories/plugins/EncryptNode.properties_3=Vuelva a escribir la contrase\u00F1a:
 accessories/plugins/EncryptNode.properties_4=Escriba su contrase\u00F1a.
 accessories/plugins/EncryptNode.properties_5=<html>Recuerde que la vulnerabilidad del cifrado<br> depende casi completamente de la calidad de su contrase\u00F1a.
 accessories/plugins/EncryptNode.properties_6=Ok
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Cancelar
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=S\u00F3lo puede (des)activar el cifrado si el nodo ha sido cifrado anteriormente. Por favor inserte un nodo cifrado utilizando el men\u00FA de herramientas.
 accessories/plugins/EncryptNode.properties_select_me=\u00A1Debe marcarme para seguir!
 accessories/plugins/EncryptNode.properties_wrong_password=La contrase\u00F1a no es correcta.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Exporta el mapa para java web start.
 accessories/plugins/ExportWithTWiki.text=Como TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exporta el mapa como un documento TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Este es un m\u00E9todo est\u00E1ndar de exportaci\u00F3n utilizando scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Como Applet de Java ...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporta el mapa como un applet java para el navegador.
-accessories/plugins/ExportWithXSLT_Flash.text=Como Flash ...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporta el mapa como una aplicaci\u00F3n flash.
 accessories/plugins/ExportWithXSLT_HTML.text=Como XHTML (versi\u00F3n JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Como XHTML (versi\u00F3n mapa Seleccionable)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Recursos del nodo RECURSOS al fichero TaskJuggler ...
@@ -35,6 +35,7 @@ actual_node_styles=Estilos condicionales del nodo aplicados al nodo
 add=&A\u00F1adir
 AddConnectorAction.text=A\u00F1adir Conector
 AddElementaryConditionAction.text=A\u00F1adir
+AddExecutionLinkAction.text=A\u00F1adir un hiperv\u00EDnculo para ejecutar un comando del SO...
 AddLocalLinkAction.text=Agregar Enlace Local
 AddMenuItemLinkAction.text=Hiperenlace (Entrada de Men\u00FA)...
 AddOnDetailsPanel.authored.by=Por {0}
@@ -72,7 +73,7 @@ addons.installer.too.old=Su versi\u00F3n actual de Freeplane {0} es muy antigua.
 addons.installer.unknown.deinstallation.rules=Sin detalles para la desintalaci\u00F3n de {0}
 addons.installer.update=Actualizar de la versi\u00F3n {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">S\u00F3lo deber\u00EDa instalar complementos de fuentes de confianza. Software malintencionado puede da\u00F1ar sus datos o comprometer su privacidad.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=A\u00F1adir atributos de estilo
 AddStyleAttributes.tooltip=A\u00F1adir atributos del estilo del nodo
 AllMapsNodeListAction.text=Buscar y reemplazar en todos los mapas
@@ -91,26 +92,27 @@ ApplyToVisibleAction.text=Se aplica a los nodos seleccionados
 as_parent=Como Principal
 AskForHelp.text=Pedir ayuda en el foro
 AssignAttributesAction.text=Asignar Atributos...
-attribute_delete=Borrar todos los Valores
-attribute_delete_value=Borrar este Valor
-attribute_font_size_tooltip=Tama\u00F1o de Fuente del Atributo
-attribute_list_box_label_text=Valores Existentes
+attribute_delete=Borrar todos los valores
+attribute_delete_value=Borrar este valor
+attribute_font_size_tooltip=Tama\u00F1o de fuente del atributo
+attribute_list_box_label_text=Valores existentes
 attribute_name=Nombre del atributo
+attribute_name_or_value=Nombre o valor del atributo
 attribute_replace=Reemplazar con
-attribute_top=Todos los Atributos conocidos para los Mapas cargados
+attribute_top=Todos los atributos conocidos para los mapas cargados
 attribute_value=Valor del atributo
 attributes_AddAttributeAction.text=A\u00F1adir atributo en el cuadro de di\u00E1logo...
 attributes_adding_empty_attribute_error=No se puede usar la cadena vac\u00EDa como nombre de atributo
-attributes_all=Todos los Atributos
+attributes_all=Todos los atributos
 attributes_assign_dialog=Asignar atributos
 attributes_attribute=Atributos
 attributes_close=Cerrar
 attributes_deselect_all=Nada
-attributes_dialog_title=Gestor de Atributos
+attributes_dialog_title=Gestor de atributos
 attributes_edit=Editar
-attributes_edit_tooltip=Editar Conjunto
-attributes_for_selected=Nodos Seleccionados
-attributes_for_visible=Todos los Nodos Visibles
+attributes_edit_tooltip=Editar conjunto
+attributes_for_selected=Nodos seleccionados
+attributes_for_visible=Todos los nodos visibles
 attributes_import=Importar
 attributes_import_tooltip=Importar atributos de otros mapas abiertos
 attributes_no_import_candidates_found=No se ha encontrado ning\u00FAn atributo nuevo
@@ -118,33 +120,38 @@ attributes_popup_delete=Borrar
 attributes_popup_down=Abajo
 attributes_popup_edit=Editar
 attributes_popup_hide=Ocultar
-attributes_popup_new=Nuevo Atributo
-attributes_popup_optimal_width=Anchura \u00D3ptima
+attributes_popup_new=Nuevo atributo
+attributes_popup_optimal_width=Anchura \u00F3ptima
 attributes_popup_up=Arriba
 attributes_refresh=Actualizar
-attributes_RemoveAllAttributesAction.text=Quitar todos los tributos
+attributes_RemoveAllAttributesAction.text=Quitar todos los atributos
 attributes_RemoveFirstAttributeAction.text=Quitar el primer atributo
 attributes_RemoveLastAttributeAction.text=Quitar el \u00FAltimo atributo
 attributes_restricted_attributes_tooltip=Restringir Conjunto de Atributos
-attributes_restricted_values_tooltip=Restringir Conjunto de Valores para el Atributo actual
-attributes_restriction=Conjunto Restringido
+attributes_restricted_values_tooltip=Restringir conjunto de valores para el atributo actual
+attributes_restriction=Conjunto restringido
 attributes_select_all=Todos
-attributes_select_all_tooltip=Seleccionar/Deseleccionar todos
+attributes_select_all_tooltip=Seleccionar/deseleccionar todos
 attributes_show=Mostrar
-attributes_skip_root=Evitar Nodo Ra\u00EDz
-attributes_visible=Seleccionado Visible
-attributes_visible_tooltip=Seleccionado Visible
+attributes_skip_root=Evitar nodo ra\u00EDz
+attributes_visible=Seleccionado visible
+attributes_visible_tooltip=Seleccionado visible
 automatic_layout=Dise\u00F1o autom\u00E1tico
 automatic_layout_disabled=desactivado
-automatically_save_message=El Mapa se salv\u00F3 autom\u00E1ticamente (utilizando el nombre de fichero {0}) ...
+automatically_save_message=El mapa se salv\u00F3 autom\u00E1ticamente (utilizando el nombre de fichero {0}) ...
+AutomaticEdgeColor.FOR_BRANCHES=por ramas
+AutomaticEdgeColor.FOR_COLUMNS=por columnas
+AutomaticEdgeColor.FOR_LEVELS=para niveles
+AutomaticEdgeColor.ON_BRANCH_CREATION=En la creaci\u00F3n de una rama
 AutomaticEdgeColorHookAction.text=Color del borde autom\u00E1tico
 AutomaticLayout.ALL=para todos los nodos
 AutomaticLayout.HEADINGS=para nodos que no est\u00E9n sueltos
 AutomaticLayout.level=Nivel {0}
 AutomaticLayout.level.root=Ra\u00EDz
-AutomaticLayoutAction.text=Presentaci\u00F3n Autom\u00E1tica
+AutomaticLayoutAction.text=Presentaci\u00F3n autom\u00E1tica
 AutomaticLayoutAction.tooltip=<html>Arregla la presentaci\u00F3n del mapa. <br>El primer nivel es negro, el segundo azul, etc.</html>
 AutomaticLayoutControllerAction.ALL.text=para todos los nodos
+AutomaticLayoutControllerAction.COLUMNS.text=para columnas
 AutomaticLayoutControllerAction.HEADINGS.text=para nodos que no est\u00E9n sueltos
 AutomaticLayoutControllerAction.null.text=desactivado
 BackAction.text=Atr\u00E1s
@@ -161,10 +168,12 @@ branch=Rama
 browse=Navegar...
 calendar_attributes_panel=Calendario y atributos
 calendar_panel=Calendario
+can_not_clone_encrypted_node=No pudo clonar los nodos encriptados
 can_not_connect_to_info_server=No se puede conectar con el servidor de informaci\u00F3n
 can_not_delete_predefined_style=No se puede borrar el estilo predefinido
 can_not_delete_root_style=No se puede borrar el estilo de la ra\u00EDz
 can_not_delete_style_group=No se puede borrar el estilo del grupo
+can_not_encrypt_cloned_node=No puedo encriptar los nodos clonados
 can_not_save_key_set=No se puede guardar la configuraci\u00F3n de teclas de acceso r\u00E1pido
 cancel=Cancelar
 CancelAction.text=Cancelar
@@ -172,9 +181,9 @@ cannot_add_parent_diff_parents=Todos los nodos deben tener el mismo nodo princip
 cannot_add_parent_to_root=El nodo Ra\u00EDz no puede ser agregado a un nuevo nodo Principal.
 cannot_delete_root=El nodo raiz no puede ser borrado o cortado.
 cannot_join_nodes_with_children=No se pueden unir nodos con hijos
+cannot_move_into_child_node=No puedo moverlo al nodo hijo
 cannot_move_to_child=No se puede mover un nodo dentro de uno de sus hijos.
 CenterAction.text=Centrar
-CenterSelectedNodeAction.text=Centrar en el nodo seleccionado
 ChangeConnectorArrowsAction.backward.text=Atr\u00E1s
 ChangeConnectorArrowsAction.both.text=Ambos
 ChangeConnectorArrowsAction.forward.text=Adelante
@@ -188,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=Nodo izquierdo
 ChangeNodeLevelLeftsAction.tooltip=A la izquierda de la raiz los nodos son desplazados hacia abajo. Se convierten en hijos de su hermano superior. A la derecha de la raiz, los nodos son desplazados hacia arriba. Directamente en la raiz, el nodo cambia de lado.
 ChangeNodeLevelRightsAction.text=Nodo derecho
 ChangeNodeLevelRightsAction.tooltip=A la derecha de la raiz los nodos son desplazados hacia abajo. Ellos se convierten en hijos de su hermano superior. A la izquierda de la raiz los nodos son desplazados hacia arriba. Directamente en la raiz, los nodos cambian de lado.
-choose_background_color=Elegir Color de Fondo:
 choose_cloud_color=Elegir Color de Nube:
 choose_edge_color=Elegir Color del Borde
 choose_map_background_color=Elegir el Color de fondo del Mapa
@@ -196,14 +204,27 @@ choose_node_background_color=Elegir Color de Fondo del Nodo:
 choose_node_color=Elegir Color del Nodo:
 ClearLinkAnchorAction.text=Borrar la etiqueta de ancla
 ClearLinkAnchorAction.tooltip=<html>quitar la etiqueta previa de ancla del nodo</html>
+CloneAction.text=Pegar clon
 close_btn=&Cerrar
-CloseAction.text=Cerrar
+CloseAction.text=Cerrar el mapa actual
+CloseAllMapsAction.text=Cerrar todos los mapas
+CloseAllOtherMapsAction.text=Cerrar los dem\u00E1s mapas
+cloud_shapes=Formas de nubes
 CloudAction.text=Nube
 CloudColorAction.text=Color de Nube...
 CloudShapeAction.ARC.text=Arco
 CloudShapeAction.RECT.text=Rect\u00E1ngulo
 CloudShapeAction.ROUND_RECT.text=Rect\u00E1ngulo redondeado
 CloudShapeAction.STAR.text=Estrella
+collection.copy.presentation=Copiar la presentaci\u00F3n
+collection.copy.slide=Copiar la diapositiva
+collection.delete=Eliminar
+collection.down=Bajar
+collection.move=Mover
+collection.moveTo=Mover a la posici\u00F3n
+collection.new.presentation=Nueva presentaci\u00F3n
+collection.new.slide=Nueva diapositiva
+collection.up=Arriba
 ColorProperty.ResetColor=Reinicia Color
 combined=Combinado
 condition=Condici\u00F3n
@@ -214,34 +235,39 @@ connector_label=Etiqueta del Conector
 connector_lines=L\u00EDneas del conector
 connector_shapes=Formas del conector
 ConnectorColorAction.text=Color del Conector...
+controls=Controles
+ConvertCloneToIndependentNodeAction.text=Desclonar
+copy_name={0} (copia)
 CopyAction.text=Copiar
 CopyAction.tooltip=Copiar la rama seleccionada
 CopyAttributes.text=Copiar atributos
-CopyIDAction.text=Copiar la Identidad del Nodo
+CopyIDAction.text=Copiar la Identidad del nodo
 CopyMapStylesAction.text=Copiar el estilo del mapa de...
 CopyNodeURIAction.text=Copiar la URL del nodo
-copyright=Copyright \u00A9 2000-2014 Equipo de Freeplane y otros
-CopySingleAction.text=Copia Sencilla
+copyright=Copyright \u00A9 2000-2017 Equipo de Freeplane y otros
+CopySingleAction.text=Copiar el nodo (sin hijos)
 CopySingleAction.tooltip=Copiar s\u00F3lo el nodo seleccionado
 CopyStyleExtensionsAction.text=Copiar contenido del estilo
 corrupt_map=El contenido del mapa est\u00E1 corrupto
 CreateConjunctConditionAction.text=Y
 CreateDisjunctConditionAction.text=O
 CreateNotSatisfiedConditionAction.text=No
-CreationModificationPluginAction.text=Mostrar Sucesi\u00F3n de Modificaciones
+CreationModificationPluginAction.text=Mostrar fechas de modificaciones
 CreationModificationPluginAction.tooltip=<html>Esta funci\u00F3n sigue la pista del tiempo de creaci\u00F3n y modificaci\u00F3n de nodos.</html>
 current_dir=Mapas
 CutAction.text=Cortar
 decrease_branch_font_size=Reducir Fuente
 DecreaseNodeFontAction.text=Reducir Fuente
 default=Por defecto
+defaultAuxiliaryWordList=un, el, de
 DefaultColorAction.text=Color por defecto
+defaultstyle.attributes=Atributos
 defaultstyle.details=Contenid (detalles)
 defaultstyle.floating=Nodo flotante
 defaultstyle.note=Nota
 delete=Borrar
 delete_child=Borrar Nodo
-DeleteAction.text=Eliminar Nodo
+DeleteAction.text=Eliminar nodo
 DeleteConditionAction.text=Borrar
 DeleteDetailsAction.text=Borrar detalles
 DeleteLevelStyleAction.text=Eliminar el estilo autom\u00E1tico por nivel
@@ -263,7 +289,9 @@ edge=Borde
 edge_is_formatted_by_style=El formato del borde lo determina el estilo. Edite los estilos implicados si es necesario.
 edge_style=Estilo del Borde
 edge_width=Ancho del Borde
+edge_widths=Ancho de las esquinas
 EdgeColorAction.text=Color del Borde...
+EdgeProperties=Propiedades de las l\u00EDneas
 EdgeStyleAction.bezier.text=Bezier
 EdgeStyleAction.bezier.tooltip=<html>Mostrar el borde como curva suave.</html>
 EdgeStyleAction.hide_edge.text=Ocultar el borde
@@ -299,14 +327,17 @@ EditAction.text=Editar Nodo
 EditAttributesAction.text=Editar Atributos
 EditDetailsAction.text=Editar los detalles del nodo
 EditDetailsInDialogAction.text=Editar el contenido del nodo (detalles) en el di\u00E1logo
+editEdgeColors=Editar color de las l\u00EDneas
 EditFilterAction.text=Editar
-EditLongAction.text=Edici\u00F3n Avanzada del Nodo...
+EditLongAction.text=Editar el nodo
 EditNoteInDialogAction.text=Editar nota...
 EditScript=Editar Script...
 EditStylesAction.text=Editar estilos
 EncryptedMap.text=Crear Mapa Cifrado...
 EncryptedMap.tooltip=Crear un nuevo mapa cifrado
+encryption=Encriptaci\u00F3n
 enter_base_url=Voy a pegar enlaces relativos. Por favor ingrese la URL base.
+enter_command=Introducir comando
 enter_condition_name=Escribir un nombre para la nueva condici\u00F3n
 enter_confirms=La tecla Intro sirve para Confirmar
 enter_keyset_name=Escribir un nombre para el conjunto de teclas de acceso r\u00E1pido
@@ -320,7 +351,9 @@ error_applying_template=Error aplicando la plantilla XSL.
 error_creating_directory=No se puede crear el directorio para exportar.
 error_in_template=Errores en la plantilla por defecto para mapas {0}. Pruebe a quitar este archivo.
 errornumber={0} errores
-ExecuteScriptError.text=Error al ejecutar el script:\n{0}\nMire el archivo de registro para m\u00E1s detalles.
+ExecuteScript.available_modes_tooltip={0} est\u00E1 disponible para
+ExecuteScript.script=Script
+ExecuteScriptError.text=Error al ejecutar el script:\n{0}
 ExecuteScriptForAllNodes.text=Ejecutar todos los scripts
 ExecuteScriptForSelectionAction.text=Ejecutar los scripts de los nodos seleccionados
 ExecuteScriptOnSelectedNode.text=Ejecutar {0} en todos los nodos seleccionados
@@ -330,14 +363,14 @@ ExecuteScripts.noScriptsAvailable=No est\u00E1 disponible
 ExecuteScripts.text=Secuencias de comandos
 ExecuteScriptSecurityError.text=Ocurri\u00F3 un error mientras se ejecutaba el script: {0}
 export_failed=Ha fallado la exportaci\u00F3n
-export_pdf_text=Formato de Documentos Portables (PDF)
-export_svg_text=Gr\u00E1fica de Vectores Escalables (SVG)
 export_using_xslt=Exportaci\u00F3n a Freeplane usando XSLT
 ExportAction.text=Exportar mapa\u2026
+ExportAllPresentationsAction.text=Exportar todas las presentaciones a im\u00E1genes PNG
 ExportBranchAction.text=Mover Rama a nuevo Mapa...
 ExportBranchToHTMLAction.text=Rama como HTML
 exported_file=archivo {0}
 ExportPdf.text=Como PDF...
+ExportPresentationAction.text=Exportar la presentaci\u00F3n actual a imagen PNG
 ExportSvg.text=Como SVG...
 ExportToHTMLAction.text=Como HTML
 ExportToImage.jpg.text=Como JPEG...
@@ -352,12 +385,13 @@ ExternalImageAddAction.text=A\u00F1adir imagen externa...
 ExternalImageChangeAction.text=Cambiar imagene externa...
 ExternalImageRemoveAction.text=Quitar imagen externa
 ExtractLinkFromTextAction.text=Hiperenlace desde el texto
-ExtractLinkFromTextAction.tooltip=Fijar el hiperenlace que se ha encontrado en el texto del nodo
+ExtractLinkFromTextAction.tooltip=Crear un hiperenlace a partir del texto del nodo
 extras=Herramientas
 f_button_unassigned=No hay nada que hacer
 FaqOpenURLAction.text=FAQ
 file=Archivo
 file_already_exists=El archivo {0} ya existe. \u00BFQuiere sobrescribirlo?
+file_not_accessible=El archivo {0} no es accesible
 file_not_found=No se ha encontrado el archivo {0}
 FileListFlavorHandler=Enlaces a los archivos
 FileProperties_BranchLeafCount=N\u00FAmero de nodos hoja en la(s) rama(s) seleccionada(s):
@@ -384,10 +418,12 @@ FileRevisionsDialog.question=Revisiones encontradas para {0}
 FileRevisionsDialog.restore=Rest&urar
 FileRevisionsDialog.restore.tooltip=Reemplarzar {0} por {1}
 FileRevisionsDialog.title=Revisiones del archivo
-filter=Filtro
+filter=F&iltro
 filter_add=A\u00F1adir
 filter_and=Y
 filter_any_text=Esencial, detalles o notas
+filter_clone_snapshot=Clones guardados de la selecci\u00F3n
+filter_clones=Clones seleccionados
 filter_conditions=Filtros
 filter_contains=Contiene
 filter_created_after=Creado despu\u00E9s de
@@ -429,26 +465,32 @@ filter_reminder_executed=ya terminado
 filter_reminder_later=programado m\u00E1s tarde
 filter_root=Nodo ra\u00EDz
 filter_script=Filtro de script
-filter_select=Seleccionar
+filter_select=&Seleccionar
 filter_selected_node_view=Nodos Seleccionados Actualmente
 filter_selected_node_view_snapshot=Selecci\u00F3n guardada
 filter_style=Estilo
 filter_time=Filtro de fecha
+FilterCondition=Condiciones del filtro
+filterConditions=filtros definidos por el usuario
+filterConditions.noActions=Filtros sin nombre
 filters_not_loaded=El filtro no se pudo cargar, el archivo est\u00E1 corrupto
+find=Buscar
 find_what=Buscar Qu\u00E9
 FindAction.text=Buscar...
 FindNextAction.text=Encontrar el siguiente
 FindPreviousAction.text=Encontrar el previo
+fit_background_to_page=Adaptar la imagen de fondo a la p\u00E1gina
 fit_map_to_page=Ajustar a una p\u00E1gina
 fit_map_to_page_height=Fijar la altura a una p\u00E1gina
 fit_map_to_page_width=Fijar el ancho a una p\u00E1gina
-FitToPage.text=Acercamiento Todo en Una Pagina
+FitToPage.text=Ajustar a la p\u00E1gina
 FitToPage.tooltip=Ajusta el nivel de acercamiento de manera tal que todo el mapa pueda verse en la ventana actual.
 fold=Doblar
 FoldAllAction.text=Doblar Todos
 FoldAllAction.tooltip=<html>Dobla los nodos seleccionados y todos sus hijos.</html>
 FoldOneLevelAction.text=Dobla Un Nivel
 FoldOneLevelAction.tooltip=<html>Dobla un nivel de nodos seleccionados.</html>
+follow_clone=En "{0}"
 follow_graphical_link=Ir a:
 FollowLinkAction.text=Ir a:
 font=Fuente
@@ -489,6 +531,8 @@ freeplane_reverted=Freeplane_Revertido_
 FreeplaneHelpStarter.text=Ayuda en l\u00EDnea...
 FreeplaneHelpStarter.tooltip=Ayuda Ampliada de Freeplane
 GettingStartedAction.text=Primeros pasos
+goto=Ir a
+goto.noActions=No hay nodos de destino
 GotoLinkNodeAction.text=Ir al Enlace
 GotoNodeAction.text=Seleccionar nodo con ID...
 GrabKeyDialog.common.cancel=Cancelar
@@ -582,7 +626,7 @@ icon_kaddressbook=Tel\u00E9fono
 icon_kmail=Correo electr\u00F3nico
 icon_knotify=M\u00FAsica
 icon_korn=Buz\u00F3n
-icon_ksmiletris=\u00A1Estoy Feliz!
+icon_ksmiletris=Estoy feliz
 icon_launch=Lanzamiento
 icon_licq=Lindo
 icon_list=Lista
@@ -603,6 +647,9 @@ icon_penguin=Linux
 icon_positive=Positivo
 icon_prepare=Sem\u00E1foro en \u00C1mbar
 icon_revision=Revisi\u00F3n
+icon_revision-green=Revisi\u00F3n verde
+icon_revision-pink=Revisi\u00F3n rosa
+icon_revision-red=Revisi\u00F3n roja
 icon_smiley-angry=Enfadado
 icon_smiley-neutral=No Importa
 icon_smiley-oh=Sorpresa
@@ -642,8 +689,9 @@ IconProgressIconDownAction.text=Bajar progreso
 IconProgressIconDownAction.tooltip=Disminuye/ inserta/ elimina los iconos de progreso (100% -> 75% -> 50% -> 25% -> 0% -> eliminar).
 IconProgressIconUpAction.text=Subir progreso
 IconProgressIconUpAction.tooltip=incrementa/ inserta los iconos de progreso (0% -> 25% -> 50% -> 75% -> 100% + OK).
-IconProgressRemoveAction.text=Elimina progreso
+IconProgressRemoveAction.text=Eliminar progreso
 IconProgressRemoveAction.tooltip=Elimina los iconos de progreso e iconos extendidos de progreso.
+icons=Iconos
 IconSelectionPlugin.text=Seleccionar Icono...
 IconSelectionPlugin.tooltip=<html>Aqu\u00ED puede seleccionar un icono utilizando una subventana.</html>
 image_covertLink=Convertir enlace a imagen
@@ -657,6 +705,7 @@ ImportFolderStructureAction.text=Estructura de Carpetas...
 ImportLinkedBranchAction.text=Rama Enlazada
 ImportLinkedBranchWithoutRootAction.text=(Rama Enlazada) Sin Ra\u00EDz...
 ImportMindmanagerFiles.text=Mapa MindManager X5 ...
+ImportXmlFile.text=Importar archivo XML
 increase_branch_font_size=Agrandar Fuente
 IncreaseNodeFontAction.text=Agrandar Fuente
 internal_error_tooltip=Errores internos. Consulte el \u00FAltimo log en {0} para m\u00E1s informaci\u00F3n.
@@ -668,13 +717,20 @@ invalid_url_msg=No se pudo crear una URL v\u00E1lida para {0}
 ItalicAction.text=Cursiva
 italicise_branch=Poner en Cursiva
 java_version=Versi\u00F3n de Java: {0}
+JoinNodesAction.separator.format=Unir nodos con "{0}"
+lastOpenedMaps=Mapas m\u00E1s recientes
+lastOpenedMaps.noActions=No hay mapas en el historial
 latex_editor=Editar f\u00F3rmula LaTeX
 LatexDeleteLatexAction.text=Quitar f\u00F3rmula LaTeX
 LatexEditLatexAction.text=Editar f\u00F3rmula LaTeX\u2026
 LatexInsertLatexAction.msg1=<html>Est\u00E1 intentando insertar una f\u00F3rmula LaTex <i>antigua</i>.<br/>La nueva forma para crear texto/f\u00F3rmulas LaTeX se describe en la siguiente p\u00E1gina:</html>
-LatexInsertLatexAction.msg2=<html>En breve: <ul><li>use un prefijo "\\latex " en el texto del nodo o</li><li><i>Ver->Panel de formato</i>, y ah\u00ED:<i>Texto del nodo->Formato->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=A\u00F1adir f\u00F3rmula LaTeX\u2026
 latexPatternFormat=LaTeX
+LengthUnits.cm=cent\u00EDmetros
+LengthUnits.in=pulgadas
+LengthUnits.mm=mm
+LengthUnits.pt=pt
+LengthUnits.px=px
 less_than_two_selected_nodes=Tiene que seleccionar al menos dos nodos para poder crear enlaces.
 license=Licencia
 license_text=<html>Este programa es software libre; puede redistribuirlo y/o<br>modificarlo bajos los t\u00E9rminos de la Licencia P\u00FAblica General GNU<br>como ha sido publicada por la Free Software Foundation; tanto la versi\u00F3n 2<br>de la licencia, o (a su elecci\u00F3n) cualquier versi\u00F3n posterior.<br><br>Este programa se distribuye con la esperanza de que sea \u00FAtil,<br>pero SIN NINGUNA GARANT\u00CDA; incluso sin la garant\u00EDa impl\u00EDcita para su<br>COMERCIALIZAC [...]
@@ -684,6 +740,7 @@ link_not_found=Enlace {0} no encontrado.
 links=Enlaces
 load=&Cargar
 load_accelerator_presets=Cargar
+load_accelerator_presets.noActions=No hay nada programado
 LoadAcceleratorPresetsAction.textPatterns.text=Patrones para el texto
 locking_failed_by_open=Fallo al intentar bloquear el mapa {0}. Se abre como S\u00F3lo Lectura.
 locking_failed_by_save_as=Fallo al intentar bloquear el mapa {0}. La acci\u00F3n de Guardar como se cancel\u00F3.
@@ -691,8 +748,9 @@ locking_old_lock_removed=El mapa {0} fu\u00E9 bloqueado por el usuario {1}. Se h
 long_node_changed_cancel=Ha cambiado el nodo. \u00BFQuiere descartar los cambios?
 long_node_changed_submit=Ha cambiado el Nodo. \u00BFDesea salvar los cambios?
 lots_of_links_warning=Vas a crear muchos enlaces apuntando al mismo nodo.  \u00BFEst\u00E1 seguro que quiere hacerlo?
+main_menu=Men\u00FA
 main_resource_directory=Fuentes de Instalaci\u00F3n: {0}
-MainView.errorUpdateText=Error al fijar el texto para la siguiente entrada: {0}\nEl error fue: {1}
+MainView.errorUpdateText=Error al fijar el texto para la siguiente entrada: {0}.
 MakeLinkFromAnchorAction.text=Crear enlace de una etiqueta de ancla
 MakeLinkFromAnchorAction.tooltip=<html>crear un enlace global o local del<br/>nodo con etiqueta de ancla al nodo seleccionado</html>
 MakeLinkToAnchorAction.text=Convertir enlace a etiqueta de ancla
@@ -732,12 +790,17 @@ ManageAddOnsDialog.visit.addon.page=Visitar la p\u00E1gina de complementos...
 ManageConditionalStylesAction.text=Gestionar los estilos condicionales
 ManageNodeConditionalStylesAction.text=Gestionar los estilos condicionales del nodo
 map_already_exists=El mapa ya existe. \u00BFQuiere sobrescribirlo?
+map_background=Mapa de fondo
+map_background_image=Imagen de fondo
 map_corrupted=Mapa corrupto. \u00BFQuiere ver los detalles?
 map_load_error=No se pudo cargar el mapa {0}
 map_locked_by_open=El mapa {0} lo est\u00E1 editando el usuario {1}. Abri\u00E9ndolo como S\u00F3lo Lectura.
 map_locked_by_save_as=El mapa {0} lo est\u00E1 editando el usuario {1}. La acci\u00F3n Guardar Como se cancel\u00F3.
 map_not_saved=El mapa no se ha guard\u00F3do antes.
+MapBackgroundClearAction.text=Limpiar
 MapBackgroundColorAction.text=Fondo del Mapa
+MapBackgroundImageAction.text=Imagen de fondo...
+maps=Mpaas
 MaxNodeWidth.text=Fijar el ancho m\u00E1ximo del nodo
 menu_applyStyle=Aplicar estilo
 menu_attributes=Atributos
@@ -783,12 +846,17 @@ mode_File=Modo de Archivo
 mode_MindMap=Modo de Mapa Conceptual
 mode_na=Modo no disponible
 mode_status=Cambio a Modo {0}
+mode_StyleMap=Edici\u00F3n del estilo
 mode_title=Freeplane - Modo {0}
 modes=Modos
 ModesMenuAction.Browse.text=Navegador de Mapas
 ModesMenuAction.File.text=Gestor de Archivos
 ModesMenuAction.MindMap.text=Editor de Mapa Conceptual
 most_recent_files=Archivos M\u00E1s Recientes
+MoveAction.text=Mover
+MoveSelectedNodeAction.CENTER.text=Centrar en el nodo seleccionado
+MoveSelectedNodeAction.EAST.text=Mueve el nodo seleccionado a la derecha
+MoveSelectedNodeAction.WEST.text=Mueve el nodo seleccionado a la izquierda
 MoveToRootAction.text=Mover a Ra\u00EDz
 NameConditionAction.text=Nombrar
 navigate=&Navegar
@@ -808,16 +876,17 @@ NewerFileRevisionsFoundDialog.file_name=Archivo
 NewerFileRevisionsFoundDialog.file_size=Bytes
 NewerFileRevisionsFoundDialog.open=Abrir
 NewerFileRevisionsFoundDialog.open.tooltip=Abrir el archivo aunque no sea el m\u00E1s reciente
-NewerFileRevisionsFoundDialog.question=\u00A1Encontrada versi\u00F3n m\u00E1s reciente para {0}! \u00BFDesea abrirla {0} (mire la primera l\u00EDnea) no obstante? Para reemplazar {0} por un archivo guardado automaticamente de la lista, debe seleccionarlo y pulsar en ''Restaurar''.
+NewerFileRevisionsFoundDialog.question=\u00A1Encontrada versi\u00F3n m\u00E1s reciente para {0}!
 NewerFileRevisionsFoundDialog.restore=Restaurar
 NewerFileRevisionsFoundDialog.restore.tooltip=Cambiar {0} por {1}
 NewerFileRevisionsFoundDialog.title=\u00A1Se han encontrado versiones m\u00E1s recientes!
+NewFreeNodeAction.text=Nuevo nodo flotante
 NewLevelStyleAction.text=A\u00F1adir automaticamente el dise\u00F1o del estilo de nivel
 newmap.install.addon.question={0} parece que es un complemento\n\u00BFDesea instalarlo?\n(Seleccione "No" para abrirlo normalmente.)
 newmap.install.addon.title=\u00BFInstalar el complemento?
 NewMapAction.text=Nuevo mapa
 NewMapViewAction.text=Nueva Vista de Mapa
-NewParentNode.text=Nuevo Nodo Principal
+NewParentNode.text=Nuevo Nodo Padre
 NewParentNode.tooltip=<html>Todos los seleccionados son enviados a un nuevo nodo Principal.</html>
 NewPreviousSiblingAction.text=Nuevo Nodo Previo Hermano
 NewSiblingAction.text=Nuevo Nodo Hermano
@@ -827,7 +896,6 @@ NextNodeAction.BACK.text=Nodo Previo
 NextNodeAction.BACK_N_FOLD.text=Nodo Previo (plegado)
 NextNodeAction.FORWARD.text=Siguiente nodo
 NextNodeAction.FORWARD_N_FOLD.text=Siguiente nodo (plegado)
-NextPresentationItemAction.text=Desplegar el siguiente elemento de la presentaci\u00F3n
 no=No
 no_copy_attributes_before_paste_attributes=No puede pegar atributos si antes no ha copiado alguno.
 NO_FORMAT=Texto
@@ -836,6 +904,7 @@ no_found_from=<html>No "{0}" encontrado en "{1}".</html>
 no_more_found_from=<html>No m\u00E1s <u>{0}</u> encontrado en "{1}".</html>
 no_previous_find=No se encontr\u00F3 ninguno Anterior.
 no_styles_found_in_map=No se han encontrado estilos en el mapa
+no_translation_strings_found=No se ha encontrado ninguna cadena para traducir
 node=Nodo
 node_changed_discard_changes=Ha cambiado el nodo. \u00BFQuiere descartar los cambios?
 node_is_write_protected=El nodo escogido est\u00E1 protegido contra escritura.
@@ -853,6 +922,10 @@ NodeListAction.text=Buscar y Reemplazar ...
 NodeListAction.tooltip=Muestra todos los nodos como una lista de b\u00FAsqueda con propiedades de filtro.
 NodeShapeAction.bubble.text=Burbuja
 NodeShapeAction.fork.text=Bifurcaci\u00F3n
+NodeShapeAction.narrow_hexagon.text=hex\u00E1gono achatado
+NodeShapeAction.oval.text=\u00D3valo
+NodeShapeAction.rectangle.text=Rect\u00E1ngulo
+NodeShapeAction.wide_hexagon.text=Hex\u00E1gono ancho
 NodeUpAction.text=Subir Nodo
 nonboldify_branch=Sin negrita
 nonitalicise_branch=Sin cursiva
@@ -861,12 +934,20 @@ not_saved_for_image_error=El mapa se debe guardar antes de que pueda escoger una
 not_saved_for_link_error=El Mapa debe ser guardado antes de establecer un enlace con el selector de archivos
 note_window_location=Posici\u00F3n de la Nota
 notes=Notas
+NotFoldingNextPresentationItemAction.text=Desplegar el siguiente elemento de la presentaci\u00F3n
+NotificationOptions.CLOSE=Cerrar
+NotificationOptions.REMIND_ME_LATER=Recu\u00E9rdame despu\u00E9s
+NotificationOptions.REMOVE_REMINDER=Remover recordatorio
+NotificationOptions.SELECT_NODE=Ir a recordatorio
 ok=De Acuerdo
 OKAction.text=De Acuerdo
 OnlineReference.text=Documentaci\u00F3n de Mapas conceptuales en l\u00EDnea
 open_asMindMap=Mapa conceptual
 OpenAction.text=Abrir...
 OpenFreeplaneSiteAction.text=P\u00E1gina Web de Freeplane
+OpenMapsAddLocation.text=Agregar ubicaci\u00F3n desde Plano..
+OpenMapsRemoveLocation.text=Eliminar ubicaci\u00F3n de Plano
+OpenMapsViewLocation.text=Ver ubicaci\u00F3n en plano\u2026
 OpenPathAction.text=Abrir Archivo
 OpenURLMapAction.text=Abrir mapa desde una URL...
 OpenUserDirAction.text=Abrir el directorio del usuario
@@ -880,12 +961,14 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Patron
 OptionPanel.ADD_CHILD=A\u00F1adir nodo hijo
 OptionPanel.ADD_SIBLING=A\u00F1adir nodo hermano
 OptionPanel.addons=Complementos
+OptionPanel.af=Afrik\u00E1ans
 OptionPanel.always_fold_all_after_load=Plegar todo
 OptionPanel.always_load_last_maps=Cargar el \u00FAltimo mapa y los nuevos
 OptionPanel.always_load_last_maps.tooltip=Abrir los \u00FAltimos archivos fijados por las opciones de arriba, incluso abrir FreePlane con un mapa en concreto.
 OptionPanel.always_save_folding=Siempre
 OptionPanel.always_save_folding_state=Siempre guardar los cambios que hay en los plegamientos
 OptionPanel.always_save_folding_state.tooltip=Si se marca, cada plegado ensuciar\u00E1 el mapa y le recordar\u00E1 que debe guardarlo.
+OptionPanel.always_show_less_than_N_nodes_after_load=Desplegar algunos nodos
 OptionPanel.always_unfold_all_after_load=Desplegar todo
 OptionPanel.antialias=Antialias
 OptionPanel.antialias.tooltip=<html>Determina la calidad del mapa. M\u00E1s antialias necesita m\u00E1s tiempo.</html>
@@ -906,6 +989,12 @@ OptionPanel.automaticFormat_level2=Formato de Nodos de Nivel 1
 OptionPanel.backup_file_number=N\u00FAmero de copias de seguridad que se conservar\u00E1n
 OptionPanel.Behaviour=Comportamiento
 OptionPanel.bezier=Bezier
+OptionPanel.border_color=Color
+OptionPanel.border_color_matches_edge_color=Usar color de borde
+OptionPanel.border_dash=Tipo de l\u00EDnea de borde
+OptionPanel.border_dash_matches_edge_dash=Usar tipo de l\u00EDnea del borde
+OptionPanel.border_width=Grosor de l\u00EDnea
+OptionPanel.border_width_matches_edge_width=Usar grosor de borde
 OptionPanel.bubble=Burbuja
 OptionPanel.ca=Catal\u00E1n, Valenciano / Catal\u00E1
 OptionPanel.Cancel=Cancelar
@@ -920,11 +1009,16 @@ OptionPanel.cloudcolor=Color de la Nube
 OptionPanel.cloudshape=Forma de la Nube
 OptionPanel.combined=Combinado
 OptionPanel.compare_as_number=Comparar como n\u00FAmeros
+OptionPanel.connector_arrows=Flechas de conexi\u00F3n
+OptionPanel.connector_dash=Tipo de linea
 OptionPanel.convert_to_current_version=<html>\u00BFConvertir autom\u00E1ticamente mapas de versiones anteriores <br>de Freeplane a la versi\u00F3n actual?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>S\u00F3lo mapas muy grandes que no requieren conversi\u00F3n <br>(consejo de experto) se pueden abrir sin conversi\u00F3n previa.</html>
+OptionPanel.copyFormatToNewSibling=Copiar formato a nuevo hermano
+OptionPanel.copyFormatToNewSiblingIncludesIcons=Copiar formato con iconos
 OptionPanel.cs=Cs / Checo
 OptionPanel.cut_nodes_without_question=\u00BFCortar los nodos sin confirmaci\u00F3n?
 OptionPanel.cut_nodes_without_question.tooltip=Si esta casilla est\u00E1 marcada, los nodos se cortan sin pedir confirmaci\u00F3n. Puede causar perdida de informaci\u00F3n si se marca por un casual.
+OptionPanel.cut_out_pictures_when_pasting_html=Remover im\u00E1genes de HTML
 OptionPanel.da=Dk / Dan\u00E9s
 OptionPanel.date_format=Formaro de fecha est\u00E1ndar
 OptionPanel.date_format.tooltip=Cualquiera de SHORT, MEDIUM, LONG o FULL o un patr\u00F3n como "MM/dd/yyyy"
@@ -943,6 +1037,7 @@ OptionPanel.default_browser_command_windows_9x.tooltip=<html>Para Windows (los "
 OptionPanel.default_browser_command_windows_nt=Navegador por defecto. Windows Nt
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>Para Windows (los "" signos son necesarios debido a los enlaces, que tienen "=" en su URL).</html>
 OptionPanel.default_charset=Juego de Caracteres
+OptionPanel.default_save_dir=Directorio para guardar por defecto
 OptionPanel.Defaults=Por Defecto
 OptionPanel.delete_automatic_saves_at_exit=Borrar Salvados Autom\u00E1ticos al Salir
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> Si los ficheros deben ser borrados autom\u00E1ticamente en un apagado normal de Freeplane, fijar la siguiente variable a 'true'</html>
@@ -954,6 +1049,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Mostrar el editor para todos
 OptionPanel.display_node_id=Mostrar la Identidad del nodo
 OptionPanel.edgecolor=Color del Borde
 OptionPanel.edgecolor.tooltip=Propiedad del borde del nodo padre (se aplica tambi\u00E9n a todos los nodos hijos)
+OptionPanel.edgedash=Tipo de l\u00EDnea de filo
 OptionPanel.edgestyle=Estilo del borde
 OptionPanel.edgestyle.tooltip=Propiedad del borde del nodo padre (se aplica tambi\u00E9n a todos los nodos hijos)
 OptionPanel.edgewidth=Anchura del borde
@@ -974,7 +1070,8 @@ OptionPanel.en=En / Ingl\u00E9s
 OptionPanel.Environment=Entorno
 OptionPanel.es=Es / Espa\u00F1ol
 OptionPanel.et=Et / Estonio
-OptionPanel.execute_scripts_without_asking=\u00BFQuiere que los scripts se ejecuten sin pedir confirmaci\u00F3n?
+OptionPanel.eu=Vasco
+OptionPanel.execute_scripts_without_asking=Ejecuci\u00F3n de scripts activada
 OptionPanel.execute_scripts_without_asking.tooltip=<html>Los scripts de Freeplane son capaces de realizar cualquier acto en su ordenador. <br>Por tanto, no deber\u00EDa ejecutar aquellos de lo que no est\u00E9 seguro de su uso. </html>
 OptionPanel.execute_scripts_without_exec_restriction=Permitir Ejecutar otras Aplicaciones (No recomendable)
 OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>Si su script necesita ejecutar alguna otra aplicaci\u00F3n (como un navegador) sin pedir confirmaci\u00F3n (!),<br> debe activar esta opci\u00F3n. <br>\u00A1\u00DAsela con cuidado porque scripts da\u00F1inos pueden estropear su ordenador!</body></html>
@@ -991,6 +1088,7 @@ OptionPanel.export_icons_in_html.tooltip=<html> Indica si el HTML exportado de F
 OptionPanel.exported_image_resolution_dpi=Resoluci\u00F3n de imagen exportada en DPI
 OptionPanel.Files=Archivos
 OptionPanel.first=Primero
+OptionPanel.fit_to_viewport=Ajustar imagen de fondo a ventana
 OptionPanel.fold_on_click_inside=Plegar al hacer click dentro
 OptionPanel.foldingsymbolwidth=Anchura del S\u00EDmbolo de Plegado
 OptionPanel.foldingsymbolwidth.tooltip=<html>Anchura del c\u00EDrculo que indica el plegado</html>
@@ -1003,10 +1101,12 @@ OptionPanel.fr=Fr / Franc\u00E9s
 OptionPanel.gl=Gl / Gallego
 OptionPanel.goto_note_end_on_edit=Situar el cursor al final
 OptionPanel.grid_size=Tama\u00F1o del espacio de la cuadr\u00EDcula
+OptionPanel.groovy_editor_font=tipograf\u00EDa para el editor Groovy Syntax Highlighting
 OptionPanel.groovy_editor_font.tooltip=Usar 'Dialog' o 'Monospaced' si necesitas caracteres Unicode!
 OptionPanel.groovy_editor_font_size=Tama\u00F1o de fuente para Groovy Syntax Highlighting Editor
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Ocultar el borde
+OptionPanel.hide_single_end_connectors=Ocultar conectores de una sola via
 OptionPanel.highlight_formulas=Destacar f\u00F3rmulas
 OptionPanel.horizontal=Horizontal
 OptionPanel.hr=Hr / Croata
@@ -1022,14 +1122,17 @@ OptionPanel.ic_file=Uso de disco
 OptionPanel.ic_ram=En la memoria RAM
 OptionPanel.icon=Icono
 OptionPanel.icon.tooltip=Si se aplica, el nodo tendr\u00E1 exactamente este icono.
+OptionPanel.icon_size=Tama\u00F1o de icono
 OptionPanel.icons.list=Listado de los Iconos est\u00E1ndares mostrados
 OptionPanel.icons.list.tooltip=Aqu\u00ED puede ordenar o quitar los iconos por defecto. Los iconos deben separarse por un ';'.
 OptionPanel.id=Id / Indonesio
 OptionPanel.IGNORE=Hacer nada
 OptionPanel.il__enter_confirms_by_default=Por defecto, la tecla Intro sirve para confirmar
 OptionPanel.image_cache=para im\u00E1genes
+OptionPanel.indentationUsesTabsInTextOutput=Usar tabulaciones en la salida de texto
 OptionPanel.it=It / Italiano
 OptionPanel.ja=Ja / Japon\u00E9s
+OptionPanel.JoinNodesAction.textSeparators=Separador de texto
 OptionPanel.key_type_action=Al escribir
 OptionPanel.Keystrokes=Atajos y combinaciones del teclado
 OptionPanel.ko=Kr / Coreano
@@ -1044,6 +1147,7 @@ OptionPanel.latex_disable_editor.tooltip=Activar esta opci\u00F3n si tienes prob
 OptionPanel.latex_editor_font=Fuente para el editor LaTeX (con Syntax Highlighting)
 OptionPanel.latex_editor_font.tooltip=Usar 'Dialog' o 'Monospaced' si necesitas caracteres Unicode!
 OptionPanel.latex_editor_font_size=Tama\u00F1o de fuente para el editor LaTeX (con Syntax Highlighting)
+OptionPanel.latex_macros=Macros LaTeX en com\u00FAn
 OptionPanel.layout_map_on_text_change=Apariencia del mapa durante la edici\u00F3n
 OptionPanel.layout_map_on_text_change.tooltip=Desactivar para mejorar el rendimiento
 OptionPanel.linear=Lineal
@@ -1056,8 +1160,12 @@ OptionPanel.load_last_map=Abrir autom\u00E1ticamente el \u00FAltimo mapa
 OptionPanel.load_last_map.tooltip=<html>Si est\u00E1 marcado, cuando Freeplane se inicia, carga el \u00FAltimo mapa abierto</html>
 OptionPanel.load_last_maps=Cargar todos los \u00FAltimos mapas
 OptionPanel.lookandfeel=Estilo y Apariencia (L&F)
+OptionPanel.lookandfeel.scaleuifonts=Escalar tipograf\u00EDas del UI
+OptionPanel.lookandfeel.scaleuifonts.tooltip=\u00DAtil para pantallas de alta densidad
 OptionPanel.lookandfeel.tooltip=<html> El Estilo y Apariencia (L&F) que se utilizar\u00E1. Est\u00E1n soportados \u2014metal\u2014, 'windows', 'motif', \u2014gtk\u2014, \u2014mac\u2014 est\u00E1 disponible solamente en MacOS. Por defecto significa que se usa el look and feel por defecto. Si desea utilizar su propio L&F, incorporar por favor el nombre de la clase aqu\u00ED y asegurase que los archivos jar correspondientes est\u00E1n cargados. Si hay problemas con el L&F, entonces aqu\u00E [...]
 OptionPanel.lt=Lt / Lituano
+OptionPanel.markClones=Pintar marcas clonadas
+OptionPanel.markSelectedClones=Pintar marcas clonadas para seleccion
 OptionPanel.max_displayed_node_count=N\u00FAmero m\u00E1ximo de nodos mostrados
 OptionPanel.max_image_width=M\u00E1ximo inicial del ancho de la imagen
 OptionPanel.max_image_width.tooltip=Nuevas im\u00E1genes se ajustar\u00E1n a este ancho
@@ -1065,11 +1173,15 @@ OptionPanel.max_menu_item_count=N\u00FAmero m\u00E1ximo de elementos del men\u00
 OptionPanel.max_menu_item_count.tooltip=N\u00FAmero m\u00E1ximo de elementos dentro de un submen\u00FA, al menos 10
 OptionPanel.max_node_width=Anchura M\u00E1xima de Nodo
 OptionPanel.max_shortened_text_length=M\u00E1xima longitud del nodo abreviado
+OptionPanel.menuItemFontSize=Tama\u00F1o de tipograf\u00EDa de item de menu
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=Ancho m\u00EDnimo del nodo
+OptionPanel.monitor_size_inches=Tama\u00F1o de monitor (pulgadas)
 OptionPanel.motif=Motif
+OptionPanel.narrow_hexagon=Hex\u00E1gono achatado
 OptionPanel.nb=Nb / Noruego
 OptionPanel.never_save_folding=Nunca
+OptionPanel.neverShowSurvey=No mostrar nunca preguntas, encuestas o consejos
 OptionPanel.nl=Nl / Holand\u00E9s
 OptionPanel.nn=Nn / Noruego
 OptionPanel.nodebackgroundcolor=Color de Fondo del nodo
@@ -1085,6 +1197,7 @@ OptionPanel.nodeformat=Formato
 OptionPanel.nodeformat.tooltip=<html>Reemplazo y/o formateo del texto:<ul><li><em>Expansi\u00F3n de plantilla</em> (<tt>%s</tt> es el texto original), e.g. <tt>PRECAUCI\u00D3N: %s</tt><li><em>Formato de fechas y n\u00FAmeros</em> - ver los ejemplos en la caja de selecci\u00F3n</ul></html>
 OptionPanel.nodenumbering=Numeraci\u00F3n del nodo
 OptionPanel.nodenumbering.tooltip=A\u00F1adir n\u00FAmero de serie (p.e. 1.3.1) al texto del nodo.
+OptionPanel.nodeshape=Forma de nodo
 OptionPanel.nodetext=Texto del Nodo
 OptionPanel.nodetext.tooltip=Aqu\u00ED puede definir c\u00F3mo ser\u00E1 el texto del nodo. El texto que tenga se borrar\u00E1 una vez que se aplique este patr\u00F3n.
 OptionPanel.nothing=Nada
@@ -1100,11 +1213,15 @@ OptionPanel.org.freeplane.plugin.bugreport.denied=Nunca enviar
 OptionPanel.org.freeplane.plugin.bugreport.userid=Identificador opcional para ser enviado
 OptionPanel.outline_hgap=Distancia horizontal
 OptionPanel.outline_vgap=Distancia vertical
+OptionPanel.oval=Ovalado
 OptionPanel.paint_connectors_behind=Los nodos ocultan los conectores
 OptionPanel.parse_data=Reconoce la entrada de n\u00FAmeros y fecha-hora
 OptionPanel.parse_data.tooltip=Intente analizar la entrade de fecha-hora y n\u00FAmero y use formatos est\u00E1ndar. Ejemplos: 100,000.00, 12/31, 12/31/99, 1999-12-31 y 1999-12-31 23:59
+OptionPanel.parse_formulas=Reconocer formulas
+OptionPanel.parse_latex=Reconocer LaTex
 OptionPanel.PASTE_HTML=Pegar como HTML
 OptionPanel.PASTE_PLAIN_TEXT=Pegar como texto simple
+OptionPanel.pasteImagesFromFiles=Pegar im\u00E1genes de archivos
 OptionPanel.path_property_may_not_be_empty=\u00A1La ruta no  puede estar vac\u00EDa! No se ha hecho el cambio.
 OptionPanel.patternname=Nombre
 OptionPanel.patternname.tooltip=Nombre de patr\u00F3n \u00FAnico
@@ -1113,16 +1230,22 @@ OptionPanel.placenewbranches=Ubicar Ramas Nuevas
 OptionPanel.placenewbranches.tooltip=<html>Donde ubicar nuevas ramas. Valores v\u00E1lidos: 'Primero' y '\u00FAltimo' </html>
 OptionPanel.plugin.tooltip=Complementos que no son del n\u00FAcleo.
 OptionPanel.plugins=Complementos
-OptionPanel.presentation_dimmer_transparency=Regulador la transparencia de la presentaci\u00F3n
-OptionPanel.presentation_mode=Modo presentaci\u00F3n
+OptionPanel.Presentation=Presentaci\u00F3n
+OptionPanel.presentation.combineAll=Combinar todas las presentaciones
+OptionPanel.presentation.processesEscapeKey=Tecla ESCAPE termina la presentaci\u00F3n
+OptionPanel.presentation.processesNavigationKeys=Teclas de navegaci\u00F3n controlan la presentaci\u00F3n
+OptionPanel.presentation.slowMotion=C\u00E1mara lenta
+OptionPanel.presentation.switchToFullScreen=Activar pantalla completa
 OptionPanel.printonwhitebackground=<html>Fondo Blanco para impresi\u00F3n</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Siempre usar fondo blanco para impresi\u00F3n</html>
 OptionPanel.pt_BR=Pt  BR / Portugu\u00E9s (Brasil)
 OptionPanel.pt_PT=Pt PT / Portugu\u00E9s (Portugal)
 OptionPanel.RECT=Rect\u00E1ngulo
+OptionPanel.rectangle=Rect\u00E1ngulo
 OptionPanel.relative=Relativo
 OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Preguntar" siempre preguntar\u00E1 (usar en caso de duda).<br>"S\u00ED" muestra el editor de texto enriquecido.<br>"No" muestra el editor de texto simple.</html>
 OptionPanel.remind_use_rich_text_in_new_nodes=Utilizar texto enriquecido para los nodos pegados
+OptionPanel.remindersBlink=Recordatorios parpadean
 OptionPanel.remove_notes_without_question=\u00BFQuitar las notas sin preguntar?
 OptionPanel.remove_notes_without_question.tooltip=Si se activa esta casilla, las notas que les correspodan a los nodos seleccionados se quitar\u00E1n sin pedir confirmaci\u00F3n. Si se activa de forma accidental puede que pierda informaci\u00F3n.
 OptionPanel.resources_use_default_font_for_notes_too=Utilizar tambi\u00E9n para las notas la fuente que hay por defecto
@@ -1133,6 +1256,7 @@ OptionPanel.ROUND_RECT=Rect\u00E1ngulo redondeado
 OptionPanel.ru=Ru / Ruso
 OptionPanel.save_folding=Guardar el estado de plegamiento
 OptionPanel.save_folding_if_map_is_changed=Si el mapa es modificado
+OptionPanel.save_last_visited_node=Guardar \u00FAltima posici\u00F3n en el mapa
 OptionPanel.save_modification_times=Guardar cada modificaci\u00F3n
 OptionPanel.script_classpath=Ruta de clase para script: directorios adicionales que contienen clases y/o JARs (ver sugerencia)
 OptionPanel.script_classpath.tooltip=<html>Listado de JARs y/o directorios para a\u00F1adir a la ruta de clase de scripts y f\u00F3rmulas.<br>Use ; (Windows) o : (Linux, Mac) para separar entradas.<br>Se buscar\u00E1n en los directorios archivos JAR y .class.<br>Rutas que no sean absolutas, se considerar\u00E1n relativas al directorio del usuario de Freeplane.<br>\u00A1Si fija la ruta de clase, debe dar permiso de lectura a los archivos!</html>
@@ -1156,6 +1280,7 @@ OptionPanel.separator.automatic_save=Guardado Autom\u00E1tico
 OptionPanel.separator.behaviour=Comportamiento
 OptionPanel.separator.browser=Navegador
 OptionPanel.separator.cache=Cach\u00E9
+OptionPanel.separator.cloud=Nube
 OptionPanel.separator.CloudControls=Nubes
 OptionPanel.separator.commands_for_the_program=Atajos del programa
 OptionPanel.separator.connectors=Conectores
@@ -1174,7 +1299,9 @@ OptionPanel.separator.html_export=Exportaci\u00F3n de Html
 OptionPanel.separator.html_import=Importaci\u00F3n de Html
 OptionPanel.separator.hyperlink_types=Tipos de Hiperenlaces
 OptionPanel.separator.icon_properties=Iconos
+OptionPanel.separator.IconControls=Iconos
 OptionPanel.separator.icons=Iconos en "Seleccionar Icono..."
+OptionPanel.separator.Icons=Iconos
 OptionPanel.separator.initial_map_size=Tama\u00F1o de Mapa Inicial
 OptionPanel.separator.inline_editor=Editor de nodos en la l\u00EDnea
 OptionPanel.separator.key_typing=Teclear
@@ -1186,6 +1313,7 @@ OptionPanel.separator.mouse_wheel=Rueda del rat\u00F3n
 OptionPanel.separator.new_node_commands=Instrucciones de Nuevo Nodo
 OptionPanel.separator.node_editing_commands=Instrucciones de Edici\u00F3n de Nodo
 OptionPanel.separator.node_navigation_commands=Instrucciones de Navegaci\u00F3n de Nodo
+OptionPanel.separator.NodeBorder=Borde de nodo
 OptionPanel.separator.NodeColors=Colores del Nodo
 OptionPanel.separator.NodeFont=Fuente del Nodo
 OptionPanel.separator.NodeShape=Forma del nodo
@@ -1197,6 +1325,8 @@ OptionPanel.separator.other_defaults=Otros Par\u00E1metros por Defecto
 OptionPanel.separator.others=Otros enlaces clave
 OptionPanel.separator.outline_view=Vista de Esquema
 OptionPanel.separator.patterns=Patrones
+OptionPanel.separator.presentation=Presentaci\u00F3n
+OptionPanel.separator.reminderOptions=Opciones de recordatorio
 OptionPanel.separator.RichTextEditor=Editor de texto enriquecido
 OptionPanel.separator.root_node_appearance=Apariencia del nodo ra\u00EDz
 OptionPanel.separator.save=Guardar
@@ -1208,16 +1338,19 @@ OptionPanel.separator.selection_method=M\u00E9todo de Selecci\u00F3n
 OptionPanel.separator.single_instance_mode=Instancia \u00FAnica de programa
 OptionPanel.separator.size_limits=L\u00EDmites de tama\u00F1o
 OptionPanel.separator.spelling=Opciones del corrector ortogr\u00E1fico
+OptionPanel.separator.SplitToWordsAction=Dividir nodo en palabras
 OptionPanel.separator.status=L\u00EDnea de estado
-OptionPanel.separator.tooltip=Veces de la descripci\u00F3n emergente
 OptionPanel.separator.undo=Deshacer
 OptionPanel.separator.updates=Programar Actualizaciones
 OptionPanel.set_property_text=Cambiar
 OptionPanel.set_property_text.tooltip=Vac\u00EDo: No se modifica; Menos=Eliminar la propiedad (fijar los valores por defecto); M\u00E1s=Cambia la propiedad
 OptionPanel.setscript=\u00BFCambiar?
 OptionPanel.setscript.tooltip=Se puede asociar al estilo un script.
+OptionPanel.shape_horizontal_margin=Margen horizontal
+OptionPanel.shape_vertical_margin=Margen vertical
 OptionPanel.sharp_bezier=Bezier con \u00E1ngulos
 OptionPanel.sharp_linear=L\u00EDnea con \u00E1ngulos
+OptionPanel.shouldCenterSmallMaps=Centrar mapas peque\u00F1os
 OptionPanel.show_icon_for_attributes=Mostrar el Icono para Atributos
 OptionPanel.show_node_tooltips=Mostrat ayuda emergente en los nodos
 OptionPanel.show_note_icons=Mostrar las notas de los iconos
@@ -1241,6 +1374,10 @@ OptionPanel.spelling_opt_ignore_capitalization=Ignorar la letra en may\u00FAscul
 OptionPanel.spelling_opt_ignore_words_with_numbers=Ignorar palabras con n\u00FAmeros
 OptionPanel.spelling_opt_suggestions_limit_dialog=M\u00E1ximo n\u00FAmero de sugerencias en el di\u00E1logo
 OptionPanel.spelling_opt_suggestions_limit_menu=M\u00E1ximo n\u00FAmero de sugerencias en el men\u00FA
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Caracteres en palabras
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=Dejar nodo original vac\u00EDo
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=N\u00FAmero de nodo en fila
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=Guardar texto original como detalles
 OptionPanel.sr=Serbio / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Archivo de plantilla est\u00E1ndar
 OptionPanel.standardbackgroundcolor=Color de Fondo Est\u00E1ndar
@@ -1249,6 +1386,7 @@ OptionPanel.standardcloudcolor=Color Est\u00E1ndar de Nube
 OptionPanel.standardcloudcolor.tooltip=<html>El color de nuve est\u00E1ndar en notaci\u00F3n html</html>
 OptionPanel.standardcloudestyle=Estilo Est\u00E1ndar de Nubes
 OptionPanel.standardcloudestyle.tooltip=<html>El estilo est\u00E1ndar de nubes. Actualmente s\u00F3lo est\u00E1 soportado 'bezier'</html>
+OptionPanel.standardcloudshape=Forma est\u00E1ndar de nube
 OptionPanel.standarddrawrectangleforselection=Mostrar Selecci\u00F3n como Rect\u00E1ngulo
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Marcar los nodos seleccionados mediante un rect\u00E1ngulo.</html>
 OptionPanel.standardlinkcolor=Color Est\u00E1ndar del Enlace
@@ -1260,15 +1398,18 @@ OptionPanel.standardselectednodecolor.tooltip=<html>El color est\u00E1ndar del n
 OptionPanel.standardselectednoderectanglecolor=Color de Rect\u00E1ngulo de Selecci\u00F3n
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>El color est\u00E1ndar del rect\u00E1ngula que marca los nodos seleccionados. En notaci\u00F3n html (#RRGGBB en valores hex) </html>
 OptionPanel.STAR=Estrella
+OptionPanel.statesymbolwidth=Ancho de s\u00EDmbolo de estado
 OptionPanel.structured_html_import=Importar el HTML como una estructura de nodos
 OptionPanel.structured_icon_toolbar=Barra de herramientas de iconos
 OptionPanel.summary=Resumen
 OptionPanel.sv=Se / Sueco
 OptionPanel.text.use_ctrl_key=Usar 'Asignar Atajo' del men\u00FA de Herramientas
+OptionPanel.textalignment=Alineamiento de texto
 OptionPanel.time_for_automatic_save=Tiempo para Guardado Autom\u00E1tico
 OptionPanel.time_for_automatic_save.tooltip=<html> tiempo entre dos salvados autom\u00E1ticos consecutivos (en msec): Para deshabilitar el salvado autom\u00E1tico fijar este n\u00FAmero a 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Tiempo para la Selecci\u00F3n Aplazada
 OptionPanel.time_for_delayed_selection.tooltip=<html> Tiempo de retardo de Selecci\u00F3n de nodos cuando el rat\u00F3n est\u00E1 encima (en msec). Cambiar este valor a 1 si quiere selecci\u00F3n directa cuando el rat\u00F3n est\u00E9 encima.</html>
+OptionPanel.toolbar_icon_height=Altura de icono de barra de herramientas
 OptionPanel.toolTipManager.dismissDelay=Quitar retraso, ms
 OptionPanel.toolTipManager.initialDelay=Retraso inicial, ms
 OptionPanel.toolTipManager.max_tooltip_width=Anchura de la Herramienta de Consejos
@@ -1281,11 +1422,11 @@ OptionPanel.undo_levels=Deshacer Niveles
 OptionPanel.undo_levels.tooltip=<html>Determina cuantos pasos almacenados pueden ser deshechos v\u00EDa "Deshacer".</html>
 OptionPanel.unfold_on_paste=Despliega nodo al pegar
 OptionPanel.unfold_on_paste.tooltip=Despliega nodo al pegar o Arrastrar y Soltar
+OptionPanel.uniform_shape=Uniforme
 OptionPanel.use_common_out_point_for_root_node=Los bordes comienzan en un punto del nodo ra\u00EDz
 OptionPanel.use_common_out_point_for_root_node.tooltip=Los bordes comienzan en un punto del nodo ra\u00EDz
 OptionPanel.use_tabbed_pane=Usar Pesta\u00F1as
 OptionPanel.use_tabbed_pane.tooltip=Si los mapas seleccionados son mostrados como pesta\u00F1as (como en FireFox :-) ).
-OptionPanel.user_defined_screen_resolution=Resoluci\u00F3n de pantalla definida por el usuario (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripting: \u00A1Si fija la ruta de clase, debe dar permisos de lectura a los archivos!
 OptionPanel.validate_invalid_date_format=Formato de fecha est\u00E1ndar no v\u00E1lido
 OptionPanel.validate_invalid_datetime_format=Formato de fecha-hora est\u00E1ndar no v\u00E1lido
@@ -1293,9 +1434,11 @@ OptionPanel.validate_invalid_number_format=Formato de n\u00FAmero no v\u00E1lido
 OptionPanel.validate_write_without_read=Scripting: considere a\u00F1adir el permiso Lectura/Archivo a Escritura/Archivo.
 OptionPanel.validation_error=<html><body>Error(es) de validaci\u00F3n:<p><em>{0}</em><p>Por favor, cambie las preferencias para subsanar el(los) error(es).</body></html>
 OptionPanel.validation_warning=<html><body>Advetencia(s) de validaci\u00F3nn:<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap.tooltip=Distancia vertical entre nodos hijos
 OptionPanel.vi=Vi / Vietnamita
 OptionPanel.wheel_velocity=Velocidad
 OptionPanel.wheel_velocity.tooltip=Un valor m\u00E1s alto tendr\u00E1 como consecuencia un efecto mayor del movimiento de la rueda del rat\u00F3n en el mapa.
+OptionPanel.wide_hexagon=Hex\u00E1gono ancho
 OptionPanel.windows=Windows
 OptionPanel.zh_CN=Zh CN / Chino simplificado
 OptionPanel.zh_TW=Zh / Chino tradicional
@@ -1309,7 +1452,7 @@ org.freeplane.plugin.bugreport.lastreport=El informe recibido
 org.freeplane.plugin.bugreport.never=Que nunca me pidan ayuda
 org.freeplane.plugin.bugreport.question=Freeplane incluye un gestor autom\u00E1tico de seguimiento de errores. \nNo se enviar\u00E1n datos personales o el contenido del mapa.\nInformar de los errores nos permitir\u00E1 mejorar el programa.
 org.freeplane.plugin.bugreport.report=Informe actual
-org.freeplane.plugin.bugreport.wanted_bug=Se produjo un error interno y se inform\u00F3 autom\u00E1ticamente.\nNos gustar\u00EDa algo m\u00E1s de informaci\u00F3n para poder reproducir el error.\nPor favor, ay\u00FAdenos envi\u00E1ndonos un informe de error a nuestro gestor de seguimiento de errores:\nexplique lo que estaba haciendo en ese momento, para que podamos reproducirlo.\n\nPulse en OK para abrir la p\u00E1gina de seguimiento de errores en su navegador.\n\nGracias por ayudarnos a [...]
+org.freeplane.plugin.bugreport.wanted_bug=Se produjo un error interno y se inform\u00F3 autom\u00E1ticamente.
 org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=El nodo {0} no est\u00E1 definido
 out_of_memory=Sin espacio en la memoria.
 overwrite_keyset_question=\u00BFSobrescribir la configuraci\u00F3n de teclas existente?
@@ -1380,7 +1523,7 @@ plugins/TimeManagement.xml_Replace_All=Reemplazar Todos
 plugins/TimeManagement.xml_Replace_Selected=Reemplazar los Seleccionados
 plugins/TimeManagement.xml_Select=Seleccionar
 plugins/TimeManagement.xml_todayButton=Hoy
-plugins/TimeManagement.xml_WindowTitle=Administraci\u00F3n de Tiempo
+plugins/TimeManagement.xml_WindowTitle=Administrar el tiempo
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Buscar y Reemplazar
 preferences=Preferencias
 print_preview_title=Vista Preliminar
@@ -1398,7 +1541,7 @@ QuickFindAllAction.text=Seleccionar todos los que concuerdan
 QuickHighlightAction.text=Destacar todos los nodos que coinciden
 QuitAction.text=Salir
 read_only=S\u00F3lo Lectura
-ReadScriptError.text=Error al leer el script.\nMire el archivo de registro para m\u00E1s detalles.
+ReadScriptError.text=Error al leer el script
 really_convert_to_current_version=<html>Este mapa se cre\u00F3 con una versi\u00F3n anterior de Freeplane. <br>\u00BFQuiere convertirlo (recomendable)? <br>(De otra forma, se deber\u00E1 aceptar tal y como est\u00E1 sin garant\u00EDa ninguna.) </html>
 really_cut_node=\u00BFDe verdad quiere cortar el/los nodo(s)?
 really_execute_script=\u00BFEst\u00E1 seguro que desea ejecutar los cripts que contiene el mapa? Puede da\u00F1ar su ordenador.
@@ -1440,7 +1583,7 @@ save=&Guardar
 save_failed=Fall\u00F3 el intento de guardar el mapa {0}.
 save_unsaved=\u00BFDesea guardar el Mapa?
 save_unsaved_styles=\u00BFGuardar estilos?
-SaveAcceleratorPresetsAction.text=Guardar configuraci\u00F3n de teclas\u2026
+SaveAcceleratorPresetsAction.text=Guardar la configuraci\u00F3n de teclas\u2026
 SaveAction.text=Guardar
 SaveAll.text=Guardar Todo
 SaveAll.tooltip=Guardar todos los mapas abiertos
@@ -1493,7 +1636,6 @@ ShowAncestorsAction.text=Mostrar Ascendentes
 ShowAttributeDialogAction.text=Gestor Atributos...
 ShowDescendantsAction.text=Mostrar Descendientes
 ShowFilterToolbarAction.text=Barra de herramientas de Filtros
-ShowFormatPanel.text=Panel de formato
 ShowFormatPanel.tooltip=Muestra un cuadro de di\u00E1logo que permite cambiar de una vez el estilo del nodo y el borde.
 ShowHideNoteAction.text=Mostrar/Esconder Ventana de Notas
 ShowHideNoteAction.tooltip=Permite ocultar o mostrar la ventana de notas.
@@ -1679,6 +1821,7 @@ simplyhtml.valignMiddle=medio
 simplyhtml.valignTop=arriba
 simplyhtml.wholeWordsOnly=Palabras completas s\u00F3lo
 simplyhtml.wholeWordsOnly.tooltip=Restringir los resultados a palabras enteras.
+slide.on_the_right.tooltip=por la izquierda
 SortNodes.text=Ordenar Hijos
 SortNodes.tooltip=Ordena alfab\u00E9ticamente los hijos de un nodo.
 split=&Dividir
@@ -1737,7 +1880,7 @@ ToggleMenubarAction.text=(Des)activar Barra de men\u00FA
 ToggleScrollbarsAction.text=Barras de desplazamiento
 ToggleStatusAction.text=Mostrar estado de l\u00EDnea
 ToggleToolbarAction.text=(Des)activar Barra de herramientas
-toolbars=Barras de herramientas
+uiTextChanger.replaceText=Reemplazar el texto del UI
 undefined_error=Ocurri\u00F3 un error inesperado. Por favor reportelo a los desarrolladores de Freeplane.
 underline=Subrayar
 UnderlineAction.text=Subrayar
@@ -1748,7 +1891,7 @@ unfold=Desplegar
 UnfoldAllAction.text=Desplegar Todos
 UnfoldAllAction.tooltip=<html>Desdobla los nodos seleccionados y todos sus hijos.</html>
 UnfoldOneLevelAction.text=Desplegar Un Nivel
-UnfoldOneLevelAction.tooltip=<html>Despliega un nivel de nodos seleccionados.</html>
+UnfoldOneLevelAction.tooltip=Despliega un nivel de nodos seleccionados.
 up=Arriba
 UpConditionAction.text=Arriba
 update_failed=La actualizaci\u00F3n fall\u00F3 y di\u00F3 el siguiente mensaje {0}
@@ -1789,5 +1932,6 @@ xslt_export.ms_word=Microsoft Word 2003 XML
 xslt_export.text=Texto simple
 xslt_export_not_possible=La exportaci\u00F3n Freeplane XSLT no es posible
 yes=S\u00ED
+zoom=Zoom
 ZoomInAction.text=Acercar
 ZoomOutAction.text=Alejar
diff --git a/freeplane/resources/translations/Resources_et.properties b/freeplane/resources/translations/Resources_et.properties
index a6c04a1..fc1b0db 100644
--- a/freeplane/resources/translations/Resources_et.properties
+++ b/freeplane/resources/translations/Resources_et.properties
@@ -18,8 +18,6 @@ accessories/plugins/ExportWithTWiki.tooltip=Ekspordib kaardi TWiki dokumendina.
 accessories/plugins/ExportWithXSLT.tooltip=See on unikaalne eksportimise meetod kasutades XSLT skripte.
 accessories/plugins/ExportWithXSLT_Applet.text=Kui Java rakend...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Ekspordib kaardi kui veebilehitseja Java rakendi.
-accessories/plugins/ExportWithXSLT_Flash.text=Kui v\u00E4lkrakendus (.swf)...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Ekspordib kaardi v\u00E4lkrakendusena (.swf).
 accessories/plugins/ExportWithXSLT_HTML.text=Kui XHTML (JavaScript-i versioon)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Kui XHTML (Kl\u00F5psatav kaart, pildiversioon)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Ressursid s\u00F5lmest RESSURSID Tegumihalduri faili...
@@ -98,7 +96,6 @@ ChangeNodeLevelLeftsAction.text=S\u00F5lm vasakule
 ChangeNodeLevelLeftsAction.tooltip=Peas\u00F5lmest vasakul on s\u00F5lm(ed) t\u00F5stetud allapoole. Need/nemad saavad olema alams\u00F5lmed nende kohal oleva peas\u00F5lme all. Peas\u00F5lmest paremal on s\u00F5lm(ed) t\u00F5stetud allapoole. Alates peas\u00F5lmest muudab(-vad) s\u00F5lm(ed) pooli.
 ChangeNodeLevelRightsAction.text=S\u00F5lm paremale
 ChangeNodeLevelRightsAction.tooltip=Peas\u00F5lmest paremal on s\u00F5lm(ed) t\u00F5stetud allapoole. Need/nemad saavad olema alams\u00F5lmed nende kohal oleva peas\u00F5lme all. Peas\u00F5lmest vasakul on s\u00F5lm(ed) t\u00F5stetud \u00FClespoole. Alates peas\u00F5lmest muudab(-vad) s\u00F5lm(ed) pooli.
-choose_background_color=Vali taustav\u00E4rv:
 choose_cloud_color=Vali pilve v\u00E4rv:
 choose_edge_color=Vali \u00FChendusjoone v\u00E4rv
 choose_node_background_color=Vali s\u00F5lme taustav\u00E4rv:
@@ -150,8 +147,6 @@ EnterPassword.text=L\u00FClita kr\u00FCpteeritud/kr\u00FCpteerimata
 error=Viga
 error_applying_template=XSL-mallide kehtestamisel tekkis viga.
 error_creating_directory=Ei suuda kataloogi luua, et sinna eksportida.
-export_pdf_text=Kaasaskantav DokumendiVorming (PDF)
-export_svg_text=Skaleeritav Vektorgraafika (SVG)
 ExportAction.text=Kaardi eksport...
 ExportBranchAction.text=S\u00F5lmede haru kui uus kaart ...
 ExportBranchToHTMLAction.text=Haru HTML-ina
diff --git a/freeplane/resources/translations/Resources_eu.properties b/freeplane/resources/translations/Resources_eu.properties
index f39425a..85d86f9 100644
--- a/freeplane/resources/translations/Resources_eu.properties
+++ b/freeplane/resources/translations/Resources_eu.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Bertan behera utzi
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Pasahitzez babestutako (zifratutako) egoera aurretik zifratutako adabegi batetan bakarrik alda zenezake. Lanabesen menua erabilz sar zenezake era hontako adabegi bat.
 accessories/plugins/EncryptNode.properties_select_me=Aukera nazazu jarraitzeko!
 accessories/plugins/EncryptNode.properties_wrong_password=Pasahitza ez da zuzena.
+accessories/plugins/Export_JavaWebStart.text=Web Java abiarazi...
+accessories/plugins/Export_JavaWebStart.tooltip=Mapa web Java-n hasteko esportatzen du.
 accessories/plugins/ExportWithTWiki.text=Twiki...
 accessories/plugins/ExportWithTWiki.tooltip=Mapa TWiki documentu eran esportatzen du.
 accessories/plugins/ExportWithXSLT.tooltip=Hau  era bereko esportazio metodo bat da.
 accessories/plugins/ExportWithXSLT_Applet.text=Java Applet-a...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Mapa Java Applet baten moduan esportatzen du.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Mapa Flash aplikazio baten moduan esportatzen du.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript bertsioa)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (mapa irudi bertsio klikagarria)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=RESOURCES adabegitik baliabideak TaskJuggler fitxategira...
@@ -73,7 +73,7 @@ addons.installer.too.old=Oraingo Freeplane {0} bertsioa zaharregia da. Add-on ho
 addons.installer.unknown.deinstallation.rules=Desinstalatzeko  {0}  araua(k) ez da/dira ezagutzen
 addons.installer.update={0} bertsiotik eguneratu
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Soilik jatorri ezaguneko add-onak instalatu beharko zenituzke. Software gaizto edo kaltegarriak zure informazioa kaltetu edota zure pribatutasuna bortxa dezake.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Estilotik ezaugarriak
 AddStyleAttributes.tooltip=Ezaugarriak estilo adabegitik gehitu
 AllMapsNodeListAction.text=Aurkitu eta mapa guztietan ordezkatu
@@ -184,7 +184,6 @@ cannot_join_nodes_with_children=Haurrak dituzten adabegiak ezin dira bateratu
 cannot_move_into_child_node=Ezin da adabegi haurrera higitu
 cannot_move_to_child=Ezin da adabegia bere haur batetara eraman.
 CenterAction.text=Erdiratu
-CenterSelectedNodeAction.text=Aukeratutako adabegia erdiratu
 ChangeConnectorArrowsAction.backward.text=Marraztu gezia atzerantz
 ChangeConnectorArrowsAction.both.text=Marraztu gezia aurrerantz eta atzerantz
 ChangeConnectorArrowsAction.forward.text=Marraztu gezia aurrerantz
@@ -198,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=Adabegia mugitu (Gurasoak senide)
 ChangeNodeLevelLeftsAction.tooltip=Erroaren ezker aldean adabegia(k) beheruntz bultzatzen da/dira. Beren gaineko senidearen haur bihurtzen da/dira. Erroaren eskuin aldean adabegia(k) goruntz bultzatzen dira. Erroan bertan, adabegia(k) aldez aldatzen da/dira.
 ChangeNodeLevelRightsAction.text=Adabegia Mugitu (senideak haur)
 ChangeNodeLevelRightsAction.tooltip=Erroaren ezker aldean adabegia(k) beheruntz bultzatzen da/dira. Beren gaineko senidearen haur bihurtzen da/dira. Erroaren eskuin aldean adabegia(k) goruntz bultzatzen dira. Erroan bertan, adabegia(k) aldez aldatzen da/dira.
-choose_background_color=Atzealde kolorea aukeratu:
 choose_cloud_color=Hodeiaren kolorea aukeratu:
 choose_edge_color=Ertzaren kolorea aukeratu
 choose_map_background_color=Maparen atzealde kolorea aukeratu
@@ -209,6 +207,8 @@ ClearLinkAnchorAction.tooltip=<html>Aurrentik ezarritako adabegi aingura ezabatu
 CloneAction.text=Klona itsatsi
 close_btn=&Itxi
 CloseAction.text=Oraingo mapa itxi
+CloseAllMapsAction.text=Mapa guztiak itxi
+CloseAllOtherMapsAction.text=Beste mapa guztiak itxi
 cloud_shapes=Hodei itxurak
 CloudAction.text=Hodeia gehitu/ezabatu (defektuz)
 CloudColorAction.text=Hodei kolorea...
@@ -216,6 +216,15 @@ CloudShapeAction.ARC.text=Uztaia
 CloudShapeAction.RECT.text=Laukizuzena
 CloudShapeAction.ROUND_RECT.text=Laukizuzen borobildua
 CloudShapeAction.STAR.text=Izarra
+collection.copy.presentation=Aurkezpena kopiatu
+collection.copy.slide=Gardenkia kopiatu
+collection.delete=Ezabatu
+collection.down=Beheruntz
+collection.move=Mugitu
+collection.moveTo=Kokapenera higitu
+collection.new.presentation=Aurkezpen berria
+collection.new.slide=Gardenki berria
+collection.up=Goruntz
 ColorProperty.ResetColor=Kolorea jatorrizko aukerara eraman
 combined=Konbinatua
 condition=Baldintza
@@ -226,14 +235,16 @@ connector_label=Lotura etiketa
 connector_lines=Lotura lerroak
 connector_shapes=Lotura itxurak
 ConnectorColorAction.text=Lotura kolorea...
+controls=Kontrolak
 ConvertCloneToIndependentNodeAction.text=Desklonatu
+copy_name={0}{kopia}
 CopyAction.text=Kopiatu
 CopyAction.tooltip=Aukeratutako adarra kopiatu
 CopyAttributes.text=Berezitasunak kopiatu
 CopyIDAction.text=Adabegiaren IDa kopiatu
 CopyMapStylesAction.text=Mapa estiloa ondorengo aukeratik kopiatu...
 CopyNodeURIAction.text=Adabegiaren URIa kopiatu
-copyright=Copyright \u00A9 2000-2016 Freeplane taldea eta besteak
+copyright=Copyright \u00A9 2000-2017 Freeplane taldea eta besteak
 CopySingleAction.text=Adabegia (soila) kopiatu
 CopySingleAction.tooltip=Aukeratutako adabegia soilik kopiatu
 CopyStyleExtensionsAction.text=Aukeratutako adabegi estilotik hedapenak kopiatu
@@ -316,6 +327,7 @@ EditAction.text=Adabegiaren barrua bertan editatu
 EditAttributesAction.text=Berezitasunak bertan editatu
 EditDetailsAction.text=Adabegiaren xehetasunak bertan editatu
 EditDetailsInDialogAction.text=Adabegiaren xehetasunak formularioan editatu
+editEdgeColors=Loturen koloreak editatu
 EditFilterAction.text=Filtroa sortu
 EditLongAction.text=Adabegiaren barrua formularioan editatu
 EditNoteInDialogAction.text=Oharra formularioan editatu
@@ -351,14 +363,14 @@ ExecuteScripts.noScriptsAvailable=Bat ere ez eskuragarri
 ExecuteScripts.text=Skriptak
 ExecuteScriptSecurityError.text=Script-aren exekuzioan akats bat bertatu da: {0}
 export_failed=Akatsa esportatzean
-export_pdf_text=Portable Document Format (PDF), Dokumentu Formatu Eramangarria
-export_svg_text=Scalable Vector Graphic (SVG), Bektore grafiko eskalagarria
 export_using_xslt=Esportatu (Freeplane)
 ExportAction.text=Mapa esportatu...
+ExportAllPresentationsAction.text=Aurkezpen guztiak PNG irudi formatura esportatu
 ExportBranchAction.text=Adarra mapa berri batetara mugitu...
 ExportBranchToHTMLAction.text=Adarra HTML eran
 exported_file={0} fitxategia
 ExportPdf.text=PDF
+ExportPresentationAction.text=Aurkezpen hau PNG irudi formatura esportatu
 ExportSvg.text=SVG
 ExportToHTMLAction.text=HTML
 ExportToImage.jpg.text=JPEG
@@ -379,6 +391,7 @@ f_button_unassigned=<ekintzarik ez>
 FaqOpenURLAction.text=FAQ
 file=&Fitxategia
 file_already_exists={0} fitxategia existitzen da dagoeneko. Gainean berridatzi nahi?
+file_not_accessible={0} fitxategia ezin da atzitu
 file_not_found={0} fitxategia ez da aurkitu
 FileListFlavorHandler=Fitxategietara loturak
 FileProperties_BranchLeafCount=Hosto adabegi kopurua aukeratutako adarre(t)an:
@@ -521,7 +534,7 @@ GettingStartedAction.text=Tutoriala
 goto=Joan
 goto.noActions=Helburu adabegirik ez
 GotoLinkNodeAction.text=Loturara joan
-GotoNodeAction.text=ID hontako adabegira joan
+GotoNodeAction.text=ID hontako adabegira joan...
 GrabKeyDialog.common.cancel=Ezeztatu
 GrabKeyDialog.common.ok=OK
 GrabKeyDialog.grab-key.assigned-to=-ri esleitua
@@ -634,6 +647,9 @@ icon_penguin=Linux
 icon_positive=Positiboa
 icon_prepare=Semaforo horia
 icon_revision=Berrikuspena
+icon_revision-green=Berrikuspena berdez
+icon_revision-pink=Berrikuspena arrosaz
+icon_revision-red=Berrikuspena gorriz
 icon_smiley-angry=Haserre
 icon_smiley-neutral=Ajolik ez
 icon_smiley-oh=Ezustekoa
@@ -674,14 +690,14 @@ IconProgressIconDownAction.tooltip=Aurrerabide ikonoak, jeitsi/sartu/kentzen dit
 IconProgressIconUpAction.text=Aurrerabidea gora
 IconProgressIconUpAction.tooltip=Aurrerabide ikonoak igo/sartzen ditu (%0 -> %25 -> %50 -> %75 -> %100 + OK).
 IconProgressRemoveAction.text=Aurrerabidea ezabatu
-IconProgressRemoveAction.tooltip=Aurrerabide eta hedatutako aurrerabide ikonoak ezabatzen ditu
+IconProgressRemoveAction.tooltip=Aurrerabide eta hedatutako aurrerabide ikonoak ezabatzen ditu.
 icons=Ikonoak
 IconSelectionPlugin.text=Ikonoak taulatik...
 IconSelectionPlugin.tooltip=<html>Hemen azpileiho bat erabiliz ikono bat aukera zenezake.</html>
 image_covertLink=Lotura irudi bihurtu
 ImageFlavorHandler=Irudia (beste fitxategi bat erabili)
 import=I&nportatu
-import_linked_branch_no_link=Aukeratutako adabegiak ez du nondik inportatzeko loturarik
+import_linked_branch_no_link=Aukeratutako adabegiak ez du nondik inportatzeko loturarik.
 ImportAction.text=Mapa inportatu
 ImportBranchAction.text=Adarra...
 ImportExplorerFavoritesAction.text=Gustokoenen esploratzailea...
@@ -708,7 +724,7 @@ latex_editor=LaTeX Formula editatu
 LatexDeleteLatexAction.text=LaTeX Formula ezabatu
 LatexEditLatexAction.text=LaTeX formula editatu...
 LatexInsertLatexAction.msg1=<html>Era zaharkitu batetan ari zara LaTeX formula sartzen saiatzen. <br/>Orri honetan daukazu LaTeX formula(k) idazteko era berria:</html>
-LatexInsertLatexAction.msg2=<html>Motzean:<ul><li>"\\latex" aurrizkia erabili adabegiak edota</li><li><i>Ikusi->Berezitasunen panela</i>, orduan <i> Testu nukleoa->Formatua->LaTeX</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>Motzean: <ul><li> "\\latex "  aurrizkia erabili adabegi testuan edotar</li><li><i>Ikusi->Lanabes panela</i>, orduan <i>Muin testua->Formatua->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=LaTeX formula gehitu...
 latexPatternFormat=LaTeX
 LengthUnits.cm=zm
@@ -716,12 +732,12 @@ LengthUnits.in=hazbete
 LengthUnits.mm=mm
 LengthUnits.pt=pt
 LengthUnits.px=px
-less_than_two_selected_nodes=Gutxienez bi adabegi aukeratu behar dituzu loturak ezartzeko
+less_than_two_selected_nodes=Gutxienez bi adabegi aukeratu behar dituzu loturak ezartzeko.
 license=Lizentzia: GPL 2 edo geroagokoa
 license_text=<html>Programa hau doako softwarea da; zabaldu edo <br> aldatu egin zenezake beti ere GNU General Public License-ek <br> aipatzen dituen balditzen pean Free Software Foundation-ek azaltzen duen moduan; Bere 2. bertsioa edo berriago baten arabera (zeure aukeran). <br><br> Programa hau erabilgarria izateko ustean banatzen da, <br> BAINA INONGO BERMERIK GABE; ezta MERKANTILIZAZIO edota HELBURU ZEATZ BATETARAKO EGOKITZEAren ustean ere. Ikus <br> GNU General Public License xeheta [...]
 link_error="{0}" lotura okerra, ez da kargatu
 link_not_available_any_more=Lotura honek ez du gehiago balio. Bitartean adabegia ezabatua izan zen.
-link_not_found={0} lotura ez da aurkitu
+link_not_found={0} lotura ez da aurkitu.
 links=Lotura
 load=&Kargatu
 load_accelerator_presets=Kargatu
@@ -753,7 +769,7 @@ ManageAddOnsDialog.deactivate=Desaktibatu
 ManageAddOnsDialog.deactivation.success={0} Freeplane berrabiaraztean desaktibatuko da.
 ManageAddOnsDialog.deinstall=Desinstalatu
 ManageAddOnsDialog.deinstallation.success={0} Freeplane berrabiaraztean desinstalatuko da.
-ManageAddOnsDialog.error=Akatsa instalazioan: {0}
+ManageAddOnsDialog.error=Akatsa instalazioan: {0}.
 ManageAddOnsDialog.install=&Installatu
 ManageAddOnsDialog.install.from.known.location=Add-on-a leku ezagun batetatik instalatu
 ManageAddOnsDialog.install.tooltip=Add-on-a instalatzeko fitxategiaren URL-a hemen sartu
@@ -839,6 +855,9 @@ ModesMenuAction.File.text=Fitxategi esploratzailea
 ModesMenuAction.MindMap.text=Adimen mapa editorea
 most_recent_files=Arestiko mapak
 MoveAction.text=Mugitu
+MoveSelectedNodeAction.CENTER.text=Aukeratutako adabegia erdiratu
+MoveSelectedNodeAction.EAST.text=Aukeratutako adabegia eskubiruntz higitu
+MoveSelectedNodeAction.WEST.text=Aukeratutako adabegia ezkerreruntz higitu
 MoveToRootAction.text=Errora joan
 NameConditionAction.text=Izena ezarri
 navigate=&Nabigatu
@@ -878,9 +897,9 @@ NextNodeAction.BACK.text=Aurreko adabegira joan
 NextNodeAction.BACK_N_FOLD.text=Aurreko adabegira joan (Tolestu)
 NextNodeAction.FORWARD.text=Hurrengo adabegira joan
 NextNodeAction.FORWARD_N_FOLD.text=Hurrengo adabegira joan (tolestu)
-NextPresentationItemAction.text=Hurrengo aurkezpen elementua ireki
+NextPresentationItemAction.text=Hurrengo aurkezpen elementua destolestu
 no=Ez
-no_copy_attributes_before_paste_attributes=Ezin dituzu ezaugarriak itsatsi lehendik batzuk kopiatu ez badituzu
+no_copy_attributes_before_paste_attributes=Ezin dituzu ezaugarriak itsatsi lehendik batzuk kopiatu ez badituzu.
 NO_FORMAT=Testua
 no_format_copy_before_format_paste=Ezin duzu formatu itsatsi aurretik bat kopiatu ez baduzu.
 no_found_from=<html> <u>{0}</u> ez da "{1}"-n aurkitu.</html>
@@ -890,20 +909,20 @@ no_styles_found_in_map=Mapan ez da estilorik aurkitu
 no_translation_strings_found=Itzuli ezineko hizki kateak aurkitu dira
 node=Adabegia
 node_changed_discard_changes=Adabegia aldatu duzu. Aldaketak ezeztatu egin nahi al dituzu?
-node_is_write_protected=Helburutzat jotako adabegiak idazteko babesa du
+node_is_write_protected=Helburutzat jotako adabegiak idazteko babesa du.
 node_location_help=Aldaketen adabegiaren lekua herrestan eramanez, ctrl+herrestatzeak distantziak aldatzen ditu. Klik bikoitzak eta ctrl+klik bikoitzak lehengora eramaten ditu.
 node_popup_scripting=Skript-ak
 node_selector=Adabegi aukeraketa
 node_selector_message=Adabegi gainean klik bikoitza
 node_styles=Adabegi estiloak
 NodeBackgroundColorAction.text=Adabegiaren atzealde kolorea...
-NodeColorAction.text=Adabegi kolorea
+NodeColorAction.text=Adabegi kolorea...
 NodeColorBlendAction.text=Nahasketa kolorea
 NodeDownAction.text=Adabegia mugitu (Senidea behera)
 NodeExtensions.EditNodeExtensions=Adabegiaren hedadurak editatu
 NodeExtensions.RemoveNodeExtensions=Adabegiaren hedadurak ezabatu
 NodeListAction.text=Aurkitu eta ordezkatu...
-NodeListAction.tooltip=Adabegi guztiak berezitasun filtrodun zerrenda aurkigarri baten moduan erakusten ditu
+NodeListAction.tooltip=Adabegi guztiak berezitasun filtrodun zerrenda aurkigarri baten moduan erakusten ditu.
 NodeShapeAction.bubble.text=Puxika
 NodeShapeAction.fork.text=Sardexka
 NodeShapeAction.narrow_hexagon.text=Hexagono mehea
@@ -918,6 +937,7 @@ not_saved_for_image_error=Fitxategi aukeratzailearen bitartez irudi bat ezarri a
 not_saved_for_link_error=Esteka bat fitxategi aukeratzailearen bitartez ezarri aurretik mapa gorde beharra dago
 note_window_location=Ohar panelaren kokapena
 notes=Oharra
+NotFoldingNextPresentationItemAction.text=Hurrengo aurkezpen elementua ireki
 NotificationOptions.CLOSE=Itxi
 NotificationOptions.REMIND_ME_LATER=Beranduago gogorarazi
 NotificationOptions.REMOVE_REMINDER=Oroitzailea ezabatu
@@ -929,21 +949,22 @@ open_asMindMap=Adimen Mapa
 OpenAction.text=Gordetako mapa ireki...
 OpenFreeplaneSiteAction.text=Freeplane-ren jatorrizko web orria
 OpenMapsAddLocation.text=OpenMaps-en kokapena gehitu...
-OpenMapsRemoveLocation.text=OpenMaps-en kokapena ezabatu...
-OpenMapsViewLocation.text=OpenMaps-en kokapena ikusi
+OpenMapsRemoveLocation.text=OpenMaps-en kokapena ezabatu
+OpenMapsViewLocation.text=Ikus OpenMaps-en kokapena...
 OpenPathAction.text=Fitxategia Ireki
-OpenURLMapAction.text=Mapa URL-tik ireki
+OpenURLMapAction.text=Mapa URL-tik ireki...
 OpenUserDirAction.text=Erabiltzailearen direktorioa ireki
 option_changes_may_require_restart=Egindako aldaketen eragina ikusteko, Freeplane berrabiarazi beharko zenuke seguruenik.
 OptionalDontShowMeAgainDialog.cancel=&Ez
-OptionalDontShowMeAgainDialog.dontShowAgain=&Ez niri berriz galdetu
+OptionalDontShowMeAgainDialog.dontShowAgain=&Ez niri berriz galdetu.
 OptionalDontShowMeAgainDialog.ok=&Bai
-OptionalDontShowMeAgainDialog.rememberMyDescision=&Nire erabakia gogoan izan
+OptionalDontShowMeAgainDialog.rememberMyDescision=&Nire erabakia gogoan izan.
 OptionPanel.absolute=Absolutua
 OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Maila estilo txantilloiak
 OptionPanel.ADD_CHILD=Haur nodoa gehitu
 OptionPanel.ADD_SIBLING=Senide nodoa gehitu
 OptionPanel.addons=Add-on edo gehigarriak
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Guztiak bildu
 OptionPanel.always_load_last_maps=Azken mapa eta berriak direnak kargatu
 OptionPanel.always_load_last_maps.tooltip=Goiko aukeretan ezarritako azken mapak kargata, baita FP aukeratutako mapa fitxategi batekin hasiz ere.
@@ -957,6 +978,8 @@ OptionPanel.antialias.tooltip=<html>Maparen kalitatea erabakitzen du. Antialias
 OptionPanel.antialias_all=Guztiei antialias-a ezarri
 OptionPanel.antialias_edges=Loturei antialias.-a ezarri
 OptionPanel.antialias_none=Antialiasik ez
+OptionPanel.antialias_svg=SVG-ei antialias-a ezarri
+OptionPanel.antialias_svg.tooltip=<html>SVG-en render kalitatea ezartzen du. Antialias gehiago denbora gehiago behar du.</html>
 OptionPanel.Appearance=Tankera
 OptionPanel.approximate_search_threshold=Antzeko parekatzerako ataria (threshold)
 OptionPanel.approximate_search_threshold.tooltip=<html>Antzeko parekatzerako ataria (threshold)g<br/><font size="2">ikus http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(zenbat eta altuago orduan eta aldaketa gutxiago<br/>aurkituko dira egindako bilaketaren inguruan)</html>
@@ -967,24 +990,32 @@ OptionPanel.ask=Galdetu
 OptionPanel.automatic=Automatiko
 OptionPanel.automaticFormat_level=Maila estiloak aplikatu
 OptionPanel.automaticFormat_level1=Erro adabegiaren formatua
-OptionPanel.automaticFormat_level2=1.go mailako adabegiaren formatua.
+OptionPanel.automaticFormat_level2=1.go mailako adabegiaren formatua
 OptionPanel.backup_file_number=Gordetako backup fitxategien kopurua
 OptionPanel.Behaviour=Jokaera
 OptionPanel.bezier=Emeki kurbatuta (bezier)
+OptionPanel.border_color=Kolorea
+OptionPanel.border_color_matches_edge_color=Loturaren kolorea erabili
+OptionPanel.border_dash=Ertzeko marra mota
+OptionPanel.border_dash_matches_edge_dash=Lotura marra mota erabili
+OptionPanel.border_width=Lerroaren zabalera
+OptionPanel.border_width_matches_edge_width=Loturaren zabalera erabili
 OptionPanel.bubble=Puxika
 OptionPanel.ca=Katalan, vaelntziera/Catal\u00E1
 OptionPanel.Cancel=Ezeztatu
 OptionPanel.center_selected_node=Aukeratutako adabegia automatikoki erdian jarri
-OptionPanel.check_updates_automatically=Programa hastean eguneratzerik dagoen begiratu.
+OptionPanel.check_updates_automatically=Programa hastean eguneratzerik dagoen begiratu
 OptionPanel.childpattern=Haur txantilloia
-OptionPanel.childpattern.tooltip=Aukeratutako txantilloia haur guztiei ezartzen zaie
+OptionPanel.childpattern.tooltip=Aukeratutako txantilloia ondorengo guztiei ezartzen zaie.
 OptionPanel.clear_all_setters=Guztial aldatu
-OptionPanel.clear_all_setters.tooltip=Aldaketa adierazle guztiak piztu edo itzaltzen ditu
+OptionPanel.clear_all_setters.tooltip=Aldaketa adierazle guztiak piztu edo itzaltzen ditu.
 OptionPanel.cloud=Hodeia
 OptionPanel.cloudcolor=Hodei kolorea
 OptionPanel.cloudshape=Hodeiaren forma
 OptionPanel.combined=Konbinatuta
 OptionPanel.compare_as_number=Zenbaki bezela alderatzen ditu
+OptionPanel.connector_arrows=Konektore geziak
+OptionPanel.connector_dash=Marra mota
 OptionPanel.convert_to_current_version=<html>Freeplane-ren bertsio zaharragoak oraingo bertsiora <br>automatikoki eguneratu?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Bakarrik aldatuak izan behar ez duten mapa oso haundientzat <br>(adituentzat soilik) mapak aldaketarik gabe ireki zenitzake.</html>
 OptionPanel.copyFormatToNewSibling=Formatua beste senideei kopiatu
@@ -992,6 +1023,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=Formatua ikono eta guzti kopiatu
 OptionPanel.cs=Txekieraz/\u010Desky
 OptionPanel.cut_nodes_without_question=Adabegiak baieztapenik gabe moztu?
 OptionPanel.cut_nodes_without_question.tooltip=Kutxatxo hau aukeratuta egonez gero adabegi guztiak baieztapenik gabe moztuko dira. Honek nahi gabeko informazio galera eragin lezake.
+OptionPanel.cut_out_pictures_when_pasting_html=HTML-tik irudiak ezabatu
 OptionPanel.da=Daniera/danks
 OptionPanel.date_format=Data format estandarra
 OptionPanel.date_format.tooltip=SHORT (motz), MEDIUM (ertain), LONG (luze) edo FULL (oso), edota "HH/ee/uuuu" (Hilabete, egun, urte) erako txantilloia
@@ -1022,6 +1054,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Inline editorea azaldu adabe
 OptionPanel.display_node_id=Adabegiaren ID-a azaldu
 OptionPanel.edgecolor=Loturaren kolorea
 OptionPanel.edgecolor.tooltip=Loturaren ezaugarriak bere gurasoari ezarri (bere haur adabegi guztiei ere ezartzen zaie)
+OptionPanel.edgedash=Lotura marra mota
 OptionPanel.edgestyle=Loturaren estiloa
 OptionPanel.edgestyle.tooltip=Loturaren ezaugarriak bere gurasoari ezarri (bere haur adabegi guztiei ere ezartzen zaie)
 OptionPanel.edgewidth=Loturaren zabalera
@@ -1078,6 +1111,7 @@ OptionPanel.groovy_editor_font.tooltip=Unicode hizki mota behar izanez gero 'Dia
 OptionPanel.groovy_editor_font_size=Groovy Editorearen Syntaxi Erakuslearen hizki mota
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Adabegi loturak ezkutatu
+OptionPanel.hide_single_end_connectors=Amaiera bakarreko loturak ezkutatu
 OptionPanel.highlight_formulas=Formulak bereziki azaldu
 OptionPanel.horizontal=Horizontala
 OptionPanel.hr=Kroaziera / hrvatski
@@ -1092,8 +1126,940 @@ OptionPanel.ic_disable=Desaktibatu
 OptionPanel.ic_file=Diskoa erabili
 OptionPanel.ic_ram=RAMean
 OptionPanel.icon=Ikonoa
-OptionPanel.icon.tooltip=Aplikatuz geroz, adabegiak zehazki ikono hau izango du
+OptionPanel.icon.tooltip=Aplikatuz gero, adabegiak zehazki ikono hau izango du.
+OptionPanel.icon_size=Ikonoen neurria
 OptionPanel.icons.list=Azaldutako Ikono Estandarren zerrenda
 OptionPanel.icons.list.tooltip=Hemen ikono estandarrak ordenatu edo desaktibatu zenitzake. Ikonoak ';' ikurraz bereizi behar dira.
 OptionPanel.id=Indonesiera / Bahasa Indonesia
 OptionPanel.IGNORE=Ez ezer egin
+OptionPanel.il__enter_confirms_by_default=Enter-ek defektuz baieztatzen du
+OptionPanel.image_cache=irudientzat
+OptionPanel.indentationUsesTabsInTextOutput=tab-ak testu irteeran erabili
+OptionPanel.it=Italiera / Italiano
+OptionPanel.ja=Japoniera / \u65E5\u672C\u8A9E
+OptionPanel.JoinNodesAction.textSeparators=Testu banatzailea
+OptionPanel.key_type_action=Tekla zapaltzean
+OptionPanel.Keystrokes=Tekla kolpeak
+OptionPanel.ko=Korearra / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
+OptionPanel.label_font_family=Hizki mota familia
+OptionPanel.label_font_size=Hizki mota neurria
+OptionPanel.language=Hizkuntza
+OptionPanel.language.tooltip=<html>Hau programan erabil beharko litzateken mintzaira da. 'automatic' aukera erabiltzailearen oraingo hizkuntza kargatzen saiatuko da </html>
+OptionPanel.last=Azkena
+OptionPanel.last_opened_list_length=Azkena irekitako zerrendaren luzera
+OptionPanel.latex_disable_editor=LaTeX sintaxia azaltzen duen editorea desaktibatu
+OptionPanel.latex_disable_editor.tooltip=Egiaztatu ea LaTeX editorearekin arazorik izaten ari zaren
+OptionPanel.latex_editor_font=LaTex editorearen hizki mota
+OptionPanel.latex_editor_font.tooltip=Unicode karaktereak behar izanez gero 'Dialog' edo 'Monospaced' erabili!
+OptionPanel.latex_editor_font_size=LaTeX editorearen hizki neurria
+OptionPanel.latex_macros=Ohiko LaTeX makroak
+OptionPanel.layout_map_on_text_change=Mapa bere lekuan ipini (layout) editatzerakoan
+OptionPanel.layout_map_on_text_change.tooltip=Errendimendu hobe batetarako desaktibatu
+OptionPanel.linear=Lineala
+OptionPanel.links=Estekak
+OptionPanel.links.tooltip=<html>Estekak ezarri, era erlatibo edo absolutuan</html>
+OptionPanel.load_folding=Kargatzerakoan
+OptionPanel.load_folding_from_map_default_fold_all=Mapa kargatu edo dena tolestu
+OptionPanel.load_folding_from_map_default_unfold_all=Mapa kargatu edo dena zabaldu
+OptionPanel.load_last_map=Azken mapa automatikoki zabaldu
+OptionPanel.load_last_map.tooltip=<html>Aukera hau aktibatuz gero, Freeplane hasten denean azkena ireki zen mapa kargatuko da</html>
+OptionPanel.load_last_maps=Azken mapa guztiak kargatu
+OptionPanel.lookandfeel=Tankera
+OptionPanel.lookandfeel.scaleuifonts=Erabiltzaile Interfazearen (UI) hizkiak neurriz aldatu
+OptionPanel.lookandfeel.scaleuifonts.tooltip=Erabilgarria dentsitate altuko monitoreetan
+OptionPanel.lookandfeel.tooltip=<html>Erabiltzeko tankera. 'metal','windows','motif', 'gtk' jasaten ditu, 'mac' soilik MacOS-en. Defektuz, aukeratutako tankera hori erabiliko da. Nahi izanez gero zeure gustuko tankera ezarri, klase izena eman eta  ziurtatu dago(z)kion jar fitxategia(k) kargatzen dela/direla. Arazorik izanez gero 'nothing' edo 'baterez' aukeratu. Applet-entzat baliagarria.</html>
+OptionPanel.lt=Lithuaniera / kalba
+OptionPanel.markClones=Klonatutako markak margotu
+OptionPanel.markSelectedClones=Aukeratzeko klonatutako markak margotu
+OptionPanel.max_displayed_node_count=Erakusgarri izango den adabegi kopuru txikiena
+OptionPanel.max_image_width=Irudiaren hasierako zabalera maximoa
+OptionPanel.max_image_width.tooltip=Irudi berriak zabalera honetara egokituko dira
+OptionPanel.max_menu_item_count=Menu elemntu kopuru maximoa
+OptionPanel.max_menu_item_count.tooltip=Azpimenu batetako elementu kopurua mugatu, gutxienez 10
+OptionPanel.max_node_width=Adabegiaren zabalera maximoa
+OptionPanel.max_shortened_text_length=Moztutako testuaren zabalera maximoa
+OptionPanel.menuItemFontSize=Menu elementuen hizki neurria
+OptionPanel.metal=Metal
+OptionPanel.min_node_width=Adabegiaren zabalera minimoa
+OptionPanel.monitor_size_inches=Monitorearen neurria (hazbetetan)
+OptionPanel.motif=Motif
+OptionPanel.narrow_hexagon=Hexagono estua
+OptionPanel.nb=Bokm\u00E5l  Norvegiera / Norsk bokm\u00E5l
+OptionPanel.never_save_folding=Inoiz ez
+OptionPanel.neverShowSurvey=Inoiz ez galdera, inkesta edo aholkurik erakutsi
+OptionPanel.nl=Nederlandera, flandriera / Nederlands, Vlaams
+OptionPanel.nn=Nynorsk  norvegiera / Norsk nynorsk
+OptionPanel.nodebackgroundcolor=Atzekaldea
+OptionPanel.nodebackgroundcolor.tooltip=Adabegiaren atzekaldea, aukeratuta ez dagoenean.
+OptionPanel.nodecolor=Testua
+OptionPanel.nodecolor.tooltip=Adabegiaren testu kolorea, aukeratuta ez dagoenean.
+OptionPanel.nodefontbold=Hizki lodiz
+OptionPanel.nodefonthyperlink=Hiperesteka
+OptionPanel.nodefontitalic=Hizki etzanean
+OptionPanel.nodefontname=Hizki mota familia
+OptionPanel.nodefontsize=Hizki neurria
+OptionPanel.nodeformat=Formatua
+OptionPanel.nodeformat.tooltip=<html>Testu ordezkpan eta/edo formatu ematea:<ul><li><em>Txantilloi hedapena</em>(<tt>%s</tt> jatorrizko testua da), adib.<tt>ADI: %s</tt><li><em>Zenbaki eta daten formatua</em> - ikus adibideak aukera kutxatxoan</ul></html>
+OptionPanel.nodenumbering=Adabegiak zenbakiz jarri
+OptionPanel.nodenumbering.tooltip=Serie zenbakia gehitzen dio adabegiari (Adib. 1.3.1).
+OptionPanel.nodeshape=Adabegiaren forma
+OptionPanel.nodetext=Muineko testua
+OptionPanel.nodetext.tooltip=Hemen adabegiaren testua defini zenezake. Aurreko testua ezabatu egiten da halako patroia aplikatzean.
+OptionPanel.nothing=Ezer ez
+OptionPanel.number_format=Zenbaki formatu estandarra
+OptionPanel.number_format.tooltip='#' daraman patroia hautazko zenbakientzat edo '0' derrigorrezkoentzat. Adbidieak; "0.00", "0.0%", "$#.00", "#0"
+OptionPanel.number_of_different_files_for_automatic_save=Automatikoki gordetzeko fitxategi ezberdin kopurua
+OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> Bertan mapak gordetzek n fitxategi ezberdinen kopurua. Lehendabizko gordetze automatikoa lehen fitxategian egiten eta eta horrela jarraitzen da n+1era iritsi arte, hau berriz ere lehen fitxategian gordetzen delarik (ziklikoki)</html>
+OptionPanel.OK=Gorde
+OptionPanel.org.freeplane.plugin.bugreport=Politikak
+OptionPanel.org.freeplane.plugin.bugreport.allowed=Beti bidali
+OptionPanel.org.freeplane.plugin.bugreport.ask=Elkarrizketaren txostena azaldu
+OptionPanel.org.freeplane.plugin.bugreport.denied=Ez inoiz bidali
+OptionPanel.org.freeplane.plugin.bugreport.userid=Hautazko identifikatzailea bidaltzeko
+OptionPanel.outline_hgap=Tarte horizontala
+OptionPanel.outline_vgap=Tarte bertikala
+OptionPanel.oval=Obaloa
+OptionPanel.paint_connectors_behind=Adabegien atzetik loturak margotu
+OptionPanel.parse_data=Zenbakien sarrera eta ordu-datak antzeman
+OptionPanel.parse_data.tooltip=Datuak parseatzen saiatu, data-ordu eta zenbaki sarrerak eta formatu estandarrak aplikatu. Adibideak: 100,000.00, 12/31, 12/31/99, 1999-12-31 and 1999-12-31 23:59
+OptionPanel.parse_formulas=Formulak antzeman
+OptionPanel.parse_formulas.tooltip='='-rekin hasten diren adabegien formulak parseatu. Ikus: http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_latex=LaTeX antzeman
+OptionPanel.parse_latex.tooltip=LaTeX formulak formatu edo aurrizkiz antzeman: Ikus http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
+OptionPanel.PASTE_HTML=HTML eran itsatsi
+OptionPanel.PASTE_PLAIN_TEXT=Testu lau bezala itsatsi
+OptionPanel.pasteImagesFromFiles=Irudiak fitxategitatik itsatsi
+OptionPanel.pasteImagesFromFiles.tooltip=Irudi fitxategia mapara isuria izan bada irudia txertatu
+OptionPanel.path_property_may_not_be_empty=Baliteke helbidearen ezaugarria hutsik ez egotea! Aldaketa bere hortan utzi da.
+OptionPanel.patternname=Izena
+OptionPanel.patternname.tooltip=Patroi izen bakarra
+OptionPanel.pl=Poloniera / polski
+OptionPanel.placenewbranches=Adar berriak ipini
+OptionPanel.placenewbranches.tooltip=<html>Adar berriak non kokatu. Balio duten sarrerak 'first' (aurrena) eta 'last' (azkena) dira</html>
+OptionPanel.plugin.tooltip=Oinarrizkoak ez diren pluginak.
+OptionPanel.plugins=Pluginak
+OptionPanel.Presentation=Aurkezpena
+OptionPanel.presentation.combineAll=Aurkezpen guztiak bateratu
+OptionPanel.presentation.exportDirectory=esportatutako aurkezpenaren direktorioaren izena
+OptionPanel.presentation.maxDropBoxRowCount=Isuritzeko kutxaren gehieneko lerro kopurua
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Gardenki aukeraketari eta aurkezpenari eragiten die
+OptionPanel.presentation.processesEscapeKey=ESCAPE teklak aurkezpena amaitzen du
+OptionPanel.presentation.processesNavigationKeys=Nabigazio teklek aurkezpena kontrolatzen dute
+OptionPanel.presentation.slideDisplaysAllNodes=Tolestutako adabegi guztiak automatikoki askatu
+OptionPanel.presentation.slowMotion=Slow-motion, higidura geldoko aurkezpena
+OptionPanel.presentation.switchToFullScreen=Pantaila osoko era aktibatu
+OptionPanel.presentation.switchToSpotlight=Puntu argi era aktibatu
+OptionPanel.presentation.zoom=Maparen zoom-a erabili
+OptionPanel.printonwhitebackground=<html>Inprimatzeko atzekalde zuria</html>
+OptionPanel.printonwhitebackground.tooltip=<html>Inprimatzeko beti atzekalde zuria erabili</html>
+OptionPanel.pt_BR=Portugesera (Brasil)/ Portugu\u00EAs (Brasil)
+OptionPanel.pt_PT=Portugesera (Portugal) / Portugu\u00EAs (Portugal)
+OptionPanel.RECT=Laukizuzena
+OptionPanel.rectangle=Laukizuzena
+OptionPanel.relative=Erlatiboa
+OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Ask" (galdetu) aukerak galdetu egingo dizu (zalantza izanez gero erabili). <br> "Bai" aukeratzeak editore aberastua erakusten du.<br>"Ez" aukeratzeak editore xumea azaltzen du. </html>
+OptionPanel.remind_use_rich_text_in_new_nodes=Itatsitako adabegietan era aberastua erabili
+OptionPanel.remindersBlink=Gogorazteko dir-dir egin
+OptionPanel.remindersShowNotifications=Gogorarazteko oharrak azaleratu
+OptionPanel.remindersStandardDelay=Gogorazpenak atzeratu
+OptionPanel.remove_notes_without_question=Oharrak galdetu gabe kendu?
+OptionPanel.remove_notes_without_question.tooltip=Hau aukeratuta baldin badago, dagozkion adabegiak baieztapenik eskatu gabe ezabatzen dira. Honen nahi gabe informazioa galtzea ekar lezake.
+OptionPanel.resources_use_default_font_for_notes_too=Oharrentzat ere defektuzko hizki mota erabili
+OptionPanel.resources_use_margin_top_zero_for_notes=Oharretan goiko margina kendu
+OptionPanel.revision_color=Kolore berrikuspena
+OptionPanel.revision_color.tooltip=Aldatu diren adabegien atzekaldeko kolorea.
+OptionPanel.ROUND_RECT=Laukizuzen ertz borobilduna
+OptionPanel.ru=Errusiera / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
+OptionPanel.save_folding=Tolestea gorde
+OptionPanel.save_folding_if_map_is_changed=Mapa aldatzen baldin bada
+OptionPanel.save_last_visited_node=Maparen azken kokapena gorde
+OptionPanel.save_modification_times=Aldaketa denborak gorde
+OptionPanel.script_classpath=Scriptaren "classpath"-a: JAR fitxategiak eta/edo klaseak gordetzen dituzten direktorio gehigarriak (Ikusi oharra)
+OptionPanel.script_classpath.tooltip=<html>JAR fitxategien eta/edo direktorioen zerrenda script eta formulen classpath-ean gehitzeko. <br> ;(Windows) edota : (Linux, Mac) erabili sarrerak bereizteko. <br> Direktorioak JAR eta .class fitxategiak aurkitzeko eskaneatuko dira. <br> Absolutuak ez diren helbideak Freeplane erabiltzaile direktorioarekiko erlatibotzat joko dira. <br> Classpath bat ezartzen baduzu bertara irakurtze baimenak ere eman behar dituzu!</html>
+OptionPanel.script_compilation_disabled_extensions=Konpilatzekoak ez diren fitxategi estentsio edo luzapenak (Oharra ikusi)
+OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Instalatutako lengoaia gehigarri bakoitzaren script guztiek (<br> groovy eta JavaScript ezik) konpilazio arazo orokor bat baldin badute<br> saiatu hemen fitxategi luzapena gehitzen (komaz banatutako zerrenda).</html>
+OptionPanel.script_directories=Script-ak bilatzeko helbidea (ikusi oharra)
+OptionPanel.script_directories.tooltip=<html>Direktorioen zerrenda ("script"ez gain).<br>;(Windows) edo : (Linux, Mac) erabili sarrerak banatzeko. <br> Absolutuak ez diren helbideak Freeplane erabiltzailearen direkorioarekiko erlatibotzat joko dira.</html>
+OptionPanel.script_user_key_name_for_signing=Hautazko erabiltzailearen giltza aliasa sinadurarako
+OptionPanel.script_user_key_name_for_signing.tooltip=<html>Zure script-a sinatu nahi baldin baduzu, sartu hemen giltzaren aliasa.<br> Giltza defektuzko tokian gordeta izatea espero da. <br>Giltza sekretuaren pasahitzak gordetakoarekin bat egin behar du (hau da defektuzkoa).</html>
+OptionPanel.scrollbar_increment=Abiada
+OptionPanel.scrolling_speed=Maparen "scrolling" abiadura automatikoa
+OptionPanel.scrollOnUnfold=Adabegi bat zabaltzean mapa mugitu (scroll)
+OptionPanel.selection_method=Aukeraketa metodoa
+OptionPanel.selection_method.tooltip=<html> Ondorengo etengailuarekin atzeratutako aukeratuta eskema aktibatu/desaktibatu zenezake. Aukera automatikoak. Edozein eratan "auto.properties"-en gordeko direnez ez aldatu.</html>
+OptionPanel.selection_method_by_click=Klik bidez
+OptionPanel.selection_method_delayed=Atzeratua
+OptionPanel.selection_method_direct=Zuzena
+OptionPanel.separator.accessories/plugins/AutomaticLayout.properties_PatternSeparatorName=Txantilloiak
+OptionPanel.separator.anti_alias=Antialias
+OptionPanel.separator.attributes=Ezaugarriak
+OptionPanel.separator.automatic_save=Automatikoki gorde
+OptionPanel.separator.behaviour=Jokaera
+OptionPanel.separator.browser=Nabigatzailea
+OptionPanel.separator.cache=Cache-a
+OptionPanel.separator.clones=Klonak
+OptionPanel.separator.cloud=Hodeia
+OptionPanel.separator.CloudControls=Hodeiak
+OptionPanel.separator.commands_for_the_program=Programarentzat komandoak
+OptionPanel.separator.connectors=Loturak
+OptionPanel.separator.data_formats=Datuei formatu eman eta parseatzea
+OptionPanel.separator.default_colors=Berezko koloreak
+OptionPanel.separator.default_fonts=Berezko hizki motak
+OptionPanel.separator.default_styles=Berezko estiloak
+OptionPanel.separator.EdgeControls=Loturak
+OptionPanel.separator.edit_long_node_window=Elkarrizketa editatu
+OptionPanel.separator.editing=Editorearen ezaugarriak
+OptionPanel.separator.export=Esportatu
+OptionPanel.separator.files=Fitxategiak
+OptionPanel.separator.formula=Formulak
+OptionPanel.separator.General=Orokorra
+OptionPanel.separator.html_export=HTML esportatu
+OptionPanel.separator.html_import=HTML inportatu
+OptionPanel.separator.hyperlink_types=Hiperesteka motak
+OptionPanel.separator.icon_properties=Ikonoak
+OptionPanel.separator.IconControls=Ikonoak
+OptionPanel.separator.icons="Ikonoa aukeratu..."n ikonoak
+OptionPanel.separator.Icons=Ikonoak
+OptionPanel.separator.initial_map_size=Maparen hasierako neurria
+OptionPanel.separator.inline_editor=Adabegian bertan editatzeko
+OptionPanel.separator.JoinNodesAction=Adabegiak uztartuz
+OptionPanel.separator.key_typing=Teklak zapaltzean
+OptionPanel.separator.language=Hizkuntza
+OptionPanel.separator.latex=LaTeX
+OptionPanel.separator.load=Kargatu
+OptionPanel.separator.look_and_feel=Tankera
+OptionPanel.separator.mouse_wheel=Saguaren gurpiltxoa
+OptionPanel.separator.new_node_commands=Adabegi komando berriak
+OptionPanel.separator.node_editing_commands=Adabegia editatzeko komandoak
+OptionPanel.separator.node_navigation_commands=Adabegietan nabigatzeko komandoak
+OptionPanel.separator.NodeBorder=Adabegi ertza
+OptionPanel.separator.NodeColors=Muin osoaren kolorea
+OptionPanel.separator.NodeFont=Muin osoaren hizki mota
+OptionPanel.separator.NodeShape=Adabegiaren forma
+OptionPanel.separator.NodeStyle=Adabegi estiloa
+OptionPanel.separator.NodeText=Muinaren testua
+OptionPanel.separator.notifications=Baieztapenak
+OptionPanel.separator.org.freeplane.plugin.bugreport=Bug edo akatsen txosten automatikoa
+OptionPanel.separator.other_defaults=Bestelako berezkoak
+OptionPanel.separator.others=Bestelako tekla loturak
+OptionPanel.separator.outline_view=Ikuspegi orokorra
+OptionPanel.separator.patterns=Txantilloiak
+OptionPanel.separator.presentation=Aurkezpena
+OptionPanel.separator.reminderOptions=Gogoratze aukerak
+OptionPanel.separator.RichTextEditor=Testu editore aberastua
+OptionPanel.separator.root_node_appearance=Erro adabegiaren itxura
+OptionPanel.separator.save=Gorde
+OptionPanel.separator.scripting=Scripting-a
+OptionPanel.separator.scrollbar=Scroll barra
+OptionPanel.separator.search=Bilatu
+OptionPanel.separator.selection_colors=Aukeraketa koloreak
+OptionPanel.separator.selection_method=Aukeraketa metodoa
+OptionPanel.separator.single_instance_mode=Programa instantzia bakarra
+OptionPanel.separator.size_limits=Neurri mugak
+OptionPanel.separator.spelling=Ortografia zuzentzailearen aukerak
+OptionPanel.separator.SplitToWordsAction=Adabegia hitzetan zatitu
+OptionPanel.separator.status=Egoera adierazteko lerroa
+OptionPanel.separator.surveys=Galdeketak
+OptionPanel.separator.svg_icons=SVG ikonoak
+OptionPanel.separator.tooltip=Ohartxoak
+OptionPanel.separator.undo=Desegin
+OptionPanel.separator.updates=Programa eguneraketak
+OptionPanel.set_property_text=Aldatu
+OptionPanel.set_property_text.tooltip=Aktibatu estilo propietateak aldatzeko
+OptionPanel.setscript=Aldatu?
+OptionPanel.setscript.tooltip=Estilo honi script bat lotu dakioke.
+OptionPanel.shape_horizontal_margin=Margin horizontala
+OptionPanel.shape_vertical_margin=Margin bertikala
+OptionPanel.sharp_bezier=Zorrozki kurbatuta (bezier)
+OptionPanel.sharp_linear=Zorrozki zuzena
+OptionPanel.shouldCenterSmallMaps=Mapa txikiak zentratu
+OptionPanel.show_connectors=Loturen lerroak azaldu
+OptionPanel.show_icon_for_attributes=Ikonoak ezaugarrien arabera erakutsi
+OptionPanel.show_icons=Ikonoak azaldu
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Mapatik kargatu edota adabegi batzuk destolestu
+OptionPanel.show_node_tooltips=Azalpentxoak erakutsi
+OptionPanel.show_note_icon_in_tooltip=Ohar ikonoa ohartxoan azaldu
+OptionPanel.show_note_icons=Oharrren ikonoak erakutsi
+OptionPanel.show_styles_in_tooltip=Adabegi estiloak azalpentxotan adierazi
+OptionPanel.signed_script_are_trusted=Sinatutako scriptetaz fidatu (aukera aholkatua).
+OptionPanel.signed_script_are_trusted.tooltip=Scripta konfidantzazko norbaitek firmatu badu (e.b. zuk zeuk edo Freeplane'ren egileren batek), mugarik gabe exekutatu.
+OptionPanel.simplyhtml.default_paste_mode=Dekektuzko itsaste modua
+OptionPanel.single_backup_directory=Backup fitxategientzat direktorio bakarra erabili
+OptionPanel.single_backup_directory.tooltip=<html>Backup eta automatikoki gordetako fitxategiak direktorio bakar batetan gorde maparen direktorioearen azpidirektorio batetan gorde ordez</html>
+OptionPanel.single_backup_directory_path=Backup direktorioa (goiko aukera onartua izan bada)
+OptionPanel.single_backup_directory_path.tooltip=<html> Defektuzko  <freeplaneuserdir>/.backup gainean idazten du </html>
+OptionPanel.single_instance=Fitxategiak martxan dagoen instantzia batetan ireki
+OptionPanel.single_instance_force=Edozein eratan bigarren instantzia bat saihestu
+OptionPanel.single_instance_force.tooltip=Kargatzeko fitxategirik ez badago ere bigarren instantzia saiestu
+OptionPanel.sk=Slovakiera  / sloven\u010Dina
+OptionPanel.skip_template_selection=Txantiloi aukeraketa elkarrizketa saihestu
+OptionPanel.sl=Sloveniera /  sloven\u010Dina
+OptionPanel.slow_scroll_selected_node=Aukeratutako adabegian "scroll" motela
+OptionPanel.spelling_opt_case_sensitive=Hizki larriak txikietatik bereizi
+OptionPanel.spelling_opt_ignore_all_caps_words=Hizki larritan idatzitako hitzak ez kontutan izan.
+OptionPanel.spelling_opt_ignore_capitalization=Hitz hasieretako hizki larriak ez kontutan izan
+OptionPanel.spelling_opt_ignore_words_with_numbers=Zenbakiak dituzten hitzak ez kontutan izan
+OptionPanel.spelling_opt_suggestions_limit_dialog=Elkarrizketan azaltzeko gehienezko iradokizun kopurua
+OptionPanel.spelling_opt_suggestions_limit_menu=Menuan azaltzeko gehienezko iradokizun konpurua
+OptionPanel.SplitToWordsAction.auxiliaryWordList=Hitz laguntzaile zerrenda
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Hitzetan karaktereak
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=Adabegi originala hutsik utzi
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=Ilaran adabegi zenbakia
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=Testu originala xehetasun bezala gorde
+OptionPanel.spotlight=Punttu argia
+OptionPanel.spotlight_background_color=Punttu argiaren atzekalde kolorea
+OptionPanel.sr=Serbiera / \u0441\u0440\u043F\u0441\u043A\u0438
+OptionPanel.standard_template=Txantiloi fitxategi estandarra
+OptionPanel.standardbackgroundcolor=Atzekalde kolore estandarra
+OptionPanel.standardbackgroundcolor.tooltip=<html>Atzekalde kolore estandarra html kodetan </html>
+OptionPanel.standardcloudcolor=Hodei kolore estandarra
+OptionPanel.standardcloudcolor.tooltip=<html>Hodei kolore estandarra html kodetan</html>
+OptionPanel.standardcloudestyle=Hodei estilo estandarra
+OptionPanel.standardcloudestyle.tooltip=<html>Hodei estilo estandarra. </html>
+OptionPanel.standardcloudshape=Hodeiaren forma estandarra
+OptionPanel.standarddrawrectangleforselection=Aukeratutako adabegiak burbuiletan erakutsi
+OptionPanel.standarddrawrectangleforselection.tooltip=<html>Aukeratutako adabegiak inguruan burbuila batez markatu.</html>
+OptionPanel.standardlinkcolor=Esteka kolore estandarra
+OptionPanel.standardlinkcolor.tooltip=<html>Esteka kolore estandarra html kodean </html>
+OptionPanel.standardlinkestyle=Esteka estilo estandarra
+OptionPanel.standardlinkestyle.tooltip=<html>Esteka estilo estandarra</html>
+OptionPanel.standardselectednodecolor=Aukeratutako adabegi kolore estandarra
+OptionPanel.standardselectednodecolor.tooltip=<html>Aukeratuz gero, adabegi kolore estandarra. HTML kodeak erabili (#RRGGBB balio hexadezimaletan) </html>
+OptionPanel.standardselectednoderectanglecolor=Aukeratutao adabegiaren burbuila kolorea
+OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Aukeratutako adabegia markatzen duen burbuila kolorea. HTML kodetan  (#RRGGBB balio hexadezimaletan) </html>
+OptionPanel.STAR=Izarra
+OptionPanel.statesymbolwidth=Ezarri ikur edo sinboloaren zabalera
+OptionPanel.structured_html_import=HTMLa adabegi egitura bezela inportatu
+OptionPanel.structured_icon_toolbar=Ikono tresnategi egituratua
+OptionPanel.summary=Laburpena
+OptionPanel.sv=Suediera / svenska
+OptionPanel.text.use_ctrl_key=Erabil 'Laburbidea ezarri' Lanabesen menutik
+OptionPanel.textalignment=Testu lerrotzea
+OptionPanel.time_for_automatic_save=Automatikoki gordetzeko denbora
+OptionPanel.time_for_automatic_save.tooltip=<html>Bi gordetze automatikoren arteko denbora (milisegundutan): Gordetze automatikoa ezerezteko 2000000000 zenbakia ipini.</html>
+OptionPanel.time_for_delayed_selection=Atzerapen ezarriko aukeraketaren denbora
+OptionPanel.time_for_delayed_selection.tooltip=<html>Sagua adabegi gainetik pasatzen aukeraketa denbora (milisegundutan) ezarri. Aukeraketa zuzen nahi izanez gero 1 balioa ezarri.</html>
+OptionPanel.toolbar_icon_height=Lanabes barraren ikonoaren garaiera
+OptionPanel.toolTipManager.dismissDelay=Ezerezte atzerapena, ms
+OptionPanel.toolTipManager.initialDelay=Hasierako atzerapena, ms
+OptionPanel.toolTipManager.max_tooltip_height=Adabegiaren azalpentxoaren gehieneko garaiera
+OptionPanel.toolTipManager.max_tooltip_height.tooltip=Adabegiaren azalpentxoaren gehieneko garaiera pixeletan.
+OptionPanel.toolTipManager.max_tooltip_width=Adabegiaren azalpentxoaren gehieneko zabalera
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Adabegiaren azalpentxoaren gehieneko zabalera pixeletan.
+OptionPanel.toolTipManager.reshowDelay=Berrerakuste atzerapena, ms
+OptionPanel.tr=Turkiera / T\u00FCrk\u00E7e
+OptionPanel.uk_UA=Ukraniera / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
+OptionPanel.undefined_font=Definitu gabeko hizki mota
+OptionPanel.undo_levels=Mailak desegin
+OptionPanel.undo_levels.tooltip=<html>Desegin aukera erabiliz (Undo), zenbat urrats ezezta daitezkeen ezartzen du. </html>
+OptionPanel.unfold_on_paste=Itsasteragoan adabegia destolestu
+OptionPanel.unfold_on_paste.tooltip=Itsastean edota eutsi eta askatzean (Drag-And-Drop) adabegia destolestu
+OptionPanel.uniform_shape=Uniformea, tankera berekoa
+OptionPanel.use_common_out_point_for_root_node=Ertzak erro adabegian puntu beretik hasten dira
+OptionPanel.use_common_out_point_for_root_node.tooltip=Ertzak erro adabegian puntu beretik hasten dira
+OptionPanel.use_svg_icons=SVG ikonoak erabili
+OptionPanel.use_svg_icons.tooltip=<html>Ikonoen render kalitatea ezartzen du, SVG ikonoek denbora gehiago behar dute.</html>
+OptionPanel.use_tabbed_pane=Erlaitzak erabili
+OptionPanel.use_tabbed_pane.tooltip=Aukeratuz gero mapak eraitzetan azaltzen dira (Firefox-en bezela :-) ).
+OptionPanel.validate_classpath_needs_readaccess=Scripting-a: Classpath-a ezartzean fitxategi horietara irakurtze baimena eman behar duzu!
+OptionPanel.validate_invalid_date_format=Data formatu estandar okerra
+OptionPanel.validate_invalid_datetime_format=Data-ordu formatu estandar okerra
+OptionPanel.validate_invalid_number_format=Zenbaki formatu estandar okerra
+OptionPanel.validate_write_without_read=Scripting-a: Kontutan izan Write/File (Fitxategia/Idatzi)-ri Read/File (Fitxategia/Irakurri) gehitzea.
+OptionPanel.validation_error=<html><body>Egiaztatze akatsa(k):<p><em>{0}</em><p>Mesedez aldatu aukerak akatsa(k) zuzentzeko.</body></html>
+OptionPanel.validation_warning=<html><body>Egiaztatze oharra(k):<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap=Haurrekiko tartea
+OptionPanel.vertical_child_gap.tooltip=Haur adabegien arteko tarte bertikala
+OptionPanel.vi=Vietnamera  / Ti\u1EBFng Vi\u1EC7t
+OptionPanel.wheel_velocity=Abiadura
+OptionPanel.wheel_velocity.tooltip=Balio altuagoak saguaren gurpilaren mugitze efektua azkartzen du.
+OptionPanel.wide_hexagon=Hexagono zabala
+OptionPanel.windows=Leihoak
+OptionPanel.zh_CN=Txinera, sinplifikatua /  \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=Txinera, tradizionala / \u7E41\u9AD4\u5B57
+org.freeplane.plugin.bugreport.agree=Bidali
+org.freeplane.plugin.bugreport.always_agree=Beti bidali
+org.freeplane.plugin.bugreport.always_deny=Ez inoiz bidali
+org.freeplane.plugin.bugreport.deny=Ez bidali
+org.freeplane.plugin.bugreport.dialog.title=Bug edo programa akats txosten bidaltze automatikoa
+org.freeplane.plugin.bugreport.freeplane_team=Freeplan taldearen mezua
+org.freeplane.plugin.bugreport.lastreport=Jasotako txostena
+org.freeplane.plugin.bugreport.never=Ez inoiz laguntzarik eskatu
+org.freeplane.plugin.bugreport.question=Freeplane-k bug edo programa akatsak automatikoki jarraitzeko modulua du.
+org.freeplane.plugin.bugreport.report=Oraingo txostena
+org.freeplane.plugin.bugreport.wanted_bug=Barne akats bat gertatu da ta automatikoki jasoa izan da.
+org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined={0} Adabegia ez dago definituta
+out_of_memory=Memoriak gainezka egin du.
+overwrite_keyset_question=Oraingo tekla multzoa berridatzi?
+PageAction.text=Konfigurazioa inprimatu...
+password_is_not_ascii=Pasahitza ez da ASCII
+PasteAction.text=Itsatsi
+PasteAttributes.text=Ezaugarriak itsatsi
+PatternNewNameProperty=Txantilloi berria
+PatternToString.backgroundColor=Atzekaldearen kolorea
+PatternToString.Child=Haur adabegiaren estiloa
+PatternToString.color=Kolorea
+PatternToString.EdgeColor=Loturaren kolorea
+PatternToString.EdgeStyle=Loturaren estiloa
+PatternToString.EdgeWidth=Loturaren zabalera
+PatternToString.FontBold=Hizki lodiz
+PatternToString.FontItalic=Hizki etzanez
+PatternToString.FontName=Hizki mota izena
+PatternToString.Icon=Ikonoa
+PatternToString.NodeFontSize=Hizki neurria
+periodic_formula={0} * n + {1}
+PeriodUnit.DAY=egun
+PeriodUnit.HOUR=ordu
+PeriodUnit.MINUTE=minutu
+PeriodUnit.MONTH=hilabete
+PeriodUnit.WEEK=aste
+PeriodUnit.YEAR=urte
+plugins/latex/LatexNodeHook.editorTitle=LaTeX formula editatu
+plugins/script_filter=Script filtroa [0}
+plugins/script_filter_error={0}k emaitza boolearra eman behar du {1}ean baina {2} itzuli du
+plugins/script_filter_execute_error={1}-entzat {0}  \nexekutatzeak akatsa:\n{2}
+plugins/ScriptEditor.cancel=Al&daketak ahaztu eta irten
+plugins/ScriptEditor.exit=&Gorde eta irten
+plugins/ScriptEditor.FORBIDDEN_ACTION=Freeplane-en Groovy skript-ak mugatuta daude. Ondorengo  {0,choice,0#File|1#Network|2#Exec}  eragiketa debekatuta dago:\n{1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. Hau programaren konfigurazioan alda zenezake.
+plugins/ScriptEditor.menu_actions=Ekintz&ak
+plugins/ScriptEditor.new_script=Script berria
+plugins/ScriptEditor.run=Abia&razi
+plugins/ScriptEditor.sign=Script-a sinatu...
+plugins/ScriptEditor/window.Result=Emaitza:
+plugins/ScriptEditor/window.title=Scripta editatu
+plugins/ScriptingEngine.illegalAccessToInternalAPI=Barne APIra sarrera debekatua ({0} paketea). - APIa behar bezain ahaltsua ez baldinb bada, Mesedez Freeplane taldearekin jarri kontaktuan.
+plugins/TimeList.xml_Created=Sortua
+plugins/TimeList.xml_Date=Data
+plugins/TimeList.xml_Details=Xehetasunak
+plugins/TimeList.xml_Icons=Ikonoak
+plugins/TimeList.xml_Modified=Aldatua
+plugins/TimeList.xml_Notes=Oharrak
+plugins/TimeList.xml_Text=Testua
+plugins/TimeManagement.xml_appendButton=Aukeraketan data sartu
+plugins/TimeManagement.xml_Cancel=Ezeztatu
+plugins/TimeManagement.xml_cancelButton=Ezeztatu
+plugins/TimeManagement.xml_closeButton=Itxi
+plugins/TimeManagement.xml_Export=Aukeratutako adabegiak esportatu
+plugins/TimeManagement.xml_Find=Bilatu
+plugins/TimeManagement.xml_Goto=-ra joan
+plugins/TimeManagement.xml_hour=Ordua:
+plugins/TimeManagement.xml_menu_actions=Ekintzak
+plugins/TimeManagement.xml_minute=Minutua:
+plugins/TimeManagement.xml_reminderButton=Data honetan gogorarazi
+plugins/TimeManagement.xml_reminderButton_tooltip=<html>Sakatuta dagoenean timer-a ezarritako datara egokitzen da. Dirdirka dauden ikonoek orduan zure arreta deituko dute.<br> Mapa isten baldin baduzu, timerrak mapa irekitzen den hurrengo aldian berriz aktibatuko dira. </html>
+plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Oraingoz adabegiko oroitzaile bakarra jarri liteke. <br> Oraingo oroigailua {0,date}{0,time}en dago jarria, zure aukera berriz {1,date}{1,time} izan da. <br><br>Orioitzailearen unea aldatu nahi al duzu (BAI)<br> ala nahiago duzu lehengoa gorde (EZ)?</html>
+plugins/TimeManagement.xml_reminderNode_tooltip=Oroitzailea ondorengo datan dago ezarria:  {0,date} {0,time}.
+plugins/TimeManagement.xml_remindLaterButton=Geroago gogorarazi
+plugins/TimeManagement.xml_remindLaterButton_tooltip=Geroxeago gogorarazi
+plugins/TimeManagement.xml_removeReminderButton=Gogorarazpena ezabatu
+plugins/TimeManagement.xml_removeReminderButton_tooltip=Aukeratutako adabegiei dagokien gogorarazpen guztiak ezabatu.
+plugins/TimeManagement.xml_Replace=Ordezkatu
+plugins/TimeManagement.xml_Replace_All=Guztiak Ordezkatu
+plugins/TimeManagement.xml_Replace_Selected=Aukeratuak ordezkatu
+plugins/TimeManagement.xml_Select=Aukeratu
+plugins/TimeManagement.xml_todayButton=Egutegia berrezarri
+plugins/TimeManagement.xml_WindowTitle=Denbora kudeatu
+plugins/TimeManagement.xml_WindowTitle_All_Nodes=Aurkitu eta ordezkatu
+preferences=Lehenespenak
+presentation=Aurkezpena
+presentation.combineAll=Aurkezpen guztiak bateratu
+print_preview_title=Inprimatzeko aurrikuspena
+PrintAction.text=Mapa inprimatu...
+PrintDirectAction.text=Inprimatu
+printing_settings=Inprimatzeko eskala
+PrintPreviewAction.text=Inprimatzeko aurrikuspena...
+program_terminates=Barne akatsa, programa amaitzera doa.
+progress=Aurrerabide ikonoa (%)
+PropertyAction.dialog=Lehenespenak
+PropertyAction.text=Lehenespenak...
+QuickFilterAction.text=Filtro azkarra
+QuickFindAction.BACK.text=Aurrekoa aurkitu
+QuickFindAction.FORWARD.text=Testua bilatu
+QuickFindAllAction.text=Ezarpena betetzen dute adabegi guztiak aukeratu
+QuickHighlightAction.text=Ezarbena betetzen duten adabegi guztiak nabarmendu
+QuitAction.text=Freeplane itxi
+read_only=Irakurri soilik
+ReadScriptError.text=Skripta irakurtzean akatsa
+really_convert_to_current_version=<html>Mapa hau Freeplane-ren aurreko bertsio batekin sortua izan da. <br> Oraingo formatura bihurtu (gomendatua)? <br> (Bestela bermerik gabe erabilia izango da.)</html>
+really_cut_node=Benetan adabegia(k) moztu?
+really_execute_script=Benetan nahi al dituzu mapa honetako script-ak abiarazi? Zure ordenagailua kaltetu lezakete.
+really_remove_node=Benetan adabegia(k) ezabatu?
+really_remove_notes=Benetan oharra(k) ezabatu?
+ReapplyFilterAction.text=Filtroaren ekintza berrezarri
+red=Gorria
+RedefineStyleAction.text=Estiloa birdefinitiu
+RedoAction.text=Berregin
+RedoFilterAction.text=Filtroaren ekintza berregin
+regular_expressions=Espresio erregularrak
+ReminderHookAction.text=Gogorarazpena ezabatu
+ReminderHookAction.tooltip=Adabegi batetatik gogorarazpena ezabatzen du.
+reminderNotification=Ohar gogorarazpena
+remove_file_from_list_on_error=Ezin izan da {0} fitxategia ireki. Azkena irekitako fitxategien zerrendatik ezabatu?
+remove_shortcut_question=Laburbidea ezabatu?
+RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Destolestutako adabegiak bere jatorrira eraman
+RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Adabegi guztien tolestea baimentzen du
+RemoveAllIconsAction.text=Ikono guztiak ezbatu
+RemoveConnectorAction.text=Lotura ezabatu
+RemoveEncryption.text=Pasahitza ezabatu
+RemoveFormatAction.text=Formatua ezabatu
+RemoveIcon_0_Action.text=Lehendabiziko ikonoa ezabatu
+RemoveIconAction.text=Azken ikonoa ezabatu
+RemoveNoteAction.text=Oharra ezabatu
+RemoveNoteAction.tooltip=<html>Oharraren edukia adabetietatik ezabatzen du</html>
+rename=Be&rrizendatu
+repair_link=Esteka konpondu
+repair_link_question=Ezin izan da lotutako mapa kargatu. Esteka eskuz konpondu?
+replace=Ordezkatu
+replace_shortcut_question=Laburbidearen tekla {0} ri esleitu zaio. Esleipena ordezkatu?
+replace_shortcut_title=Laburbidea ordezkatu?
+ReportBugAction.text=Software akatsaz ("zomorroa") jakinarazi
+RequestFeatureAction.text=Berezitasun baten eskaria egin
+reset_to_default=Defektuzkoa erabili
+ResetNodeLocationAction.text=Adabegiaren kokapena jatorrizko tokira eraman
+ResetStyleAction.text=Adabegiaren estiloa jatorrizkora eraman
+RevertAction.text=Bertako historitik berreskuratu
+RevisionPluginAction.text=Berrikuspenen atzekalde kolorea aldatu
+save=&Gorde
+save_failed={0} maparen gordetze ahaleginak huts egin du.
+save_unsaved=Ondoko adimen mapa gorde?
+save_unsaved_styles=Estiloak gorde?
+SaveAcceleratorPresetsAction.text=Tekla bero multzoa gorde...
+SaveAction.text=Mapa &Gorde
+SaveAction_readonlyMsg=Mapa hau irakurtzeko da soilik. Mesedez "Fitxategia->... bezala gurde' erabili mapa hau gordetzeko.
+SaveAction_readonlyTitle=Irakurtzeko soilik den mapa baten gordetze saiakera
+SaveAll.text=Mapa guzti&ak gorde
+SaveAll.tooltip=Irekita dauden mapa guztiak gordetzen ditu
+SaveAs_toReadonlyMsg={0} irakurtzeko soilik da. Mesedez beste fitxategi batetan gorde.
+SaveAs_toReadonlyTitle=Irakurtzeko soilik den mapa baten gordetze saiakera
+SaveAsAction.text=.... bezala gorde mapa.
+saved=Gordea
+saving_canceled=Gordeketa ezabatuta
+scanners_not_loaded=Eskanerrak ezin izan dira kargatu, fitxategi akatsduna
+scheme_evaluate=Ebaluatu!
+script_execution_disabled=Skript-en abiaraztea ezeztatuta, ikus -> Herramintak/Lehentasunak/Plugin-ak
+ScriptEditor.text=Skripta editatu: ...
+ScriptEditor.tooltip=Freeplane barruan script luzeagoak idaztea ahalbideratzen du.
+ScriptEditorPanel.changed_cancel=Script hauek aldatu egin dira. Egindako aldaketak bertan behera utzi nahi al dituzu?
+scripting=Scriptak
+scripting_api_generator_legend=Legenda, albo hitzak
+scripting_api_generator_proxy=Proxia
+scripting_api_generator_title=Scripting-erako APIa
+scripting_api_generator_utilities=Erabilgarriak
+scripting_api_generator_web=Web baliabideak
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Aukeratutako adabegien script-ak abiarazi
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Aukeratutako adabegien script-ak abiarazi, errekurtsiboki
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Aukeratutako adabegi batetan abiarazi script-a
+select_favorites_folder=Aukeratu zure gogokoenak non gordetzen dituzun
+select_file_export_to=Aukeratu nora exportatu nahi duzun fitxategiaren izena
+select_folder_for_importing=Aukeratu inportatatzeko direktorioa
+select_icon=Ikonoa aukeratu
+select_menu_item_dialog=Menu elementu bat aukeratu
+select_menu_item_root_node=Menua
+select_template=Txantilloia aukeratu
+SelectAllAction.text=Ikusgarri dauden adabegi guztiak aukeratu
+SelectBranchAction.text=Aukeratu ikusgarri dagoen adar bat
+SelectedPasteAction.text=Ondorengoa bezala itsatsi...
+selection_method_by_click=Klik bakarra egin aukeratzeko
+selection_method_delayed=Aukeraketa automatikoa atzeratua
+selection_method_direct=Apuntatu aukeratzeko
+SelectNoteAction.text=Oharra Editatu Aldatu
+SelectNoteAction.tooltip=Aldatu ohar paneletik erantzuteko
+set_accelerator_on_next_click_helpmessage=Tekla laburdura berri bat sortzeko aukeratu menuan nahi duzun komandoa.
+SetAccelerator.dialogTitle=Tekla bero esleipena
+SetAccelerator.keystrokeDetected="{0}" tekla ez zaio menuko inongo elementuri esleitu.
+SetAcceleratorOnNextClickAction.text=Tekla beroa esleitu...
+SetAlwaysUnfoldedNodeFlagsAction.text=Zabaldutako adabegiak mantendu
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Zabalduta dauden adabegiak tolestetik babestu
+SetImageByFileChooserAction.text=Irudia aukeraz edo estekatik...
+SetLinkAnchorAction.text=Estekaren aingura ezarri
+SetLinkAnchorAction.tooltip=<html>Aukeratutako adabegia etorkizunerako<br/>tokiko esteken sorrerarako  aingura izateko ezarri.
+SetLinkAnchorAction.tooltip_anchored=<html>Aukeratutako adabegia etorkizunerako<br/>esteka globalen sorrerarako aingura moduan ezarri. Oraingo aingura:<br/>{0}
+SetLinkByFileChooserAction.text=Hiperesteka gehitu (aukeratu)...
+SetLinkByTextFieldAction.text=Hiperesteka gehitu edo aldatu (idatzi)...
+SetNodeLink.text=Esteka adabegia ezarri...
+SetNoteWindowPosition.bottom.text=Azpian
+SetNoteWindowPosition.left.text=Ezkerretan
+SetNoteWindowPosition.right.text=Eskubitan
+SetNoteWindowPosition.top.text=Goian
+SetShortenerStateAction.text=Nodoa minimizatu
+sf_login_required=Source Forge-n izen ematea beharrezkoa. Jarraitu?
+ShowAllAttributesAction.text=Ezaubarri guztiak erakutsi
+ShowAncestorsAction.text=Arbasoak erakutsi
+ShowAttributeDialogAction.text=Ezaugarri kudeatzailea...
+ShowDescendantsAction.text=Ondorengoan azaldu
+ShowFilterToolbarAction.text=Filtro edo iragazkien lanabes barra
+ShowFirstSlideAction.text=Lehen iragazkia
+ShowFirstSlideAndStartPresentationAction.text=Aurkezpena hasieratik abiarazi
+ShowFormatPanel.text=Lanabesen panela
+ShowFormatPanel.tooltip=Adabegi eta loturaren ezaugarriak batera aldatzea ahalbideratzen duen elkarrizketa aurkezten du.
+ShowHideNoteAction.text=Oharren panela azaldu
+ShowHideNoteAction.tooltip=Oharren panela azaldu eta ezkutatzen du.
+ShowLastSlideAction.text=Azken iragazkia
+ShowNextChildAction.text=Hurrengo haurra erakutsi
+ShowNextSlideAction.text=Hurrengo iragazkia
+ShowNotesInMapAction.text=Oharrak mapan erakusten ditu
+ShowPreviousSlideAction.text=Aurreko iragazkia
+ShowSelectedAttributesAction.text=Aukeratutako ezaugarriak erakutsi
+ShowSelectionAsRectangleAction.text=Aukeraketa laukizuzena
+simplyhtml.aboutFrameTitle=Aplikazio honi buruz
+simplyhtml.aboutLabel=SimplyHTML-ri buruz...
+simplyhtml.alignCenter=zentruan
+simplyhtml.alignLabel=Lerroketa:
+simplyhtml.alignLeft=ezkerrean
+simplyhtml.alignRight=eskubitan
+simplyhtml.allCellsRangeLabel=gelaxka guztiak
+simplyhtml.allOccurrencesReplaced=Gertakizun guztiak ordezkatu
+simplyhtml.appendTableColLabel=Zutabea gehitu
+simplyhtml.appendTableRowLabel=Lerroa gehitu
+simplyhtml.applyCellAttrLabel=-ri aplikatu
+simplyhtml.backgroundLabel=Atzekaldea:
+simplyhtml.blackFontColorLabel=Beltza
+simplyhtml.blueFontColorLabel=Urdina
+simplyhtml.boldItalicName=hizki lod etzanez
+simplyhtml.boldName=hizki lodiz
+simplyhtml.borderColorLabel=Kolorea:
+simplyhtml.borderWidthLabel=Zabalera
+simplyhtml.bottomLabel=Azpian:
+simplyhtml.cancelBtnName=Ezabatu
+simplyhtml.cellBorderTabLabel=Ertzak
+simplyhtml.cellGenTabLabel=Ororkorrean
+simplyhtml.cellMarginTabLabel=Margina
+simplyhtml.cellPanelTitle=Gelaxka formatua
+simplyhtml.clearFormatLabel=Formatua ezabatu
+simplyhtml.clearFormatTip=Formatu ematea ezabatu
+simplyhtml.close=Itxi
+simplyhtml.closeBtnName=Itxi
+simplyhtml.colorLabel=Kolorea
+simplyhtml.copyLabel=Kopiatu
+simplyhtml.copyTip=Kopiatu
+simplyhtml.cTagNameHead1=1. Izenburua
+simplyhtml.cTagNameHead2=2. Izenburua
+simplyhtml.cTagNameHead3=3. Izenburua
+simplyhtml.cTagNameHead4=4. Izenburua
+simplyhtml.cTagNameHead5=5. Izenburua
+simplyhtml.cTagNameHead6=6. Izenburua
+simplyhtml.cTagNameLink=Esteka
+simplyhtml.cTagNameOL=Ordenatutako zerrenda
+simplyhtml.cTagNamePara=Paragrafoa
+simplyhtml.cTagNameUL=Ordenatu gabeko zerrenda
+simplyhtml.cutLabel=Moztu
+simplyhtml.cutTip=moztu
+simplyhtml.decreaseFontSizeLabel=Txikiago
+simplyhtml.defaultDocName=Izenik gabe
+simplyhtml.deleteTableColLabel=Zutabea ezabatu
+simplyhtml.deleteTableRowLabel=Lerroa ezabatu
+simplyhtml.docTitleQuery=Izenburua ezarri:
+simplyhtml.docTitleTitle=Documentuaren izenburua editatu
+simplyhtml.editLabel=Editatu
+simplyhtml.effectLabel=Efektua
+simplyhtml.familyLabel=Familia
+simplyhtml.findNext=Hurrengoa aurkitu...
+simplyhtml.findReplaceDialogTitle=Aurkitu eta ordezkatu
+simplyhtml.findReplaceLabel=Aurkitu eta ordezkatu
+simplyhtml.findReplaceTip=Aurkitu eta ordezkatu
+simplyhtml.fontBoldLabel=Hizki lodiz
+simplyhtml.fontBoldTip=Hizki lodira/tik aldatu
+simplyhtml.fontColorLabel=Testu kolorea
+simplyhtml.fontColorTip=Testu kolorea
+simplyhtml.fontDialogTitle=Formaturako hizki mota
+simplyhtml.fontItalicLabel=Hizki etzanez
+simplyhtml.fontItalicTip=Hizki etzanez bai/ez
+simplyhtml.fontLabel=Hizki mota...
+simplyhtml.fontTabLabel=Hizki mota
+simplyhtml.fontTip=Formatuaren hizki mota...
+simplyhtml.fontUnderlineLabel=Azimarra
+simplyhtml.fontUnderlineTip=Azpimarra bai/ez
+simplyhtml.foregroundLabel=Aurrekaldea:
+simplyhtml.formatLabel=Formatua
+simplyhtml.formatListLabel=Zerrenda...
+simplyhtml.formatListTip=Zerrendaren formatua aldatu
+simplyhtml.formatParaLabel=Paragrafoa...
+simplyhtml.formatParaTip=Paragrafoaren formatua aldatu
+simplyhtml.formatTableLabel=Taula...
+simplyhtml.formatTableTip=Taulari formatua eman
+simplyhtml.greenFontColorLabel=Berdea
+simplyhtml.helpLabel=Lagunta
+simplyhtml.htmlTabTitle=HTML kode ikuskera
+simplyhtml.imageFileDesc=Irudi fitxategiak
+simplyhtml.increaseFontSizeLabel=Handiago
+simplyhtml.insertTableColLabel=Zutabea txertatu
+simplyhtml.insertTableLabel=Taula...
+simplyhtml.insertTableMsg=Zenbat zutabe?
+simplyhtml.insertTableRowLabel=Lerroa txertatu
+simplyhtml.insertTableTitle=Taula txertatu
+simplyhtml.italicName=Hizki etzanez
+simplyhtml.layoutTabTitle=Layout edo diseinuaren ikuskera
+simplyhtml.leftLabel=Ezkerraldea:
+simplyhtml.listDialogTitle=Zerrendari formatua eman
+simplyhtml.listIndentTitle=Koskatzea:
+simplyhtml.listPosInside=barruan
+simplyhtml.listPositionLabel=Kokapena:
+simplyhtml.listPosOutside=kanpoan
+simplyhtml.listTypeCircle=borobildutako ohar puntua
+simplyhtml.listTypeDecimal=1.,2.,3.,4.
+simplyhtml.listTypeDisc=fitxategi ikurra bulet gisa
+simplyhtml.listTypeLabel=Mota:
+simplyhtml.listTypeLowerAlpha=a.,b.,c.,d.
+simplyhtml.listTypeLowerRoman=i.,ii.,iii.,iv.
+simplyhtml.listTypeNone=baterez
+simplyhtml.listTypeSquare=bulet karratua
+simplyhtml.listTypeUpperAlpha=A.,B.,C.,D.
+simplyhtml.listTypeUpperRoman=I.,II.,III.,IV.
+simplyhtml.marginLabel=Kanpokaldeako
+simplyhtml.matchApproximately=Gutxigorabehera parekatu
+simplyhtml.matchApproximately.tooltip=<html>Gutxigorabeherako parekaketak baimendu<br/> adib. 'iznea' bilatzerakoan 'izena' aurkitzen siatuko da.</html>
+simplyhtml.matchCase=Hizki neurria kontutan izan parekatzerakoan
+simplyhtml.matchCase.tooltip=Hizki neurria kontutan hartu ala ez parekatzerakoan.
+simplyhtml.newStyleDefaultName=Estillo berria
+simplyhtml.nextTableCellLabel=Hurrengo gelaxka
+simplyhtml.noLineLabel=baterez
+simplyhtml.noMoreOccurrencesFound=ez da gehiago halakorik aurkitu
+simplyhtml.okBtnName=OK
+simplyhtml.paddingLabel=Barrukaldea
+simplyhtml.paraAlignCenterLabel=Zentrutik lerrotu
+simplyhtml.paraAlignCenterTip=Paragrafoa zentrutik lerrotzea ezarri
+simplyhtml.paraAlignLeftLabel=Ezkerretik lerrotu
+simplyhtml.paraAlignLeftTip=Paragrafoa ezkerretik lerrotzea ezarri
+simplyhtml.paraAlignRightLabel=Eskubitik lerrotu
+simplyhtml.paraAlignRightTip=Paragrafoa eskubitik lerrotzea ezarri
+simplyhtml.paraStyleDialogTitle=Paragrafo estiloa
+simplyhtml.paraTabLabel=Paragrafoa
+simplyhtml.pasteHTMLLabel=HTML itsatsi
+simplyhtml.pasteLabel=Itsatsi
+simplyhtml.pastePlainTextLabel=Testu lau eran itsatsi
+simplyhtml.pasteTip=itsatsi
+simplyhtml.plainName=laua
+simplyhtml.previewLabel=Aurrikusi
+simplyhtml.previewText=Testua aurrikusi
+simplyhtml.prevTableCellLabel=Aurreko gelaxka
+simplyhtml.printLabel=Inprimatu...
+simplyhtml.redFontColorLabel=Gorria
+simplyhtml.redoLabel=Berregin
+simplyhtml.redoTip=berregin
+simplyhtml.removeFontColorLabel=kolorea ezabatu
+simplyhtml.replace=Ordezkatu...
+simplyhtml.replaceAll=Guztiak
+simplyhtml.replaceDone=Egina
+simplyhtml.replaceNo=Ez
+simplyhtml.replaceThisQuery=ondorengo honen gertakizunak ordezkatu
+simplyhtml.replaceWith=Honekin ordezkatu:
+simplyhtml.replaceYes=Bai
+simplyhtml.rightLabel=eskubia:
+simplyhtml.searchDown=Beheruntz bilatu
+simplyhtml.searchDown.tooltip=Goitik behera bilatu.
+simplyhtml.searchFromStart=Hasieratik bilatu
+simplyhtml.searchFromStart.tooltip=Kurtsoretik hasi beharrean hasieratik hasi bilatzen.
+simplyhtml.searchUp=Goruntz bilatu
+simplyhtml.searchUp.tooltip=Behetik goruntz bilatu.
+simplyhtml.selectAllLabel=Guztia aukeratu
+simplyhtml.selectedFontColorLabel=Hizki kolorea aukeratuta
+simplyhtml.sizeLabel=Neurria
+simplyhtml.standardStyleName=estandarra
+simplyhtml.strikeLabel=Hitza erditik lerroz zeharkatu
+simplyhtml.styleLabel=Estiloa
+simplyhtml.styleNameInputText=Estilo berriaren izena?
+simplyhtml.styleNameInputTitle=Estiloa gorde
+simplyhtml.tableBgColLabel=Atzekalde kolorea:
+simplyhtml.tableDialogTitle=Taula formatua
+simplyhtml.tableLabel=Taula
+simplyhtml.tablePanelTitle=Taula formatua
+simplyhtml.tableWidthLabel=Zabalera:
+simplyhtml.textIndentLabel=Indentazioa:
+simplyhtml.textToFind=Aurkitu beharreko testua:
+simplyhtml.thisCellRangeLabel=gelaxka hau
+simplyhtml.thisColRangeLabel=zutabe hau
+simplyhtml.thisRowRangeLabel=lerro hau
+simplyhtml.toggleBulletsLabel=Zerrenda buletekin bai/ez
+simplyhtml.toggleBulletsTip=zerrenda buletekin bai/ez
+simplyhtml.toggleNumbersLabel=Zenbakitutako zerrenda bai/ez
+simplyhtml.toggleNumbersTip=zenbakitutako zerrenda bai/ez
+simplyhtml.topLabel=goikalea:
+simplyhtml.uLineLabel=Azpimarra
+simplyhtml.unableToOpenFileError=Ezin izan da fitxategia ireki
+simplyhtml.unableToRedoError=Ezin berregin:
+simplyhtml.unableToUndoError=Ezin desegin:
+simplyhtml.undoLabel=Desegin
+simplyhtml.undoTip=desegin
+simplyhtml.valignBaseline=oinarri lerroa
+simplyhtml.valignBottom=azpikaldea
+simplyhtml.valignLabel=Lerroketa bertikala:
+simplyhtml.valignMiddle=erdikaldea
+simplyhtml.valignTop=goikaldea
+simplyhtml.wholeWordsOnly=Hitz osoak soilik
+simplyhtml.wholeWordsOnly.tooltip=Parekaketa hitz osoetara mugatu.
+slide.add=Gehitu
+slide.add.tooltip=Gardenxkari aukeratutako adabegiak atxiki
+slide.at_center.tooltip=erdikaldean
+slide.content=Gardenxkaren edukia
+slide.descendants=Ondorengoan erakutsi
+slide.edge=marginean
+slide.filter=Filtroa
+slide.first=Estrainekoa
+slide.last=Azkena
+slide.next=Hurrengoa
+slide.nofilter=Filtroik ez
+slide.on_the_left.tooltip=ezkerraldean
+slide.on_the_right.tooltip=ezkerraldean
+slide.placenode=Aukeratutako adabegia ipini
+slide.placenode.tooltip=Gardenxka bertan dagoenean
+slide.present=Bertan
+slide.presentation=Aurkezpena
+slide.presentations=Aurkezpenak
+slide.previous=Aurrekoa
+slide.remove=Ezabatu
+slide.remove.tooltip=Aukeratutako adabegiak gardenxkatik kendu
+slide.select=Aukeratu
+slide.select.tooltip=Gardenxka adabegiak mapan aukeratu
+slide.set=Ezarri
+slide.set.tooltip=Aukeratutako adabegiak gardenxka eduki egin
+slide.setfilter=Filroa ezarri
+slide.setfilter.tooltip=Gardekia ageri denean filtroa ezarri edo kendu
+slide.setfoldingstate=Tolestea ezarri
+slide.setfoldingstate.tooltip=Gardenkia ageri denean oraingo tolesketa berreskuratu
+slide.setzoom=Zoom-a ezarri
+slide.setzoom.tooltip=Gardenkia ageri denean maparen zoom-a ezarri edo kendu
+slide.showancestors=Arbasoak azaldu
+slide.showonlyselected=Aukeratutako adabegiak soilik azaldu
+slide.showonlyselected.tooltip=Gardenkia ageri denean beste adabegiak ezkutatu
+slide.slides=Gardenkiak
+slide.stop=Geratu
+SortNodes.text=Ondorengoak ordenatu
+SortNodes.tooltip=Adabegi baten ondorengoak alfabetikoki ordenatzen ditu.
+split=&Banandu
+SplitConditionAction.text=Banandu
+SplitNode.text=Banandutako moduan
+SplitNode.tooltip=<html>Adabegia bitan eginda</html>
+SplitToWordsAction.text={0} lerroko banandu
+STANDARD_FORMAT=Estandarra
+StartPresentationAction.text=Aurkezpena abiarazi
+StartPresentationOrShowNextSlideAction.text=Aurkezpena abiarazi/Hurrengo gardenkia
+stop_processing=Geratu
+StopPresentationAction.text=Aurkezpena Geratu
+StringFlavorHandler=Testu laua adabegi hierarkia bezala
+StructuredHtmlFlavorHandler=HTML adabegi hierarkia bezala
+style=Estiloa
+style_already_exists=Estiloa dagoeneko existitzen da.
+styledialog.cancel.text=Ezeztatu
+styledialog.ok.text=OK
+styles=Est&iloak
+styles.AutomaticLayout=Maila estiloak ezarri
+styles.connection=Konexioak
+styles.date=Data
+styles.definition=Definizioa
+styles.description=Deskribapena
+styles.floating_node=Adabegi higikorra
+styles.idea=Ideia
+styles.important=Garrantzitsua
+styles.key=Giltza
+styles.list=Zerrenda
+styles.needs_action=Ekintza behar du
+styles.note=Oharra
+styles.ok=OK
+styles.pending=Egiteko
+styles.predefined=Aurrez definitutako estiloak
+styles.question=Galdera
+styles.quotation=Aipua
+styles.root_node=Estiloak
+styles.subsubtopic=Azpiazpigaia
+styles.subtopic=Azpigaia
+styles.topic=Gaia
+styles.user-defined=Erabiltzaileak definitutako estiloak
+styles.website=Webtokia
+styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\nEstilo multzo honi buruz\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\nEstandar hau  jakintza prozesua erreztu eta azkartzeko  11 urtez garatutako pedagogi ikerk [...]
+styles_menu=Eskuragarri dauden estiloak
+submenu_keystroke_in_use_error={0} tekla zapaltzea ezin da {1} aspimenuan erabili. Tekla zapaltzea ezabatuta.
+summary_nodes=Laburpen adabegiak
+summary_not_possible=Aukeraketa honentzat ezin da laburpen adabegirik sortu
+svg=SVG
+template_dir=Txantilloi estandarrak
+TextAlignAction.CENTER.text=Testua erdiratuta
+TextAlignAction.DEFAULT.text=Defektuz
+TextAlignAction.LEFT.text=Testua ezkerrera lerrokatuta
+TextAlignAction.RIGHT.text=Testua eskubira lerrokatuta
+textalignment=Testu lerrokatzea
+TextChangeHotKeyAction.text=Ikusi testua aldaketarako tekla bero edo laburdura
+TimeListAction.text=Atazak kudeatu ...
+TimeListAction.tooltip=Plangintzan dauden denbora guztiak eta dagozkien adabegiak azaltzen ditu.
+TimeManagementAction.text=Denbora kudeatu...
+TimeManagementAction.tooltip=<html>Kay Toedter-en egutegi modulua azaltzen du </html>
+TimePeriodUnits.days=egunak
+TimePeriodUnits.hours=orduak
+TimePeriodUnits.minutes=minutuak
+TimePeriodUnits.ms=ms
+TimePeriodUnits.seconds=segunduak
+TimePeriodUnits.weeks=asteak
+ToggleChildrenFoldedAction.text=Ondorengoak (des)tolestu
+ToggleDetailsAction.text=Xehetasunak ezktutau
+ToggleFBarAction.text=F-barra
+ToggleFoldedAction.text=(Des)tolestu
+ToggleFullScreenAction.text=Pantaila osoko moduan
+ToggleLeftToolbarAction.text=Ikonoen lanabes barra
+ToggleMenubarAction.text=Menu barra
+ToggleScrollbarsAction.text=Irristatze barra
+ToggleStatusAction.text=Estatus lerroa azaldu
+ToggleToolbarAction.text=Lanabes barra
+TranslatedElement.BORDER=Testuaren ertzak
+TranslatedElement.TEXT=Testua
+TranslatedElement.TOOLTIP=Azalpen testua
+uiTextChanger.originalTextIsNotDefined=Tetu originala ez da definitu
+uiTextChanger.replaceText=UI testua ordezkatu
+undefined_error=Ezusteko akats bat gertatu da. Mesedez akatsaren txosten bat egiten saiatu.
+underline=Azpimarra
+UnderlineAction.text=Azpimarra
+underlined=Azpimarratuta
+UndoAction.text=Desegin
+UndoFilterAction.text=Filtro ekintza desegin
+unfold=Destolestu
+UnfoldAllAction.text=Guztia destolestu
+UnfoldAllAction.tooltip=<html>Aueratutako adabegiak eta beraien ondorengoak destolesten ditu.</html>
+UnfoldOneLevelAction.text=Maila bat destolestu
+UnfoldOneLevelAction.tooltip=Aukeratutako adabegiak maila batetan destolesten ditu.
+unparsedLatexPatternFormat=Parseatu gabeko LaTeX
+up=&Gora
+UpConditionAction.text=Gora
+update_failed=Eguneratzeak akatsa izan du {0} mezuarekin
+UpdateCheckAction.text=Eguneratzeak dauden begiratu
+updatecheckdialog=Eguneratze elkarrizketa
+updater.component=Konponentea
+updater.goToDownload=Jeitsialdietara joan
+updater.version.installed=Instalatutako bertsioa
+updater.version.latest=Azken bertsioa
+updater.version.noUpdateUrl=Ez dago add-on honentzat eguneratze URL edo atariko orririk.
+updater.version.unknown=ezezaguna
+updater.version.unreachable=Iturri irakurtezina:
+updater.viewChangelog=Aldaketa log-a ikusi
+url_error=URL hau ez dago ongi tajututa!
+url_open_error=Ezin {0} URLa ireki.
+used_in_menu=Laburdura hau ezin da ezarri, menuko laburtura baita.
+UsePlainTextAction.text=Testu laua erabili
+user_config_folder=Erabiltzailearen konfigurazio direktorioa: {0}
+user_defined_filters=Erabiltzaileak definitutako filtroak
+user_defined_scale=&Erabiltzaileak definitutako eskala
+user_defined_zoom=Erabiltzaileak definitua
+user_defined_zoom_status_bar=Zooma erabiltzaileak ezarritako %{0}ra aldatzen.
+user_icon=Erabiltzaile ikonoa "{0}"
+user_template_dir=Erabiltzaile txantioiak
+user_zoom=Inprimatzeko zoom faktorea (0.0 - 2.0):
+userScripts=Skriptak
+value_format=Balio formatua
+version_up_to_date=Dagoeneko azken bertsioa ari zara erabiltzen
+view=&Ikusi
+ViewLayoutTypeAction.OUTLINE.text=Egitura ikusi
+web_resources=Web baliabideak
+WebDocuAction.text=Web dokumentazioa
+WhatsNewAction.text=Zer berri Freeplane 1.5.x-en
+width=Zabalera
+wrong_regexp="{0}" espresio okerra, {1} akatsa
+xslt_export.html=Html dokumentua
+xslt_export.latex=Latex dokumentua
+xslt_export.latexbook=Latex liburua
+xslt_export.mediawiki=Mediawiki
+xslt_export.ms_excel=Microsoft Excel 2003 XML
+xslt_export.ms_project=Microsoft Project 2003 XML
+xslt_export.ms_word=Microsoft Word 2003 XML
+xslt_export.text=Testu laua
+xslt_export_not_possible=Freeplane XSLT esportazioa ezinezkoa
+yes=Bai
+zoom=Zooma
+ZoomInAction.text=Zooma hurbildu
+ZoomOutAction.text=Zoom-a urrundu
diff --git a/freeplane/resources/translations/Resources_fr.properties b/freeplane/resources/translations/Resources_fr.properties
index 13c2980..ca4c7a8 100644
--- a/freeplane/resources/translations/Resources_fr.properties
+++ b/freeplane/resources/translations/Resources_fr.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Annuler
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Vous pouvez uniquement basculer le status de protection d'un n\u0153ud. Pour cr\u00E9er une carte prot\u00E9g\u00E9e utilisez le menu "Fichier".
 accessories/plugins/EncryptNode.properties_select_me=Continuer !
 accessories/plugins/EncryptNode.properties_wrong_password=Le mot de passe est incorrect.
+accessories/plugins/Export_JavaWebStart.text=D\u00E9marrage de Java Web...
+accessories/plugins/Export_JavaWebStart.tooltip=Exporte la carte pour Java Web Start.
 accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exporte la carte en document TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Il s'agit d'une m\u00E9thode d'exportation utilisant des scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Applet Java...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporte la carte en applet Java pour navigateur Web.
-accessories/plugins/ExportWithXSLT_Flash.text=Animation Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporte la carte en animation Flash.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML JavaScript...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML image cliquable...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Les ressources depuis le n\u0153ud Ressources vers un fichier TaskJuggler...
@@ -73,7 +73,7 @@ addons.installer.too.old=La version Freeplane {0} est trop ancienne. Cet add-on
 addons.installer.unknown.deinstallation.rules=D\u00E9sinstallation impossible, {0}
 addons.installer.update=Mise \u00E0 jour de la version {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Attention : vous ne devez installer que des add-ons de sources v\u00E9rifi\u00E9es. Certains codes peuvent causer des dommages voire conduire \u00E0 la perte de vos donn\u00E9es.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Ajouter des attributs par style
 AddStyleAttributes.tooltip=Ajouter des attributs bas\u00E9s sur le style du n\u0153ud
 AllMapsNodeListAction.text=Rechercher et remplacer dans toutes les cartes...
@@ -186,7 +186,6 @@ cannot_join_nodes_with_children=Impossible de fusionner des n\u0153uds ayant des
 cannot_move_into_child_node=Impossible de d\u00E9placer dans le fils
 cannot_move_to_child=Impossible de d\u00E9placer un n\u0153ud dans l'un de ses fils.
 CenterAction.text=Centrer
-CenterSelectedNodeAction.text=Centrer le n\u0153ud s\u00E9lectionn\u00E9
 ChangeConnectorArrowsAction.backward.text=Fl\u00E8che au d\u00E9part
 ChangeConnectorArrowsAction.both.text=Double fl\u00E8ches
 ChangeConnectorArrowsAction.forward.text=Fl\u00E8che \u00E0 l'arriv\u00E9e
@@ -200,7 +199,6 @@ ChangeNodeLevelLeftsAction.text=D\u00E9placer le n\u0153ud vers la gauche
 ChangeNodeLevelLeftsAction.tooltip=Le n\u0153ud est d\u00E9plac\u00E9 dans la hi\u00E9rarchie. A droite du n\u0153ud racine, le n\u0153ud monte dans la hi\u00E9rarchie; \u00E0 gauche du n\u0153ud racine, le n\u0153ud descend dans la hi\u00E9rarchie. A la racine, le n\u0153ud bascule \u00E0 gauche.
 ChangeNodeLevelRightsAction.text=D\u00E9placer le n\u0153ud vers la droite
 ChangeNodeLevelRightsAction.tooltip=Le n\u0153ud est d\u00E9plac\u00E9 dans la hi\u00E9rarchie. A droite du n\u0153ud racine, le n\u0153ud descend dans la hi\u00E9rarchie; \u00E0 gauche du n\u0153ud racine, le n\u0153ud monte dans la hi\u00E9rarchie. A la racine, le n\u0153ud bascule \u00E0 droite.
-choose_background_color=S\u00E9lectionner la couleur de fond du n\u0153ud
 choose_cloud_color=Couleur du nuage
 choose_edge_color=Couleur de la ligne
 choose_map_background_color=Couleur de fond de la carte
@@ -211,6 +209,8 @@ ClearLinkAnchorAction.tooltip=Efface la m\u00E9morisation du n\u0153ud
 CloneAction.text=Coller comme Clone
 close_btn=Fermer
 CloseAction.text=Fermer la carte
+CloseAllMapsAction.text=Fermer toutes  les cartes
+CloseAllOtherMapsAction.text=Fermer toutes les autres cartes
 cloud_shapes=Formes de nuage
 CloudAction.text=Ajouter un nuage
 CloudColorAction.text=Ajouter un nuage ou modifier sa couleur...
@@ -218,6 +218,15 @@ CloudShapeAction.ARC.text=Arc
 CloudShapeAction.RECT.text=Rectangle
 CloudShapeAction.ROUND_RECT.text=Rectangle arrondi
 CloudShapeAction.STAR.text=Etoile
+collection.copy.presentation=Copier la pr\u00E9sentation
+collection.copy.slide=Copier la diapositive
+collection.delete=Supprimer
+collection.down=Descendre
+collection.move=D\u00E9placer
+collection.moveTo=D\u00E9placer vers
+collection.new.presentation=Nouvelle pr\u00E9sentation
+collection.new.slide=Nouvelle diapositive
+collection.up=Monter
 ColorProperty.ResetColor=Mise \u00E0 z\u00E9ro des couleurs
 combined=Mixte
 condition=Condition
@@ -228,14 +237,16 @@ connector_label=Libell\u00E9 du connecteur
 connector_lines=Trait du connecteur
 connector_shapes=Forme du connecteur
 ConnectorColorAction.text=Couleur du connecteur...
+controls=Contr\u00F4les
 ConvertCloneToIndependentNodeAction.text=Ne plus cloner
+copy_name={0} (copie)
 CopyAction.text=Copier
 CopyAction.tooltip=Copie la branche s\u00E9lectionn\u00E9e
 CopyAttributes.text=Copier les attributs
 CopyIDAction.text=Copier l'identifiant du n\u0153ud
 CopyMapStylesAction.text=Importer des styles...
 CopyNodeURIAction.text=Copier l'identifiant du n\u0153ud et chemin de la carte
-copyright=Copyright \u00A9 2000-2016 \u00E9quipe Freeplane et autres contributeurs
+copyright=Copyright \u00A9 2000-2017 \u00E9quipe Freeplane et autres contributeurs
 CopySingleAction.text=Copier le n\u0153ud seul (sans fils)
 CopySingleAction.tooltip=Copie uniquement le n\u0153ud s\u00E9lectionn\u00E9
 CopyStyleExtensionsAction.text=Appliquer les d\u00E9tails et attributs du style
@@ -318,6 +329,7 @@ EditAction.text=Modifier le n\u0153ud
 EditAttributesAction.text=Modifier les attributs
 EditDetailsAction.text=Modifier les d\u00E9tails
 EditDetailsInDialogAction.text=Modifier les d\u00E9tails dans une nouvelle fen\u00EAtre...
+editEdgeColors=Modifier la couleur de ligne
 EditFilterAction.text=G\u00E9rer les filtres...
 EditLongAction.text=Modifier le n\u0153ud en texte riche...
 EditNoteInDialogAction.text=Modifier les notes...
@@ -353,14 +365,14 @@ ExecuteScripts.noScriptsAvailable=Aucun script
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=Une erreur s''est produite pendant l''ex\u00E9cution du script : {0}
 export_failed=L'export a \u00E9chou\u00E9
-export_pdf_text=Document PDF
-export_svg_text=Image vectorielle
 export_using_xslt=Exporter la carte
 ExportAction.text=Exporter la carte...
+ExportAllPresentationsAction.text=Exporter toutes les pr\u00E9sentations en images PNG
 ExportBranchAction.text=Exporter la branche comme nouvelle carte...
 ExportBranchToHTMLAction.text=Branche en HTML texte
 exported_file={0} fichier
 ExportPdf.text=En PDF...
+ExportPresentationAction.text=Exporter la pr\u00E9sentation courante en images PNG
 ExportSvg.text=En SVG...
 ExportToHTMLAction.text=HTML texte
 ExportToImage.jpg.text=En JPEG...
@@ -381,6 +393,7 @@ f_button_unassigned=<aucune action>
 FaqOpenURLAction.text=Foire aux questions (FAQ)
 file=&Fichier
 file_already_exists=Le fichier {0} existe d\u00E9j\u00E0. Souhaitez-vous le remplacer ?
+file_not_accessible=Le fichier {0} n''est pas accessible
 file_not_found=Le fichier {0} n''a pas \u00E9t\u00E9 trouv\u00E9
 FileListFlavorHandler=Liens vers des fichiers
 FileProperties_BranchLeafCount=Nombre de n\u0153uds de dernier niveau dans les branches s\u00E9lectionn\u00E9es :
@@ -636,6 +649,9 @@ icon_penguin=Linux
 icon_positive=Bien
 icon_prepare=Feu orange
 icon_revision=R\u00E9vis\u00E9
+icon_revision-green=R\u00E9vision verte
+icon_revision-pink=R\u00E9vision rose
+icon_revision-red=R\u00E9vision rouge
 icon_smiley-angry=En col\u00E8re
 icon_smiley-neutral=Neutre
 icon_smiley-oh=Surpris
@@ -710,7 +726,7 @@ latex_editor=Modifier la formule LaTeX
 LatexDeleteLatexAction.text=Supprimer la formule LaTeX
 LatexEditLatexAction.text=Modifier la formule LaTeX...
 LatexInsertLatexAction.msg1=<html>Vous tentez d'ins\u00E9rer une formule LaTeX <i>native</i>.<br/>La nouvelle mani\u00E8re d'ins\u00E9rer une chaine ou une formule LaTeX est d\u00E9crite sur cette page :</html>
-LatexInsertLatexAction.msg2=<html>En r\u00E9sum\u00E9 :<ul><li>saisissez le pr\u00E9fixe "\\latex" devant le texte du n\u0153ud</li><li>ou affichez le Panneau de propri\u00E9t\u00E9s depuis le menu <i>Affichage -> Barres d'outils -> Panneau de propri\u00E9t\u00E9s</i>, enfin s\u00E9lectionnez <i>Texte calcul\u00E9 -> Format -> LaTeX.</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>En r\u00E9sum\u00E9 :<ul><li>saisissez le pr\u00E9fixe "\\latex" devant le texte du n\u0153ud</li><li>ou affichez le Panneau de propri\u00E9t\u00E9s depuis le menu <i>Affichage -> Barres d'outils -> Panneau de propri\u00E9t\u00E9s</i>, enfin s\u00E9lectionnez <i>Texte calcul\u00E9 > Format : LaTeX.</i></li></ul></html>
 LatexInsertLatexAction.text=Ajouter une formule LaTeX...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -841,6 +857,9 @@ ModesMenuAction.File.text=Explorateur de fichiers
 ModesMenuAction.MindMap.text=Concepteur de cartes
 most_recent_files=Fichiers r\u00E9cents
 MoveAction.text=D\u00E9placer
+MoveSelectedNodeAction.CENTER.text=Centrer le n\u0153ud s\u00E9lectionn\u00E9
+MoveSelectedNodeAction.EAST.text=D\u00E9placer le n\u0153ud s\u00E9lectionn\u00E9 vers la droite
+MoveSelectedNodeAction.WEST.text=D\u00E9placer le n\u0153ud s\u00E9lectionn\u00E9 vers la gauche
 MoveToRootAction.text=Aller \u00E0 la racine
 NameConditionAction.text=Nommer le filtre...
 navigate=&Navigation
@@ -880,7 +899,7 @@ NextNodeAction.BACK.text=N\u0153ud pr\u00E9c\u00E9dent de la carte
 NextNodeAction.BACK_N_FOLD.text=N\u0153ud pr\u00E9c\u00E9dent de la carte (avec pliage automatique)
 NextNodeAction.FORWARD.text=N\u0153ud suivant de la carte
 NextNodeAction.FORWARD_N_FOLD.text=N\u0153ud suivant de la carte (avec pliage automatique)
-NextPresentationItemAction.text=D\u00E9plier le prochain n\u0153ud pr\u00E9sent\u00E9
+NextPresentationItemAction.text=D\u00E9plier l'\u00E9l\u00E9ment de pr\u00E9sentation suivant (pli\u00E9)
 no=Non
 no_copy_attributes_before_paste_attributes=Pour coller des attributs, veuillez d'abord les copier.
 NO_FORMAT=Texte
@@ -922,6 +941,7 @@ not_saved_for_image_error=Vous devez enregistrer la carte avant d'ajouter une im
 not_saved_for_link_error=La carte doit avoir \u00E9t\u00E9 enregistr\u00E9e avant de pouvoir d\u00E9finir un lien vers un fichier.
 note_window_location=Position de l'\u00E9diteur de notes
 notes=Note
+NotFoldingNextPresentationItemAction.text=D\u00E9plier le prochain n\u0153ud pr\u00E9sent\u00E9
 NotificationOptions.CLOSE=Fermer
 NotificationOptions.REMIND_ME_LATER=Me le demander plus tard
 NotificationOptions.REMOVE_REMINDER=Supprimer le rappel
@@ -948,6 +968,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Styles
 OptionPanel.ADD_CHILD=Ajouter un n\u0153ud fils
 OptionPanel.ADD_SIBLING=Ajouter un n\u0153ud fr\u00E8re
 OptionPanel.addons=Add-ons
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Tout plier
 OptionPanel.always_load_last_maps=Appliquer les options ci-dessus au d\u00E9marrage depuis un fichier
 OptionPanel.always_load_last_maps.tooltip=Tenir compte des 2 options pr\u00E9c\u00E9dentes lorsque Freeplane d\u00E9marre apr\u00E8s un double clic sur un fichier *.mm
@@ -961,10 +982,12 @@ OptionPanel.antialias.tooltip=D\u00E9finit la qualit\u00E9 graphique de la carte
 OptionPanel.antialias_all=Tout lisser
 OptionPanel.antialias_edges=Lisser les lignes
 OptionPanel.antialias_none=Sans lissage
+OptionPanel.antialias_svg=Anticr\u00E9nelage SVG
+OptionPanel.antialias_svg.tooltip=<html>D\u00E9finissez la qualit\u00E9 d\u2019affichage des ic\u00F4nes SVG. Avec l'anticr\u00E9nelage les ic\u00F4nes SVG sont de meilleure qualit\u00E9 mais mettent plus longtemps \u00E0 s'afficher.</html>
 OptionPanel.Appearance=Apparence
 OptionPanel.approximate_search_threshold=Seuil pour la recherche par variantes
 OptionPanel.approximate_search_threshold.tooltip=<html>Plus le nombre est \u00E9lev\u00E9 moins il y aura de r\u00E9sultats.<br><font size="2">Plus de d\u00E9tails sur : http://freeplane.sf.net/wiki/index.php/Approximate_search
-OptionPanel.ar=Arabe
+OptionPanel.ar=Arabe / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=Arc
 OptionPanel.as_parent=Comme le p\u00E8re
 OptionPanel.ask=Demander
@@ -977,6 +1000,8 @@ OptionPanel.Behaviour=Comportement
 OptionPanel.bezier=Courbe
 OptionPanel.border_color=Couleur
 OptionPanel.border_color_matches_edge_color=Utiliser la couleur de ligne
+OptionPanel.border_dash=Type ligne pour le contour
+OptionPanel.border_dash_matches_edge_dash=Utiliser le type de ligne
 OptionPanel.border_width=Largeur de ligne
 OptionPanel.border_width_matches_edge_width=Utiliser une largeur de bords
 OptionPanel.bubble=Bulle
@@ -993,13 +1018,16 @@ OptionPanel.cloudcolor=Couleur du nuage
 OptionPanel.cloudshape=Forme du nuage
 OptionPanel.combined=Mixte
 OptionPanel.compare_as_number=Comparer comme nombres
+OptionPanel.connector_arrows=Pointes des connecteurs
+OptionPanel.connector_dash=Type de ligne
 OptionPanel.convert_to_current_version=<html>Convertir automatiquement les cartes des versions ant\u00E9rieures <br> de Freeplane \u00E0 la version courante ?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Seulement pour les tr\u00E8s grandes cartes qui n'ont pas besoin d'\u00EAtre converties<br>(seulement si vous savez ce que vous faites) vous pouvez ouvrir les cartes sans conversion.</html>
 OptionPanel.copyFormatToNewSibling=Appliquer la mise en forme aux n\u0153uds fr\u00E8res
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Copier la mise en forme avec les ic\u00F4nes
-OptionPanel.cs=Tch\u00E8que
+OptionPanel.cs=Tch\u00E8que / \u010Desky
 OptionPanel.cut_nodes_without_question=Couper les n\u0153uds sans confirmation
 OptionPanel.cut_nodes_without_question.tooltip=Coupe imm\u00E9diatement les n\u0153uds, sans confirmation
+OptionPanel.cut_out_pictures_when_pasting_html=Retirer les images du code HTML
 OptionPanel.da=Danois
 OptionPanel.date_format=Format des dates
 OptionPanel.date_format.tooltip=Saisissez SHORT, MEDIUM, LONG, FULL ou un motif pr\u00E9cis comme "MM/dd/yyyy"
@@ -1030,6 +1058,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Activer la saisie dans la ca
 OptionPanel.display_node_id=Afficher l'identifiant du n\u0153ud
 OptionPanel.edgecolor=Couleur de ligne
 OptionPanel.edgecolor.tooltip=Couleur de ligne du n\u0153ud (s'applique aussi aux n\u0153uds fils)
+OptionPanel.edgedash=Type de ligne
 OptionPanel.edgestyle=Style de ligne
 OptionPanel.edgestyle.tooltip=Style de ligne du n\u0153ud (s'applique aussi aux n\u0153uds fils)
 OptionPanel.edgewidth=\u00C9paisseur de ligne
@@ -1038,7 +1067,7 @@ OptionPanel.EDIT_CURRENT=Effacer le contenu
 OptionPanel.edit_on_double_click=Le double clic permet de modifier le texte du n\u0153ud
 OptionPanel.editor_extra_width=Agrandissement automatique de la zone de saisie (en pixels)
 OptionPanel.editor_extra_width.tooltip=D\u00E9finit la taille suppl\u00E9mentaire dont s'agrandit la zone de saisie lorsque le texte du n\u0153ud d\u00E9passe la taille courante du n\u0153ud
-OptionPanel.el=Grecque
+OptionPanel.el=Grecque / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__buttons_above=Afficher les boutons en haut
 OptionPanel.el__enter_confirms_by_default=La touche "Entr\u00E9e" valide le n\u0153ud
 OptionPanel.el__max_default_window_height=Hauteur maximum par d\u00E9faut de la fen\u00EAtre
@@ -1086,6 +1115,7 @@ OptionPanel.groovy_editor_font.tooltip=S\u00E9lectionnez les polices 'Dialog' ou
 OptionPanel.groovy_editor_font_size=Taille de police pour la syntaxe Groovy
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Invisible
+OptionPanel.hide_single_end_connectors=Masquer les connecteurs simple fl\u00E8che
 OptionPanel.highlight_formulas=Entourer les formules
 OptionPanel.horizontal=Rectiligne
 OptionPanel.hr=Croate
@@ -1101,6 +1131,7 @@ OptionPanel.ic_file=Utiliser le disque
 OptionPanel.ic_ram=Utiliser la m\u00E9moire vive (RAM)
 OptionPanel.icon=Ic\u00F4ne
 OptionPanel.icon.tooltip=Si appliqu\u00E9, le n\u0153ud aura exactement cette ic\u00F4ne.
+OptionPanel.icon_size=Taille d'ic\u00F4ne
 OptionPanel.icons.list=Liste des ic\u00F4nes standard affich\u00E9es
 OptionPanel.icons.list.tooltip=Vous pouvez ordonner ou d\u00E9sactiver les ic\u00F4nes standard. Les ic\u00F4nes doivent \u00EAtre s\u00E9p\u00E9es par ';'.
 OptionPanel.id=Indon\u00E9sien
@@ -1109,11 +1140,11 @@ OptionPanel.il__enter_confirms_by_default=La touche "Entr\u00E9e" valide le n\u0
 OptionPanel.image_cache=Pour les images
 OptionPanel.indentationUsesTabsInTextOutput=Utiliser les tabulations dans les zones de saisie
 OptionPanel.it=Italien
-OptionPanel.ja=Japonais
+OptionPanel.ja=Japonais / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=S\u00E9parateur de texte
 OptionPanel.key_type_action=Saisie clavier hors d'un n\u0153ud
 OptionPanel.Keystrokes=Raccourcis clavier
-OptionPanel.ko=Cor\u00E9en
+OptionPanel.ko=Cor\u00E9en / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Police
 OptionPanel.label_font_size=Taille du texte
 OptionPanel.language=Langue de l'utilisateur
@@ -1149,8 +1180,10 @@ OptionPanel.max_menu_item_count=Nombre de commandes affich\u00E9es dans les menu
 OptionPanel.max_menu_item_count.tooltip=(10 minimum). Au-del\u00E0 de ce nombre les commandes apparaissent en sous-menu.
 OptionPanel.max_node_width=Largeur maximale des n\u0153uds
 OptionPanel.max_shortened_text_length=Largeur utilis\u00E9e pour r\u00E9sumer les n\u0153uds
+OptionPanel.menuItemFontSize=Taille de la police pour le menu
 OptionPanel.metal=M\u00E9tal
 OptionPanel.min_node_width=Largeur minimale des n\u0153uds
+OptionPanel.monitor_size_inches=Taille de l'\u00E9cran (en pouces)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Hexagone ajust\u00E9
 OptionPanel.nb=Norv\u00E9gien
@@ -1197,6 +1230,8 @@ OptionPanel.parse_latex=Reconna\u00EEtre LaTeX
 OptionPanel.parse_latex.tooltip=Reconna\u00EEtre les formules LaTeX gr\u00E2ce \u00E0 un pr\u00E9fixe ou un format, voir http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Coller avec mise en forme
 OptionPanel.PASTE_PLAIN_TEXT=Coller comme texte brut
+OptionPanel.pasteImagesFromFiles=Coller les images depuis les fichiers
+OptionPanel.pasteImagesFromFiles.tooltip=Ajouter l'image lorsqu'un fichier image est d\u00E9pos\u00E9  dans la carte
 OptionPanel.path_property_may_not_be_empty=Le dossier ne peut \u00EAtre vide ! R\u00E9tablissement des anciennes valeurs.
 OptionPanel.patternname=Nom
 OptionPanel.patternname.tooltip=Nom unique de mod\u00E8le
@@ -1205,8 +1240,17 @@ OptionPanel.placenewbranches=Position des nouveaux n\u0153uds
 OptionPanel.placenewbranches.tooltip=D\u00E9finit l'emplacement des nouveaux n\u0153uds fils sur la carte
 OptionPanel.plugin.tooltip=Plugins
 OptionPanel.plugins=Formules & Scripts
-OptionPanel.presentation_dimmer_transparency=Transparence de l'arri\u00E8re-plan en mode pr\u00E9sentation
-OptionPanel.presentation_mode=Mode pr\u00E9sentation
+OptionPanel.Presentation=Pr\u00E9sentation
+OptionPanel.presentation.combineAll=Assembler toutes les pr\u00E9sentations
+OptionPanel.presentation.exportDirectory=Dossier d'export des pr\u00E9sentations
+OptionPanel.presentation.maxDropBoxRowCount=Nombre maximum d'\u00E9l\u00E9ments dans la liste d\u00E9roulante
+OptionPanel.presentation.processesEscapeKey=La touche \u00C9chap arr\u00EAte la pr\u00E9sentation
+OptionPanel.presentation.processesNavigationKeys=Les touches de navigation contr\u00F4lent la pr\u00E9sentation
+OptionPanel.presentation.slideDisplaysAllNodes=D\u00E9plier tous les n\u0153uds de la diapositive automatiquement
+OptionPanel.presentation.slowMotion=Au ralenti
+OptionPanel.presentation.switchToFullScreen=Activer le mode plein \u00E9cran
+OptionPanel.presentation.switchToSpotlight=Activer le focus
+OptionPanel.presentation.zoom=Utiliser le zoom de la carte
 OptionPanel.printonwhitebackground=Fond blanc \u00E0 l'impression
 OptionPanel.printonwhitebackground.tooltip=Toujours utiliser un fond blanc \u00E0 l'impression
 OptionPanel.pt_BR=Portugais (du Br\u00E9sil)
@@ -1226,7 +1270,7 @@ OptionPanel.resources_use_margin_top_zero_for_notes=Enlever la marge sup\u00E9ri
 OptionPanel.revision_color=Couleur de r\u00E9vision
 OptionPanel.revision_color.tooltip=Couleur de fond indiquant les n\u0153uds r\u00E9vis\u00E9s (lorsque l'option est active dans le menu Outils)
 OptionPanel.ROUND_RECT=Rectangle arrondi
-OptionPanel.ru=Russe
+OptionPanel.ru=Russe / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
 OptionPanel.save_folding=Enregistrer l'\u00E9tat du pliage
 OptionPanel.save_folding_if_map_is_changed=Si la carte est modifi\u00E9e
 OptionPanel.save_last_visited_node=M\u00E9moriser la derni\u00E8re position dans la carte
@@ -1254,6 +1298,8 @@ OptionPanel.separator.automatic_save=Sauvegardes automatiques
 OptionPanel.separator.behaviour=Comportement
 OptionPanel.separator.browser=Navigateur
 OptionPanel.separator.cache=Cache
+OptionPanel.separator.clones=Clones
+OptionPanel.separator.cloud=Nuage
 OptionPanel.separator.CloudControls=Nuage
 OptionPanel.separator.commands_for_the_program=Raccourcis clavier
 OptionPanel.separator.connectors=Connecteurs
@@ -1272,7 +1318,9 @@ OptionPanel.separator.html_export=Export HTML
 OptionPanel.separator.html_import=Import HTML
 OptionPanel.separator.hyperlink_types=Liens hypertextes
 OptionPanel.separator.icon_properties=Ic\u00F4nes
+OptionPanel.separator.IconControls=Ic\u00F4nes
 OptionPanel.separator.icons=Ic\u00F4nes dans le menu "Ic\u00F4nes"
+OptionPanel.separator.Icons=Ic\u00F4nes
 OptionPanel.separator.initial_map_size=Taille initiale de la carte
 OptionPanel.separator.inline_editor=\u00C9dition de n\u0153ud dans la carte
 OptionPanel.separator.JoinNodesAction=Fusionner les noeuds
@@ -1297,6 +1345,7 @@ OptionPanel.separator.other_defaults=Autres r\u00E9glages par d\u00E9faut
 OptionPanel.separator.others=Autres raccourcis clavier
 OptionPanel.separator.outline_view=Vue plan
 OptionPanel.separator.patterns=Mod\u00E8les
+OptionPanel.separator.presentation=Pr\u00E9sentation
 OptionPanel.separator.reminderOptions=Options pour les rappels
 OptionPanel.separator.RichTextEditor=\u00C9diteur de texte riche
 OptionPanel.separator.root_node_appearance=Apparence du n\u0153ud racine
@@ -1312,7 +1361,8 @@ OptionPanel.separator.spelling=Correcteur orthographique
 OptionPanel.separator.SplitToWordsAction=Diviser le n\u0153ud par mot
 OptionPanel.separator.status=Barre d'\u00E9tat
 OptionPanel.separator.surveys=Sondages
-OptionPanel.separator.tooltip=Info-bulles
+OptionPanel.separator.svg_icons=Ic\u00F4nes SVG
+OptionPanel.separator.tooltip=Infobulles
 OptionPanel.separator.undo=Annulation
 OptionPanel.separator.updates=Mise \u00E0 jour du programme
 OptionPanel.set_property_text=Personnalis\u00E9
@@ -1324,9 +1374,12 @@ OptionPanel.shape_vertical_margin=Marge verticale
 OptionPanel.sharp_bezier=Courbe effil\u00E9
 OptionPanel.sharp_linear=Droit effil\u00E9
 OptionPanel.shouldCenterSmallMaps=Centrer les cartes de petite taille
+OptionPanel.show_connectors=Afficher les lignes des connecteurs
 OptionPanel.show_icon_for_attributes=Afficher les ic\u00F4nes des attributs
+OptionPanel.show_icons=Afficher les ic\u00F4nes
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Charger depuis la carte ou d\u00E9plier quelques n\u0153uds
 OptionPanel.show_node_tooltips=Afficher les info-bulles sur les n\u0153uds
+OptionPanel.show_note_icon_in_tooltip=Afficher l'ic\u00F4ne de note dans l'infobulle
 OptionPanel.show_note_icons=Afficher les ic\u00F4nes de Notes
 OptionPanel.show_styles_in_tooltip=Afficher le style en info-bulle
 OptionPanel.signed_script_are_trusted=Autoriser les scripts sign\u00E9s (recommand\u00E9)
@@ -1339,10 +1392,10 @@ OptionPanel.single_backup_directory_path.tooltip=Remplace le dossier de sauvegar
 OptionPanel.single_instance=Ouvrir les fichiers dans l'instance courante
 OptionPanel.single_instance_force=Toujours utiliser une seule instance du programme
 OptionPanel.single_instance_force.tooltip=Toujours utiliser une seule instance du programme m\u00EAme s'il n'y a aucun fichier \u00E0 ouvrir
-OptionPanel.sk=Slovaque
+OptionPanel.sk=Slovaque / sloven\u010Dina
 OptionPanel.skip_template_selection=Ignorer l'\u00E9cran de s\u00E9lection du mod\u00E8le
-OptionPanel.sl=Slov\u00E8ne
-OptionPanel.slow_scroll_selected_node=D\u00E9filement doux jusqu'au n\u0153ud s\u00E9lectionn\u00E9
+OptionPanel.sl=Slov\u00E8ne / sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Faire d\u00E9filer doucement le n\u0153ud s\u00E9lectionn\u00E9
 OptionPanel.small_bubble=Petite bulle
 OptionPanel.small_wide_hexagon=Petit hexagone
 OptionPanel.spelling_opt_case_sensitive=Sensible \u00E0 la casse
@@ -1356,7 +1409,9 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=caract\u00E8res int\u00E
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=Laisser le n\u0153ud d'origine vide
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=num\u00E9ro du n\u0153ud dans l'enregistrement
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=Enregistrer le n\u0153ud d'origine comme d\u00E9tail
-OptionPanel.sr=Serbe /  \u0441\u0440\u043F\u0441\u043A\u0438
+OptionPanel.spotlight=Focus
+OptionPanel.spotlight_background_color=Couleur de fond du focus
+OptionPanel.sr=Serbe / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Mod\u00E8le de carte par d\u00E9faut (choisissez une valeur ou entrez le chemin)
 OptionPanel.standardbackgroundcolor=Couleur de fond
 OptionPanel.standardbackgroundcolor.tooltip=Couleur par d\u00E9faut du fond
@@ -1364,6 +1419,7 @@ OptionPanel.standardcloudcolor=Couleur de nuage
 OptionPanel.standardcloudcolor.tooltip=Couleur par d\u00E9faut des nuages
 OptionPanel.standardcloudestyle=Style de nuage
 OptionPanel.standardcloudestyle.tooltip=Style par d\u00E9faut des nuages
+OptionPanel.standardcloudshape=Forme de nuage
 OptionPanel.standarddrawrectangleforselection=Entourer les n\u0153uds s\u00E9lectionn\u00E9s
 OptionPanel.standarddrawrectangleforselection.tooltip=Entoure d'un rectangle color\u00E9 les n\u0153uds s\u00E9lectionn\u00E9s
 OptionPanel.standardlinkcolor=Couleur de connecteur
@@ -1386,6 +1442,7 @@ OptionPanel.time_for_automatic_save=Fr\u00E9quence de sauvegarde automatique (en
 OptionPanel.time_for_automatic_save.tooltip=Intervalle entre deux sauvegardes automatiques (en millisecondes). Pour d\u00E9sactiver la sauvegarde automatique, saisir 2 000 000 000.
 OptionPanel.time_for_delayed_selection=D\u00E9lai pour la s\u00E9lection
 OptionPanel.time_for_delayed_selection.tooltip=<html>D\u00E9lai de s\u00E9lection des n\u0153uds lorsque la souris survole le n\u0153ud (en millisecondes).<br>Saisissez 1 si vous souhaitez une s\u00E9lection rapide.
+OptionPanel.toolbar_icon_height=Hauteur d'ic\u00F4ne pour la barre d'outils
 OptionPanel.toolTipManager.dismissDelay=Dur\u00E9e d'affichage (en millisecondes)
 OptionPanel.toolTipManager.initialDelay=D\u00E9lai avant affichage (en millisecondes)
 OptionPanel.toolTipManager.max_tooltip_height=Hauteur maximale des infobulles
@@ -1394,7 +1451,7 @@ OptionPanel.toolTipManager.max_tooltip_width=Largeur maximale des infos-bulles
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=Largeur maximale des infos-bulles en pixels.
 OptionPanel.toolTipManager.reshowDelay=D\u00E9lai de r\u00E9affichage (en millisecondes)
 OptionPanel.tr=Turque
-OptionPanel.uk_UA=Ukrainien
+OptionPanel.uk_UA=Ukrainien / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Police inconnue
 OptionPanel.undo_levels=Nombre d'actions m\u00E9moris\u00E9es
 OptionPanel.undo_levels.tooltip=D\u00E9fini combien d'actions utilisateur sont m\u00E9moris\u00E9es et peuvent \u00EAtre annul\u00E9es
@@ -1403,9 +1460,10 @@ OptionPanel.unfold_on_paste.tooltip=D\u00E9plier le n\u0153ud sur copier/coller
 OptionPanel.uniform_shape=Uniforme
 OptionPanel.use_common_out_point_for_root_node=Les lignes partent d'un point du n\u0153ud racine
 OptionPanel.use_common_out_point_for_root_node.tooltip=Les lignes partent d'un point du n\u0153ud racine
+OptionPanel.use_svg_icons=Utiliser les ic\u00F4nes SVG
+OptionPanel.use_svg_icons.tooltip=<html>D\u00E9finissez la qualit\u00E9 d\u2019affichage des Ic\u00F4nes. Les ic\u00F4nes SVG sont de meilleure qualit\u00E9 mais mettent plus longtemps \u00E0 s'afficher.</html>
 OptionPanel.use_tabbed_pane=Utiliser les onglets
 OptionPanel.use_tabbed_pane.tooltip=Les cartes ouvertes sont pr\u00E9sent\u00E9es dans des onglets.
-OptionPanel.user_defined_screen_resolution=R\u00E9solution \u00E9cran personnalis\u00E9e (en dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripts : v\u00E9rifiez que les dossiers et les fichiers d\u00E9clar\u00E9s dans classpath sont accessibles en lecture !
 OptionPanel.validate_invalid_date_format=Le format de date n'est pas valide
 OptionPanel.validate_invalid_datetime_format=Le format de date/heure n'est pas valide
@@ -1415,13 +1473,13 @@ OptionPanel.validation_error=<html>Erreur : <p><em>{0}</em>.<p>Merci de modifier
 OptionPanel.validation_warning=<html>Avertissement : <p><em>{0}
 OptionPanel.vertical_child_gap=Espacement avec le fils
 OptionPanel.vertical_child_gap.tooltip=Espacement vertical entre fils
-OptionPanel.vi=Vietnamien
+OptionPanel.vi=Vietnamien / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Vitesse
 OptionPanel.wheel_velocity.tooltip=Une valeur plus grande donne des effets de mouvements plus rapides sur la carte.
 OptionPanel.wide_hexagon=Grand hexagone
 OptionPanel.windows=Fen\u00EAtre
-OptionPanel.zh_CN=Chinois (simplifi\u00E9)
-OptionPanel.zh_TW=Chinois (Mandarin)
+OptionPanel.zh_CN=Chinois simplifi\u00E9 / \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=Chinois traditionnel  / \u7E41\u9AD4\u5B57
 org.freeplane.plugin.bugreport.agree=Envoyer
 org.freeplane.plugin.bugreport.always_agree=Toujours envoyer
 org.freeplane.plugin.bugreport.always_deny=Ne jamais envoyer
@@ -1506,11 +1564,14 @@ plugins/TimeManagement.xml_todayButton=Aujourd'hui
 plugins/TimeManagement.xml_WindowTitle=Gestion du temps
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Rechercher et remplacer
 preferences=Pr\u00E9f\u00E9rences
+presentation=Pr\u00E9sentation
+presentation.combineAll=Assembler toutes les pr\u00E9sentations
 print_preview_title=Aper\u00E7u avant impression
 PrintAction.text=Imprimer...
 PrintDirectAction.text=Imprimer
 printing_settings=Mise en page de l'impression
 PrintPreviewAction.text=Aper\u00E7u avant impression...
+program_terminates=Erreur interne, arr\u00EAt du programme.
 progress=Avancement
 PropertyAction.dialog=Pr\u00E9f\u00E9rences utilisateur
 PropertyAction.text=Pr\u00E9f\u00E9rences...
@@ -1557,7 +1618,7 @@ replace_shortcut_title=Remplacer le raccourci
 ReportBugAction.text=Signaler une erreur
 RequestFeatureAction.text=Sugg\u00E9rer une \u00E9volution
 reset_to_default=Par d\u00E9faut
-ResetNodeLocationAction.text=Restaurer la position du n\u0153ud
+ResetNodeLocationAction.text=Restaurer la position des n\u0153uds
 ResetStyleAction.text=Effacer le style du n\u0153ud
 RevertAction.text=Restaurer le dernier enregistrement
 RevisionPluginAction.text=Modifier la couleur d'arri\u00E8re-plan des n\u0153uds r\u00E9vis\u00E9s
@@ -1569,7 +1630,7 @@ SaveAcceleratorPresetsAction.text=Enregistrer les touches de fonction...
 SaveAction.text=Enregistrer
 SaveAction_readonlyMsg=Cette carte est en lecture seule. Pour la modifier, enregistrez la depuis 'Fichier -> Enregistrer sous ...'.
 SaveAction_readonlyTitle=Enregistrement de carte en lecture seule
-SaveAll.text=Enregistrer tout
+SaveAll.text=Enregistrer toutes les cartes
 SaveAll.tooltip=Enregistre toutes les cartes ouvertes
 SaveAs_toReadonlyMsg={0} est en lecture seule. Merci de l''enregistrer sous un autre nom de fichier.
 SaveAs_toReadonlyTitle=Enregistrement de fichier en lecture seule
@@ -1578,7 +1639,7 @@ saved=Carte enregistr\u00E9e
 saving_canceled=Enregistrement annul\u00E9
 scanners_not_loaded=Fichier illisible
 scheme_evaluate=\u00C9valuer !
-script_execution_disabled=L'ex\u00E9cution des scripts est d\u00E9sactiv\u00E9e
+script_execution_disabled=L'ex\u00E9cution des scripts est d\u00E9sactiv\u00E9e, voir Outils > Pr\u00E9f\u00E9rences > Formules & Scripts > Scripts
 ScriptEditor.text=\u00C9diteur de scripts...
 ScriptEditor.tooltip=Permet d'\u00E9crire de longs scripts dans Freeplane
 ScriptEditorPanel.changed_cancel=Les scripts ont \u00E9t\u00E9 modif\u00E9s. Voulez-vous ignorer ces modifications ?
@@ -1630,12 +1691,17 @@ ShowAncestorsAction.text=Afficher les p\u00E8res des n\u0153uds filtr\u00E9s
 ShowAttributeDialogAction.text=Gestionnaire d'attributs...
 ShowDescendantsAction.text=Afficher les fils des n\u0153uds filtr\u00E9s
 ShowFilterToolbarAction.text=Barre de filtres
+ShowFirstSlideAction.text=Premi\u00E8re diapositive
+ShowFirstSlideAndStartPresentationAction.text=D\u00E9marrer la pr\u00E9sentation avec la premi\u00E8re diapositive
 ShowFormatPanel.text=Panneau de propri\u00E9t\u00E9s
 ShowFormatPanel.tooltip=Affiche le panneau de propri\u00E9t\u00E9s du n\u0153ud qui permet de d\u00E9finir la mise en forme du n\u0153ud, de g\u00E9rer le calendrier et les attributs
 ShowHideNoteAction.text=Editeur de notes
 ShowHideNoteAction.tooltip=Affiche l'\u00E9diteur de notes
+ShowLastSlideAction.text=Derni\u00E8re diapositive
 ShowNextChildAction.text=Afficher le n\u0153ud fils suivant
+ShowNextSlideAction.text=Diapositive suivante
 ShowNotesInMapAction.text=Afficher les notes sur la carte
+ShowPreviousSlideAction.text=Diapositive pr\u00E9c\u00E9dente
 ShowSelectedAttributesAction.text=Afficher les attributs s\u00E9lectionn\u00E9s
 ShowSelectionAsRectangleAction.text=Entourer la s\u00E9lection
 simplyhtml.aboutFrameTitle=\u00C0 propos de cette application
@@ -1782,7 +1848,7 @@ simplyhtml.replaceThisQuery=Remplacer cette occurence de
 simplyhtml.replaceWith=Remplacer par
 simplyhtml.replaceYes=Oui
 simplyhtml.rightLabel=A droite
-simplyhtml.searchDown=Chercher vers le bas
+simplyhtml.searchDown=Rechercher vers le bas
 simplyhtml.searchDown.tooltip=Cherche vers le bas
 simplyhtml.searchFromStart=Chercher depuis le d\u00E9but
 simplyhtml.searchFromStart.tooltip=Chercher depuis le d\u00E9but sans tenir compte de la position courante
@@ -1824,6 +1890,42 @@ simplyhtml.valignMiddle=Centr\u00E9
 simplyhtml.valignTop=En haut
 simplyhtml.wholeWordsOnly=Mots entiers
 simplyhtml.wholeWordsOnly.tooltip=Rechercher uniquement les mots entiers
+slide.add=Ajouter
+slide.add.tooltip=Ajouter les n\u0153uds s\u00E9lectionn\u00E9s \u00E0 la diapositive
+slide.at_center.tooltip=au centre
+slide.content=Contenu de cette diapositive
+slide.descendants=Afficher les fils
+slide.edge=dans la marge
+slide.filter=Filtre
+slide.first=Premi\u00E8re
+slide.last=Derni\u00E8re
+slide.next=Suivant
+slide.nofilter=Aucun filtre
+slide.on_the_left.tooltip=sur la gauche
+slide.on_the_right.tooltip=sur la droite
+slide.placenode=Positionner le n\u0153ud s\u00E9lectionn\u00E9
+slide.placenode.tooltip=lorsque la diapositive est affich\u00E9e
+slide.present=Pr\u00E9senter
+slide.presentation=Pr\u00E9sentation
+slide.presentations=Pr\u00E9sentations
+slide.previous=Pr\u00E9c\u00E9dent
+slide.remove=Retirer
+slide.remove.tooltip=Retirer les n\u0153uds s\u00E9lectionn\u00E9s de la diapositive
+slide.select=S\u00E9lectionner
+slide.select.tooltip=S\u00E9lectionner les n\u0153uds de la pr\u00E9sentation sur la carte
+slide.set=Appliquer
+slide.set.tooltip=Ajouter les n\u0153uds s\u00E9lectionn\u00E9s \u00E0 la diapositive
+slide.setfilter=M\u00E9moriser le filtre
+slide.setfilter.tooltip=M\u00E9moriser ou effacer les filtres \u00E0 appliquer lors de la pr\u00E9sentation
+slide.setfoldingstate=M\u00E9moriser le pliage
+slide.setfoldingstate.tooltip=M\u00E9moriser ou effacer le pliage courant durant la pr\u00E9sentation
+slide.setzoom=M\u00E9moriser le zoom
+slide.setzoom.tooltip=D\u00E9finir ou ignorer le niveau de zoom durant la pr\u00E9sentation
+slide.showancestors=Afficher les parents
+slide.showonlyselected=Afficher uniquement les n\u0153uds s\u00E9lectionn\u00E9s
+slide.showonlyselected.tooltip=Masquer les autres n\u0153uds lorsque la diapositive est affich\u00E9e
+slide.slides=Diapositives
+slide.stop=Arr\u00EAter
 SortNodes.text=Trier les fils
 SortNodes.tooltip=Trie par ordre alphab\u00E9tique tous les fils d'un n\u0153ud
 split=&Diviser
@@ -1832,7 +1934,10 @@ SplitNode.text=Diviser le n\u0153ud
 SplitNode.tooltip=Divise le n\u0153ud en plusieurs n\u0153uds de m\u00EAme niveau, chaque ligne devient un n\u0153ud
 SplitToWordsAction.text=Diviser en {0} mots par ligne
 STANDARD_FORMAT=Standard
+StartPresentationAction.text=D\u00E9buter  la pr\u00E9sentation
+StartPresentationOrShowNextSlideAction.text=D\u00E9marrer la pr\u00E9sentation / Diapositive suivante
 stop_processing=Ne pas \u00E9valuer les styles suivants
+StopPresentationAction.text=Arr\u00EAter la pr\u00E9sentation
 StringFlavorHandler=Coller en texte brut en conservant la hi\u00E9rarchie
 StructuredHtmlFlavorHandler=Coller en HTML en conservant la hi\u00E9rarchie
 style=Style
@@ -1896,7 +2001,6 @@ ToggleMenubarAction.text=Barre de menus
 ToggleScrollbarsAction.text=Barres de d\u00E9filement
 ToggleStatusAction.text=Barre d'\u00E9tat
 ToggleToolbarAction.text=Barre d'outils principale
-toolbars=Barres d'outils
 TranslatedElement.BORDER=Bordure de texte
 TranslatedElement.TEXT=Texte
 TranslatedElement.TOOLTIP=Info-bulle
@@ -1954,8 +2058,8 @@ xslt_export.latex=Document LaTeX
 xslt_export.latexbook=Classeur LaTeX
 xslt_export.mediawiki=Mediawiki
 xslt_export.ms_excel=Microsoft Excel 2003 et au-del\u00E0 (format XML)
-xslt_export.ms_project=Microsoft Excel 2003 et au-del\u00E0 (format XML)
-xslt_export.ms_word=Microsoft Excel 2003 et au-del\u00E0 (format XML)
+xslt_export.ms_project=Microsoft Project 2003 et au-del\u00E0 (format XML)
+xslt_export.ms_word=Microsoft Word 2003 et au-del\u00E0 (format XML)
 xslt_export.text=Texte brut
 xslt_export_not_possible=Export  XSLT impossible
 yes=Oui
diff --git a/freeplane/resources/translations/Resources_gl.properties b/freeplane/resources/translations/Resources_gl.properties
index 13644e0..4a8357a 100644
--- a/freeplane/resources/translations/Resources_gl.properties
+++ b/freeplane/resources/translations/Resources_gl.properties
@@ -14,8 +14,6 @@ accessories/plugins/EncryptNode.properties_wrong_password=O contrasinal \u00E9 i
 accessories/plugins/ExportWithXSLT.tooltip=Este \u00E9 un m\u00E9todo de exportaci\u00F3n uniforme mediante scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Como un applet de Java.
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporta o mapa como un applet de Java para o navegador.
-accessories/plugins/ExportWithXSLT_Flash.text=Como Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporta o mapa como unha aplicaci\u00F3n de Flash.
 accessories/plugins/ExportWithXSLT_HTML.text=Como XHTML (versi\u00F3n JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Como XHTML (versi\u00F3n imaxe de mapa premible)
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Recursos do nodo RECURSOS ao ficheiro do TaskJuggler...
@@ -90,7 +88,6 @@ ChangeNodeLevelLeftsAction.text=Nodo esquerdo
 ChangeNodeLevelLeftsAction.tooltip=\u00C1 esquerda da ra\u00EDz o(s) nodo(s) \u00E9 desplazado cara abaixo. Convertese en fillo do irm\u00E1n que est\u00E1 enriba. \u00C1 dereita do ra\u00EDz o(s) nodo(s) \u00E9 desplazado cara arriba. Directamente na ra\u00EDz, os nodos cambian de lado.
 ChangeNodeLevelRightsAction.text=Nodo dereito
 ChangeNodeLevelRightsAction.tooltip=\u00C1 dereita da ra\u00EDz o(s) nodo(s) \u00E9 desplazado cara abaixo. Convertese en fillo do irm\u00E1n que est\u00E1 enriba. \u00C1 esquerda do ra\u00EDz o(s) nodo(s) \u00E9 desplazado cara arriba. Directamente na ra\u00EDz, os nodos cambian de lado.
-choose_background_color=Escolla a cor de fondo:
 choose_cloud_color=Escolla a cor da nube:
 choose_edge_color=Escoller a cor dos arcos
 choose_node_background_color=Escolla a cor de fondo do nodo:
@@ -141,8 +138,6 @@ EnterPassword.text=Activar/desactivar cifrado / descifrado
 error=Erro
 error_creating_directory=Non foi posible crear o directorio para a exportaci\u00F3n.
 ExecuteScripts.text=Scripts[translate me]
-export_pdf_text=Formato de Documento Portable (PDF)
-export_svg_text=Vector Gr\u00E1fico Escalable (SVG)
 ExportAction.text=Exportar
 ExportBranchToHTMLAction.text=Rama como HTML
 ExportPdf.text=Como PDF...
diff --git a/freeplane/resources/translations/Resources_hr.properties b/freeplane/resources/translations/Resources_hr.properties
index ce2a1e8..01f7667 100644
--- a/freeplane/resources/translations/Resources_hr.properties
+++ b/freeplane/resources/translations/Resources_hr.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Odustani
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Mo\u017Eete uklju\u010Diti ili isklju\u010Diti stanje \u0161ifriranja samo na \u0161ifriranom \u010Dvoru.
 accessories/plugins/EncryptNode.properties_select_me=Odaberi za nastavak!
 accessories/plugins/EncryptNode.properties_wrong_password=Neispravna lozinka.
+accessories/plugins/Export_JavaWebStart.text=Java Web start...
+accessories/plugins/Export_JavaWebStart.tooltip=Izvoz mape za java web start.
 accessories/plugins/ExportWithTWiki.text=Kao TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Izvozi Mentalnu mapu kao Twiki dokument.
 accessories/plugins/ExportWithXSLT.tooltip=To je ujedna\u010Dena metoda izvoza s upotrebom XSLT skripte.
 accessories/plugins/ExportWithXSLT_Applet.text=Kao Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Izvoz mape kao Java browser appleta.
-accessories/plugins/ExportWithXSLT_Flash.text=Kao Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Izvoz mape kao flash aplikacije.
 accessories/plugins/ExportWithXSLT_HTML.text=Kao XHTML (JavaScript verzija)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Kao XHTML (verzija kliktaju\u0107e mentalne mape)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Resursi iz \u010Dvora Resursi u TaskJuggler datoteku...
@@ -73,7 +73,7 @@ addons.installer.too.old=Trenutna verzija Freeplane {0} je prestara za ovo pro\u
 addons.installer.unknown.deinstallation.rules=Nepoznata pravila za deinstalaciju {0}
 addons.installer.update=Nadogradnja na verziju {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Trebali bi instalirati samo pro\u0161irenja povjerljivog izvora. Zlonamjerna pro\u0161irenja mogu o\u0161tetiti va\u0161e podatke ili ugroziti va\u0161u privatnost.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Dodaj obilje\u017Eje iz stila
 AddStyleAttributes.tooltip=Dodavanje atributa iz stilizranog \u010Dvora
 AllMapsNodeListAction.text=Tra\u017Ei i zamijeni u svim mapama
@@ -185,7 +185,6 @@ cannot_join_nodes_with_children=\u010Cvorove nije mogu\u0107e pridru\u017Eiti s
 cannot_move_into_child_node=\u010Cvor nije mogu\u0107e pomaknuti u \u010Dvor Dijete
 cannot_move_to_child=\u010Cvor nije mogu\u0107e pomaknuti prema \u010Dvoru njegove Djece.
 CenterAction.text=Sredina
-CenterSelectedNodeAction.text=Odabrani \u010Dvor u centru prikaza
 ChangeConnectorArrowsAction.backward.text=Nazad
 ChangeConnectorArrowsAction.both.text=Obje strelice
 ChangeConnectorArrowsAction.forward.text=Naprijed
@@ -199,7 +198,6 @@ ChangeNodeLevelLeftsAction.text=\u010Cvor ulijevo
 ChangeNodeLevelLeftsAction.tooltip=Lijevo od korijena \u010Dvor/ovi  je/su pomaknut/i prema dolje. \u010Cvor/ovi je/su postali djeca od bratskih \u010Dvorova. Desno od korijena \u010Dvor/ovi je/su pomaknut/i prema gore.Direktno na korijenu \u010Dvor/ovi mijena/ju strane.
 ChangeNodeLevelRightsAction.text=\u010Cvor udesno
 ChangeNodeLevelRightsAction.tooltip=Desno od korijena \u010Dvor/ovi  je/su pomaknut/i prema dolje. \u010Cvor/ovi je/su postali djeca od bratskih \u010Dvorova. Lijevo od korijena \u010Dvor/ovi je/su pomaknut/i prema gore.Direktno na korijenu \u010Dvor/ovi mijena/ju strane.
-choose_background_color=Izaberite boju pozadine mape:
 choose_cloud_color=Izaberite boju obla\u010Di\u0107a:
 choose_edge_color=Odaberi boju ruba
 choose_map_background_color=Izaberi pozadinsku boju mape
@@ -210,6 +208,8 @@ ClearLinkAnchorAction.tooltip=<html>obri\u0161i prothodno postavljeno sidro \u01
 CloneAction.text=Zaljepi klon
 close_btn=&Zatvori
 CloseAction.text=Zatvori
+CloseAllMapsAction.text=Zatvori sve mape
+CloseAllOtherMapsAction.text=Zatvori sve ostale mape
 cloud_shapes=Oblik obla\u010Di\u0107a
 CloudAction.text=Obla\u010Di\u0107
 CloudColorAction.text=Boja obla\u010Di\u0107a...
@@ -217,6 +217,15 @@ CloudShapeAction.ARC.text=Krivulja
 CloudShapeAction.RECT.text=Pravokutnik
 CloudShapeAction.ROUND_RECT.text=Zaobljeni pravokutnik
 CloudShapeAction.STAR.text=Zvijezda
+collection.copy.presentation=Kopiraj prezentaciju
+collection.copy.slide=Kopiraj slajd
+collection.delete=Obri\u0161i
+collection.down=Dolje
+collection.move=Pomak
+collection.moveTo=Pomakni na poziciju
+collection.new.presentation=Nova prezentacija
+collection.new.slide=Novi slajd
+collection.up=Gore
 ColorProperty.ResetColor=Vra\u0107anje izvornih boja
 combined=kombinirano
 condition=Stanje
@@ -227,14 +236,16 @@ connector_label=Oznaka poveznika
 connector_lines=Vrsta crte poveznika
 connector_shapes=Oblik poveznika
 ConnectorColorAction.text=Boja poveznika...
+controls=Kontrole
 ConvertCloneToIndependentNodeAction.text=Ukloni klon
+copy_name={0} (kopiraj)
 CopyAction.text=Kopiraj
 CopyAction.tooltip=Kopiraj odabranu granu
 CopyAttributes.text=Kopiraj obilje\u017Eje
 CopyIDAction.text=Kopiraj ID \u010Dvora
 CopyMapStylesAction.text=Kopiraj stil mape...
 CopyNodeURIAction.text=Kopiraj URL (vezu) \u010Dvora
-copyright=Copyright \u00A9 2000-2016 Freeplane tim i ostali
+copyright=Copyright \u00A9 2000-2017 Freeplane tim i ostali
 CopySingleAction.text=Kopiraj pojedina\u010Dno
 CopySingleAction.tooltip=Kopiraj samo odabrani \u010Dvor
 CopyStyleExtensionsAction.text=Umetni stil povezanog sadr\u017Eaja
@@ -317,6 +328,7 @@ EditAction.text=Uredi \u010Dvor
 EditAttributesAction.text=Novo obilje\u017Eje
 EditDetailsAction.text=Dodaj detalje \u010Dvora
 EditDetailsInDialogAction.text=Uredi detalje \u010Dvora u odvojenom prozoru
+editEdgeColors=Uredi boju ruba
 EditFilterAction.text=Uredi
 EditLongAction.text=Bolje uredi jezgru \u010Dvora
 EditNoteInDialogAction.text=Uredi bilje\u0161ke
@@ -352,14 +364,14 @@ ExecuteScripts.noScriptsAvailable=Nisu dostupne
 ExecuteScripts.text=Skripte
 ExecuteScriptSecurityError.text=Do\u0161lo je do pogre\u0161ke tijekom izvo\u0111enja skripte: {0}
 export_failed=Izvoz nije uspio
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Izvoz Freeplane mape pomo\u0107u XLST skripte
 ExportAction.text=Izvoz mape\u2026
+ExportAllPresentationsAction.text=Izvoz svih prezentacija u PNG slike
 ExportBranchAction.text=Razvijanje grane kao nove Mape-\u2026
 ExportBranchToHTMLAction.text=Izvoz grane kao HTML
 exported_file={0} datoteka
 ExportPdf.text=Kao PDF...
+ExportPresentationAction.text=Izvoz aktualne prezentacije u PNG slike
 ExportSvg.text=Kao SVG...
 ExportToHTMLAction.text=Kao HTML
 ExportToImage.jpg.text=Kao JPEG...
@@ -380,6 +392,7 @@ f_button_unassigned=nema akcije
 FaqOpenURLAction.text=\u010Cesto postavljena pitanja
 file=&Datoteka
 file_already_exists=Datoteka {0} ve\u0107 postoji. \u017Delite li spremiti preko postoje\u0107e datoteke?
+file_not_accessible=Datoteka {0} nije dostupna
 file_not_found=Datoteka {0} nije na\u0111ena
 FileListFlavorHandler=Linkovi do datoteka
 FileProperties_BranchLeafCount=Broj krajnih \u010Dvora u odabranim granama:
@@ -635,6 +648,9 @@ icon_penguin=Linux
 icon_positive=Pozitivno
 icon_prepare=Pripremi
 icon_revision=Revizija
+icon_revision-green=Revizija zeleno
+icon_revision-pink=Revizija rozo
+icon_revision-red=Revizija crveno
 icon_smiley-angry=Ljut
 icon_smiley-neutral=Ravnodu\u0161an
 icon_smiley-oh=Iznena\u0111en
@@ -709,7 +725,7 @@ latex_editor=Uredi LaTeX formulu
 LatexDeleteLatexAction.text=Obri\u0161i LaTeX formulu
 LatexEditLatexAction.text=Uredi LaTeX formulu...
 LatexInsertLatexAction.msg1=<html>Poku\u0161avate umetnuti <i>staru</i> LaTeX formulu.<br/>Novi na\u010Din stvaranja LaTex teksta/formula opisan je na ovoj stranici:</html>
-LatexInsertLatexAction.msg2=<html>Ukratko: <ul><li>koristite "\\latex " prefiks u tekstu \u010Dvora ili</li><li><i>Pogled->Plo\u010Da oblikovanja</i>, i <i>Tekst \u010Dvora->Predlo\u017Eak/Oblik->Latex</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>Kratko: <ul><li>koristi "\\latex " prefiks u tekstu \u010Dvora ili</li><li><i>Pogled->Plo\u010Da alata</i>, tada <i>Osnovni tekst->Oblik->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=Dodaj LaTeX formulu...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -840,6 +856,9 @@ ModesMenuAction.File.text=Preglednik datoteka
 ModesMenuAction.MindMap.text=Ure\u0111iva\u010D mentalnih mapa
 most_recent_files=Ne&davno otvarane datoteke
 MoveAction.text=Pomakni
+MoveSelectedNodeAction.CENTER.text=Odabrani \u010Dvor u centru prikaza
+MoveSelectedNodeAction.EAST.text=Pomakni odabrani \u010Dvor udesno
+MoveSelectedNodeAction.WEST.text=Pomakni odabrani \u010Dvor ulijevo
 MoveToRootAction.text=Povratak na korijenski \u010Dvor
 NameConditionAction.text=Postavi naziv
 navigate=&Navigacija
@@ -879,7 +898,7 @@ NextNodeAction.BACK.text=Prethodni \u010Dvor
 NextNodeAction.BACK_N_FOLD.text=Prethodni \u010Dvor (sklopljeno)
 NextNodeAction.FORWARD.text=Sljede\u0107i \u010Dvor
 NextNodeAction.FORWARD_N_FOLD.text=Slijede\u0107i \u010Dvor (sklopljeno)
-NextPresentationItemAction.text=Prika\u017Ei slijede\u0107u stavku prezentacije
+NextPresentationItemAction.text=Rasklopi slijede\u0107u stavku prezentacije (sklopljenu)
 no=Ne
 no_copy_attributes_before_paste_attributes=Ne mo\u017Eete zalijepiti obilje\u017Eje ako ga prethodno niste kopirali.
 NO_FORMAT=Tekst
@@ -921,6 +940,7 @@ not_saved_for_image_error=Mapa mora biti pohranjena prije postavljanja slike
 not_saved_for_link_error=Mapa mora biti spremljena prije povezivanja datoteke preko pretra\u017Eiva\u010Da datoteka
 note_window_location=Pozicija prozora bilje\u0161ki
 notes=Bilje\u0161ka
+NotFoldingNextPresentationItemAction.text=Prika\u017Ei slijede\u0107u stavku prezentacije
 NotificationOptions.CLOSE=Zatvori
 NotificationOptions.REMIND_ME_LATER=Podsjeti me kasnije
 NotificationOptions.REMOVE_REMINDER=Ukloni podsjetnik
@@ -947,6 +967,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Automa
 OptionPanel.ADD_CHILD=Dodaj \u010Dvor Djete
 OptionPanel.ADD_SIBLING=Dodaj bratski \u010Dvor
 OptionPanel.addons=Pro\u0161irenja
+OptionPanel.af=Afri\u010Dki
 OptionPanel.always_fold_all_after_load=Sklopi sve
 OptionPanel.always_load_last_maps=U\u010Ditaj posljednje i nove mape
 OptionPanel.always_load_last_maps.tooltip=Otvara posljednje datoteke prema gore odabranim postavkama, \u010Dak i pokretanjem FP odabirom druge datoteke.
@@ -960,10 +981,12 @@ OptionPanel.antialias.tooltip=<html>Odre\u0111ivanje grafi\u010Dke kvalitete men
 OptionPanel.antialias_all=Zagladi sve
 OptionPanel.antialias_edges=Zagla\u0111ivanje ruba
 OptionPanel.antialias_none=Bez zagla\u0111ivanja
+OptionPanel.antialias_svg=Zagladi SVG
+OptionPanel.antialias_svg.tooltip=<html>Odre\u0111uje kvalitetu SVG renderiranja. Vi\u0161e zagla\u0111ivanja treba vi\u0161e vremena.</html>
 OptionPanel.Appearance=Izgled
 OptionPanel.approximate_search_threshold=Granica pribli\u017Enog uspore\u0111ivanja
 OptionPanel.approximate_search_threshold.tooltip=<html>Granica pribli\u017Enog uspore\u0111ivanja<br/><font size="2">pogledajte http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(ako koristite ve\u0107i broj slova<br/>broj prona\u0111enih rezultata tra\u017Eenog pojma biti \u0107e manji)</html>
-OptionPanel.ar=arapski
+OptionPanel.ar=arapski / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=Krivulja
 OptionPanel.as_parent=Kao Roditelj
 OptionPanel.ask=Pitanje
@@ -976,6 +999,8 @@ OptionPanel.Behaviour=Karakteristike
 OptionPanel.bezier=Bezier
 OptionPanel.border_color=Boja
 OptionPanel.border_color_matches_edge_color=Koristi boju ruba
+OptionPanel.border_dash=Vrsta crte okvira
+OptionPanel.border_dash_matches_edge_dash=Koristi vrstu crte ruba
 OptionPanel.border_width=\u0160irina crte
 OptionPanel.border_width_matches_edge_width=Koristi \u0161irinu ruba
 OptionPanel.bubble=Obla\u010Di\u0107
@@ -992,13 +1017,16 @@ OptionPanel.cloudcolor=Boja obla\u010Di\u0107a
 OptionPanel.cloudshape=Oblik obla\u010Di\u0107a
 OptionPanel.combined=Kombinirano
 OptionPanel.compare_as_number=Usporedi kao brojeve
+OptionPanel.connector_arrows=Strelice poveznika
+OptionPanel.connector_dash=Vrsta crte
 OptionPanel.convert_to_current_version=<html>\u017Delite li automatsko pretvaranje mapa starih verzija Freeplanea <br>u trenutnu verziju?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Samo za vrlo velike mape za koje nije potrebno pretvaranje <br>(a za to je potrebno stru\u010Dno znanje), mo\u017Eete otvarati bez pretvaranja.</html>
 OptionPanel.copyFormatToNewSibling=Kopiranje oblika za nove \u010Dvorove (bra\u0107u)
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopiraj oblik sa ikonama
-OptionPanel.cs=\u010Ce\u0161ki
+OptionPanel.cs=\u010Ce\u0161ka / \u010De\u0161ki
 OptionPanel.cut_nodes_without_question=Izrati \u010Dvor(ove) bez potvrde?
 OptionPanel.cut_nodes_without_question.tooltip=Ako je polje odabrano \u010Dvorovi \u0107e biti izrezani bez potvrde. Ovo mo\u017Ee prouzro\u010Diti gubitak informacija ukoliko nismo pa\u017Eljivi kod brisanja.
+OptionPanel.cut_out_pictures_when_pasting_html=Ukloni slike iz HTML
 OptionPanel.da=Danski
 OptionPanel.date_format=Standardni oblik datuma
 OptionPanel.date_format.tooltip=Upi\u0161i SHORT, MEDIUM, LONG ILI FULL ili oblik datuma poput  "MM/dd/yyyy"
@@ -1029,6 +1057,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Prika\u017Ei jednostavni ure
 OptionPanel.display_node_id=Prika\u017Ei ID \u010Dvora (indetifikacijski broj)
 OptionPanel.edgecolor=Boja ruba
 OptionPanel.edgecolor.tooltip=Svojstvo ruba roditeljskog \u010Dvora (primijenit \u0107e se na sve \u010Dvorove Djecu)
+OptionPanel.edgedash=Vrsta crte ruba
 OptionPanel.edgestyle=Stil ruba
 OptionPanel.edgestyle.tooltip=Svojstvo ruba roditeljskog \u010Dvora (primijenit \u0107e se na sve \u010Dvorove Djecu)
 OptionPanel.edgewidth=\u0160irina ruba
@@ -1037,7 +1066,7 @@ OptionPanel.EDIT_CURRENT=Prepi\u0161i sadr\u017Eaj
 OptionPanel.edit_on_double_click=Dvostruki klik za ure\u0111ivanje
 OptionPanel.editor_extra_width=\u0160irina dodatnog prostora ure\u0111iva\u010Da (broj znakova)
 OptionPanel.editor_extra_width.tooltip=<html>Odre\u0111uje broj piksela za pove\u0107anje \u0161irine \u010Dvor prilikom ure\u0111ivanja \u010Dvora</html>
-OptionPanel.el=estonski
+OptionPanel.el=Gr\u010Dki / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__buttons_above=Gumbi na vrh prozora
 OptionPanel.el__enter_confirms_by_default=Tipka Enter kao potvrda (izlaz iz prozora)
 OptionPanel.el__max_default_window_height=Zadana maksimalna visina prozora
@@ -1085,6 +1114,7 @@ OptionPanel.groovy_editor_font.tooltip=Koristi 'Dialog' ili 'Monospaced' ako tre
 OptionPanel.groovy_editor_font_size=Veli\u010Dina slova ure\u0111iva\u010Da Groovy sintakse
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Skriveni rubovi
+OptionPanel.hide_single_end_connectors=Sakrij pojedina\u010Dne krajeve konektora
 OptionPanel.highlight_formulas=Osvijetli formulu
 OptionPanel.horizontal=Vodoravno
 OptionPanel.hr=hrvatski
@@ -1100,6 +1130,7 @@ OptionPanel.ic_file=Tvrdi disk
 OptionPanel.ic_ram=Radna memorija
 OptionPanel.icon=Ikona
 OptionPanel.icon.tooltip=Nakon primjene \u010Dvor \u0107e imati ovu ikonu.
+OptionPanel.icon_size=Veli\u010Dina ikone
 OptionPanel.icons.list=Popis prikazanih standardnih ikona
 OptionPanel.icons.list.tooltip=Ovdje mo\u017Eete napraviti vlastiti raspored ikona ili onemogu\u0107iti prikaz ikona. Ikone trebaju biti odvojene znakom ";".
 OptionPanel.id=indonezijski
@@ -1108,11 +1139,11 @@ OptionPanel.il__enter_confirms_by_default="Enter" kao standardna potvrda unosa
 OptionPanel.image_cache=Za slike
 OptionPanel.indentationUsesTabsInTextOutput=Koristi tabulator u izlaznom tekst
 OptionPanel.it=talijanski
-OptionPanel.ja=japanski
+OptionPanel.ja=Japanski / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Razdjelnik teksta
 OptionPanel.key_type_action=Unos tipkovnicom
 OptionPanel.Keystrokes=Tipkovni\u010Dke kratice
-OptionPanel.ko=korejski
+OptionPanel.ko=Korejski / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Oblik slova
 OptionPanel.label_font_size=Veli\u010Dina slova
 OptionPanel.language=Jezik
@@ -1141,6 +1172,8 @@ OptionPanel.lookandfeel.scaleuifonts=Mjerilo veli\u010Dine UI slova
 OptionPanel.lookandfeel.scaleuifonts.tooltip=Korisno za monitore visoke rezolucije
 OptionPanel.lookandfeel.tooltip=<html>'Izgled i ugo\u0111aj' koji \u0107e biti upotrebljen. Podr\u017Eani su 'metal','windows','motiv', 'gtk' , 'mac' je dostupan samo za  MacOS. zadano zna\u010Di, da je upotrebljen zadani Izgled i ugo\u0111aj. \u017Delite li umetnuti svoj vlastiti Izgled i ugo\u0111aj, molimo upi\u0161ite ime razreda ovdje i osigurajte da odgovaraju\u0107a datoteka /datoteke .jar bude u\u010Ditana. Ako postoje problemi s postavkama Izgled i ugo\u0111aj odaberite ovdje 'n [...]
 OptionPanel.lt=litvanski
+OptionPanel.markClones=Oboji oznake klona
+OptionPanel.markSelectedClones=Oboji oznake klona za odabir
 OptionPanel.max_displayed_node_count=Maksimalni broj prikazanih \u010Dvorova
 OptionPanel.max_image_width=Po\u010Detna \u0161irina slike
 OptionPanel.max_image_width.tooltip=Umetnute slike umanjene su na tu \u0161irinu
@@ -1148,8 +1181,10 @@ OptionPanel.max_menu_item_count=Maksimalan broj stavki izbornika
 OptionPanel.max_menu_item_count.tooltip=Ograni\u010Denje broja stavki ako je jedan podizbornik, najmanje 10
 OptionPanel.max_node_width=Maksimalna \u0161irina \u010Dvora (pikseli)
 OptionPanel.max_shortened_text_length=Maksimalna duljina smanjenog \u010Dvora
+OptionPanel.menuItemFontSize=Veli\u010Dina slova stavki izbornika
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=Minimalna \u0161irina \u010Dvora
+OptionPanel.monitor_size_inches=Veli\u010Dina monitora (in\u010Di)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Uski \u0161esterokut
 OptionPanel.nb=Norve\u0161ki (Bokm\u00E5l)
@@ -1196,6 +1231,8 @@ OptionPanel.parse_latex=Prepoznaj LaTeX
 OptionPanel.parse_latex.tooltip=Prepoznaje LaTeX zapise prema obliku ili prefiksu: Pogledaj http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Zalijepi kao HTML
 OptionPanel.PASTE_PLAIN_TEXT=Zalijepi kao obi\u010Dan tekst
+OptionPanel.pasteImagesFromFiles=Zaljepi slike iz datoteka
+OptionPanel.pasteImagesFromFiles.tooltip=Umetni sliku ako je datoteka ispu\u0161tena u mapu
 OptionPanel.path_property_may_not_be_empty=Polje unosa nemo\u017Ee biti prazno, unesite putanju mapesigurnosnih kopija.
 OptionPanel.patternname=Ime
 OptionPanel.patternname.tooltip=Jedinstveno ime uzorka
@@ -1204,8 +1241,18 @@ OptionPanel.placenewbranches=Postavi novu granu
 OptionPanel.placenewbranches.tooltip=<html>Odre\u0111uje polo\u017Eaj nove grane. Valjane vrijednosti su 'prva' i 'posljednja' </html>
 OptionPanel.plugin.tooltip=Vanjski dodaci.
 OptionPanel.plugins=Dodaci
-OptionPanel.presentation_dimmer_transparency=Prozirnost zatamnjenja prezentacije
-OptionPanel.presentation_mode=Prezentacija
+OptionPanel.Presentation=Prezentacija
+OptionPanel.presentation.combineAll=Kombiniraj sve prezentacije
+OptionPanel.presentation.exportDirectory=Ime mape izvezene prezentacije
+OptionPanel.presentation.maxDropBoxRowCount=Maksimalan broj redaka u padaju\u0107em okviru
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Primjenjuje se na prezentaciju i selektore slajda
+OptionPanel.presentation.processesEscapeKey=Tipka ESCAPE zavr\u0161ava prezentaciju
+OptionPanel.presentation.processesNavigationKeys=Navigacijske tipke za kontrolu prezentacije
+OptionPanel.presentation.slideDisplaysAllNodes=Rasklopi sve slajdove \u010Dvorova automatski
+OptionPanel.presentation.slowMotion=Usporeni prikaz
+OptionPanel.presentation.switchToFullScreen=Aktiviraj cijeli zaslon
+OptionPanel.presentation.switchToSpotlight=Aktivirajte reflektor
+OptionPanel.presentation.zoom=Koristi pove\u0107anje mape
 OptionPanel.printonwhitebackground=<html>Bijela pozadina kod ispisa</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Uvijek koristi bijelu pozadinu kod ispisa</html>
 OptionPanel.pt_BR=portugalski BR
@@ -1225,7 +1272,7 @@ OptionPanel.resources_use_margin_top_zero_for_notes=Makni gornju marginu kod bil
 OptionPanel.revision_color=Pozadinska boja izmjenjenih \u010Dvorova
 OptionPanel.revision_color.tooltip=Pozadinska boja izmijenjenih \u010Dvorova.
 OptionPanel.ROUND_RECT=Zaobljeni pravokutnik
-OptionPanel.ru=ruski
+OptionPanel.ru=Ruski / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
 OptionPanel.save_folding=Spremi strukturu stabla
 OptionPanel.save_folding_if_map_is_changed=Samo ako je mapa promijenjena
 OptionPanel.save_last_visited_node=Spremi posljednju poziciju na mapi
@@ -1253,6 +1300,8 @@ OptionPanel.separator.automatic_save=Automatsko spremanje
 OptionPanel.separator.behaviour=Karakteristike
 OptionPanel.separator.browser=Preglednik
 OptionPanel.separator.cache=Pri\u010Duvna memorija
+OptionPanel.separator.clones=Klonovi
+OptionPanel.separator.cloud=Obla\u010Di\u0107
 OptionPanel.separator.CloudControls=Obla\u010Di\u0107i
 OptionPanel.separator.commands_for_the_program=Naredbe programa
 OptionPanel.separator.connectors=Poveznici
@@ -1271,7 +1320,9 @@ OptionPanel.separator.html_export=HTML izvoz
 OptionPanel.separator.html_import=HTML Uvoz
 OptionPanel.separator.hyperlink_types=Vrste hiperveza
 OptionPanel.separator.icon_properties=Ikone
+OptionPanel.separator.IconControls=Ikone
 OptionPanel.separator.icons=Ikone u "Odaberi Ikonu..."
+OptionPanel.separator.Icons=Ikone
 OptionPanel.separator.initial_map_size=Po\u010Detna veli\u010Dina Mentalne mape
 OptionPanel.separator.inline_editor=Jednostavni ure\u0111iva\u010D \u010Dvora
 OptionPanel.separator.JoinNodesAction=Pridru\u017Eivanje \u010Dvorova
@@ -1296,6 +1347,7 @@ OptionPanel.separator.other_defaults=Ostale zadane vrijednosti
 OptionPanel.separator.others=Ostale tipkovni\u010Dke kratice
 OptionPanel.separator.outline_view=Op\u0107i pregled
 OptionPanel.separator.patterns=Uzorci
+OptionPanel.separator.presentation=Prezentacija
 OptionPanel.separator.reminderOptions=Mogu\u0107nosti podsjetnika
 OptionPanel.separator.RichTextEditor=Ure\u0111iva\u010D teksta
 OptionPanel.separator.root_node_appearance=Izgled korijenskog \u010Dvora
@@ -1311,7 +1363,8 @@ OptionPanel.separator.spelling=Opcije provjere pravopisa
 OptionPanel.separator.SplitToWordsAction=Razdvajanje \u010Dvora prema rije\u010Dima
 OptionPanel.separator.status=Statusna traka
 OptionPanel.separator.surveys=Istra\u017Eivanja
-OptionPanel.separator.tooltip=Vrijeme prikaza opisa alata
+OptionPanel.separator.svg_icons=SVG Ikone
+OptionPanel.separator.tooltip=Opis alata
 OptionPanel.separator.undo=Poni\u0161ti
 OptionPanel.separator.updates=Nadogradnja programa
 OptionPanel.set_property_text=Promijeni
@@ -1323,9 +1376,12 @@ OptionPanel.shape_vertical_margin=Okomita margina
 OptionPanel.sharp_bezier=Grubo bezier
 OptionPanel.sharp_linear=Grubo linearno
 OptionPanel.shouldCenterSmallMaps=Centriranje male mape
+OptionPanel.show_connectors=Prika\u017Ei crte poveznika
 OptionPanel.show_icon_for_attributes=Prika\u017Ei ikone obilje\u017Eja
+OptionPanel.show_icons=Prika\u017Ei ikone
 OptionPanel.show_less_than_N_nodes_by_default_after_load=U\u010Ditaj iz mape ili rasklopi neke \u010Dvorove
 OptionPanel.show_node_tooltips=Prika\u017Ei opis alata za \u010Dvorove
+OptionPanel.show_note_icon_in_tooltip=Prika\u017Ei ikonu bilje\u0161ke u prozoru bilje\u0161ke
 OptionPanel.show_note_icons=Prika\u017Ei ikone bilje\u0161aka
 OptionPanel.show_styles_in_tooltip=Prika\u017Ei opis stila \u010Dvora
 OptionPanel.signed_script_are_trusted=Omogu\u0107i izvo\u0111enje potpisanih skripta (preporu\u010Deno).
@@ -1338,10 +1394,10 @@ OptionPanel.single_backup_directory_path.tooltip=<html>Promijenite zadanu putanj
 OptionPanel.single_instance=Otvori datoteku u aktivnom prozoru programa
 OptionPanel.single_instance_force=Izbjegni otvaranje datoteke u novom prozoru programa
 OptionPanel.single_instance_force.tooltip=Izbjegni otvaranje programa u novom prozoru \u010Dak iako ne postoji datoteka za u\u010Ditavanje
-OptionPanel.sk=slova\u010Dki
+OptionPanel.sk=Slova\u010Dki / sloven\u010Dina
 OptionPanel.skip_template_selection=Presko\u010Di okvir za odabir predlo\u0161ka
-OptionPanel.sl=slovenski
-OptionPanel.slow_scroll_selected_node=Sporo pomicanje do odabranog \u010Dvora
+OptionPanel.sl=Slovenski / sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Sporo pomicanje odabranog \u010Dvora
 OptionPanel.small_bubble=Mali mjehuri\u0107
 OptionPanel.small_wide_hexagon=Mali \u0161esterokut
 OptionPanel.spelling_opt_case_sensitive=Osjetljiv na veli\u010Dinu (slova)
@@ -1355,7 +1411,9 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=broj znakova u rije\u010
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=ostavi izvorni \u010Dvor prazan
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=broj \u010Dvora u redu
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=spremi orginalni tekst kao detalje
-OptionPanel.sr=srpski / \u0441\u0440\u043F\u0441\u043A\u0438
+OptionPanel.spotlight=Reflektor
+OptionPanel.spotlight_background_color=Pozadinska boja reflektora
+OptionPanel.sr=Srpski / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Datoteka  predlo\u0161ka
 OptionPanel.standardbackgroundcolor=Boja pozadine mape
 OptionPanel.standardbackgroundcolor.tooltip=<html>Standardna boja pozadine mape u HTML zapisu </html>
@@ -1363,6 +1421,7 @@ OptionPanel.standardcloudcolor=Boja obla\u010Di\u0107a
 OptionPanel.standardcloudcolor.tooltip=<html>Standardna boja obla\u010Di\u0107a u HTML zapisu </html>
 OptionPanel.standardcloudestyle=Stil obla\u010Di\u0107a
 OptionPanel.standardcloudestyle.tooltip=<html>Standardni stil obla\u010Di\u0107a. Trenutno je podr\u017Ean samo 'bezier' </html>
+OptionPanel.standardcloudshape=Standardni oblik obla\u010Di\u0107a
 OptionPanel.standarddrawrectangleforselection=Prika\u017Ei okvir za odabir \u010Dvora
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Odabrani \u010Dvor ima okvir sa zaobljenim uglovima oko sebe .</html>
 OptionPanel.standardlinkcolor=Boja veze sa strelicom
@@ -1385,6 +1444,7 @@ OptionPanel.time_for_automatic_save=Vrijeme automatskog spremanja (msec.)
 OptionPanel.time_for_automatic_save.tooltip=<html> vrijeme izme\u0111u dva uzastopna automatska spremanja (u msec): za onemogu\u0107avanje automatskog spremanja potrebno je ovu vrijednost staviti na 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Vrijeme ka\u0161njenja odabira
 OptionPanel.time_for_delayed_selection.tooltip=<html> Vremensko zaka\u0161njenje odabira \u010Dvora kada je pokaziva\u010D mi\u0161a iznad \u010Dvora (u milisekundama).Promijenite ovaj iznos na 1 ako \u017Eelite direktno odabrati \u010Dvor kad je pokaziva\u010D mi\u0161a iznad.</html>
+OptionPanel.toolbar_icon_height=Visina ikona alatne trake
 OptionPanel.toolTipManager.dismissDelay=Vrijeme prestanka prikaza, ms
 OptionPanel.toolTipManager.initialDelay=Vrijeme po\u010Detka prikaza, ms
 OptionPanel.toolTipManager.max_tooltip_height=Maksimalna visina opisa alata
@@ -1393,7 +1453,7 @@ OptionPanel.toolTipManager.max_tooltip_width=Maksimalna \u0161irina opisa alata
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=Maksimalna \u0161irina opisa alata u pikselima.
 OptionPanel.toolTipManager.reshowDelay=Vrijeme ponovnog prikaza, ms
 OptionPanel.tr=turski
-OptionPanel.uk_UA=ukrajinski
+OptionPanel.uk_UA=Ukrajnski / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Nedefiniran oblik slova
 OptionPanel.undo_levels=Broj poni\u0161tenja
 OptionPanel.undo_levels.tooltip=<html>Odre\u0111ivanje broja spremljenih koraka koji \u0107e se mo\u0107i vratiti funkcijom "Poni\u0161ti".</html>
@@ -1402,9 +1462,10 @@ OptionPanel.unfold_on_paste.tooltip=Rasklopi \u010Dvor kad ga zalijepi\u0161 ili
 OptionPanel.uniform_shape=Ujedna\u010Deno
 OptionPanel.use_common_out_point_for_root_node=Rubovi zapo\u010Dinju iz jedne to\u010Dke na korijenskom \u010Dvoru
 OptionPanel.use_common_out_point_for_root_node.tooltip=Rubovi zapo\u010Dinju iz jedne to\u010Dke na korijenskom \u010Dvoru
+OptionPanel.use_svg_icons=Koristi SVG ikone
+OptionPanel.use_svg_icons.tooltip=<html>Odre\u0111uje kvalitetu renderiranj ikona.Za SVG ikone potrebno je vi\u0161e vremena.</html>
 OptionPanel.use_tabbed_pane=Koristi tabove
 OptionPanel.use_tabbed_pane.tooltip=Ako je aktivno mape \u0107e se prikazivati u tabovima (kao u FireFox-u :-)).
-OptionPanel.user_defined_screen_resolution=Korisni\u010Dki definirana razlu\u010Divost zaslona (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Izvo\u0111enje skripti: Kada su postavljene putanje \u010Ditanja JAR i .class datoteka morate omogu\u0107iti  \u010Ditanje datoteka!
 OptionPanel.validate_invalid_date_format=Une\u0161en je neva\u017Ee\u0107i oblik datuma
 OptionPanel.validate_invalid_datetime_format=Une\u0161en je neva\u017Ee\u0107i oblik datuma-vremena
@@ -1414,13 +1475,13 @@ OptionPanel.validation_error=<html><body>Potvrda gre\u0161ke/a:<p><em>{0}</em><p
 OptionPanel.validation_warning=<html><body>Potvrda upozorenja:<p><em>{0}</em></body></html>
 OptionPanel.vertical_child_gap=Razmak \u010Dvorova Djece
 OptionPanel.vertical_child_gap.tooltip=Okomiti razmak izme\u0111u \u010Dvorova Djece
-OptionPanel.vi=vijetnamski
+OptionPanel.vi=Vijetnamski / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=Brzina
 OptionPanel.wheel_velocity.tooltip=Ve\u0107a vrijednost rezultira kod pomaka kota\u010Di\u0107a mi\u0161a br\u017Ee u\u010Dinke na mapi.
 OptionPanel.wide_hexagon=\u0160iroki \u0161esterokut
 OptionPanel.windows=Windows
-OptionPanel.zh_CN=kineski, pojednostavljeno
-OptionPanel.zh_TW=kineski, tradicionalno
+OptionPanel.zh_CN=Kineski, pojednostavljeno / \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=Kineski, tradicionalno / \u7E41\u9AD4\u5B57
 org.freeplane.plugin.bugreport.agree=Po\u0161alji
 org.freeplane.plugin.bugreport.always_agree=Uvijek po\u0161alji
 org.freeplane.plugin.bugreport.always_deny=Nikad ne \u0161alji
@@ -1505,11 +1566,14 @@ plugins/TimeManagement.xml_todayButton=Osvje\u017Ei kalendar
 plugins/TimeManagement.xml_WindowTitle=Upravljanje kalendarom
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Pretra\u017Ei i zamijeni
 preferences=Postavke
+presentation=Prezentacija
+presentation.combineAll=Kombiniraj sve prezentacije
 print_preview_title=Pregled ispisa
 PrintAction.text=Ispis...
 PrintDirectAction.text=Ispis
 printing_settings=Skaliranje ispisa
 PrintPreviewAction.text=Pregled ispisa...
+program_terminates=Interna gre\u0161ka, program se prekida.
 progress=Ikona napredka (%)
 PropertyAction.dialog=Postavke
 PropertyAction.text=Postavke ...
@@ -1569,7 +1633,7 @@ SaveAcceleratorPresetsAction.text=Pohrana grupe tipkovni\u010Dkih kratica F-trak
 SaveAction.text=&Spremi
 SaveAction_readonlyMsg=Mapa je samo za \u010Ditanje. Koristi 'Datoteka->Spremi mapu kao..' za spremanje ove mape.
 SaveAction_readonlyTitle=Poku\u0161aj spremanje "samo za \u010Ditanje" mape (datoteke)
-SaveAll.text=Spremi sve otvorene d&atoteke
+SaveAll.text=Spremi sve d&atoteke
 SaveAll.tooltip=Spremi sve otvorene mape
 SaveAs_toReadonlyMsg={0} je samo za \u010Ditanje. Molim, spremite datoteku pod drugim imenom..
 SaveAs_toReadonlyTitle=Poku\u0161aj spremanja u datoteku "samo za \u010Ditanje"
@@ -1630,12 +1694,17 @@ ShowAncestorsAction.text=Prika\u017Ei pretke (prethodnike)
 ShowAttributeDialogAction.text=Upravljanje obilje\u017Ejima...
 ShowDescendantsAction.text=Prika\u017Ei potomke (nasljednike)
 ShowFilterToolbarAction.text=Filtar traka
-ShowFormatPanel.text=Plo\u010Da oblikovanja
+ShowFirstSlideAction.text=Prvi slajd
+ShowFirstSlideAndStartPresentationAction.text=Pokreni prezentaciju od po\u010Detka
+ShowFormatPanel.text=Plo\u010Da alata
 ShowFormatPanel.tooltip=Prikazuje dijalog u kojem oblici \u010Dvorova i rubova mogu mijenjati odjednom.
 ShowHideNoteAction.text=Bilje\u0161ke
 ShowHideNoteAction.tooltip=Uklju\u010Divanje ili isklju\u010Divanje prozora s bilje\u0161kama.
+ShowLastSlideAction.text=Posljednji slajd
 ShowNextChildAction.text=Prika\u017Ei slijede\u0107i \u010Dvor
+ShowNextSlideAction.text=Slijede\u0107i slajd
 ShowNotesInMapAction.text=Prika\u017Ei bilje\u0161ke u prozoru mape
+ShowPreviousSlideAction.text=Prethodni slajd
 ShowSelectedAttributesAction.text=Prika\u017Ei odabrana obilje\u017Eja
 ShowSelectionAsRectangleAction.text=Prika\u017Ei okvir za odabir \u010Dvora
 simplyhtml.aboutFrameTitle=O programu
@@ -1824,6 +1893,42 @@ simplyhtml.valignMiddle=Sredina
 simplyhtml.valignTop=Gore
 simplyhtml.wholeWordsOnly=Samo cijele rije\u010Di
 simplyhtml.wholeWordsOnly.tooltip=Ograni\u010Di uspore\u0111ivanje na cijelu rije\u010D.
+slide.add=Dodati
+slide.add.tooltip=Dodaj trenutno odabrani \u010Dvor u slajd
+slide.at_center.tooltip=u sredini
+slide.content=Sadr\u017Eaj slajda
+slide.descendants=Prikaz potomka
+slide.edge=na margini
+slide.filter=Filtar
+slide.first=Prvi
+slide.last=Posljednji
+slide.next=Slijede\u0107i
+slide.nofilter=Bez filtriranja
+slide.on_the_left.tooltip=lijevo
+slide.on_the_right.tooltip=lijevo
+slide.placenode=Polo\u017Eaj odabranog \u010Dvora
+slide.placenode.tooltip=kada je slajd odabran
+slide.present=Predstaviti
+slide.presentation=Prezentacija
+slide.presentations=Prezentacije
+slide.previous=Prethodni
+slide.remove=Obri\u0161i
+slide.remove.tooltip=Makni trenutno odabrani \u010Dvor iz slajda
+slide.select=Odaberi
+slide.select.tooltip=Odaberi \u010Dvorove mape za slajd
+slide.set=Postavi
+slide.set.tooltip=U\u010Dini trenutno odabrane \u010Dvorove kao sadr\u017Eaj slajda
+slide.setfilter=Postavi filtar
+slide.setfilter.tooltip=Postavi ili makni postavljeni filter kada je slajd prikazan
+slide.setfoldingstate=Postavi sklapanje
+slide.setfoldingstate.tooltip=Ponovo postavi rasklapanje kada je slajd prikazan
+slide.setzoom=Postavi pove\u0107anje
+slide.setzoom.tooltip=Postavi ili makni postavljeno pove\u010Danje kada je \u010Dvor prikazan
+slide.showancestors=Prikaz pretka
+slide.showonlyselected=Prikaz odabranih \u010Dvorova
+slide.showonlyselected.tooltip=Sakrij ostale \u010Dvorove kada je slajd prikazan
+slide.slides=Slajdovi
+slide.stop=Zaustavi
 SortNodes.text=Razvrstavanje Djece abecednim redom
 SortNodes.tooltip=Razvrstavanje svih \u010Dvora Djece abecednim redom.
 split=&Razdijeli
@@ -1832,7 +1937,10 @@ SplitNode.text=Podijeli \u010Dvor
 SplitNode.tooltip=<html>Dijeli trenutni \u010Dvor na poziciji pokaziva\u010Da mi\u0161a</html>
 SplitToWordsAction.text=Razdvoji sa {0} rije\u010Di u retku
 STANDARD_FORMAT=Standard
+StartPresentationAction.text=Pokreni prezentaciju
+StartPresentationOrShowNextSlideAction.text=Pokreni prezentaciju/Slijede\u0107i slajd
 stop_processing=Stop
+StopPresentationAction.text=Zaustavi prezentaciju
 StringFlavorHandler=Obi\u010Dan tekst kao hijerarhija \u010Dvorova
 StructuredHtmlFlavorHandler=HTML kao hijerarhija \u010Dvorova
 style=Stil
@@ -1896,7 +2004,6 @@ ToggleMenubarAction.text=Izborna traka
 ToggleScrollbarsAction.text=Kliza\u010Di
 ToggleStatusAction.text=Prika\u017Ei statusnu traku
 ToggleToolbarAction.text=Alatna traka
-toolbars=Alatne trake
 TranslatedElement.BORDER=Okvir teksta
 TranslatedElement.TEXT=Tekst
 TranslatedElement.TOOLTIP=Opis alata
diff --git a/freeplane/resources/translations/Resources_hu.properties b/freeplane/resources/translations/Resources_hu.properties
index 553908a..6454a7c 100644
--- a/freeplane/resources/translations/Resources_hu.properties
+++ b/freeplane/resources/translations/Resources_hu.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=M\u00E9gse
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Csak titkos\u00EDtott pontnak tudja be\u00E1ll\u00EDtani a jelsz\u00F3v\u00E9delm\u00E9t. El\u0151sz\u00F6r sz\u00FArjon be egy ilyen pontot az Eszk\u00F6z\u00F6k men\u00FCb\u0151l.
 accessories/plugins/EncryptNode.properties_select_me=V\u00E1lassz ki a folytat\u00E1shoz!
 accessories/plugins/EncryptNode.properties_wrong_password=Nem megfelel\u0151 jelsz\u00F3.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=T\u00E9rk\u00E9p export\u00E1l\u00E1sa Java Web Start ind\u00EDt\u00E1shoz.
 accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=T\u00E9rk\u00E9p export\u00E1l\u00E1sa TWiki dokumentumk\u00E9nt.
 accessories/plugins/ExportWithXSLT.tooltip=Ez egy egyedi export\u00E1l\u00E1si lehet\u0151s\u00E9g XSLT f\u00E1jlok haszn\u00E1lat\u00E1val.
 accessories/plugins/ExportWithXSLT_Applet.text=Java kisalkalmaz\u00E1s...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Export\u00E1l\u00E1s b\u00F6ng\u00E9sz\u0151ben fut\u00F3 Java kisalkalmaz\u00E1sk\u00E9nt.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Export\u00E1l\u00E1s Flash alkalmaz\u00E1sk\u00E9nt.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript verzi\u00F3)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (m\u00E1sik verzi\u00F3, felh\u0151kkel \u00E9s linkekkel)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Er\u0151forr\u00E1sok exportja a RESOURCES pontb\u00F3l TaskJuggler f\u00E1jlba...
@@ -169,12 +169,12 @@ branch=\u00C1g
 browse=Tall\u00F3z\u00E1s...
 calendar_attributes_panel=Napt\u00E1r \u00E9s attrib\u00FAtumok
 calendar_panel=Napt\u00E1r
-can_not_clone_encrypted_node=Nem siker\u00FClt lem\u00E1solni a titkos\u00EDtott pontokat
+can_not_clone_encrypted_node=Nem lehet titkos\u00EDtott pontokat m\u00E1solni
 can_not_connect_to_info_server=Nem siker\u00FClt csatlakozni az inform\u00E1ci\u00F3s szerverhez
 can_not_delete_predefined_style=Be\u00E9p\u00EDtett st\u00EDlust nem lehet t\u00F6r\u00F6lni
 can_not_delete_root_style=A gy\u00F6k\u00E9r st\u00EDlus nem t\u00F6r\u00F6lhet\u0151
 can_not_delete_style_group=St\u00EDluscsoport nem t\u00F6r\u00F6lhet\u0151
-can_not_encrypt_cloned_node=Nem siker\u00FClt titkos\u00EDtani a lem\u00E1solt pontokat
+can_not_encrypt_cloned_node=Nem lehet m\u00E1solt pontokat titkos\u00EDtani
 can_not_save_key_set=A gyorsbillenty\u0171 profil nem menthet\u0151
 cancel=M\u00E9gsem
 CancelAction.text=M\u00E9gsem
@@ -182,10 +182,9 @@ cannot_add_parent_diff_parents=Ehhez a funkci\u00F3hoz a pontoknak k\u00F6z\u00F
 cannot_add_parent_to_root=A gy\u00F6k\u00E9rpont nem adhat\u00F3 hozz\u00E1 \u00FAj sz\u00FCl\u0151h\u00F6z.
 cannot_delete_root=A gy\u00F6k\u00E9r pontot nem lehet t\u00F6r\u00F6lni vagy kiv\u00E1gni.
 cannot_join_nodes_with_children=A pontok nem egyes\u00EDthet\u0151k a gyermekeikkel
-cannot_move_into_child_node=Nem siker\u00FClt \u00E1thelyezni a gyermek pontba
+cannot_move_into_child_node=Nem lehet \u00E1thelyezni a gyermek pontba
 cannot_move_to_child=Egy pontot nem lehet a gyermekei k\u00F6z\u00E9 \u00E1thelyezni.
 CenterAction.text=K\u00F6z\u00E9pre
-CenterSelectedNodeAction.text=Kiv\u00E1lasztott pont k\u00F6z\u00E9pre helyez\u00E9se
 ChangeConnectorArrowsAction.backward.text=Ny\u00EDl visszafel\u00E9
 ChangeConnectorArrowsAction.both.text=Ny\u00EDl mindk\u00E9t ir\u00E1nyba
 ChangeConnectorArrowsAction.forward.text=Ny\u00EDl el\u0151re
@@ -199,7 +198,6 @@ ChangeNodeLevelLeftsAction.text=Pont mozgat\u00E1sa egy szinttel feljebb
 ChangeNodeLevelLeftsAction.tooltip=A gy\u00F6k\u00E9r bal oldal\u00E1n l\u00E9v\u0151 pont(ok) lefel\u00E9 mozog(nak). A felett\u00FCk l\u00E9v\u0151 testv\u00E9r gyermek\u00E9v\u00E9 v\u00E1lnak. A gy\u00F6k\u00E9r jobb oldal\u00E1n l\u00E9v\u0151 pont(ok) felfel\u00E9 mozog(nak). K\u00F6zvetlen\u00FCl a gy\u00F6k\u00E9rn\u00E9l a pont(ok) a m\u00E1sik oldalra ker\u00FCl(nek).
 ChangeNodeLevelRightsAction.text=Pont mozgat\u00E1sa egy szinttel lejjebb
 ChangeNodeLevelRightsAction.tooltip=A gy\u00F6k\u00E9r jobb oldal\u00E1n l\u00E9v\u0151 pont(ok) lefel\u00E9 mozog(nak). A felett\u00FCk l\u00E9v\u0151 testv\u00E9r gyermek\u00E9v\u00E9 v\u00E1lnak. A gy\u00F6k\u00E9r bal oldal\u00E1n l\u00E9v\u0151 pont(ok) felfel\u00E9 mozog(nak). K\u00F6zvetlen\u00FCl a gy\u00F6k\u00E9rn\u00E9l a pont(ok) a m\u00E1sik oldalra ker\u00FCl(nek).
-choose_background_color=V\u00E1laszd ki a h\u00E1tt\u00E9rsz\u00EDnt:
 choose_cloud_color=Felh\u00F5 sz\u00EDn\u00E9nek kiv\u00E1laszt\u00E1sa
 choose_edge_color=V\u00E1laszd ki az \u00E9l sz\u00EDn\u00E9t
 choose_map_background_color=V\u00E1lassza ki a t\u00E9rk\u00E9p h\u00E1tt\u00E9rsz\u00EDn\u00E9t
@@ -209,7 +207,7 @@ ClearLinkAnchorAction.text=Horgony t\u00F6rl\u00E9se
 ClearLinkAnchorAction.tooltip=<html>kor\u00E1bban be\u00E1ll\u00EDtott horgony t\u00F6rl\u00E9se</html>
 CloneAction.text=M\u00E1solat beilleszt\u00E9se
 close_btn=&Bez\u00E1r
-CloseAction.text=Bez\u00E1r\u00E1s
+CloseAction.text=Akut\u00E1lis t\u00E9rk\u00E9p bez\u00E1r\u00E1sa
 cloud_shapes=Felh\u0151 form\u00E1k
 CloudAction.text=Felh\u0151 besz\u00FAr\u00E1sa/t\u00F6rl\u00E9se
 CloudColorAction.text=Felh\u0151 sz\u00EDne...
@@ -217,6 +215,12 @@ CloudShapeAction.ARC.text=\u00CDves
 CloudShapeAction.RECT.text=T\u00E9glalap
 CloudShapeAction.ROUND_RECT.text=Lekerek\u00EDtett t\u00E9glalap
 CloudShapeAction.STAR.text=Csillag
+collection.delete=T\u00F6rl\u00E9s
+collection.down=Le
+collection.move=Mozgat\u00E1s
+collection.new.presentation=\u00DAj bemutat\u00F3
+collection.new.slide=\u00DAj dia
+collection.up=Fel
 ColorProperty.ResetColor=Sz\u00EDn alaphelyzetbe
 combined=Kombin\u00E1lt
 condition=Felt\u00E9tel
@@ -234,7 +238,7 @@ CopyAttributes.text=Attrib\u00FAtumok m\u00E1sol\u00E1sa
 CopyIDAction.text=Pont azonos\u00EDt\u00F3 m\u00E1sol\u00E1sa
 CopyMapStylesAction.text=T\u00E9rk\u00E9pst\u00EDlus m\u00E1sol\u00E1sa...
 CopyNodeURIAction.text=Pont URI m\u00E1sol\u00E1sa
-copyright=Copyright \u00A9 2000-2016 A Freeplane csapata \u00E9s m\u00E1sok
+copyright=Copyright \u00A9 2000-2017 A Freeplane csapata \u00E9s m\u00E1sok
 CopySingleAction.text=Pont m\u00E1sol\u00E1sa
 CopySingleAction.tooltip=Csak a kiv\u00E1lasztott pont m\u00E1sol\u00E1sa
 CopyStyleExtensionsAction.text=St\u00EDluspont kiterjeszt\u00E9seinek m\u00E1sol\u00E1sa
@@ -317,6 +321,7 @@ EditAction.text=Pont szerkeszt\u00E9se helyben
 EditAttributesAction.text=Attrib\u00FAtum szerkeszt\u00E9se helyben
 EditDetailsAction.text=Pont r\u00E9szletek szerkeszt\u00E9se helyben
 EditDetailsInDialogAction.text=Pont r\u00E9szletek szerkeszt\u00E9se p\u00E1rbesz\u00E9dablakban
+editEdgeColors=\u00C9lek sz\u00EDn\u00E9nek szerkeszt\u00E9se
 EditFilterAction.text=Sz\u0171r\u0151 \u00F6ssze\u00E1ll\u00EDt\u00E1sa
 EditLongAction.text=Pont szerkeszt\u00E9se p\u00E1rbesz\u00E9dablakban
 EditNoteInDialogAction.text=Megjegyz\u00E9s szerkeszt\u00E9se p\u00E1rbesz\u00E9dablakban
@@ -352,8 +357,6 @@ ExecuteScripts.noScriptsAvailable=Nincs el\u00E9rhet\u0151
 ExecuteScripts.text=Szkriptek
 ExecuteScriptSecurityError.text=Hiba l\u00E9pett fel a szkript futtat\u00E1sakor: {0}
 export_failed=Hib\u00E1s export\u00E1l\u00E1s
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable vector graphic (SVG)
 export_using_xslt=Freeplane Export
 ExportAction.text=Export\u00E1l\u00E1s...
 ExportBranchAction.text=\u00C1g \u00E1thelyez\u00E9se \u00FAj t\u00E9rk\u00E9pbe...
@@ -380,6 +383,7 @@ f_button_unassigned=<nincs m\u0171velet>
 FaqOpenURLAction.text=GYIK
 file=&F\u00E1jl
 file_already_exists=A(z) {0} f\u00E1jl m\u00E1r l\u00E9tezik. Szeretn\u00E9 fel\u00FCl\u00EDrni azt?
+file_not_accessible=A(z) {0} f\u00E1jl nem \u00E9rhet\u0151 el
 file_not_found=A(z) {0} f\u00E1jl nem tal\u00E1lhat\u00F3
 FileListFlavorHandler=F\u00E1jlokra mutat\u00F3 linkek
 FileProperties_BranchLeafCount=Lev\u00E9lpontok sz\u00E1ma a kijel\u00F6lt \u00E1g(ak)ban:
@@ -709,7 +713,6 @@ latex_editor=LaTeX Formula szerkeszt\u00E9se
 LatexDeleteLatexAction.text=LaTeX formula elt\u00E1vol\u00EDt\u00E1sa
 LatexEditLatexAction.text=LaTeX formula szerkeszt\u00E9se...
 LatexInsertLatexAction.msg1=<html>Egy <i>elavult</i> LaTeX formul\u00E1t pr\u00F3b\u00E1l besz\u00FArni.<br/>A LaTeX sz\u00F6veg/formula l\u00E9trehoz\u00E1s\u00E1nak \u00FAj m\u00F3dszere itt olvashat\u00F3:</html>
-LatexInsertLatexAction.msg2=<html>R\u00F6viden: <ul><li>haszn\u00E1ljon "\\latex " prefixet a pont sz\u00F6veg\u00E9ben vagy</li><li><i>N\u00E9zet->Jellemz\u0151k panel</i>, majd <i>T\u00F6rzssz\u00F6veg->Form\u00E1tum->LaTeX</i></li></ul></html>
 LatexInsertLatexAction.text=LaTeX formula hozz\u00E1ad\u00E1sa...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -840,6 +843,7 @@ ModesMenuAction.File.text=F\u00E1jlkezel\u0151
 ModesMenuAction.MindMap.text=Elmet\u00E9rk\u00E9p szerkeszt\u0151
 most_recent_files=Legut\u00F3bbi f\u00E1jlok
 MoveAction.text=\u00C1thelyez\u00E9s
+MoveSelectedNodeAction.CENTER.text=Kiv\u00E1lasztott pont k\u00F6z\u00E9pre helyez\u00E9se
 MoveToRootAction.text=Ugr\u00E1s a gy\u00F6k\u00E9rhez
 NameConditionAction.text=N\u00E9v megad\u00E1sa
 navigate=Na&vig\u00E1l\u00E1s
@@ -879,7 +883,7 @@ NextNodeAction.BACK.text=Ugr\u00E1s az el\u0151z\u0151 pontra
 NextNodeAction.BACK_N_FOLD.text=Ugr\u00E1s az el\u0151z\u0151 pontra (kihajt\u00E1s)
 NextNodeAction.FORWARD.text=Ugr\u00E1s a k\u00F6vetkez\u0151 pontra
 NextNodeAction.FORWARD_N_FOLD.text=Ugr\u00E1s a k\u00F6vetkez\u0151 pontra (kihajt\u00E1s)
-NextPresentationItemAction.text=K\u00F6vetkez\u0151 bemutat\u00F3elem kihajt\u00E1sa
+NextPresentationItemAction.text=K\u00F6vetkez\u0151 bemutat\u00F3elem kihajt\u00E1sa (behajt\u00E1s)
 no=Nem
 no_copy_attributes_before_paste_attributes=Nem lehet attrib\u00FAtumokat beilleszteni, am\u00EDg nem m\u00E1solta ki \u0151ket.
 NO_FORMAT=Sz\u00F6veg
@@ -921,6 +925,7 @@ not_saved_for_image_error=A t\u00E9rk\u00E9pet le kell menteni ahhoz, hogy egy k
 not_saved_for_link_error=A t\u00E9rk\u00E9pet el kell menteni ahhoz, hogy linket lehessen v\u00E1lasztani a f\u00E1jlv\u00E1laszt\u00F3b\u00F3l
 note_window_location=Megjegyz\u00E9spanel poz\u00EDci\u00F3ja
 notes=Megjegyz\u00E9s
+NotFoldingNextPresentationItemAction.text=K\u00F6vetkez\u0151 bemutat\u00F3elem kihajt\u00E1sa
 NotificationOptions.CLOSE=Bez\u00E1r\u00E1s
 NotificationOptions.REMIND_ME_LATER=Eml\u00E9keztet\u00E9s k\u00E9s\u0151bb
 NotificationOptions.REMOVE_REMINDER=Eml\u00E9keztet\u0151 t\u00F6rl\u00E9se
@@ -947,6 +952,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Szints
 OptionPanel.ADD_CHILD=Gyermekpont hozz\u00E1ad\u00E1sa
 OptionPanel.ADD_SIBLING=Testv\u00E9rpont hozz\u00E1ad\u00E1sa
 OptionPanel.addons=Kiterjeszt\u00E9sek
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Mindent behajt
 OptionPanel.always_load_last_maps=Utols\u00F3 \u00E9s \u00FAj t\u00E9rk\u00E9pek bet\u00F6lt\u00E9se
 OptionPanel.always_load_last_maps.tooltip=Legut\u00F3bbi f\u00E1jlok megnyit\u00E1sa a fent megadott opci\u00F3kkal, s\u0151t FP ind\u00EDt\u00E1sa a kiv\u00E1lasztott t\u00E9rk\u00E9ppel.
@@ -960,6 +966,8 @@ OptionPanel.antialias.tooltip=<html>Hat\u00E1ssal van a t\u00E9rk\u00E9p min\u01
 OptionPanel.antialias_all=Minden elem \u00E9lsim\u00EDt\u00E1sa
 OptionPanel.antialias_edges=\u00C9lek \u00E9lsim\u00EDt\u00E1sa
 OptionPanel.antialias_none=Nincs \u00E9lsim\u00EDt\u00E1s
+OptionPanel.antialias_svg=SVG-k \u00E9lsim\u00EDt\u00E1sa
+OptionPanel.antialias_svg.tooltip=<html>Az SVG renderel\u00E9s min\u0151s\u00E9g\u00E9t hat\u00E1rozza meg. Finomabb \u00E9lsim\u00EDt\u00E1s t\u00F6bb id\u0151t ig\u00E9nyel.</html>
 OptionPanel.Appearance=Megjelen\u00E9s
 OptionPanel.approximate_search_threshold=T\u0171r\u00E9s a k\u00F6r\u00FCl-bel\u00FCli egyez\u00E9shez
 OptionPanel.approximate_search_threshold.tooltip=<html>T\u0171r\u00E9s a k\u00F6r\u00FCl-bel\u00FCli egyez\u00E9shez<br/><font size="2">l\u00E1sd a http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>oldalt (magasabb \u00E9rt\u00E9kre kevesebb<br/>tal\u00E1latot eredm\u00E9nyez)</html>
@@ -976,6 +984,8 @@ OptionPanel.Behaviour=Viselked\u00E9s
 OptionPanel.bezier=Finoman \u00EDvelt (bezier)
 OptionPanel.border_color=Sz\u00EDn
 OptionPanel.border_color_matches_edge_color=\u00C9l sz\u00EDn\u00E9nek haszn\u00E1lata
+OptionPanel.border_dash=Szeg\u00E9ly vonalt\u00EDpus
+OptionPanel.border_dash_matches_edge_dash=\u00C9l vonalt\u00EDpus
 OptionPanel.border_width=Vonalvastags\u00E1g
 OptionPanel.border_width_matches_edge_width=\u00C9lvastags\u00E1g haszn\u00E1lata
 OptionPanel.bubble=Bubor\u00E9k
@@ -992,6 +1002,8 @@ OptionPanel.cloudcolor=Felh\u0151 sz\u00EDne
 OptionPanel.cloudshape=Felh\u0151 alakja
 OptionPanel.combined=Kombin\u00E1lt
 OptionPanel.compare_as_number=Hasonl\u00EDt\u00E1s sz\u00E1mk\u00E9nt
+OptionPanel.connector_arrows=\u00D6sszek\u00F6t\u0151 nyilak
+OptionPanel.connector_dash=Vonalt\u00EDpus
 OptionPanel.convert_to_current_version=<html>Automatikusan konvert\u00E1lja a r\u00E9gebbi Freeplane verzi\u00F3j\u00FA t\u00E9rk\u00E9peket <br>az aktu\u00E1lis verzi\u00F3ra?</html>
 OptionPanel.convert_to_current_version.tooltip=html>Csak nagyon nagy t\u00E9rk\u00E9pekhez, amik nem ig\u00E9nyelnek konverzi\u00F3t <br>(ehhez szak\u00E9rt\u0151i tud\u00E1s kell) a t\u00E9rk\u00E9pek megnyithat\u00F3k konverzi\u00F3 n\u00E9lk\u00FCl.</html>
 OptionPanel.copyFormatToNewSibling=Form\u00E1tum m\u00E1sol\u00E1sa az \u00FAj testv\u00E9robjektumokra
@@ -1029,6 +1041,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Minden \u00FAj pont szerkesz
 OptionPanel.display_node_id=Pont azonos\u00EDt\u00F3 (ID) megjelen\u00EDt\u00E9se
 OptionPanel.edgecolor=\u00C9l sz\u00EDne
 OptionPanel.edgecolor.tooltip=A tulajdons\u00E1g a sz\u00FCl\u0151 be\u00E1ll\u00EDt\u00E1s\u00E1val fog megegyezni (a gyerek pontok is \u00F6r\u00F6klik)
+OptionPanel.edgedash=\u00C9l vonalt\u00EDpus
 OptionPanel.edgestyle=\u00C9l st\u00EDlusa
 OptionPanel.edgestyle.tooltip=A tulajdons\u00E1g a sz\u00FCl\u0151 be\u00E1ll\u00EDt\u00E1s\u00E1val fog megegyezni (a gyerek pontok is \u00F6r\u00F6klik)
 OptionPanel.edgewidth=\u00C9l vastags\u00E1ga
@@ -1100,6 +1113,7 @@ OptionPanel.ic_file=Lemezre ker\u00FClj\u00F6n
 OptionPanel.ic_ram=Tartsa mem\u00F3ri\u00E1ban (RAM)
 OptionPanel.icon=Ikon
 OptionPanel.icon.tooltip=Ha alkalmaz\u00E1sra ker\u00FCl, a pontnak pont ez lesz az ikonja.
+OptionPanel.icon_size=Ikon m\u00E9ret
 OptionPanel.icons.list=Megjelen\u00EDtett alap ikonok list\u00E1ja
 OptionPanel.icons.list.tooltip=Itt rendezheti vagy tilthatja az alap ikonokat. Az ikonokat ';'-vel kell elv\u00E1lasztani.
 OptionPanel.id=Indon\u00E9z / Bahasa Indonesia
@@ -1148,6 +1162,7 @@ OptionPanel.max_menu_item_count=Maxim\u00E1lisan megjelen\u00EDtett men\u00FCpon
 OptionPanel.max_menu_item_count.tooltip=Almen\u00FCk sz\u00E1m\u00E1nak korl\u00E1toz\u00E1sa, legal\u00E1bb 10
 OptionPanel.max_node_width=Maxim\u00E1lis pont sz\u00E9less\u00E9g
 OptionPanel.max_shortened_text_length=Maxim\u00E1lis r\u00F6vid sz\u00F6veg sz\u00E9less\u00E9g
+OptionPanel.menuItemFontSize=Men\u00FCpont bet\u0171m\u00E9rete
 OptionPanel.metal=F\u00E9mes
 OptionPanel.min_node_width=Minim\u00E1lis pont sz\u00E9less\u00E9g
 OptionPanel.motif=Motif
@@ -1204,8 +1219,7 @@ OptionPanel.placenewbranches=\u00DAj \u00E1gak elhelyez\u00E9se
 OptionPanel.placenewbranches.tooltip=<html>Hol helyezkedjenek el az \u00FAjonnan l\u00E9trehozott \u00E1gak. 'Els\u0151k\u00E9nt' \u00E9s 'Utols\u00F3k\u00E9nt' a lehets\u00E9ges \u00E9rt\u00E9kek</html>
 OptionPanel.plugin.tooltip=Nem-be\u00E9p\u00EDtett kieg\u00E9sz\u00EDt\u0151k.
 OptionPanel.plugins=Kieg\u00E9sz\u00EDt\u0151k
-OptionPanel.presentation_dimmer_transparency=Bemutat\u00F3 halv\u00E1ny \u00E1ttetsz\u0151s\u00E9g
-OptionPanel.presentation_mode=Bemutat\u00F3 m\u00F3d
+OptionPanel.presentation.switchToFullScreen=Teljes k\u00E9perny\u0151 aktiv\u00E1l\u00E1sa
 OptionPanel.printonwhitebackground=<html>Nyomtat\u00E1shoz haszn\u00E1ljon feh\u00E9r h\u00E1tteret</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Nyomtat\u00E1shoz mindig feh\u00E9r h\u00E1tteret haszn\u00E1ljon</html>
 OptionPanel.pt_BR=Portug\u00E1l (Braz\u00EDlia) / Portugu\u00EAs (Brasil)
@@ -1253,6 +1267,7 @@ OptionPanel.separator.automatic_save=Automatikus ment\u00E9s
 OptionPanel.separator.behaviour=Viselked\u00E9s
 OptionPanel.separator.browser=B\u00F6ng\u00E9sz\u0151
 OptionPanel.separator.cache=Gyors\u00EDt\u00F3t\u00E1r
+OptionPanel.separator.cloud=Felh\u0151
 OptionPanel.separator.CloudControls=Felh\u0151k
 OptionPanel.separator.commands_for_the_program=Program men\u00FC parancsok
 OptionPanel.separator.connectors=\u00D6sszek\u00F6t\u0151k
@@ -1271,7 +1286,9 @@ OptionPanel.separator.html_export=HTML export
 OptionPanel.separator.html_import=Html Import\u00E1l\u00E1s
 OptionPanel.separator.hyperlink_types=Hiperlink t\u00EDpusok
 OptionPanel.separator.icon_properties=Ikonok
+OptionPanel.separator.IconControls=Ikonok
 OptionPanel.separator.icons=Ikonok az "Ikon kiv\u00E1laszt\u00E1sa t\u00E1bl\u00E1zatb\u00F3l..." men\u00FCben
+OptionPanel.separator.Icons=Ikonok
 OptionPanel.separator.initial_map_size=Kezdeti t\u00E9rk\u00E9p m\u00E9ret
 OptionPanel.separator.inline_editor=Pont helyben t\u00F6rt\u00E9n\u0151 szerkeszt\u00E9se
 OptionPanel.separator.JoinNodesAction=\u00D6sszek\u00F6t\u0151 pont
@@ -1296,6 +1313,7 @@ OptionPanel.separator.other_defaults=Egy\u00E9b alap\u00E9rtelmez\u00E9sek
 OptionPanel.separator.others=Egy\u00E9b gyorsbillenty\u0171k
 OptionPanel.separator.outline_view=\u00C1ttekint\u0151 n\u00E9zet
 OptionPanel.separator.patterns=Mint\u00E1k
+OptionPanel.separator.presentation=Bemutat\u00F3
 OptionPanel.separator.reminderOptions=Eml\u00E9keztet\u0151 be\u00E1ll\u00EDt\u00E1sai
 OptionPanel.separator.RichTextEditor=Form\u00E1zott sz\u00F6veg szerkeszt\u0151
 OptionPanel.separator.root_node_appearance=Gy\u00F6k\u00E9r pont megjelen\u00E9se
@@ -1311,7 +1329,7 @@ OptionPanel.separator.spelling=Helyes\u00EDr\u00E1s-ellen\u0151rz\u0151 be\u00E1
 OptionPanel.separator.SplitToWordsAction=Pont sz\u00E9tbont\u00E1sa szavank\u00E9nt
 OptionPanel.separator.status=St\u00E1tuszsor
 OptionPanel.separator.surveys=Felm\u00E9r\u00E9sek
-OptionPanel.separator.tooltip=Inform\u00E1ci\u00F3s bubor\u00E9k id\u0151k
+OptionPanel.separator.svg_icons=SVG ikonok
 OptionPanel.separator.undo=Visszavon\u00E1s
 OptionPanel.separator.updates=Programfriss\u00EDt\u00E9sek
 OptionPanel.set_property_text=M\u00F3dos\u00EDt
@@ -1363,6 +1381,7 @@ OptionPanel.standardcloudcolor=Alap\u00E9rtelmezett felh\u0151 sz\u00EDn
 OptionPanel.standardcloudcolor.tooltip=<html>Felh\u0151k alap\u00E9rtelmezett sz\u00EDne HTML sz\u00EDnk\u00F3ddal megadva (#RRGGBB hex\u00E1ban) </html>
 OptionPanel.standardcloudestyle=Alap\u00E9rtelmezett felh\u0151 st\u00EDlus
 OptionPanel.standardcloudestyle.tooltip=<html>Az \u00E1ltal\u00E1nos felh\u0151 st\u00EDlus. </html>
+OptionPanel.standardcloudshape=Alap\u00E9rtelmezett felh\u0151-alak
 OptionPanel.standarddrawrectangleforselection=Kijel\u00F6lt pontok bubor\u00E9kban mutat\u00E1sa
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>A kijel\u00F6lt pontok megjel\u00F6l\u00E9se k\u00F6r\u00E9j\u00FCk rajzolt bubor\u00E9kkal.</html>
 OptionPanel.standardlinkcolor=Alap\u00E9rtelmezett sz\u00EDn
@@ -1385,6 +1404,7 @@ OptionPanel.time_for_automatic_save=Automatikus ment\u00E9s gyakoris\u00E1ga
 OptionPanel.time_for_automatic_save.tooltip=<html> k\u00E9t egym\u00E1st k\u00F6vet\u0151 ment\u00E9s k\u00F6z\u00F6tti id\u0151 (ezredm\u00E1sodpercben): Az automatikus ment\u00E9s kikapcsol\u00E1s\u00E1hoz \u00E1ll\u00EDtsa ezt az \u00E9rt\u00E9ket 2000000000-ra.</html>
 OptionPanel.time_for_delayed_selection=K\u00E9sleltetett kijel\u00F6l\u00E9s ideje
 OptionPanel.time_for_delayed_selection.tooltip=<html> Kijel\u00F6l\u00E9s k\u00E9sleltet\u00E9se az eg\u00E9r mutat\u00F3 pont f\u00F6l\u00E9 \u00E9r\u00E9se ut\u00E1n (milim\u00E1sodpercben). \u00C1ll\u00EDtsa 1-re ha azt szeretn\u00E9, hogy a kijel\u00F6l\u00E9s azonnal megt\u00F6rt\u00E9njen.</html>
+OptionPanel.toolbar_icon_height=Eszk\u00F6zt\u00E1r ikon magass\u00E1ga
 OptionPanel.toolTipManager.dismissDelay=Elt\u0171n\u00E9s k\u00E9sleltet\u00E9se, ms
 OptionPanel.toolTipManager.initialDelay=Megmutat\u00E1s k\u00E9sleltet\u00E9se, ms
 OptionPanel.toolTipManager.max_tooltip_height=Inform\u00E1ci\u00F3s bubor\u00E9k maxim\u00E1lis magass\u00E1ga
@@ -1402,9 +1422,10 @@ OptionPanel.unfold_on_paste.tooltip=Pont kihajt\u00E1sa beilleszt\u00E9s vagy Fo
 OptionPanel.uniform_shape=Egyenletes
 OptionPanel.use_common_out_point_for_root_node=Az \u00E9lek egy pontb\u00F3l indulnak a gy\u00F6k\u00E9rpontn\u00E1l
 OptionPanel.use_common_out_point_for_root_node.tooltip=Az \u00E9lek egy k\u00F6z\u00F6s pontb\u00F3l indulnak a gy\u00F6k\u00E9rpont eset\u00E9ben
+OptionPanel.use_svg_icons=SVG ikonok haszn\u00E1lata
+OptionPanel.use_svg_icons.tooltip=<html>Az ikon renderel\u00E9s min\u0151s\u00E9g\u00E9t hat\u00E1rozza meg. Az SVG ikonok t\u00F6bb id\u0151t ig\u00E9nyelnek.</html>
 OptionPanel.use_tabbed_pane=F\u00FClek haszn\u00E1lata
 OptionPanel.use_tabbed_pane.tooltip=Kijel\u00F6l\u00E9s\u00E9vel a t\u00E9rk\u00E9pek f\u00FCleken jelennek meg (mint a FireFox-ban :-) ).
-OptionPanel.user_defined_screen_resolution=Egy\u00E9ni k\u00E9perny\u0151felbont\u00E1s (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Szkriptek: Ha be\u00E1ll\u00EDt egy oszt\u00E1ly \u00FAtvonalat, olvas\u00E1si jogot kell adjon a f\u00E1jlokra!
 OptionPanel.validate_invalid_date_format=Hib\u00E1s d\u00E1tumform\u00E1tum
 OptionPanel.validate_invalid_datetime_format=Hib\u00E1s d\u00E1tum-id\u0151 form\u00E1tum
@@ -1505,6 +1526,7 @@ plugins/TimeManagement.xml_todayButton=Napt\u00E1r a mai napra
 plugins/TimeManagement.xml_WindowTitle=Id\u0151 kezel\u00E9se
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Keres\u00E9s \u00E9s csere
 preferences=Be\u00E1ll\u00EDt\u00E1sok
+presentation=Bemutat\u00F3
 print_preview_title=Ny&omtat\u00E1si k\u00E9p
 PrintAction.text=Nyomtat\u00E1s...
 PrintDirectAction.text=Nyomtat\u00E1s
@@ -1605,6 +1627,7 @@ selection_method_delayed=K\u00E9sleltetett automatikus kiv\u00E1laszt\u00E1s
 selection_method_direct=R\u00E1mutat\u00E1s a kijel\u00F6l\u00E9shez
 SelectNoteAction.text=Megjegyz\u00E9s szerkeszt\u0151 panel megjelen\u00EDt\u00E9se
 SelectNoteAction.tooltip=Megjegyz\u00E9s szerkeszt\u0151 panel megjelen\u00EDt\u00E9se
+set_accelerator_on_next_click_helpmessage=\u00DAj gyorsbillenty\u0171 l\u00E9trehoz\u00E1s\u00E1hoz kattintson a k\u00EDv\u00E1nt parancsra a men\u00FCben.
 SetAccelerator.dialogTitle=Gyorsbillenty\u0171 hozz\u00E1rendel\u00E9se
 SetAccelerator.keystrokeDetected=A ''{0}'' billenty\u0171 nincs hozz\u00E1rendelve egy men\u00FCelemhez sem.
 SetAcceleratorOnNextClickAction.text=Gyorsbillenty\u0171 be\u00E1ll\u00EDt\u00E1sa...
@@ -1628,12 +1651,12 @@ ShowAncestorsAction.text=Felmen\u0151k megjelen\u00EDt\u00E9se
 ShowAttributeDialogAction.text=Attrib\u00FAtumkezel\u0151...
 ShowDescendantsAction.text=Lesz\u00E1rmazottak megjelen\u00EDt\u00E9se
 ShowFilterToolbarAction.text=Sz\u0171r\u0151 eszk\u00F6zt\u00E1r
-ShowFormatPanel.text=Jellemz\u0151k panel
 ShowFormatPanel.tooltip=Megjelen\u00EDt egy p\u00E1rbesz\u00E9dablakot, melyben a pont- \u00E9s \u00E9ljellemz\u0151k egy l\u00E9p\u00E9sben m\u00F3dos\u00EDthat\u00F3k.
 ShowHideNoteAction.text=Jegyzet panel megjelen\u00EDt\u00E9se
 ShowHideNoteAction.tooltip=Megjegyz\u00E9s panel ki/bekapcsol\u00E1sa.
 ShowNextChildAction.text=K\u00F6vetkez\u0151 gyermekpont megjelen\u00EDt\u00E9se
 ShowNotesInMapAction.text=Megjegyz\u00E9sek mutat\u00E1sa a t\u00E9rk\u00E9pen
+ShowPreviousSlideAction.text=El\u0151z\u0151 dia megjelen\u00EDt\u00E9se
 ShowSelectedAttributesAction.text=Kiv\u00E1lasztott attrib\u00FAtumok megjelen\u00EDt\u00E9se
 ShowSelectionAsRectangleAction.text=Kijel\u00F6l\u00E9s mutat\u00E1sa n\u00E9gysz\u00F6g dobozzal
 simplyhtml.aboutFrameTitle=Alkalmaz\u00E1s n\u00E9vjegye
@@ -1822,6 +1845,34 @@ simplyhtml.valignMiddle=k\u00F6z\u00E9pre
 simplyhtml.valignTop=fel\u00FClre
 simplyhtml.wholeWordsOnly=Csak teljes szavak
 simplyhtml.wholeWordsOnly.tooltip=A tal\u00E1latok korl\u00E1toz\u00E1sa eg\u00E9sz szavakra.
+slide.add=Hozz\u00E1ad\u00E1s
+slide.add.tooltip=Kiv\u00E1lasztott pontok hozz\u00E1ad\u00E1sa a di\u00E1hoz
+slide.content=Dia tartalma
+slide.descendants=Lesz\u00E1rmazottak megjelen\u00EDt\u00E9se
+slide.filter=Sz\u0171r\u0151
+slide.next=K\u00F6vetkez\u0151
+slide.nofilter=Nincs sz\u0171r\u0151
+slide.placenode.tooltip=amikor a dia megjelenik
+slide.present=Bemutat
+slide.presentation=Bemutat\u00F3
+slide.presentations=Bemutat\u00F3k
+slide.previous=El\u0151z\u0151
+slide.remove=Elt\u00E1vol\u00EDt\u00E1s
+slide.remove.tooltip=Kiv\u00E1lasztott pontok t\u00F6rl\u00E9se a di\u00E1b\u00F3l
+slide.select=Kiv\u00E1laszt\u00E1s
+slide.select.tooltip=Pontok kiv\u00E1laszt\u00E1sa di\u00E1hoz a t\u00E9rk\u00E9pen
+slide.set=Be\u00E1ll\u00EDt\u00E1s
+slide.set.tooltip=A kiv\u00E1lasztott pontok alkoss\u00E1k a dia tartalm\u00E1t
+slide.setfilter=Sz\u0171r\u0151 be\u00E1ll\u00EDt\u00E1sa
+slide.setfilter.tooltip=A dia mutat\u00E1sakor alkalmazand\u00F3 sz\u0171r\u0151 be\u00E1ll\u00EDt\u00E1sa vagy t\u00F6rl\u00E9se
+slide.setfoldingstate=Ki/behajt\u00E1s be\u00E1ll\u00EDt\u00E1sa
+slide.setfoldingstate.tooltip=A jelenlegi ki-behajt\u00E1si \u00E1llapot vissza\u00E1ll\u00EDt\u00E1sa, amikor a dia megjelenik
+slide.setzoom=Nagy\u00EDt\u00E1s be\u00E1ll\u00EDt\u00E1sa
+slide.setzoom.tooltip=A t\u00E9rk\u00E9pen a dia mutat\u00E1sakor alkalmazand\u00F3 nagy\u00EDt\u00E1s be\u00E1ll\u00EDt\u00E1sa vagy t\u00F6rl\u00E9se
+slide.showancestors=Felmen\u0151k megjelen\u00EDt\u00E9se
+slide.showonlyselected=Csak a kiv\u00E1lasztott pontok megjelen\u00EDt\u00E9se
+slide.showonlyselected.tooltip=A t\u00F6bbi pont elrejt\u00E9se a dia mutat\u00E1sakor
+slide.slides=Di\u00E1k
 SortNodes.text=Gyermekek rendez\u00E9se
 SortNodes.tooltip=\u00C1b\u00E9c\u00E9 sorrendbe rendezi a pont minden gyermek\u00E9t.
 split=&Sz\u00E9tbont\u00E1s
@@ -1830,7 +1881,9 @@ SplitNode.text=Pont sz\u00E9tbont\u00E1sa
 SplitNode.tooltip=<html>A pont soronk\u00E9nt sz\u00E9tbont\u00E1sra ker\u00FCl</html>
 SplitToWordsAction.text=A sor {0} sz\u00F3ra oszt\u00E1sa
 STANDARD_FORMAT=Standard
+StartPresentationOrShowNextSlideAction.text=Bemutat\u00F3 ind\u00EDt\u00E1sa/K\u00F6vetkez\u0151 dia
 stop_processing=\u00C1llj
+StopPresentationAction.text=Bemutat\u00F3 le\u00E1ll\u00EDt\u00E1sa
 StringFlavorHandler=Egyszer\u0171 sz\u00F6vegk\u00E9nt mint pont hierarchia
 StructuredHtmlFlavorHandler=HTML pont hierarchiak\u00E9nt
 style=St\u00EDlus
@@ -1894,7 +1947,6 @@ ToggleMenubarAction.text=Men\u00FCsor
 ToggleScrollbarsAction.text=G\u00F6rd\u00EDt\u0151s\u00E1vok
 ToggleStatusAction.text=St\u00E1tuszsor megjelen\u00EDt\u00E9se
 ToggleToolbarAction.text=Eszk\u00F6zt\u00E1r
-toolbars=Eszk\u00F6zt\u00E1rak
 TranslatedElement.BORDER=Szeg\u00E9ly sz\u00F6vege
 TranslatedElement.TEXT=Sz\u00F6veg
 TranslatedElement.TOOLTIP=Gyorstipp
diff --git a/freeplane/resources/translations/Resources_id.properties b/freeplane/resources/translations/Resources_id.properties
index aa061af..57f1008 100644
--- a/freeplane/resources/translations/Resources_id.properties
+++ b/freeplane/resources/translations/Resources_id.properties
@@ -1,4 +1,4 @@
-about_text=Pesawatbebas - pemetaan pendapat dan pengetahuan pembangunan perangkat lunak secara bebas
+about_text=Freeplane - pemetaan pikiran bebas dan perangkat lunak pembuatan pengetahuan
 AboutAction.text=Tentang
 acceleratorPresets=awal kunci utama
 accelerators_loading_error=TIdak bisa memuat akselerator dari null
@@ -19,9 +19,7 @@ accessories/plugins/ExportWithTWiki.text=Sebagai TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Ekspor peta sebagai dokumen TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Metode ekspor universal menggunakan skrip XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Sebagai Applet Java...
-accessories/plugins/ExportWithXSLT_Applet.tooltip=ekspor peta sebagai applet peramban java
-accessories/plugins/ExportWithXSLT_Flash.text=Sebagai Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Ekspor peta sebagai aplikasi Flash
+accessories/plugins/ExportWithXSLT_Applet.tooltip=Mengekspor peta sebagai browser java applet.
 accessories/plugins/ExportWithXSLT_HTML.text=Sebagai XHTML (versi JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Sebagai XHTML (versi gambar peta yang dapat diklik)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Sumberdaya dari SUMBERDAYA ke berkas Pemutar Tugas...
@@ -57,7 +55,7 @@ attributes_edit_tooltip=Edit Set
 attributes_for_selected=Node Terpilih
 attributes_for_visible=Semua Node Terlihat
 attributes_import=Impor
-attributes_import_tooltip=Impor atribut dari peta lain yang termuat.
+attributes_import_tooltip=Impor atribut-atribut dari peta lainnya yang dimuat
 attributes_no_import_candidates_found=Atribut baru tidak ditemukan
 attributes_popup_delete=Hapus
 attributes_popup_down=Turun
@@ -102,7 +100,6 @@ ChangeNodeLevelLeftsAction.text=Node ke kiri
 ChangeNodeLevelLeftsAction.tooltip=Di sebelah kiri akar, node digeser ke bawah. Mereka menjadi anak dari saudaranya sendiri. Di sebelah kanan akar, node digeser ke atas. Tepat di akar, node bertukar sisi.
 ChangeNodeLevelRightsAction.text=Node ke kanan
 ChangeNodeLevelRightsAction.tooltip=Di sebelah kanan akar, node digeser ke bawah. Mereka menjadi anak dari saudaranya sendiri. Di sebelah kiri akar, node digeser ke atas. Tepat di akar, node bertukar sisi.
-choose_background_color=Pilih Warna Latar Belakang:
 choose_cloud_color=Pilih Warna Awan:
 choose_edge_color=Pilih Warna Tangkai
 choose_node_background_color=Pilih Warna Latar Belakang Node:
@@ -142,7 +139,7 @@ EdgeWidthAction_width_thin.text=Tipis
 edit=&Edit
 edit.decision=Editor HTML
 edit.edit_rich_text=Apakah Anda ingin menggunakan pemformatan seperti tebal atau miring?
-edit_link_manually=Edit Hipertaut secara Manual
+edit_link_manually=Sunting Hyperlink secara manual...
 edit_long_node=Edit Long Node[translate me]
 edit_source_label=Edit Source Label[translate me]
 edit_target_label=Edit Target Label[translate me]
@@ -151,7 +148,7 @@ EditAttributesAction.text=Edit Atribut
 EditFilterAction.text=Edit
 EditLongAction.text=Edit Node Panjang
 EncryptedMap.text=Buat Peta Terenkripsi...
-EncryptedMap.tooltip=Buat peta terenkripsi baru.
+EncryptedMap.tooltip=Peta terlindungi baru
 enter_base_url=Masukkan URL acuan. Hipertaut akan dibuat relatif mengacu terhadap URL ini.
 enter_confirms=Enter untuk Menerapkan
 EnterPassword.text=Mati-hidupkan Enkripsi
@@ -159,9 +156,7 @@ error=Galat
 error_applying_template=Galat menerapkan pola acu XSL.
 error_creating_directory=Tidak dapat membuat direktori untuk ekspor.
 ExecuteScripts.text=Scripts[translate me]
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
-ExportAction.text=Ekspor
+ExportAction.text=Ekspor peta...
 ExportBranchToHTMLAction.text=Cabang sebagai HTML
 ExportPdf.text=Sebagai PDF...
 ExportSvg.text=Sebagai SVG...
@@ -336,7 +331,7 @@ ItalicAction.text=Miring
 italicise_branch=Miringkan
 less_than_two_selected_nodes=Anda harus memilih minimal dua node untuk membuat tautan.
 link_not_available_any_more=Tautan ini tidak sahih lagi. Node di antaranya telah dicopot.
-link_not_found=Link {0} tidak ditemukan
+link_not_found=Link {0} tidak ditemukan.
 load=Muat
 locking_failed_by_open=Penguncian peta {0} gagal. Dibuka untuk baca-saja.
 locking_failed_by_save_as=Penguncian peta {0} gagal. Perintah Simpan Sebagai dibatalkan.
@@ -398,7 +393,7 @@ NodeUpAction.text=Node ke Atas
 nonboldify_branch=Tak-tebalkan
 nonitalicise_branch=Tak-miringkan
 normal=Normal
-not_saved_for_link_error=Peta harus disimpan sebelum mengeset hipertaut melalui pemilih berkas.
+not_saved_for_link_error=Peta harus disimpan sebelum Anda dapat mengatur link dengan file chooser
 ok=OK
 OKAction.text=OK
 OpenAction.text=Buka...
@@ -474,7 +469,7 @@ OptionPanel.en=En
 OptionPanel.Environment=Lingkungan
 OptionPanel.es=Es
 OptionPanel.et=Et[translate me]
-OptionPanel.execute_scripts_without_asking=Skrip akan dijalankan tanpa konfirmasi?
+OptionPanel.execute_scripts_without_asking=Eksekusi script diaktifkan
 OptionPanel.execute_scripts_without_asking.tooltip=<html>Skrip Freeplane pada prinsipnya dapat melakukan apa saja pada komputer Anda. <br>Jadi, skrip yang tidak diketahui aman jangan dijalankan.</html>
 OptionPanel.execute_scripts_without_exec_restriction=Ijinkan Eksekusi Aplikasi Lain (TIDAK dianjurkan)
 OptionPanel.execute_scripts_without_exec_restriction.tooltip=<html><body>Bila skrip Groovy Anda perlu mengeksekusi aplikasi lain (seperti penjelajah) tanpa bertanya(!)),<br>Anda perlu mengaktifkan opsi ini. <br>Gunakan dengan hati-hati, karena kini skrip yang jahat dapat membahayakan komputer Andar!</body></html>
@@ -531,15 +526,15 @@ OptionPanel.nb=Nb
 OptionPanel.nl=Nl
 OptionPanel.nn=Nn
 OptionPanel.nodebackgroundcolor=Warna Latar Belakang Node
-OptionPanel.nodebackgroundcolor.tooltip=Warna Latar Belakang Node
+OptionPanel.nodebackgroundcolor.tooltip=Latar belakang simpul saat tidak dipilih.
 OptionPanel.nodecolor=Warna Node
-OptionPanel.nodecolor.tooltip=Warna Node
+OptionPanel.nodecolor.tooltip=Warna teks simpul saat tidak dipilih.
 OptionPanel.nodefontbold=Font Tebal
 OptionPanel.nodefontitalic=Font Miring
 OptionPanel.nodefontname=Nama Font Node
 OptionPanel.nodefontsize=Ukuran Font Node
 OptionPanel.nodetext=Teks Node
-OptionPanel.nodetext.tooltip=Teks Node
+OptionPanel.nodetext.tooltip=Di sini, Anda dapat menentukan teks simpul. Teks terdahulu dibuang saat pola semacam itu diterapkan.
 OptionPanel.nothing=Nihil
 OptionPanel.number_of_different_files_for_automatic_save=Jumlah Berkas Berbeda untuk Penyimpanan Otomatis
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> Sejumlah n berkas berbeda untuk menyimpan peta. Penyimpanan otomatis pertama menggunakan berkas pertama, dan seterusnya, hingga yang ke-n+1 kembali menggunakan berkas pertama (siklik)</html>
@@ -720,7 +715,7 @@ really_remove_node=Benar hapus node?
 RedoAction.text=Ulangi
 RedoFilterAction.text=Ulangi
 ReminderHookAction.text=Copot Pengingat
-ReminderHookAction.tooltip=Copot Pengingat dari Node
+ReminderHookAction.tooltip=Menghapus pengingat dari sebuah simpul.
 RemoveAllIconsAction.text=Copot Semua Ikon
 RemoveIconAction.text=Copot Ikon Terakhir
 RemoveNoteAction.text=Copot Catatan
@@ -731,7 +726,7 @@ repair_link_question=Peta tertaut tidak dapat dimuat. Perbaiki taut secara manua
 replace=Ganti
 ReportBugAction.text=Report a Bug[translate me]
 ResetNodeLocationAction.text=Tata-ulang Posisi
-save_failed=Usaha menyimpan peta {0} gagal
+save_failed=Usaha menyimpan peta {0} gagal.
 save_unsaved=Simpan peta berikut?
 SaveAction.text=Simpan
 SaveAll.text=Simpan Semua
@@ -752,8 +747,8 @@ selection_method_direct=Tunjuk untuk Memilih
 SelectNoteAction.text=Tukar Editor Catatan
 SelectNoteAction.tooltip=Switch to resp. from note window
 SetImageByFileChooserAction.text=Gambar (Pemilih Berkas atau Taut)...
-SetLinkByFileChooserAction.text=Hipertaut (Pemilih Berkas)
-SetLinkByTextFieldAction.text=Hipertaut (Kolom Teks)
+SetLinkByFileChooserAction.text=Tambahkan hyperlink (pilih)...
+SetLinkByTextFieldAction.text=Tambahkan atau ubah hyperlink (tipe)...
 ShowAllAttributesAction.text=Tampilkan Semua Atribut
 ShowAncestorsAction.text=Tampilkan Moyangnya
 ShowAttributeDialogAction.text=Kelola Atribut...
@@ -766,7 +761,7 @@ ShowSelectionAsRectangleAction.text=Pemilih Segiempat
 simplyhtml.aboutFrameTitle=Tentang aplikasi ini
 simplyhtml.aboutLabel=Tentang SimplyHTML...
 simplyhtml.alignCenter=tengah
-simplyhtml.alignLabel=Perataan
+simplyhtml.alignLabel=Penjajaran:
 simplyhtml.alignLeft=kiri
 simplyhtml.alignRight=kanan
 simplyhtml.allCellsRangeLabel=semua sel
@@ -774,12 +769,12 @@ simplyhtml.allOccurrencesReplaced=Semua kemunculan diganti
 simplyhtml.appendTableColLabel=Tambahkan kolom
 simplyhtml.appendTableRowLabel=Tambahkan baris
 simplyhtml.applyCellAttrLabel=Terapkan pada
-simplyhtml.backgroundLabel=Latar Belakang
+simplyhtml.backgroundLabel=Latar Belakang:
 simplyhtml.boldItalicName=tebal miring
 simplyhtml.boldName=tebal
 simplyhtml.borderColorLabel=Warna:
 simplyhtml.borderWidthLabel=Lebar
-simplyhtml.bottomLabel=bawah
+simplyhtml.bottomLabel=bawah:
 simplyhtml.cancelBtnName=Batal
 simplyhtml.cellBorderTabLabel=Sempadan
 simplyhtml.cellGenTabLabel=Umum
@@ -826,7 +821,7 @@ simplyhtml.fontTabLabel=Font
 simplyhtml.fontTip=Format font...
 simplyhtml.fontUnderlineLabel=Garis Bawah
 simplyhtml.fontUnderlineTip=Mati-hidupkan Garis Bawah
-simplyhtml.foregroundLabel=Latar Depan
+simplyhtml.foregroundLabel=Latar Depan:
 simplyhtml.formatLabel=Format
 simplyhtml.formatListLabel=Senarai...
 simplyhtml.formatListTip=Ubah format senarai
@@ -844,7 +839,7 @@ simplyhtml.insertTableRowLabel=Sisipkan baris
 simplyhtml.insertTableTitle=Sisipkan Tabel
 simplyhtml.italicName=miring
 simplyhtml.layoutTabTitle=Tampilan Atak
-simplyhtml.leftLabel=kiri
+simplyhtml.leftLabel=kiri:
 simplyhtml.listDialogTitle=Format Senarai
 simplyhtml.listIndentTitle=Indentasi:
 simplyhtml.listPosInside=di dalam
@@ -889,9 +884,9 @@ simplyhtml.replaceAll=Semua
 simplyhtml.replaceDone=Sudah
 simplyhtml.replaceNo=Tidak
 simplyhtml.replaceThisQuery=ganti tiap kemunculan
-simplyhtml.replaceWith=Ganti dengan
+simplyhtml.replaceWith=Ganti dengan:
 simplyhtml.replaceYes=Ya
-simplyhtml.rightLabel=kanan
+simplyhtml.rightLabel=kanan:
 simplyhtml.searchDown=Cari ke bawah
 simplyhtml.searchFromStart=Cari dari mula
 simplyhtml.searchUp=Cari ke atas
@@ -916,7 +911,7 @@ simplyhtml.toggleBulletsLabel=Senarai berbulir mati/hidup
 simplyhtml.toggleBulletsTip=senarai berbulir mati/hidup
 simplyhtml.toggleNumbersLabel=Senarai bernomor mati/hidup
 simplyhtml.toggleNumbersTip=senarai bernomor mati/hidup
-simplyhtml.topLabel=atas
+simplyhtml.topLabel=atas:
 simplyhtml.uLineLabel=Garis Bawah
 simplyhtml.unableToOpenFileError=Berkas tidak bisa dibuka
 simplyhtml.unableToRedoError=Tak bisa ulangi:
@@ -925,7 +920,7 @@ simplyhtml.undoLabel=Urungkan
 simplyhtml.undoTip=urungkan
 simplyhtml.valignBaseline=garis dasar
 simplyhtml.valignBottom=bawah
-simplyhtml.valignLabel=Perataan Vertikal
+simplyhtml.valignLabel=Penjajaran Vertikal:
 simplyhtml.valignMiddle=tengah
 simplyhtml.valignTop=atas
 simplyhtml.wholeWordsOnly=Hanya kata seutuhnya
@@ -936,7 +931,7 @@ SplitNode.text=Pisahkan Node
 SplitNode.tooltip=<html>Node dipisahkan</html>
 style=Gaya
 svg=SVG[translate me]
-TimeListAction.text=Tampilkan Senarai Jadual Waktu
+TimeListAction.text=Kelola tugas ...
 TimeListAction.tooltip=Tampilkan semua waktu terjadual dan node yang bersangkutan.
 TimeManagementAction.text=Tunjukkan Kalender...
 TimeManagementAction.tooltip=<html>Tunjukkan modul Kalender buatan Kai Toedter.</html>
@@ -960,7 +955,7 @@ UpdateCheckAction.text=Check for Updates[translate me]
 url_error=URL ini salah formatnya!
 url_load_error=Peta yang diacu URL tidak dapat dimuat.
 UsePlainTextAction.text=Gunakan Teks Polos
-user_defined_zoom=Setelan pemakai.
+user_defined_zoom=Ditetapkan pengguna
 user_defined_zoom_status_bar=Mengubah zum sesuai setelan pemakai di {0}%.
 user_zoom=Faktor Zum Pencetakan (0.0 - 2.0):
 view=&Tampakan
diff --git a/freeplane/resources/translations/Resources_it.properties b/freeplane/resources/translations/Resources_it.properties
index 2cc82ab..d194713 100644
--- a/freeplane/resources/translations/Resources_it.properties
+++ b/freeplane/resources/translations/Resources_it.properties
@@ -20,8 +20,6 @@ accessories/plugins/ExportWithTWiki.tooltip=Esporta la mappa come documento TWik
 accessories/plugins/ExportWithXSLT.tooltip=Questo \u00E8 un metodo di esportazione uniforme che usa scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Come Applet Java...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Esporta la mappa come "applet java".
-accessories/plugins/ExportWithXSLT_Flash.text=In Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Esporta la mappa come applicazione Flash.
 accessories/plugins/ExportWithXSLT_HTML.text=In XHTML (versione JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=In XHTML (mappa cliccabile)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Risorse dal nodo RISORSE al file Gestore dei processi...
@@ -173,7 +171,6 @@ cannot_delete_root=Il nodo radice non pu\u00F2 essere cancellato o tagliato.
 cannot_join_nodes_with_children=Impossibile collegare i nodi con i figli
 cannot_move_to_child=Impossibile spostare un nodo ad uno dei figli
 CenterAction.text=Centra
-CenterSelectedNodeAction.text=Centra il nodo selezionato
 ChangeConnectorArrowsAction.backward.text=Indietro
 ChangeConnectorArrowsAction.both.text=Entrambe
 ChangeConnectorArrowsAction.forward.text=Avanti
@@ -187,7 +184,6 @@ ChangeNodeLevelLeftsAction.text=Sposta nodo a sinistra
 ChangeNodeLevelLeftsAction.tooltip=I nodi che si trovano alla sinistra del nodo centrale, verranno spostati in basso; diventeranno nodi figli del fratello superiore. I nodi che si trovano alla destra del nodo centrale, verranno spostati in alto; I nodi collegati direttamente alla radice, camberanno lato.
 ChangeNodeLevelRightsAction.text=Sposta nodo a destra
 ChangeNodeLevelRightsAction.tooltip=I nodi che si trovano alla destra del nodo centrale, verranno spostati in basso; diventeranno nodi figli del fratello superiore. I nodi che si trovano alla sinistra del nodo centrale, verranno spostati in alto. I nodi collegati direttamente alla radice, cambieranno lato.
-choose_background_color=Scegliere il colore di sfondo
 choose_cloud_color=Scegliere il colore della nuvola:
 choose_edge_color=Scegliere il colore collegamento
 choose_map_background_color=Scegliere il colore di sfondo della mappa
@@ -328,8 +324,6 @@ ExecuteScripts.noScriptsAvailable=Nessuno disponibile
 ExecuteScripts.text=Script
 ExecuteScriptSecurityError.text=E'' accaduto un errore durante l''esecuzione dello script: {0}
 export_failed=Esportazione fallita
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Esporta a Freeplane usando XSLT
 ExportAction.text=Esporta
 ExportBranchAction.text=Ramifica come nuova mappa...
@@ -782,6 +776,7 @@ ModesMenuAction.Browse.text=Mappa del Browser
 ModesMenuAction.File.text=Esplora file
 ModesMenuAction.MindMap.text=Editor mappe mentali
 most_recent_files=&File recenti
+MoveSelectedNodeAction.CENTER.text=Centra il nodo selezionato
 MoveToRootAction.text=Vai al nodo centrale
 NameConditionAction.text=Imposta nome
 navigate=&Naviga
@@ -820,7 +815,6 @@ NextNodeAction.BACK.text=Nodo precedente
 NextNodeAction.BACK_N_FOLD.text=Nodo precedente (collassa)
 NextNodeAction.FORWARD.text=Nodo successivo
 NextNodeAction.FORWARD_N_FOLD.text=Nodo successivo (espandi)
-NextPresentationItemAction.text=Espandi il prossimo elemento della presentazione
 no=No
 no_copy_attributes_before_paste_attributes=Non si possono incollare Attributi, finch\u00E8 non vengono copiati prima.
 NO_FORMAT=Testo
@@ -854,6 +848,7 @@ not_saved_for_image_error=La mappa deve essere salvata, prima di impostare una i
 not_saved_for_link_error=La mappa deve essere salvata, prima di scegliere un collegamento col selettore file.
 note_window_location=Posizione finestra delle note
 notes=Note
+NotFoldingNextPresentationItemAction.text=Espandi il prossimo elemento della presentazione
 ok=&OK
 OKAction.text=OK
 OnlineReference.text=Mappa documentazione Online
@@ -1098,8 +1093,6 @@ OptionPanel.placenewbranches=Inserisci nuovo ramo
 OptionPanel.placenewbranches.tooltip=<html>Quando inserisci un nuovo ramo i valori validi sono 'primo' e 'ultimo' </html>
 OptionPanel.plugin.tooltip=Plugin secondari
 OptionPanel.plugins=Plugin
-OptionPanel.presentation_dimmer_transparency=Sfumatura trasparenza Presentazione
-OptionPanel.presentation_mode=Modo Presentazione
 OptionPanel.printonwhitebackground=<html>Sfondo bianco per la stampa</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Usa sempre lo sfondo bianco per la stampa</html>
 OptionPanel.pt_BR=Portoghese (Brasile) / Portugu\u00EAs (Brasil)
@@ -1190,7 +1183,6 @@ OptionPanel.separator.single_instance_mode=Unica finestra di Programma
 OptionPanel.separator.size_limits=Limite di dimensione
 OptionPanel.separator.spelling=Opzioni di controllo ortografico
 OptionPanel.separator.status=Linea di Stato
-OptionPanel.separator.tooltip=Tempi dei Suggerimenti Tooltip
 OptionPanel.separator.undo=Annulla
 OptionPanel.separator.updates=Aggiornamenti Programma
 OptionPanel.set_property_text=Modifica
@@ -1264,7 +1256,6 @@ OptionPanel.use_common_out_point_for_root_node=I collegamenti iniziano da un pun
 OptionPanel.use_common_out_point_for_root_node.tooltip=In uscita al nodo principale, i collegamenti iniziano da un punto a destra e uno a sinistra, poi si diramano.
 OptionPanel.use_tabbed_pane=Usa schede per indicare le mappe aperte
 OptionPanel.use_tabbed_pane.tooltip=Se selezionato, le mappe sono visualizzate in schede (come in FireFox ) ).
-OptionPanel.user_defined_screen_resolution=Risoluzione schermo definita dall'utente (DPI)
 OptionPanel.validate_classpath_needs_readaccess=Script: Quando si setta la classpath, \u00E8 necessario permettere l'accesso in lettura ai file!
 OptionPanel.validate_invalid_date_format=Formato data non valido
 OptionPanel.validate_invalid_datetime_format=Formato data-ora non valido
@@ -1467,7 +1458,6 @@ ShowAncestorsAction.text=Visualizza ascendenti
 ShowAttributeDialogAction.text=Gestione attributi
 ShowDescendantsAction.text=Visualizza discendenti
 ShowFilterToolbarAction.text=Barra del Filtro
-ShowFormatPanel.text=Pannello di Formattazione
 ShowFormatPanel.tooltip=Presenta un pannello in cui gli attributi dei nodi e dei collegamenti, possono essere modificati.
 ShowHideNoteAction.text=Finestra delle note
 ShowHideNoteAction.tooltip=Mostra o nasconde la finestra delle note.
@@ -1717,7 +1707,6 @@ ToggleLeftToolbarAction.text=Barra delle icone
 ToggleMenubarAction.text=Barra dei menu
 ToggleStatusAction.text=Visualizza la Linea di Stato
 ToggleToolbarAction.text=Barra degli strumenti
-toolbars=Barre Strumenti
 undefined_error=Si \u00E8 verificato un errore imprevisto. Inviare un rapporto errori, grazie.
 underline=Sottolinea
 UnderlineAction.text=Sottolinea
diff --git a/freeplane/resources/translations/Resources_ja.properties b/freeplane/resources/translations/Resources_ja.properties
index 20f31d6..7017e12 100644
--- a/freeplane/resources/translations/Resources_ja.properties
+++ b/freeplane/resources/translations/Resources_ja.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=\u30AD\u30E3\u30F3\u30BB\u30EB
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=\u3053\u306E\u30B3\u30DE\u30F3\u30C9\u3067\u306F\u3001\u6697\u8A3C\u4ED8\u304D\u30CE\u30FC\u30C9\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u4FDD\u8B77\u306E\u8A2D\u5B9A\u3068\u89E3\u9664\u306E\u5207\u308A\u66FF\u3048\u3057\u304B\u3067\u304D\u307E\u305B\u3093\u3002\n\u79D8\u533F\u30CE\u30FC\u30C9\u3092\u8FFD\u52A0\u3059\u308B\u306B\u306F\u3001\u30C4\u30FC\u30EB\u30E1\u30CB\u30E5\u30FC\u3092\u4F7F\u7528\u3057\u3066\u304F\u306 [...]
 accessories/plugins/EncryptNode.properties_select_me=\u3053\u3053\u3092\u9078\u629E\u3057\u3066\u4F5C\u696D\u3092\u7D99\u7D9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 accessories/plugins/EncryptNode.properties_wrong_password=\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Java Web Start \u306E\u305F\u3081\u306B\u30DE\u30C3\u30D7\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
 accessories/plugins/ExportWithTWiki.text=TWiki \u306B
 accessories/plugins/ExportWithTWiki.tooltip=TWiki \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5F62\u5F0F\u3067\u66F8\u304D\u51FA\u3057\u307E\u3059\u3002
 accessories/plugins/ExportWithXSLT.tooltip=\u5171\u901A\u4ED5\u69D8\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u624B\u6BB5\u3067\u3059\u3002
 accessories/plugins/ExportWithXSLT_Applet.text=Java \u30A2\u30D7\u30EC\u30C3\u30C8\u306B
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Java \u30D6\u30E9\u30A6\u30B6\u30A2\u30D7\u30EC\u30C3\u30C8\u5F62\u5F0F\u3067\u66F8\u304D\u51FA\u3057\u307E\u3059\u3002
-accessories/plugins/ExportWithXSLT_Flash.text=Flash \u306B
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Flash \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u5F62\u5F0F\u3067\u66F8\u304D\u51FA\u3057\u307E\u3059\u3002
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML\uFF08JavaScript\u7248\uFF09\u306B
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML\uFF08\u30AF\u30EA\u30C3\u30AB\u30D6\u30EB\u30DE\u30C3\u30D7\u7248\uFF09\u306B
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u30EA\u30BD\u30FC\u30B9\u3092 RESOURCES \u30CE\u30FC\u30C9\u304B\u3089 Taskjuggler \u30D5\u30A1\u30A4\u30EB\u306B
@@ -73,9 +73,9 @@ addons.installer.too.old=<html>\u3053\u306E Freeplane \u30D0\u30FC\u30B8\u30E7\u
 addons.installer.unknown.deinstallation.rules=\u672A\u77E5\u306E\u53D6\u308A\u5916\u3057\u30EB\u30FC\u30EB\uFF1A {0}
 addons.installer.update=\u30D0\u30FC\u30B8\u30E7\u30F3 {0} \u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">\u4FE1\u983C\u3067\u304D\u308B\u30BD\u30FC\u30B9\u4EE5\u5916\u304B\u3089\u306E\u30A2\u30C9\u30AA\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306F\u907F\u3051\u307E\u3057\u3087\u3046\u3002\u60AA\u610F\u306E\u3042\u308B\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u306B\u3088\u308B\u3001\u30C7\u30FC\u30BF\u306E\u7834\u58CA\u3084\u30D7\u30E9\u30A4\u30D0\u30B7\u30FC\u306E\u4FB5\u5BB3\u306E\u6050\u308C\u304C\u3042\u30 [...]
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=\u30B9\u30BF\u30A4\u30EB\u304B\u3089\u5C5E\u6027\u3092\u30B3\u30D4\u30FC
-AddStyleAttributes.tooltip=\u9078\u629E\u30CE\u30FC\u30C9\u306B\u3001\u5F53\u8A72\u30CE\u30FC\u30C9\u306B\u9069\u7528\u3055\u308C\u305F\u30B9\u30BF\u30A4\u30EB\u306B\u542B\u307E\u308C\u308B\u5C5E\u6027\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002.\uFF3B\u8A33\u6CE8\uFF1A\u30DE\u30CB\u30E5\u30A2\u30EB\u304B\u3089\u610F\u8A33\uFF3D
+AddStyleAttributes.tooltip=\u9078\u629E\u30CE\u30FC\u30C9\u306B\u3001\u5F53\u8A72\u30CE\u30FC\u30C9\u306B\u9069\u7528\u3055\u308C\u305F\u30B9\u30BF\u30A4\u30EB\u306B\u542B\u307E\u308C\u308B\u5C5E\u6027\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002\uFF3B\u8A33\u6CE8\uFF1A\u30DE\u30CB\u30E5\u30A2\u30EB\u304B\u3089\u610F\u8A33\uFF3D
 AllMapsNodeListAction.text=\u3059\u3079\u3066\u306E\u30DE\u30C3\u30D7\u3067\u691C\u7D22\uFF06\u7F6E\u63DB...
 always=\u5E38\u306B
 AlwaysUnfoldedNodeAction.text=\u5E38\u306B\u30CE\u30FC\u30C9\u3092\u5C55\u958B\uFF08\u30AA\u30F3\uFF0F\u30AA\u30D5\uFF09
@@ -85,7 +85,7 @@ antialias_none=\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9\u306A\u3057
 apply=\u9069\u7528(&A)
 ApplyAction.text=\u9069\u7528(A)
 ApplyFormatPlugin.text=\u9078\u629E\u30CE\u30FC\u30C9\u306E\u66F8\u5F0F\u5909\u66F4 ...
-ApplyFormatPlugin.tooltip=\u30CE\u30FC\u30C9\u3068\u7DDA\u306E\u5C5E\u6027\u3092\u4E00\u5EA6\u306B\u5909\u66F4\u3067\u304D\u308B\u30C0\u30A4\u30A2\u30ED\u30B0\u3067\u3059\u3002
+ApplyFormatPlugin.tooltip=\u30CE\u30FC\u30C9\u3068\u7DDA\u306E\u5C5E\u6027\u3092\u540C\u6642\u306B\u5909\u66F4\u3067\u304D\u308B\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8868\u793A\u3057\u307E\u3059\u3002
 ApplyNoFilteringAction.text=\u30D5\u30A3\u30EB\u30BF\u89E3\u9664
 ApplySelectedViewConditionAction.text=\u9078\u629E\u30CE\u30FC\u30C9\u306B\u7D5E\u3063\u3066\u9069\u7528
 ApplyToVisibleAction.text=\u30D5\u30A3\u30EB\u30BF\u4E2D\u306E\u30CE\u30FC\u30C9\u306B\u9069\u7528\uFF08\u7D5E\u308A\u8FBC\u307F\uFF09
@@ -183,7 +183,6 @@ cannot_join_nodes_with_children=\u5B50\u30CE\u30FC\u30C9\u4ED8\u304D\u306E\u30CE
 cannot_move_into_child_node=\u5B50\u30CE\u30FC\u30C9\u3078\u306E\u79FB\u52D5\u306F\u3067\u304D\u307E\u305B\u3093
 cannot_move_to_child=\u30CE\u30FC\u30C9\u306F\u81EA\u5206\u306E\u5B50\u30CE\u30FC\u30C9\u306B\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
 CenterAction.text=\u9078\u629E\u4E2D\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u4E2D\u5FC3\u306B\u8868\u793A
-CenterSelectedNodeAction.text=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u4E2D\u592E\u3078
 ChangeConnectorArrowsAction.backward.text=\u5F8C\u65B9
 ChangeConnectorArrowsAction.both.text=\u4E21\u65B9
 ChangeConnectorArrowsAction.forward.text=\u524D\u65B9
@@ -197,7 +196,6 @@ ChangeNodeLevelLeftsAction.text=\u30CE\u30FC\u30C9\u3092\u79FB\u52D5\uFF08\u89AA
 ChangeNodeLevelLeftsAction.tooltip=<html>\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u304C\u30EB\u30FC\u30C8\u306E\u5DE6\u5074\u306B\u3042\u308B\u5834\u5408\u306F\u3001\u30CE\u30FC\u30C9\u3092\u4E0B\u4F4D\u306B\u79FB\u52D5\u3057\u3001\u5144\u5F1F\u30CE\u30FC\u30C9\u306E\u5B50\u306B<br>\u79FB\u3057\u307E\u3059\u3002\u30EB\u30FC\u30C8\u306E\u53F3\u5074\u306E\u5834\u5408\u306F\u3001\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u3092\u4E0A\u4F4D\u306B\u79FB\u52D5\u3057\u307E\u3059\u3002\u305D\u3 [...]
 ChangeNodeLevelRightsAction.text=\u30CE\u30FC\u30C9\u3092\u79FB\u52D5\uFF08\u5144\u306E\u672B\u5B50\u3078\uFF09
 ChangeNodeLevelRightsAction.tooltip=<html>\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u304C\u30EB\u30FC\u30C8\u306E\u53F3\u5074\u306B\u3042\u308B\u5834\u5408\u306F\u3001\u30CE\u30FC\u30C9\u3092\u4E0B\u4F4D\u306B\u79FB\u52D5\u3057\u3001\u5144\u5F1F\u30CE\u30FC\u30C9\u306E\u5B50\u306B<br>\u79FB\u3057\u307E\u3059\u3002\u30EB\u30FC\u30C8\u306E\u5DE6\u5074\u306E\u5834\u5408\u306F\u3001\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u3092\u4E0A\u4F4D\u306B\u79FB\u52D5\u3057\u307E\u3059\u3002\u305D\u [...]
-choose_background_color=\u80CC\u666F\u8272\u3092\u9078\u3076...
 choose_cloud_color=\u96F2\u306E\u8272\u3092\u9078\u3076...
 choose_edge_color=\u7DDA\u306E\u8272\u3092\u9078\u3076
 choose_map_background_color=\u30DE\u30C3\u30D7\u306E\u80CC\u666F\u8272\u3092\u9078\u3076
@@ -208,6 +206,8 @@ ClearLinkAnchorAction.tooltip=<html>\u30CE\u30FC\u30C9\u306B\u30BB\u30C3\u30C8\u
 CloneAction.text=\u30AF\u30ED\u30FC\u30F3\u3068\u3057\u3066\u8CBC\u308A\u4ED8\u3051
 close_btn=\u9589\u3058\u308B(&C)
 CloseAction.text=\u8868\u793A\u4E2D\u306E\u30DE\u30C3\u30D7\u3092\u9589\u3058\u308B
+CloseAllMapsAction.text=\u3059\u3079\u3066\u306E\u30DE\u30C3\u30D7\u3092\u9589\u3058\u308B
+CloseAllOtherMapsAction.text=\u307B\u304B\u306E\u30DE\u30C3\u30D7\u3092\u3059\u3079\u3066\u9589\u3058\u308B
 cloud_shapes=\u96F2\u306E\u5F62
 CloudAction.text=\u96F2\uFF08\u6A19\u6E96\uFF09\u3092\u4ED8\u52A0\uFF0F\u524A\u9664
 CloudColorAction.text=\u96F2\u306E\u8272...
@@ -215,6 +215,15 @@ CloudShapeAction.ARC.text=\u30E2\u30AF\u30E2\u30AF
 CloudShapeAction.RECT.text=\u77E9\u5F62
 CloudShapeAction.ROUND_RECT.text=\u4E38\u89D2\u77E9\u5F62
 CloudShapeAction.STAR.text=\u30C8\u30F3\u30AC\u30EA
+collection.copy.presentation=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u30B3\u30D4\u30FC
+collection.copy.slide=\u30B9\u30E9\u30A4\u30C9\u3092\u30B3\u30D4\u30FC
+collection.delete=\u524A\u9664
+collection.down=\u4E0B\u3052\u308B
+collection.move=\u79FB\u52D5
+collection.moveTo=\u79FB\u52D5
+collection.new.presentation=\u65B0\u898F\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+collection.new.slide=\u65B0\u898F\u30B9\u30E9\u30A4\u30C9
+collection.up=\u4E0A\u3052\u308B
 ColorProperty.ResetColor=\u30EA\u30BB\u30C3\u30C8\u6642\u306E\u8272
 combined=\u8907\u5408
 condition=\u6761\u4EF6
@@ -225,14 +234,16 @@ connector_label=\u30B3\u30CD\u30AF\u30BF\u306E\u30E9\u30D9\u30EB
 connector_lines=\u7DDA\u3000 \u7A2E
 connector_shapes=\u5F62\u3000 \u72B6
 ConnectorColorAction.text=\u30B3\u30CD\u30AF\u30BF\u306E\u8272...
+controls=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB
 ConvertCloneToIndependentNodeAction.text=\u30AF\u30ED\u30FC\u30F3\u89E3\u9664
+copy_name={0} (\u30B3\u30D4\u30FC)
 CopyAction.text=\u30B3\u30D4\u30FC(C)
 CopyAction.tooltip=\u9078\u629E\u4E2D\u306E\u679D\u3092\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002
 CopyAttributes.text=\u5C5E\u6027\u3092\u30B3\u30D4\u30FC
 CopyIDAction.text=\u30CE\u30FC\u30C9 ID \u3092\u30B3\u30D4\u30FC
 CopyMapStylesAction.text=\u30DE\u30C3\u30D7\u306E\u30B9\u30BF\u30A4\u30EB\u3092\u30B3\u30D4\u30FC...
 CopyNodeURIAction.text=\u30CE\u30FC\u30C9\u306E URI \u3092\u30B3\u30D4\u30FC
-copyright=Copyright \u00A9 2000-2016 Freeplane team and others
+copyright=Copyright \u00A9 2000-2017 Freeplane team and others
 CopySingleAction.text=\u9078\u629E\u30CE\u30FC\u30C9\u306E\u307F\u30B3\u30D4\u30FC
 CopySingleAction.tooltip=\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u3060\u3051\u30B3\u30D4\u30FC\u3057\u307E\u3059\u3002
 CopyStyleExtensionsAction.text=\u30B9\u30BF\u30A4\u30EB\u30CE\u30FC\u30C9\u304B\u3089\u62E1\u5F35\u60C5\u5831\u3092\u30B3\u30D4\u30FC
@@ -315,6 +326,7 @@ EditAction.text=\u30CE\u30FC\u30C9\u30B3\u30A2\u3092\u30A4\u30F3\u30E9\u30A4\u30
 EditAttributesAction.text=\u5C5E\u6027\u3092\u30A4\u30F3\u30E9\u30A4\u30F3\u7DE8\u96C6...
 EditDetailsAction.text=\u30CE\u30FC\u30C9\u306E\u8A73\u7D30\u3092\u30A4\u30F3\u30E9\u30A4\u30F3\u7DE8\u96C6...
 EditDetailsInDialogAction.text=\u30CE\u30FC\u30C9\u306E\u8A73\u7D30\u3092\u30C0\u30A4\u30A2\u30ED\u30B0\u7DE8\u96C6...
+editEdgeColors=\u7DDA\u306E\u8272\u3092\u7DE8\u96C6
 EditFilterAction.text=\u30D5\u30A3\u30EB\u30BF\u6761\u4EF6\u3092\u6307\u5B9A...
 EditLongAction.text=\u30CE\u30FC\u30C9\u30B3\u30A2\u3092\u30C0\u30A4\u30A2\u30ED\u30B0\u7DE8\u96C6...
 EditNoteInDialogAction.text=\u30CE\u30FC\u30C8\u3092\u30C0\u30A4\u30A2\u30ED\u30B0\u7DE8\u96C6...
@@ -349,14 +361,14 @@ ExecuteScripts.noScriptsAvailable=\u4F7F\u7528\u53EF\u80FD\u30B9\u30AF\u30EA\u30
 ExecuteScripts.text=\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u9078\u3093\u3067\u5B9F\u884C
 ExecuteScriptSecurityError.text=\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A {0} \n\u3000\u3000\u3092\u5B9F\u884C\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 export_failed=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-export_pdf_text=PDF \u30D5\u30A1\u30A4\u30EB\u306B
-export_svg_text=SVG \u753B\u50CF\u306B
 export_using_xslt=Freeplane \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportAction.text=\u30DE\u30C3\u30D7\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8...
+ExportAllPresentationsAction.text=\u3059\u3079\u3066\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092 PNG \u3067\u51FA\u529B\u3059\u308B
 ExportBranchAction.text=\u679D\u3092\u65B0\u3057\u3044\u30DE\u30C3\u30D7\u306B...
 ExportBranchToHTMLAction.text=\u679D\u3092 HTML \u30D5\u30A1\u30A4\u30EB\u306B
 exported_file={0} \u30D5\u30A1\u30A4\u30EB
 ExportPdf.text=PDF \u30D5\u30A1\u30A4\u30EB\u306B
+ExportPresentationAction.text=\u73FE\u5728\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092 PNG \u3067\u51FA\u529B\u3059\u308B
 ExportSvg.text=SVG \u753B\u50CF\u306B
 ExportToHTMLAction.text=HTML \u30D5\u30A1\u30A4\u30EB\u306B
 ExportToImage.jpg.text=JPEG \u753B\u50CF\u306B
@@ -377,6 +389,7 @@ f_button_unassigned=\uFF1C\u672A\u5B9A\u7FA9\uFF1E
 FaqOpenURLAction.text=\u3088\u304F\u3042\u308B\u8CEA\u554F
 file=\u30D5\u30A1\u30A4\u30EB(&F)
 file_already_exists=\u540C\u3058\u30D5\u30A1\u30A4\u30EB {0} \u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u3066\u4FDD\u5B58\u3057\u307E\u3059\u304B\uFF1F
+file_not_accessible=\u30D5\u30A1\u30A4\u30EB {0} \u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
 file_not_found=\u30D5\u30A1\u30A4\u30EB {0} \u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 FileListFlavorHandler=\u30D5\u30A1\u30A4\u30EB\u306B\u30EA\u30F3\u30AF
 FileProperties_BranchLeafCount=\u9078\u629E\u4E2D\u306E\u679D\u306E\u672B\u7AEF\u30CE\u30FC\u30C9\u6570\uFF1A
@@ -632,6 +645,9 @@ icon_penguin=Linux
 icon_positive=\u826F\u3044
 icon_prepare=\u9EC4\u4FE1\u53F7
 icon_revision=\u30EA\u30D3\u30B8\u30E7\u30F3
+icon_revision-green=\u30EA\u30D3\u30B8\u30E7\u30F3\u7DD1
+icon_revision-pink=\u30EA\u30D3\u30B8\u30E7\u30F3\u30D4\u30F3\u30AF
+icon_revision-red=\u30EA\u30D3\u30B8\u30E7\u30F3\u8D64
 icon_smiley-angry=\u6012\u308A
 icon_smiley-neutral=\u5E73\u9759
 icon_smiley-oh=\u9A5A\u304D
@@ -706,7 +722,7 @@ latex_editor=LaTeX \u6570\u5F0F\u3092\u7DE8\u96C6
 LatexDeleteLatexAction.text=LaTeX \u6570\u5F0F\u3092\u524A\u9664
 LatexEditLatexAction.text=LaTeX \u6570\u5F0F\u3092\u7DE8\u96C6...
 LatexInsertLatexAction.msg1=<html>LaTeX \u6570\u5F0F\u3092<i>\u53E4\u3044</i>\u65B9\u6CD5\u3067\u5165\u529B\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002<br/>LaTeX \u6570\u5F0F\u306E\u65B0\u3057\u3044\u4F5C\u6210\u65B9\u6CD5\u306F\u3001\u3053\u306E\u30DA\u30FC\u30B8\u306B\u8A18\u8F09\u3055\u308C\u3066\u3044\u307E\u3059\uFF1A</html>
-LatexInsertLatexAction.msg2=<html>\u8981\u7D04\uFF1A<ul><li>\u30CE\u30FC\u30C9\u30C6\u30AD\u30B9\u30C8\u306E\u5148\u982D\u306B "\\latex " \u3092\u5165\u529B\u3059\u308B\u3002\u307E\u305F\u306F\u3001</li><li><i>\u8868\u793A\u2192\u30D7\u30ED\u30D1\u30C6\u30A3\u30D1\u30CD\u30EB</i> \u305D\u306E\u5F8C <i>\u30CE\u30FC\u30C9\u30B3\u30A2\u306E\u30C6\u30AD\u30B9\u30C8\u2192\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\uFF0F\u66F8\u5F0F\u2192LaTeX</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>\u8981\u7D04: <ul><li>\u30CE\u30FC\u30C9\u30C6\u30AD\u30B9\u30C8\u306E\u5148\u982D\u306B "\\latex " \u3092\u4F7F\u7528\u3059\u308B\u304B</li><li><i>\u8868\u793A -> \u30C4\u30FC\u30EB\u30D1\u30CD\u30EB</i> \u304B\u3089 <i>\u30CE\u30FC\u30C9\u30B3\u30A2\u306E\u30C6\u30AD\u30B9\u30C8 -> \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\uFF0F\u66F8\u5F0F ->Latex</i> \u3092\u9078\u629E</li></ul></html>
 LatexInsertLatexAction.text=LaTeX \u6570\u5F0F\u3092\u4ED8\u52A0...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -837,6 +853,9 @@ ModesMenuAction.File.text=\u30D5\u30A1\u30A4\u30E9\u30FC\u30E2\u30FC\u30C9
 ModesMenuAction.MindMap.text=\u30DE\u30C3\u30D7\u7DE8\u96C6\u30E2\u30FC\u30C9
 most_recent_files=\u6700\u8FD1\u4F7F\u3063\u305F\u30DE\u30C3\u30D7
 MoveAction.text=\u79FB\u52D5
+MoveSelectedNodeAction.CENTER.text=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u4E2D\u592E\u3078
+MoveSelectedNodeAction.EAST.text=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u53F3\u3078\u79FB\u52D5
+MoveSelectedNodeAction.WEST.text=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u5DE6\u3078\u79FB\u52D5
 MoveToRootAction.text=\u30EB\u30FC\u30C8\u30CE\u30FC\u30C9\u3078\u30B8\u30E3\u30F3\u30D7
 NameConditionAction.text=\u540D\u79F0\u3092\u6307\u5B9A
 navigate=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3(&N)
@@ -876,7 +895,7 @@ NextNodeAction.BACK.text=\u524D\u306E\u30CE\u30FC\u30C9
 NextNodeAction.BACK_N_FOLD.text=\u524D\u306E\u30CE\u30FC\u30C9\uFF08\u6298\u308A\u7573\u3080\uFF09
 NextNodeAction.FORWARD.text=\u6B21\u306E\u30CE\u30FC\u30C9
 NextNodeAction.FORWARD_N_FOLD.text=\u6B21\u306E\u30CE\u30FC\u30C9\uFF08\u6298\u308A\u7573\u3080\uFF09
-NextPresentationItemAction.text=\u6B21\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u30A2\u30A4\u30C6\u30E0\u3092\u5C55\u958B
+NextPresentationItemAction.text=\u6B21\u306E\u6298\u308A\u7573\u307E\u308C\u305F\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u30A2\u30A4\u30C6\u30E0\uFF08\u6298\u308A\u7573\u3080\uFF09
 no=\u3044\u3044\u3048
 no_copy_attributes_before_paste_attributes=\u5C5E\u6027\u306F\u3001\u4E8B\u524D\u306B\u30B3\u30D4\u30FC\u3057\u3066\u304A\u304B\u306A\u3051\u308C\u3070\u3001\u8CBC\u308A\u4ED8\u3051\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3002
 NO_FORMAT=\u30C6\u30AD\u30B9\u30C8\u306E\u307F
@@ -917,6 +936,7 @@ not_saved_for_image_error=\u753B\u50CF\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u5B9A
 not_saved_for_link_error=\u30EA\u30F3\u30AF\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u5B9A\u3059\u308B\u524D\u306B\u3001\u30DE\u30C3\u30D7\u3092\u4FDD\u5B58\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 note_window_location=\u30CE\u30FC\u30C8\u30D1\u30CD\u30EB\u306E\u4F4D\u7F6E
 notes=\u30CE\u30FC\u30C8
+NotFoldingNextPresentationItemAction.text=\u6B21\u306E\u6298\u308A\u7573\u307E\u308C\u305F\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u30A2\u30A4\u30C6\u30E0
 NotificationOptions.CLOSE=\u9589\u3058\u308B
 NotificationOptions.REMIND_ME_LATER=\u30EA\u30DE\u30A4\u30F3\u30C9\u306E\u5EF6\u671F
 NotificationOptions.REMOVE_REMINDER=\u30EA\u30DE\u30A4\u30F3\u30C0\u306E\u524A\u9664
@@ -943,6 +963,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=\u968E
 OptionPanel.ADD_CHILD=\u5B50\u30CE\u30FC\u30C9\u3092\u4ED8\u52A0
 OptionPanel.ADD_SIBLING=\u5144\u5F1F\u30CE\u30FC\u30C9\u3092\u4ED8\u52A0
 OptionPanel.addons=\u30A2\u30C9\u30AA\u30F3
+OptionPanel.af=\u30A2\u30D5\u30EA\u30AB\u30FC\u30F3\u30B9\u8A9E
 OptionPanel.always_fold_all_after_load=\u3059\u3079\u3066\u6298\u308A\u7573\u3080
 OptionPanel.always_load_last_maps=\u8D77\u52D5\u6642\u306B\u3001\u5E38\u306B\u4E0A\u8A18\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u5C0A\u91CD
 OptionPanel.always_load_last_maps.tooltip=<html>\u30DE\u30C3\u30D7\u3092\u6307\u5B9A\u3057\u3066 FP \u3092\u8D77\u52D5\u3059\u308B\u5834\u5408\u3067\u3082\u3001\u4E0A\u8A18\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u53CD\u6620\u3057\u307E\u3059\u3002<br>\uFF08\u30DE\u30C3\u30D7\u3092\u6307\u5B9A\u3057\u3066 FP \u3092\u8D77\u52D5\u3059\u308B\u5834\u5408\u3001\u901A\u5E38\u3001\u524D\u56DE\u7D42\u4E86\u6642\u306E\u30D5\u30A1\u30A4\u30EB\u306E\u72B6\u614B\u3092\u7121\u8996\u3057\u307E\u3059\u3002 [...]
@@ -956,6 +977,8 @@ OptionPanel.antialias.tooltip=<html>\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u
 OptionPanel.antialias_all=\u3059\u3079\u3066\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9
 OptionPanel.antialias_edges=\u7DDA\u3060\u3051\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9
 OptionPanel.antialias_none=\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9\u306A\u3057
+OptionPanel.antialias_svg=SVG\u3092\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9
+OptionPanel.antialias_svg.tooltip=<html>SVG\u30EC\u30F3\u30C0\u30EA\u30F3\u30B0\u306E\u54C1\u8CEA\u3092\u6C7A\u5B9A\u3057\u307E\u3059\u3002\u30A2\u30F3\u30C1\u30A8\u30A4\u30EA\u30A2\u30B9\u304C\u591A\u304F\u306A\u308B\u3068\u3088\u308A\u6642\u9593\u304C\u304B\u304B\u308A\u307E\u3059\u3002</html>
 OptionPanel.Appearance=\u753B\u9762\u8868\u793A
 OptionPanel.approximate_search_threshold=\u66D6\u6627\u691C\u7D22\u306E\u95BE\u5024
 OptionPanel.approximate_search_threshold.tooltip=<html>\u66D6\u6627\u691C\u7D22\u3067\u30DE\u30C3\u30C1\u3057\u305F\u3068\u307F\u306A\u3059\u95BE\u5024\u3067\u3059\u3002<br/><font size="2">http://freeplane.sf.net/wiki/index.php/Approximate_search \u3092\u53C2\u7167\u3002</font><br/>\uFF08\u5024\u304C\u5927\u304D\u3044\u307B\u3069\u3001\u691C\u7D22\u6761\u4EF6\u306B\u30DE\u30C3\u30C1\u3059\u308B\u3082\u306E\u304C\u5C11\u306A\u304F\u306A\u308A\u307E\u3059\u3002\uFF09</html>
@@ -970,10 +993,16 @@ OptionPanel.automaticFormat_level2=\u7B2C\uFF11\u968E\u5C64\u30CE\u30FC\u30C9\u6
 OptionPanel.backup_file_number=\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30D5\u30A1\u30A4\u30EB\u306E\u4FDD\u6301\u6570
 OptionPanel.Behaviour=\u52D5\u4F5C\u8A2D\u5B9A
 OptionPanel.bezier=\u30D9\u30B8\u30A7\u66F2\u7DDA
+OptionPanel.border_color=\u8272
+OptionPanel.border_color_matches_edge_color=\u30A8\u30C3\u30B8\u306E\u7DDA\u306E\u8272\u3092\u4F7F\u7528
+OptionPanel.border_dash=\u7DDA\u7A2E
+OptionPanel.border_dash_matches_edge_dash=\u30A8\u30C3\u30B8\u306E\u7DDA\u7A2E\u3092\u4F7F\u7528
+OptionPanel.border_width=\u7DDA\u306E\u592A\u3055
+OptionPanel.border_width_matches_edge_width=\u30A8\u30C3\u30B8\u306E\u7DDA\u306E\u592A\u3055\u3092\u4F7F\u7528
 OptionPanel.bubble=\u56F2\u307F
 OptionPanel.ca=\u30AB\u30BF\u30ED\u30CB\u30A2\u8A9E\uFF08\u30D0\u30EC\u30F3\u30B7\u30A2\uFF09\uFF0FCatal\u00E0
 OptionPanel.Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-OptionPanel.center_selected_node=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u4E2D\u592E\u3078
+OptionPanel.center_selected_node=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u81EA\u52D5\u7684\u306B\u4E2D\u592E\u3078
 OptionPanel.check_updates_automatically=\u8D77\u52D5\u6642\u306B\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
 OptionPanel.childpattern=\u5B50\u30CE\u30FC\u30C9\u30D1\u30BF\u30FC\u30F3
 OptionPanel.childpattern.tooltip=\u9078\u629E\u3055\u308C\u305F\u30D1\u30BF\u30FC\u30F3\u306F\u3059\u3079\u3066\u306E\u5B50\u30CE\u30FC\u30C9\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
@@ -984,6 +1013,8 @@ OptionPanel.cloudcolor=\u96F2\u306E\u8272
 OptionPanel.cloudshape=\u96F2\u306E\u5F62
 OptionPanel.combined=\u8907\u5408
 OptionPanel.compare_as_number=\u6570\u5024\u3068\u3057\u3066\u6BD4\u8F03
+OptionPanel.connector_arrows=\u77E2\u5370
+OptionPanel.connector_dash=\u7DDA\u7A2E
 OptionPanel.convert_to_current_version=\u65E7\u30D0\u30FC\u30B8\u30E7\u30F3\u306E Freeplane \u306E\u30DE\u30A4\u30F3\u30C9\u30DE\u30C3\u30D7\u3092\u73FE\u884C\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u3082\u306E\u306B\u81EA\u52D5\u5909\u63DB\u3057\u307E\u3059\u304B\uFF1F
 OptionPanel.convert_to_current_version.tooltip=<html>\u5DE8\u5927\u30DE\u30C3\u30D7\u306B\u9650\u3063\u3066\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u5909\u63DB\u3059\u308B\u5FC5\u8981\u306F\u3042\u308A\u307E\u305B\u3093\u3002\uFF08\u3053\u308C\u306F\u3001\u5C02\u9580\u77E5\u8B58\u306B\u95A2\u308F<br>\u308B\u4E8B\u9805\u3067\u3059\uFF09\u3002\u305D\u3046\u3057\u305F\u30DE\u30C3\u30D7\u306F\u5909\u63DB\u3057\u306A\u304F\u3066\u3082\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</html>
 OptionPanel.copyFormatToNewSibling=\u65B0\u898F\u5144\u5F1F\u30CE\u30FC\u30C9\u3078\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u30B3\u30D4\u30FC
@@ -991,6 +1022,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=\u30A2\u30A4\u30B3\u30F3\u4ED8\u
 OptionPanel.cs=\u30C1\u30A7\u30B3\u8A9E\uFF0F\u010Desky
 OptionPanel.cut_nodes_without_question=\u30CE\u30FC\u30C9\u5207\u308A\u53D6\u308A\u6642\u306B\u78BA\u8A8D\u3092\u7701\u7565
 OptionPanel.cut_nodes_without_question.tooltip=<html>\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u3068\u3001\u30CE\u30FC\u30C9\u5207\u308A\u53D6\u308A\u6642\u306B\u78BA\u8A8D\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8868\u793A\u3057\u307E\u305B\u3093\u3002\u4E0D\u6CE8\u610F\u306B\u3088\u308A\u60C5\u5831<br>\u304C\u5931\u308F\u308C\u308B\u6050\u308C\u304C\u3042\u308A\u307E\u3059\u3002</html>
+OptionPanel.cut_out_pictures_when_pasting_html=HTML \u304B\u3089\u753B\u50CF\u3092\u524A\u9664
 OptionPanel.da=\u30C7\u30F3\u30DE\u30FC\u30AF\u8A9E\uFF0Fdansk
 OptionPanel.date_format=\u65E5\u4ED8\u306E\u6A19\u6E96\u66F8\u5F0F
 OptionPanel.date_format.tooltip=SHORT \u3084 MEDIUM\u3001 LONG\u3001FULL \u3092\u9078\u3076\u304B\u3001"MM/dd/yyyy" \u306E\u3088\u3046\u306A\u30D1\u30BF\u30FC\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
@@ -1021,6 +1053,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=<html>\u3059\u3079\u3066\u30
 OptionPanel.display_node_id=\u30CE\u30FC\u30C9 ID \u3092\u8868\u793A
 OptionPanel.edgecolor=\u7DDA\u306E\u8272
 OptionPanel.edgecolor.tooltip=\u89AA\u30CE\u30FC\u30C9\u306B\u3064\u306A\u304C\u308B\u7DDA\u306E\u30D7\u30ED\u30D1\u30C6\u30A3 (\u3059\u3079\u3066\u306E\u5B50\u30CE\u30FC\u30C9\u306B\u9069\u7528\u3055\u308C\u307E\u3059)
+OptionPanel.edgedash=\u7DDA\u7A2E
 OptionPanel.edgestyle=\u7DDA\u306E\u5F62\u72B6
 OptionPanel.edgestyle.tooltip=\u89AA\u30CE\u30FC\u30C9\u306B\u3064\u306A\u304C\u308B\u7DDA\u306E\u30D7\u30ED\u30D1\u30C6\u30A3 (\u3059\u3079\u3066\u306E\u5B50\u30CE\u30FC\u30C9\u306B\u9069\u7528\u3055\u308C\u307E\u3059)
 OptionPanel.edgewidth=\u7DDA\u306E\u592A\u3055
@@ -1074,9 +1107,10 @@ OptionPanel.goto_note_end_on_edit=\u30CE\u30FC\u30C8\u30D1\u30CD\u30EB\u306E\u30
 OptionPanel.grid_size=\uFF08\u30CE\u30FC\u30C9\u4F4D\u7F6E\u79FB\u52D5\u6642\u306E\uFF09\u30B0\u30EA\u30C3\u30C9\u306E\u9593\u9694
 OptionPanel.groovy_editor_font=Groovy\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF\u30A4\u30E9\u30A4\u30C8\u30A8\u30C7\u30A3\u30BF\u306E\u30D5\u30A9\u30F3\u30C8
 OptionPanel.groovy_editor_font.tooltip=Unicode\u6587\u5B57\u304C\u5FC5\u8981\u306A\u3089 'Dialog' \u304B 'Monospaced' \u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\uFF01
-OptionPanel.groovy_editor_font_size=Groovy\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF\u30A4\u30E9\u30A4\u30C8\u30A8\u30C7\u30A3\u30BF\u306E\u30D5\u30A9\u30F3\u30C8\u30B5\u30A4\u30BA
+OptionPanel.groovy_editor_font_size=Groovy\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF\u30A4\u30E9\u30A4\u30C8\u30A8\u30C7\u30A3\u30BF\u306E\u6587\u5B57\u30B5\u30A4\u30BA
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=\u7DDA\u3092\u96A0\u3059
+OptionPanel.hide_single_end_connectors=\u7247\u5074\u3060\u3051\u306E\u30B3\u30CD\u30AF\u30BF\u3092\u96A0\u3059
 OptionPanel.highlight_formulas=\u8A08\u7B97\u5F0F\u30CE\u30FC\u30C9\u3092\u67A0\u56F2\u3044\u8868\u793A
 OptionPanel.horizontal=\u76F4\u89D2\u66F2\u304C\u308A
 OptionPanel.hr=\u30AF\u30ED\u30A2\u30C1\u30A2\u8A9E\uFF0Fhrvatski
@@ -1092,6 +1126,7 @@ OptionPanel.ic_file=\u30CF\u30FC\u30C9\u30C7\u30A3\u30B9\u30AF\u306B\u4F5C\u6210
 OptionPanel.ic_ram=\u30E1\u30E2\u30EA\u306B\u4F5C\u6210
 OptionPanel.icon=\u30A2\u30A4\u30B3\u30F3
 OptionPanel.icon.tooltip=\u9069\u7528\u3059\u308B\u3068\u3001\u30CE\u30FC\u30C9\u306B\u3053\u306E\u30A2\u30A4\u30B3\u30F3\u304C\u4ED8\u304D\u307E\u3059\u3002
+OptionPanel.icon_size=\u30A2\u30A4\u30B3\u30F3\u30B5\u30A4\u30BA
 OptionPanel.icons.list=\u6A19\u6E96\u7684\u306A\u8868\u793A\u30A2\u30A4\u30B3\u30F3\u4E00\u89A7
 OptionPanel.icons.list.tooltip=<html>\u3053\u3053\u3067\u6A19\u6E96\u306E\u30A2\u30A4\u30B3\u30F3\u306E\u9806\u5E8F\u3092\u5165\u308C\u66FF\u3048\u305F\u308A\u3001\u4F7F\u7528\u4E2D\u6B62\u306B\u3057\u305F\u308A\u3067\u304D\u307E\u3059\u3002\u30A2\u30A4\u30B3\u30F3\u306F '\uFF1B'<br>\uFF08\u30BB\u30DF\u30B3\u30ED\u30F3\uFF09\u3067\u5206\u3051\u3066\u304F\u3060\u3055\u3044\u3002</html>
 OptionPanel.id=\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u8A9E\uFF0FBahasa Indonesia
@@ -1115,7 +1150,7 @@ OptionPanel.latex_disable_editor=LaTex\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF
 OptionPanel.latex_disable_editor.tooltip=LaTex\u30A8\u30C7\u30A3\u30BF\u306B\u554F\u984C\u304C\u3042\u308B\u5834\u5408\u306B\u30C1\u30A7\u30C3\u30AF\u3092\u3064\u3051\u3066\u304F\u3060\u3055\u3044\u3002
 OptionPanel.latex_editor_font=LaTeX\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF\u30A4\u30E9\u30A4\u30C8\u30A8\u30C7\u30A3\u30BF\u306E\u30D5\u30A9\u30F3\u30C8
 OptionPanel.latex_editor_font.tooltip=Unicode\u6587\u5B57\u304C\u5FC5\u8981\u306A\u3089 'Dialog' \u304B 'Monospaced' \u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\uFF01
-OptionPanel.latex_editor_font_size=LaTeX\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF\u30A4\u30E9\u30A4\u30C8\u30A8\u30C7\u30A3\u30BF\u306E\u30D5\u30A9\u30F3\u30C8\u30B5\u30A4\u30BA
+OptionPanel.latex_editor_font_size=LaTeX\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30CF\u30A4\u30E9\u30A4\u30C8\u30A8\u30C7\u30A3\u30BF\u306E\u6587\u5B57\u30B5\u30A4\u30BA
 OptionPanel.latex_macros=\u5171\u901A LaTeX \u30DE\u30AF\u30ED
 OptionPanel.layout_map_on_text_change=\u7DE8\u96C6\u4E2D\u306B\u30DE\u30C3\u30D7\u3092\u81EA\u52D5\u30EC\u30A4\u30A2\u30A6\u30C8
 OptionPanel.layout_map_on_text_change.tooltip=\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9\u3092\u512A\u5148\u3059\u308B\u5834\u5408\u306F\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
@@ -1133,6 +1168,8 @@ OptionPanel.lookandfeel.scaleuifonts=UI\u30D5\u30A9\u30F3\u30C8\u3092\u62E1\u592
 OptionPanel.lookandfeel.scaleuifonts.tooltip=\u9AD8\u5BC6\u5EA6\u30E2\u30CB\u30BF\u306E\u5834\u5408\u306B\u6709\u7528\u3067\u3059
 OptionPanel.lookandfeel.tooltip=<html>\u4F7F\u7528\u3059\u308B\u30EB\u30C3\u30AF\uFF06\u30D5\u30A3\u30FC\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002'metal' 'windows' 'motif' 'gtk'\u3092\u30B5\u30DD<br>\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059\u3002'mac' \u306F\u3001MacOS \u4E0A\u3067 \u3057\u304B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u6A19\u6E96\u7684\u306A<br>\u30EB\u30C3\u30AF\uFF06\u30D5\u30A3\u30FC\u30EB [...]
 OptionPanel.lt=\u30EA\u30C8\u30A2\u30CB\u30A2\u8A9E\uFF0Fkalba
+OptionPanel.markClones=\u30AF\u30ED\u30FC\u30F3\u30CE\u30FC\u30C9\u306B\u5370\u3092\u3064\u3051\u308B
+OptionPanel.markSelectedClones=\u9078\u629E\u3057\u305F\u30AF\u30ED\u30FC\u30F3\u30CE\u30FC\u30C9\u306B\u5370\u3092\u3064\u3051\u308B
 OptionPanel.max_displayed_node_count=\u30CE\u30FC\u30C9\u306E\u6700\u5927\u8868\u793A\u6570
 OptionPanel.max_image_width=\u65B0\u898F\u753B\u50CF\u306E\u6700\u5927\u8868\u793A\u5E45
 OptionPanel.max_image_width.tooltip=\u65B0\u898F\u753B\u50CF\u304C\u5927\u304D\u3044\u5834\u5408\u3001\u3053\u3053\u3067\u6307\u5B9A\u3059\u308B\u6A2A\u5E45\u306B\u5408\u308F\u305B\u3066\u7E2E\u5C0F\u8868\u793A\u3057\u307E\u3059\u3002
@@ -1140,8 +1177,10 @@ OptionPanel.max_menu_item_count=\u6700\u5927\u30E1\u30CB\u30E5\u30FC\u9805\u76EE
 OptionPanel.max_menu_item_count.tooltip=\u5404\u30B5\u30D6\u30E1\u30CB\u30E5\u30FC\u306B\u542B\u3081\u3089\u308C\u308B\u6A5F\u80FD\u9805\u76EE\u6570\u306E\u4E0A\u9650\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002\u6700\u5C0F\u5024\u306F10\u3067\u3059\u3002
 OptionPanel.max_node_width=\u30CE\u30FC\u30C9\u306E\u6700\u5927\u8868\u793A\u5E45
 OptionPanel.max_shortened_text_length=\u30C6\u30AD\u30B9\u30C8\u306E\u6700\u5927\u8868\u793A\u5E45
+OptionPanel.menuItemFontSize=\u30E1\u30CB\u30E5\u30FC\u9805\u76EE\u306E\u6587\u5B57\u30B5\u30A4\u30BA
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=\u30CE\u30FC\u30C9\u306E\u6700\u5C0F\u8868\u793A\u5E45
+OptionPanel.monitor_size_inches=\u30E2\u30CB\u30BF\u30FC\u30B5\u30A4\u30BA\uFF08\u30A4\u30F3\u30C1\uFF09
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=\u7D30\u3044\u516D\u89D2\u5F62
 OptionPanel.nb=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E\uFF08\u30D6\u30FC\u30AF\u30E2\u30FC\u30EB\uFF09\uFF0FNorsk bokm\u00E5l
@@ -1188,6 +1227,8 @@ OptionPanel.parse_latex=LaTeX \u3092\u8A8D\u8B58\u3059\u308B
 OptionPanel.parse_latex.tooltip=LaTeX \u6570\u5F0F\u3068\u8A8D\u8B58\u3059\u308B\u66F8\u5F0F\u307E\u305F\u306F\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u3002 http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane \u3092\u53C2\u7167\u3002
 OptionPanel.PASTE_HTML=HTML \u5F62\u5F0F
 OptionPanel.PASTE_PLAIN_TEXT=\u30D7\u30EC\u30FC\u30F3\u30C6\u30AD\u30B9\u30C8\u5F62\u5F0F
+OptionPanel.pasteImagesFromFiles=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u753B\u50CF\u3092\u8CBC\u308A\u4ED8\u3051
+OptionPanel.pasteImagesFromFiles.tooltip=\u30DE\u30C3\u30D7\u3078\u753B\u50CF\u30D5\u30A1\u30A4\u30EB\u304C\u30C9\u30ED\u30C3\u30D7\u3055\u308C\u305F\u3089\u753B\u50CF\u3092\u633F\u5165\u3057\u307E\u3059
 OptionPanel.path_property_may_not_be_empty=\u30D1\u30B9\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u672A\u6D88\u53BB\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u66F4\u65B0\u524D\u306E\u72B6\u614B\u306B\u623B\u308A\u307E\u3057\u305F\u3002
 OptionPanel.patternname=\u540D\u524D
 OptionPanel.patternname.tooltip=\u56FA\u6709\u306E\u30D1\u30BF\u30FC\u30F3\u540D
@@ -1196,8 +1237,18 @@ OptionPanel.placenewbranches=\u65B0\u898F\u30CE\u30FC\u30C9\u306E\u914D\u7F6E
 OptionPanel.placenewbranches.tooltip=\u65B0\u898F\u306E\u679D\u306F\u3069\u3053\u306B\u4F5C\u308A\u307E\u3059\u304B\uFF1F\u3000\u6709\u52B9\u5024\u306F\u300C\u5192\u982D\u300D\u304B\u300C\u672B\u5C3E\u300D\u3067\u3059\u3002
 OptionPanel.plugin.tooltip=\u30AA\u30D7\u30B7\u30E7\u30F3\u7684\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u3067\u3059\u3002
 OptionPanel.plugins=\u30D7\u30E9\u30B0\u30A4\u30F3
-OptionPanel.presentation_dimmer_transparency=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u30E2\u30FC\u30C9\u306E\u900F\u904E\u5EA6
-OptionPanel.presentation_mode=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u30E2\u30FC\u30C9
+OptionPanel.Presentation=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+OptionPanel.presentation.combineAll=\u5168\u3066\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u7D50\u5408\u3059\u308B
+OptionPanel.presentation.exportDirectory=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D
+OptionPanel.presentation.maxDropBoxRowCount=\u30C9\u30ED\u30C3\u30D7\u30C0\u30A6\u30F3\u30EA\u30B9\u30C8\u306E\u6700\u5927\u884C
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3068\u30B9\u30E9\u30A4\u30C9\u306E\u9078\u629E\u6642\u306B\u9069\u7528\u3055\u308C\u307E\u3059
+OptionPanel.presentation.processesEscapeKey=ESC \u30AD\u30FC\u3067\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u7D42\u4E86\u3059\u308B
+OptionPanel.presentation.processesNavigationKeys=\u77E2\u5370\u30AD\u30FC\u3067\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u64CD\u4F5C\u3059\u308B
+OptionPanel.presentation.slideDisplaysAllNodes=\u5168\u3066\u306E\u30B9\u30E9\u30A4\u30C9\u306E\u30CE\u30FC\u30C9\u3092\u81EA\u52D5\u7684\u306B\u5C55\u958B\u3059\u308B
+OptionPanel.presentation.slowMotion=\u30B9\u30ED\u30FC\u30E2\u30FC\u30B7\u30E7\u30F3
+OptionPanel.presentation.switchToFullScreen=\u30D5\u30EB\u30B9\u30AF\u30EA\u30FC\u30F3\u8868\u793A
+OptionPanel.presentation.switchToSpotlight=\u30B9\u30DD\u30C3\u30C8\u30E9\u30A4\u30C8\u3092\u4F5C\u52D5\u3055\u305B\u308B
+OptionPanel.presentation.zoom=\u30DE\u30C3\u30D7\u306E\u8868\u793A\u500D\u7387\u3092\u4F7F\u7528\u3059\u308B
 OptionPanel.printonwhitebackground=\u80CC\u666F\u3092\u767D\u5730\u3067\u5370\u5237
 OptionPanel.printonwhitebackground.tooltip=\u80CC\u666F\u3092\u5E38\u306B\u767D\u5730\u3067\u5370\u5237\u3057\u307E\u3059\u3002
 OptionPanel.pt_BR=\u30DD\u30EB\u30C8\u30AC\u30EB\u8A9E\uFF08\u30D6\u30E9\u30B8\u30EB\uFF09\uFF0FPortugu\u00EAs (Brasil)
@@ -1245,6 +1296,8 @@ OptionPanel.separator.automatic_save=\u81EA\u52D5\u4FDD\u5B58
 OptionPanel.separator.behaviour=\u57FA\u672C\u52D5\u4F5C
 OptionPanel.separator.browser=OS \u5225\u306E\u6A19\u6E96\u30D6\u30E9\u30A6\u30B6\u8D77\u52D5\u30B3\u30DE\u30F3\u30C9
 OptionPanel.separator.cache=\u30AD\u30E3\u30C3\u30B7\u30E5
+OptionPanel.separator.clones=\u30AF\u30ED\u30FC\u30F3
+OptionPanel.separator.cloud=\u96F2
 OptionPanel.separator.CloudControls=\u96F2
 OptionPanel.separator.commands_for_the_program=\u30D7\u30ED\u30B0\u30E9\u30E0\u30B3\u30DE\u30F3\u30C9
 OptionPanel.separator.connectors=\u30B3\u30CD\u30AF\u30BF
@@ -1252,7 +1305,7 @@ OptionPanel.separator.data_formats=\u30C7\u30FC\u30BF\u66F8\u5F0F\u306E\u8A2D\u5
 OptionPanel.separator.default_colors=\u6A19\u6E96\u8272
 OptionPanel.separator.default_fonts=\u6A19\u6E96\u30D5\u30A9\u30F3\u30C8
 OptionPanel.separator.default_styles=\u6A19\u6E96\u30B9\u30BF\u30A4\u30EB
-OptionPanel.separator.EdgeControls=\u7DDA
+OptionPanel.separator.EdgeControls=\u30A8\u30C3\u30B8
 OptionPanel.separator.edit_long_node_window=\u9577\u6587\u7DE8\u96C6\u30A6\u30A4\u30F3\u30C9\u30A6
 OptionPanel.separator.editing=\u30A8\u30C7\u30A3\u30BF\u306E\u8A2D\u5B9A
 OptionPanel.separator.export=\u66F8\u304D\u51FA\u3057
@@ -1263,7 +1316,9 @@ OptionPanel.separator.html_export=HTML \u3078\u306E\u66F8\u304D\u51FA\u3057
 OptionPanel.separator.html_import=HTML \u304B\u3089\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
 OptionPanel.separator.hyperlink_types=\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF\u306E\u7A2E\u985E
 OptionPanel.separator.icon_properties=\u30A2\u30A4\u30B3\u30F3
+OptionPanel.separator.IconControls=\u30A2\u30A4\u30B3\u30F3
 OptionPanel.separator.icons=\u300C\u30A2\u30A4\u30B3\u30F3\u3092\u9078\u629E...\u300D\u306E\u30A2\u30A4\u30B3\u30F3
+OptionPanel.separator.Icons=\u30A2\u30A4\u30B3\u30F3
 OptionPanel.separator.initial_map_size=\u521D\u671F\u30DE\u30C3\u30D7\u30B5\u30A4\u30BA
 OptionPanel.separator.inline_editor=\u30A4\u30F3\u30E9\u30A4\u30F3\u30CE\u30FC\u30C9\u30A8\u30C7\u30A3\u30BF
 OptionPanel.separator.JoinNodesAction=\u30CE\u30FC\u30C9\u306E\u7D50\u5408
@@ -1276,6 +1331,7 @@ OptionPanel.separator.mouse_wheel=\u30DE\u30A6\u30B9\u30DB\u30A4\u30FC\u30EB
 OptionPanel.separator.new_node_commands=\u65B0\u898F\u30CE\u30FC\u30C9\u4F5C\u6210
 OptionPanel.separator.node_editing_commands=\u30CE\u30FC\u30C9\u7DE8\u96C6\u30B3\u30DE\u30F3\u30C9
 OptionPanel.separator.node_navigation_commands=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30B3\u30DE\u30F3\u30C9
+OptionPanel.separator.NodeBorder=\u30CE\u30FC\u30C9\u5883\u754C
 OptionPanel.separator.NodeColors=\u30CE\u30FC\u30C9\u30B3\u30A2\u5168\u4F53\u306E\u8272
 OptionPanel.separator.NodeFont=\u30CE\u30FC\u30C9\u30B3\u30A2\u5168\u4F53\u306E\u30D5\u30A9\u30F3\u30C8
 OptionPanel.separator.NodeShape=\u30CE\u30FC\u30C9\u306E\u5F62
@@ -1287,6 +1343,7 @@ OptionPanel.separator.other_defaults=\u305D\u306E\u4ED6
 OptionPanel.separator.others=\u305D\u306E\u4ED6\u306E\u30AD\u30FC\u5272\u308A\u5F53\u3066
 OptionPanel.separator.outline_view=\u30A2\u30A6\u30C8\u30E9\u30A4\u30F3\u30D3\u30E5\u30FC
 OptionPanel.separator.patterns=\u30D1\u30BF\u30FC\u30F3
+OptionPanel.separator.presentation=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
 OptionPanel.separator.reminderOptions=\u30EA\u30DE\u30A4\u30F3\u30C0\u30AA\u30D7\u30B7\u30E7\u30F3
 OptionPanel.separator.RichTextEditor=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8\u30A8\u30C7\u30A3\u30BF
 OptionPanel.separator.root_node_appearance=\u30EB\u30FC\u30C8\u30CE\u30FC\u30C9\u306E\u4F53\u88C1
@@ -1302,7 +1359,8 @@ OptionPanel.separator.spelling=\u30B9\u30DA\u30EB\u30C1\u30A7\u30C3\u30AF\u30AA\
 OptionPanel.separator.SplitToWordsAction=\u30CE\u30FC\u30C9\u3092\u5358\u8A9E\u306B\u5206\u5272
 OptionPanel.separator.status=\u30B9\u30C6\u30FC\u30BF\u30B9\u30D0\u30FC
 OptionPanel.separator.surveys=\u8ABF\u67FB
-OptionPanel.separator.tooltip=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u8868\u793A\u306E\u6642\u9593
+OptionPanel.separator.svg_icons=SVG\u30A2\u30A4\u30B3\u30F3
+OptionPanel.separator.tooltip=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7
 OptionPanel.separator.undo=\u5143\u306B\u623B\u3059
 OptionPanel.separator.updates=\u30D7\u30ED\u30B0\u30E9\u30E0\u306E\u66F4\u65B0
 OptionPanel.set_property_text=\u5909\u66F4
@@ -1314,9 +1372,12 @@ OptionPanel.shape_vertical_margin=\u7E26\u306E\u4F59\u767D
 OptionPanel.sharp_bezier=\u5148\u7D30\u30D9\u30B8\u30A7\u66F2\u7DDA
 OptionPanel.sharp_linear=\u5148\u7D30\u76F4\u7DDA
 OptionPanel.shouldCenterSmallMaps=\u5C0F\u3055\u306A\u30DE\u30C3\u30D7\u3092\u4E2D\u592E\u3078\u8868\u793A
+OptionPanel.show_connectors=\u30B3\u30CD\u30AF\u30BF\u306E\u7DDA\u3092\u8868\u793A
 OptionPanel.show_icon_for_attributes=\u5C5E\u6027\u4ED8\u304D\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A
+OptionPanel.show_icons=\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A
 OptionPanel.show_less_than_N_nodes_by_default_after_load=\u4FDD\u5B58\u6642\u306E\u72B6\u614B\u304B\u3001\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30CE\u30FC\u30C9\u6570\u3092\u5C55\u958B\u3059\u308B
 OptionPanel.show_node_tooltips=\u30CE\u30FC\u30C9\u60C5\u5831\u3092\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u8868\u793A
+OptionPanel.show_note_icon_in_tooltip=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u306B\u30CE\u30FC\u30C8\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A
 OptionPanel.show_note_icons=\u30CE\u30FC\u30C8\u4ED8\u304D\u30A2\u30A4\u30B3\u30F3\u3092\u8868\u793A
 OptionPanel.show_styles_in_tooltip=\u30CE\u30FC\u30C9\u30B9\u30BF\u30A4\u30EB\u3092\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u8868\u793A
 OptionPanel.signed_script_are_trusted=\u7F72\u540D\u4ED8\u304D\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u4FE1\u983C\uFF08\u63A8\u5968\uFF09
@@ -1332,7 +1393,7 @@ OptionPanel.single_instance_force.tooltip=\u8AAD\u307F\u8FBC\u307F\u30D5\u30A1\u
 OptionPanel.sk=\u30B9\u30ED\u30D0\u30AD\u30A2\u8A9E\uFF0Fsloven\u010Dina
 OptionPanel.skip_template_selection=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u9078\u629E\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u30B9\u30AD\u30C3\u30D7\u3059\u308B
 OptionPanel.sl=\u30B9\u30ED\u30D9\u30CB\u30A2\u8A9E\uFF0Fsloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u4E2D\u592E\u306B\u3059\u308B\u5834\u5408\u3001\u3086\u3063\u304F\u308A\u30B9\u30AF\u30ED\u30FC\u30EB
+OptionPanel.slow_scroll_selected_node=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u306A\u3081\u3089\u304B\u306B\u30B9\u30AF\u30ED\u30FC\u30EB
 OptionPanel.small_bubble=\u5C0F\u3055\u306A\u56F2\u307F
 OptionPanel.spelling_opt_case_sensitive=\u5927\u6587\u5B57\uFF0F\u5C0F\u6587\u5B57\u3092\u533A\u5225
 OptionPanel.spelling_opt_ignore_all_caps_words=\u5927\u6587\u5B57\u306E\u307F\u306E\u8A9E\u3092\u7121\u8996
@@ -1345,14 +1406,17 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=\u5358\u8A9E\u306B\u542B
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=\u5206\u5272\u5143\u30CE\u30FC\u30C9\u3092\u7A7A\u767D\u306B\u3059\u308B
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u4E00\u5217\u306E\u30CE\u30FC\u30C9\u6570
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=\u5143\u6587\u7AE0\u3092\u30CE\u30FC\u30C9\u306E\u8A73\u7D30\u3068\u3057\u3066\u4FDD\u5B58
+OptionPanel.spotlight=\u30B9\u30DD\u30C3\u30C8\u30E9\u30A4\u30C8
+OptionPanel.spotlight_background_color=\u30B9\u30DD\u30C3\u30C8\u30E9\u30A4\u30C8\u306E\u80CC\u666F\u8272
 OptionPanel.sr=\u30BB\u30EB\u30D3\u30A2\u8A9E\uFF0F\u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=\u6A19\u6E96\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB
 OptionPanel.standardbackgroundcolor=\u30CE\u30FC\u30C9\u306E\u80CC\u666F
 OptionPanel.standardbackgroundcolor.tooltip=\u6A19\u6E96\u7684\u306A\u30CE\u30FC\u30C9\u306E\u80CC\u666F\u8272\u3002HTML\u8868\u8A18\u6CD5(16\u9032\u6570\u306E #RRGGBB )\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-OptionPanel.standardcloudcolor=\u96F2\u3000\u3000
+OptionPanel.standardcloudcolor=\u96F2
 OptionPanel.standardcloudcolor.tooltip=\u6A19\u6E96\u7684\u306A\u96F2\u306E\u8272\u3002HTML\u8868\u8A18\u6CD5(16\u9032\u6570\u306E #RRGGBB )\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 OptionPanel.standardcloudestyle=\u96F2\u306E\u5F62
 OptionPanel.standardcloudestyle.tooltip=\u6A19\u6E96\u7684\u306A\u96F2\u306E\u5F62
+OptionPanel.standardcloudshape=\u96F2\u306E\u6A19\u6E96\u306E\u5F62
 OptionPanel.standarddrawrectangleforselection=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u67A0\u56F2\u3044\u8868\u793A
 OptionPanel.standarddrawrectangleforselection.tooltip=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u67A0\u3067\u56F2\u307F\u307E\u3059\u3002
 OptionPanel.standardlinkcolor=\u6A19\u6E96\u8272
@@ -1375,6 +1439,7 @@ OptionPanel.time_for_automatic_save=\u81EA\u52D5\u4FDD\u5B58\u9593\u9694(\u30DF\
 OptionPanel.time_for_automatic_save.tooltip=<html> \u81EA\u52D5\u4FDD\u5B58\u306E\u9593\u9694(\u30DF\u30EA\u79D2)\u3002<br>\u81EA\u52D5\u4FDD\u5B58\u3092\u7121\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u3053\u306E\u6570\u5024\u30922000000000\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002</html>
 OptionPanel.time_for_delayed_selection=\u81EA\u52D5\u9078\u629E\u307E\u3067\u306E\u6642\u9593(\u30DF\u30EA\u79D2)
 OptionPanel.time_for_delayed_selection.tooltip=<html>\u30DE\u30A6\u30B9\u30AB\u30FC\u30BD\u30EB\u304C\u30CE\u30FC\u30C9\u4E0A\u306B\u79FB\u3063\u3066\u304B\u3089\u81EA\u52D5\u9078\u629E\u3059\u308B\u307E\u3067\u306E\u6642\u9593(\u30DF\u30EA\u79D2)\u3002\u30DE\u30A6\u30B9\u30AB\u30FC\u30BD<br>\u30EB\u3092\u30CE\u30FC\u30C9\u4E0A\u306B\u79FB\u3059\u3068\u540C\u6642\u306B\u9078\u629E\u3057\u305F\u3044\u5834\u5408\u306F\u3001\u3053\u306E\u5024\u3092\uFF11\u306B\u5909\u66F4\u3057\u3066\u304F\ [...]
+OptionPanel.toolbar_icon_height=\u30C4\u30FC\u30EB\u30D0\u30FC\u30A2\u30A4\u30B3\u30F3\u306E\u9AD8\u3055
 OptionPanel.toolTipManager.dismissDelay=\u8868\u793A\u3092\u4E2D\u65AD\u3059\u308B\u307E\u3067\u306E\u6642\u9593(\u30DF\u30EA\u79D2)
 OptionPanel.toolTipManager.initialDelay=\u6700\u521D\u306B\u8868\u793A\u3059\u308B\u307E\u3067\u306E\u6642\u9593(\u30DF\u30EA\u79D2)
 OptionPanel.toolTipManager.max_tooltip_height=\u30CE\u30FC\u30C9\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u306E\u6700\u5927\u8868\u793A\u9AD8\u3055
@@ -1392,9 +1457,10 @@ OptionPanel.unfold_on_paste.tooltip=\u30C9\u30E9\u30C3\u30B0\uFF06\u30C9\u30ED\u
 OptionPanel.uniform_shape=\u5747\u4E00\u5316
 OptionPanel.use_common_out_point_for_root_node=\u7DDA\u306E\u59CB\u70B9\u3092\u4E00\u70B9\u306B\u96C6\u7D04
 OptionPanel.use_common_out_point_for_root_node.tooltip=\u7DDA\u304C\u30EB\u30FC\u30C8\u30CE\u30FC\u30C9\u306E\u5DE6\u53F3\u305D\u308C\u305E\u308C\u4E00\u70B9\u304B\u3089\u767A\u3059\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002
+OptionPanel.use_svg_icons=SVG\u30A2\u30A4\u30B3\u30F3\u3092\u4F7F\u7528
+OptionPanel.use_svg_icons.tooltip=<html>\u30A2\u30A4\u30B3\u30F3\u306E\u30EC\u30F3\u30C0\u30EA\u30F3\u30B0\u54C1\u8CEA\u3092\u6C7A\u5B9A\u3057\u307E\u3059\u3002SVG\u30A2\u30A4\u30B3\u30F3\u306F\u8868\u793A\u306B\u6642\u9593\u304C\u304B\u304B\u308A\u307E\u3059\u3002</html>
 OptionPanel.use_tabbed_pane=\u30BF\u30D6\u8868\u793A\u6A5F\u80FD\u3092\u4F7F\u7528
 OptionPanel.use_tabbed_pane.tooltip=\u8AAD\u307F\u8FBC\u307E\u308C\u305F\u30DE\u30C3\u30D7\u3092(FireFox \u306E\u3088\u3046\u306B)\u30BF\u30D6\u3067\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-OptionPanel.user_defined_screen_resolution=\u30E6\u30FC\u30B6\u5B9A\u7FA9\u753B\u9762\u89E3\u50CF\u5EA6(dpi)
 OptionPanel.validate_classpath_needs_readaccess=\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A\u30AF\u30E9\u30B9\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\u5834\u5408\u306F\u3001\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u8AAD\u307F\u8FBC\u307F\u30A2\u30AF\u30BB\u30B9\u3092\u8A31\u53EF\u3057\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
 OptionPanel.validate_invalid_date_format=\u65E5\u4ED8\u306E\u6A19\u6E96\u66F8\u5F0F\u304C\u7121\u52B9
 OptionPanel.validate_invalid_datetime_format=\u6642\u523B\u4ED8\u304D\u65E5\u4ED8\u306E\u6A19\u6E96\u66F8\u5F0F\u304C\u7121\u52B9
@@ -1495,11 +1561,14 @@ plugins/TimeManagement.xml_todayButton=\u30AB\u30EC\u30F3\u30C0\u30FC\u9078\u629
 plugins/TimeManagement.xml_WindowTitle=\u6642\u9593\u7BA1\u7406
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=\u691C\u7D22\uFF06\u7F6E\u63DB
 preferences=\u8A2D\u5B9A
+presentation=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+presentation.combineAll=\u5168\u3066\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u7D50\u5408\u3059\u308B
 print_preview_title=\u5370\u5237\u30D7\u30EC\u30D3\u30E5\u30FC
 PrintAction.text=\u30DE\u30C3\u30D7\u3092\u5370\u5237...
 PrintDirectAction.text=\u5370\u5237
 printing_settings=\u5370\u5237\u30B5\u30A4\u30BA\u3092\u6307\u5B9A
 PrintPreviewAction.text=\u5370\u5237\u30D7\u30EC\u30D3\u30E5\u30FC...
+program_terminates=\u5185\u90E8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
 progress=\u9032\u6357\u5EA6
 PropertyAction.dialog=\u74B0\u5883\u8A2D\u5B9A
 PropertyAction.text=\u74B0\u5883\u8A2D\u5B9A...
@@ -1525,7 +1594,7 @@ regular_expressions=\u6B63\u898F\u8868\u73FE
 ReminderHookAction.text=\u30EA\u30DE\u30A4\u30F3\u30C0\u3092\u524A\u9664
 ReminderHookAction.tooltip=\u30CE\u30FC\u30C9\u304B\u3089\u30EA\u30DE\u30A4\u30F3\u30C0\u3092\u524A\u9664\u3057\u307E\u3059\u3002
 reminderNotification=\u30EA\u30DE\u30A4\u30F3\u30C0\u901A\u77E5
-remove_file_from_list_on_error=<html>\u30D5\u30A1\u30A4\u30EB  {0} \u3092\u8AAD\u307F\u8FBC\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3002<br>\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u300C\u6700\u8FD1\u4F7F\u3063\u305F\u30D5\u30A1\u30A4\u30EB\u300D\u304B\u3089\u524A\u9664\u3057\u307E\u3059\u304B\u3002</html>
+remove_file_from_list_on_error=<html>\u30D5\u30A1\u30A4\u30EB  {0} \u3092\u8AAD\u307F\u8FBC\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3002<br>\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u300C\u6700\u8FD1\u4F7F\u3063\u305F\u30DE\u30C3\u30D7\u300D\u304B\u3089\u524A\u9664\u3057\u307E\u3059\u304B\u3002</html>
 remove_shortcut_question=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u7F6E\u63DB\u3057\u307E\u3059\u304B\uFF1F
 RemoveAllAlwaysUnfoldedNodeFlagsAction.text=\u5E38\u6642\u5C55\u958B\u30CE\u30FC\u30C9\u306E\u89E3\u9664
 RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=\u3059\u3079\u3066\u306E\u30CE\u30FC\u30C9\u306E\u6298\u308A\u305F\u305F\u307F\u3092\u53EF\u80FD\u306B\u3057\u307E\u3059
@@ -1595,6 +1664,7 @@ selection_method_delayed=\u9593\u3092\u7F6E\u3044\u3066\u81EA\u52D5\u9078\u629E
 selection_method_direct=\u76F4\u3061\u306B\u9078\u629E
 SelectNoteAction.text=\u30CE\u30FC\u30C8\u7DE8\u96C6\u306B\u5207\u308A\u66FF\u3048
 SelectNoteAction.tooltip=\u64CD\u4F5C\u5BFE\u8C61\u3092\u30CE\u30FC\u30C8\u30D1\u30CD\u30EB\u306B\u5207\u308A\u66FF\u3048\u307E\u3059\u3002
+set_accelerator_on_next_click_helpmessage=\u65B0\u3057\u3044\u30AD\u30FC\u30DC\u30FC\u30C9\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306B\u3001\u30E1\u30CB\u30E5\u30FC\u306E\u76EE\u7684\u306E\u30B3\u30DE\u30F3\u30C9\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 SetAccelerator.dialogTitle=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u306E\u5272\u308A\u5F53\u3066
 SetAccelerator.keystrokeDetected=\u5165\u529B\u30AD\u30FC ''{0}'' \u306F\u3001\u3069\u306E\u30E1\u30CB\u30E5\u30FC\u30A2\u30A4\u30C6\u30E0\u306B\u3082\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 SetAcceleratorOnNextClickAction.text=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u3092\u5272\u308A\u5F53\u3066...
@@ -1618,12 +1688,17 @@ ShowAncestorsAction.text=\u4E0A\u4F4D\u30CE\u30FC\u30C9\u3082\u8868\u793A
 ShowAttributeDialogAction.text=\u5C5E\u6027\u30DE\u30CD\u30FC\u30B8\u30E3...
 ShowDescendantsAction.text=\u4E0B\u4F4D\u30CE\u30FC\u30C9\u3082\u8868\u793A
 ShowFilterToolbarAction.text=\u30D5\u30A3\u30EB\u30BF\u30D0\u30FC
-ShowFormatPanel.text=\u30D7\u30ED\u30D1\u30C6\u30A3\u30D1\u30CD\u30EB
+ShowFirstSlideAction.text=\u6700\u521D\u306E\u30B9\u30E9\u30A4\u30C9
+ShowFirstSlideAndStartPresentationAction.text=\u6700\u521D\u304B\u3089\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u3092\u5B9F\u884C\u3059\u308B
+ShowFormatPanel.text=\u30C4\u30FC\u30EB\u30D1\u30CD\u30EB
 ShowFormatPanel.tooltip=\u30CE\u30FC\u30C9\u3068\u7DDA\u306E\u5C5E\u6027\u3092\u540C\u6642\u306B\u5909\u66F4\u3067\u304D\u308B\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u8868\u793A\u3057\u307E\u3059\u3002
 ShowHideNoteAction.text=\u30CE\u30FC\u30C8\u30D1\u30CD\u30EB\u3092\u8868\u793A
 ShowHideNoteAction.tooltip=\u30CE\u30FC\u30C8\u30D1\u30CD\u30EB\u306E\u8868\u793A\uFF0F\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002
+ShowLastSlideAction.text=\u6700\u5F8C\u306E\u30B9\u30E9\u30A4\u30C9
 ShowNextChildAction.text=\u6B21\u306E\u5B50\u30CE\u30FC\u30C9\u3092\u8868\u793A
+ShowNextSlideAction.text=\u6B21\u306E\u30B9\u30E9\u30A4\u30C9
 ShowNotesInMapAction.text=\u30DE\u30C3\u30D7\u5185\u306B\u30CE\u30FC\u30C8\u3092\u8868\u793A
+ShowPreviousSlideAction.text=\u524D\u306E\u30B9\u30E9\u30A4\u30C9
 ShowSelectedAttributesAction.text=\u8868\u793A\u3059\u308B\u5C5E\u6027\u3092\u9650\u5B9A
 ShowSelectionAsRectangleAction.text=\u9078\u629E\u30CE\u30FC\u30C9\u3092\u67A0\u56F2\u3044\u8868\u793A
 simplyhtml.aboutFrameTitle=\u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3064\u3044\u3066
@@ -1646,7 +1721,7 @@ simplyhtml.borderColorLabel=\u8272\uFF1A
 simplyhtml.borderWidthLabel=\u5E45
 simplyhtml.bottomLabel=\u4E0B\u8A70\u3081\uFF1A
 simplyhtml.cancelBtnName=\u30AD\u30E3\u30F3\u30BB\u30EB
-simplyhtml.cellBorderTabLabel=\u5883\u754C\u7DDA
+simplyhtml.cellBorderTabLabel=\u5883\u754C
 simplyhtml.cellGenTabLabel=\u5168\u822C
 simplyhtml.cellMarginTabLabel=\u30DE\u30FC\u30B8\u30F3
 simplyhtml.cellPanelTitle=\u30BB\u30EB\u306E\u66F8\u5F0F
@@ -1812,6 +1887,42 @@ simplyhtml.valignMiddle=\u4E2D\u592E\u63C3\u3048
 simplyhtml.valignTop=\u4E0A\u8A70\u3081
 simplyhtml.wholeWordsOnly=\u5B8C\u5168\u306B\u4E00\u81F4\u3059\u308B\u5358\u8A9E\u306E\u307F
 simplyhtml.wholeWordsOnly.tooltip=\u8907\u6570\u8A9E\u306E\u691C\u7D22\u6642\u306B\u3001\u8A9E\u7FA4\u5168\u4F53\u304C\u30DE\u30C3\u30C1\u3059\u308B\u3082\u306E\u3060\u3051\u30DE\u30C3\u30C1\u3059\u308B\u3082\u306E\u3068\u307F\u306A\u3057\u307E\u3059\u3002
+slide.add=\u8FFD\u52A0
+slide.add.tooltip=\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u3092\u30B9\u30E9\u30A4\u30C9\u306B\u8FFD\u52A0
+slide.at_center.tooltip=\u4E2D\u592E
+slide.content=\u30B9\u30E9\u30A4\u30C9\u30B3\u30F3\u30C6\u30F3\u30C4
+slide.descendants=\u4E0B\u4F4D\u30B9\u30E9\u30A4\u30C9\u3082\u8868\u793A
+slide.edge=\u4F59\u767D
+slide.filter=\u30D5\u30A3\u30EB\u30BF
+slide.first=\u6700\u521D
+slide.last=\u6700\u5F8C
+slide.next=\u6B21\u3078
+slide.nofilter=\u30D5\u30A3\u30EB\u30BF\u7121\u3057
+slide.on_the_left.tooltip=\u5DE6\u63C3\u3048
+slide.on_the_right.tooltip=\u5DE6\u63C3\u3048
+slide.placenode=\u9078\u629E\u3055\u308C\u305F\u30CE\u30FC\u30C9\u306E\u4F4D\u7F6E
+slide.placenode.tooltip=\u30B9\u30E9\u30A4\u30C9\u304C\u63D0\u793A\u3055\u308C\u308B\u6642
+slide.present=\u30D7\u30EC\u30BC\u30F3
+slide.presentation=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+slide.presentations=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+slide.previous=\u524D\u3078
+slide.remove=\u524A\u9664
+slide.remove.tooltip=\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u3092\u30B9\u30E9\u30A4\u30C9\u304B\u3089\u524A\u9664
+slide.select=\u9078\u629E
+slide.select.tooltip=\u30B9\u30E9\u30A4\u30C9\u3067\u4F7F\u7528\u3059\u308B\u30CE\u30FC\u30C9\u3092\u30DE\u30C3\u30D7\u304B\u3089\u9078\u629E
+slide.set=\u6C7A\u5B9A
+slide.set.tooltip=\u9078\u629E\u4E2D\u306E\u30CE\u30FC\u30C9\u3092\u30B9\u30E9\u30A4\u30C9\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u6307\u5B9A
+slide.setfilter=\u30D5\u30A3\u30EB\u30BF\u8A2D\u5B9A
+slide.setfilter.tooltip=\u30B9\u30E9\u30A4\u30C9\u8868\u793A\u6642\u306E\u30D5\u30A3\u30EB\u30BF\u306E\u8A2D\u5B9A\u307E\u305F\u306F\u524A\u9664
+slide.setfoldingstate=\u6298\u308A\u7573\u307F\u306E\u8A2D\u5B9A
+slide.setfoldingstate.tooltip=\u30B9\u30E9\u30A4\u30C9\u8868\u793A\u6642\u306B\u73FE\u5728\u306E\u6298\u308A\u7573\u307F\u3092\u5FA9\u5143
+slide.setzoom=\u8868\u793A\u500D\u7387\u306E\u8A2D\u5B9A
+slide.setzoom.tooltip=\u30B9\u30E9\u30A4\u30C9\u8868\u793A\u6642\u306E\u8868\u793A\u500D\u7387\u306E\u8A2D\u5B9A\u307E\u305F\u306F\u524A\u9664
+slide.showancestors=\u4E0A\u4F4D\u30B9\u30E9\u30A4\u30C9\u3092\u8868\u793A
+slide.showonlyselected=\u9078\u629E\u3057\u305F\u30CE\u30FC\u30C9\u306E\u307F\u3092\u8868\u793A
+slide.showonlyselected.tooltip=\u30B9\u30E9\u30A4\u30C9\u8868\u793A\u6642\u306B\u4ED6\u306E\u30CE\u30FC\u30C9\u3092\u96A0\u3057\u307E\u3059
+slide.slides=\u30B9\u30E9\u30A4\u30C9
+slide.stop=\u505C\u6B62
 SortNodes.text=\u5B50\u30CE\u30FC\u30C9\u3092\u4E26\u3079\u66FF\u3048
 SortNodes.tooltip=\u3059\u3079\u3066\u306E\u5B50\u30CE\u30FC\u30C9\u3092\u6570\u5024\u9806\u3001\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u3001\u4E94\u5341\u97F3\u9806\u7B49\u306B\u4E26\u3079\u66FF\u3048\u307E\u3059\u3002
 split=\u30CE\u30FC\u30C9\u3092\u5206\u5272(&S)
@@ -1820,7 +1931,10 @@ SplitNode.text=\u30CE\u30FC\u30C9\u3092\u5206\u5272
 SplitNode.tooltip=\u30CE\u30FC\u30C9\u3092\u5206\u5272\u3057\u307E\u3059\u3002
 SplitToWordsAction.text=\u4E00\u884C {0} \u5358\u8A9E\u306B\u5206\u5272
 STANDARD_FORMAT=\u6A19\u6E96
+StartPresentationAction.text=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u958B\u59CB
+StartPresentationOrShowNextSlideAction.text=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u958B\u59CB / \u6B21\u306E\u30B9\u30E9\u30A4\u30C9
 stop_processing=\u9069\u7528\u3092\u4E2D\u6B62
+StopPresentationAction.text=\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3\u505C\u6B62
 StringFlavorHandler=\u30D7\u30EC\u30FC\u30F3\u30C6\u30AD\u30B9\u30C8\uFF1A\u30CE\u30FC\u30C9\u968E\u5C64\u4ED8\u304D\uFF08\u6298\u308A\u7573\u3080\uFF09
 StructuredHtmlFlavorHandler=HTML \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\uFF1A\u30CE\u30FC\u30C9\u968E\u5C64\u4ED8\u304D
 style=\u30B9\u30BF\u30A4\u30EB
@@ -1884,7 +1998,6 @@ ToggleMenubarAction.text=\u30E1\u30CB\u30E5\u30FC\u30D0\u30FC
 ToggleScrollbarsAction.text=\u30B9\u30AF\u30ED\u30FC\u30EB\u30D0\u30FC
 ToggleStatusAction.text=\u30B9\u30C6\u30FC\u30BF\u30B9\u30D0\u30FC\u3092\u8868\u793A
 ToggleToolbarAction.text=\u30C4\u30FC\u30EB\u30D0\u30FC
-toolbars=\u30C4\u30FC\u30EB\u30D0\u30FC
 TranslatedElement.TEXT=\u30C6\u30AD\u30B9\u30C8
 TranslatedElement.TOOLTIP=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7
 uiTextChanger.originalTextIsNotDefined=\u5143\u306E\u30C6\u30AD\u30B9\u30C8\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
@@ -1922,7 +2035,7 @@ user_config_folder=User configuration folder: {0}
 user_defined_filters=\u30E6\u30FC\u30B6\u5B9A\u7FA9\u30D5\u30A3\u30EB\u30BF
 user_defined_scale=\u753B\u9762\u8868\u793A(&U)\u3000\u00D7
 user_defined_zoom=\u30E6\u30FC\u30B6\u6307\u5B9A
-user_defined_zoom_status_bar=\u30E6\u30FC\u30B6\u306E\u6307\u5B9A\u306B\u3088\u308A\u753B\u9762\u8868\u793A\u3092 {0}% \u306B\u8A2D\u5B9A\u3057\u3066\u3044\u307E\u3059\u3002
+user_defined_zoom_status_bar=\u30E6\u30FC\u30B6\u306E\u6307\u5B9A\u306B\u3088\u308A\u8868\u793A\u500D\u7387\u3092 {0}% \u306B\u8A2D\u5B9A\u3057\u3066\u3044\u307E\u3059\u3002
 user_icon=\u30E6\u30FC\u30B6\u30A2\u30A4\u30B3\u30F3 "{0}"
 user_template_dir=\u30E6\u30FC\u30B6\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 user_zoom=\u3000\u3000\u3000\u5370\u5237\u500D\u7387[0.0 - 2.0]\uFF1A
@@ -1946,6 +2059,6 @@ xslt_export.ms_word=XSLT\u3092\u4F7F\u3063\u3066 Microsoft Word 2003 XML \u306B
 xslt_export.text=XSLT\u3092\u4F7F\u3063\u3066\u30D7\u30EC\u30FC\u30F3\u30C6\u30AD\u30B9\u30C8\u306B
 xslt_export_not_possible=Freeplane XSLT \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002
 yes=\u306F\u3044
-zoom=\u30BA\u30FC\u30E0
+zoom=\u8868\u793A\u500D\u7387
 ZoomInAction.text=\u62E1\u5927\u8868\u793A
 ZoomOutAction.text=\u7E2E\u5C0F\u8868\u793A
diff --git a/freeplane/resources/translations/Resources_ko.properties b/freeplane/resources/translations/Resources_ko.properties
index dbce57a..5bfe81c 100644
--- a/freeplane/resources/translations/Resources_ko.properties
+++ b/freeplane/resources/translations/Resources_ko.properties
@@ -15,15 +15,15 @@ accessories/plugins/EncryptNode.properties_7=\uCDE8\uC18C
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=\uC554\uD638\uD654\uB41C \uB178\uB4DC\uC5D0\uC11C\uB9CC \uAC00\uB2A5\uD569\uB2C8\uB2E4. \uB3C4\uAD6C \uBA54\uB274\uC5D0\uC11C \uC554\uD638\uD654\uB41C \uB178\uB4DC \uC0BD\uC785\uC73C\uB85C \uB0B4\uC6A9\uC744 \uBA3C\uC800 \uB9CC\uB4DC\uC138\uC694.
 accessories/plugins/EncryptNode.properties_select_me=\uACC4\uC18D\uD558\uC2DC\uB824\uBA74 \uC120\uD0DD\uD558\uC138\uC694!
 accessories/plugins/EncryptNode.properties_wrong_password=\uC554\uD638\uAC00 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+accessories/plugins/Export_JavaWebStart.text=\uC790\uBC14 \uC6F9 \uC2DC\uC791...
+accessories/plugins/Export_JavaWebStart.tooltip=\uC790\uBC14 \uC6F9 \uC2DC\uC791\uC73C\uB85C \uC9C0\uB3C4\uB97C \uB0B4\uBCF4\uB0B4\uAE30 \uD569\uB2C8\uB2E4.
 accessories/plugins/ExportWithTWiki.text=TWiki \uBB38\uC11C\uB85C...
 accessories/plugins/ExportWithTWiki.tooltip=\uC9C0\uB3C4\uB97C TWiki \uBB38\uC11C\uB85C \uB0B4\uBCF4\uB0C5\uB2C8\uB2E4.
 accessories/plugins/ExportWithXSLT.tooltip=XSLT \uC2A4\uD06C\uB9BD\uD2B8\uB97C \uC0AC\uC6A9\uC2DC \uADE0\uC77C\uD55C \uBC29\uBC95\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4.
 accessories/plugins/ExportWithXSLT_Applet.text=\uC790\uBC14 \uC560\uD50C\uB9BF\uC73C\uB85C...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\uC790\uBC14 \uC560\uD50C\uB9BF\uC73C\uB85C \uC9C0\uB3C4\uB97C \uB0B4\uBCF4\uB0C5\uB2C8\uB2E4.
-accessories/plugins/ExportWithXSLT_Flash.text=\uD50C\uB798\uC2DC\uB85C...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\uD50C\uB798\uC2DC \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC73C\uB85C \uC9C0\uB3C4\uB97C \uB0B4\uBCF4\uB0C5\uB2C8\uB2E4.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML\uB85C \uC800\uC7A5 (JavaScript \uD615\uD0DC)...
-accessories/plugins/ExportWithXSLT_HTML3.text=XHTML(\uD074\uB9AD \uAC00\uB2A5\uD55C \uC9C0\uB3C4 \uADF8\uB9BC \uD615\uD0DC)\uB85C \uC800\uC7A5...
+accessories/plugins/ExportWithXSLT_HTML3.text=XHTML(\uD074\uB9AD \uAC00\uB2A5\uD55C \uC9C0\uB3C4 \uC774\uBBF8\uC9C0 \uBC84\uC804)\uB85C \uC800\uC7A5...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=RESOURCES \uB178\uB4DC\uC5D0\uC11C TaskJuggler \uD30C\uC77C\uB85C \uC790\uC6D0\uC744 \uC81C\uACF5\uD569\uB2C8\uB2E4.???...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>RESOURCES \uB178\uB4DC\uC5D0\uC11C Taskjuggler\uBAA8\uB4C8\uB85C \uC790\uC6D0\uC744 \uB0B4\uBCF4\uB0B4\uAE30. </html>
 accessories/plugins/ExportWithXSLT_TASKSTJI.text=TASKS \uB178\uB4DC\uC5D0\uC11C TaskJuggler \uD30C\uC77C\uB85C \uC791\uC5C5\uC744 \uB9DE\uAE41\uB2C8\uB2E4???...
@@ -73,7 +73,7 @@ addons.installer.too.old=\uD604\uC7AC \uD504\uB9AC\uD50C\uB808\uC778 \uBC84\uC80
 addons.installer.unknown.deinstallation.rules=\uC54C\uC218 \uC5C6\uB294 \uC124\uCE58 \uD574\uC81C??? \uADDC\uCE59 {0}
 addons.installer.update=\uBC84\uC804 {0} \uC5D0\uC11C \uAC31\uC2E0
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">\uC2E0\uB8B0\uD558\uB294 \uC6D0\uBCF8\uC73C\uB85C \uBD80\uAC00 \uAE30\uB2A5\uC744 \uC124\uCE58\uD574\uC57C \uD569\uB2C8\uB2E4. \uC545\uC131 \uC18C\uD504\uD2B8\uC6E8\uC5B4\uB294 \uB370\uC774\uD130\uC5D0 \uB300\uD55C \uC190\uC0C1\uC774\uB098 \uAC1C\uC778\uC815\uBCF4\uB97C \uCE68\uD574\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=\uAF34\uC5D0\uC11C \uC18D\uC131
 AddStyleAttributes.tooltip=\uAF34 \uB178\uB4DC\uC5D0\uC11C \uC18D\uC131\uC744 \uCD94\uAC00
 AllMapsNodeListAction.text=\uBAA8\uB4E0 \uC9C0\uB3C4\uC5D0\uC11C \uCC3E\uC544 \uBC14\uAFB8\uAE30
@@ -121,13 +121,13 @@ attributes_popup_down=\uC544\uB798
 attributes_popup_edit=\uD3B8\uC9D1
 attributes_popup_hide=\uC228\uAE30\uAE30
 attributes_popup_new=\uC0C8\uB85C\uC6B4 \uC18D\uC131
-attributes_popup_optimal_width=\uCD5C\uC801 \uB108\uBE44
+attributes_popup_optimal_width=\uCD5C\uC801\uC758 \uB108\uBE44
 attributes_popup_up=\uC704\uB85C
 attributes_refresh=\uC0C8\uB85C\uACE0\uCE68
 attributes_RemoveAllAttributesAction.text=\uBAA8\uB4E0 \uC18D\uC131 \uC81C\uAC70
 attributes_RemoveFirstAttributeAction.text=\uCCAB\uBC88\uC9F8 \uC18D\uC131 \uC81C\uAC70
 attributes_RemoveLastAttributeAction.text=\uB9C8\uC9C0\uB9C9 \uC18D\uC131 \uC81C\uAC70
-attributes_restricted_attributes_tooltip=\uC18D\uC131 \uC9D1\uD569\uC5D0 \uC81C\uD55C\uC744 \uAC78\uAE30
+attributes_restricted_attributes_tooltip=\uC18D\uC131 \uC9D1\uD569 \uC81C\uD55C
 attributes_restricted_values_tooltip=\uD604\uC7AC \uC18D\uC131\uC73C\uB85C \uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uAC12\uC744 \uC81C\uD55C\uD558\uAE30
 attributes_restriction=\uC81C\uD55C\uB41C \uC124\uC815
 attributes_select_all=\uBAA8\uB450
@@ -141,7 +141,7 @@ automatic_layout_disabled=\uBE44\uD65C\uC131\uD654\uB428
 automatically_save_message=\uC9C0\uB3C4\uAC00 \uC790\uB3D9 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4 (\uD30C\uC77C\uBA85 {0})...
 AutomaticEdgeColor.FOR_BRANCHES=\uAC00\uC9C0\uB85C
 AutomaticEdgeColor.FOR_COLUMNS=\uC5F4\uB85C
-AutomaticEdgeColor.FOR_LEVELS=\uC218\uC900??\uC5D0\uB300\uD558\uC5EC
+AutomaticEdgeColor.FOR_LEVELS=\uC218\uC900\uBCC4\uB85C
 AutomaticEdgeColor.ON_BRANCH_CREATION=\uC9C0\uC810 \uC0DD\uC131
 AutomaticEdgeColorHookAction.text=\uC790\uB3D9 \uC904\uAE30 \uC0C9\uC0C1
 AutomaticLayout.ALL=\uBAA8\uB4E0 \uB178\uB4DC\uC5D0
@@ -160,7 +160,7 @@ background=\uBC30\uACBD
 bitmaps=\uBE44\uD2B8\uB9F5
 black=\uAC80\uC815
 BlinkingNodeHookAction.text=\uBC18\uC9DD\uC774\uB294 \uB178\uB4DC
-BlinkingNodeHookAction.tooltip=<html>\uB178\uB4DC\uB97C \uBC18\uC9DD\uC774\uAC8C \uD569\uB2C8\uB2E4. \uD558\uC9C0\uB9CC \uB108\uBB34 \uB9CE\uC740 \uB178\uB4DC\uC5D0 \uC801\uC6A9\uD558\uAC70\uB098 <strong>\uB2E4\uB978 \uD615\uC2DD \uC790\uB3D9 \uC124\uC815 \uAE30\uB2A5\uC744 \uAC19\uC740 \uB178\uB4DC\uC5D0 \uB3D9\uC2DC \uC801\uC6A9</strong>\uC2DC\uD0A4\uC9C0 \uC54A\uB3C4\uB85D \uC8FC\uC758\uD558\uC138\uC694.</html>
+BlinkingNodeHookAction.tooltip=<html>\uC774\uB807\uAC8C\uD558\uBA74 \uB178\uB4DC\uAC00 \uAE5C\uBC15\uC785\uB2C8\uB2E4. \uD558\uC9C0\uB9CC \uC870\uC2EC\uD558\uC2ED\uC2DC\uC624. \uB108\uBB34 \uB9CE\uC740 \uB178\uB4DC\uB098 <strong>\uB2E4\uB978 \uC790\uB3D9 \uD615\uC2DD\uB41C \uAC19\uC740 \uB178\uB4DC\uC5D0</strong>\uC5F0\uACB0\uD558\uC9C0 \uB9C8\uC2ED\uC2DC\uC624.</html>
 blue=\uD30C\uB791
 BoldAction.text=\uAC15\uC870
 boldify_branch=\uAC00\uC9C0\uB97C \uAD75\uAC8C
@@ -184,7 +184,6 @@ cannot_join_nodes_with_children=\uD558\uC704 \uB0B4\uC6A9\uC774 \uC788\uB294 \uB
 cannot_move_into_child_node=\uC790\uC2DD \uB178\uB4DC\uB85C \uC774\uB3D9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4
 cannot_move_to_child=\uB178\uB4DC\uB97C \uC790\uC2E0\uC758 \uD558\uC704 \uB178\uB4DC\uB85C \uC62E\uAE38 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 CenterAction.text=\uC911\uC559\uC815\uB82C
-CenterSelectedNodeAction.text=\uC120\uD0DD\uD55C \uB178\uB4DC\uB97C \uC911\uC559 \uC815\uB82C
 ChangeConnectorArrowsAction.backward.text=\uC5ED\uBC29\uD5A5 \uD654\uC0B4\uD45C \uADF8\uB9AC\uAE30
 ChangeConnectorArrowsAction.both.text=\uC591\uBC29\uD5A5 \uD654\uC0B4\uD45C \uADF8\uB9AC\uAE30
 ChangeConnectorArrowsAction.forward.text=\uC815\uBC29\uD5A5 \uD654\uC0B4\uD45C \uADF8\uB9AC\uAE30
@@ -198,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=\uB178\uB4DC \uC774\uB3D9\uD558\uAE30 (\uBD80\uB
 ChangeNodeLevelLeftsAction.tooltip=\uCD5C\uC0C1\uC704 \uB178\uB4DC\uC758 \uC67C\uCABD\uC5D0\uC11C\uB294 \uB178\uB4DC\uAC00 \uC544\uB798\uB85C \uBC00\uB9BD\uB2C8\uB2E4. \uC190\uC704 \uD615\uC81C \uB178\uB4DC\uC758 \uD558\uC704 \uB178\uB4DC\uB85C \uBCC0\uD569\uB2C8\uB2E4. \uCD5C\uC0C1\uC704 \uB178\uB4DC\uC758 \uC624\uB978\uCABD\uC5D0\uC11C\uB294 \uB178\uB4DC\uAC00 \uC704\uCABD\uC73C\uB85C \uBC00\uB9BD\uB2C8\uB2E4. \uCD5C\uC0C1\uC704 \uB178\uB4DC \uC790\uCCB4\uC5D0\uC11C\uB294 \uB178\uB4DC\ [...]
 ChangeNodeLevelRightsAction.text=\uB178\uB4DC \uC774\uB3D9\uD558\uAE30 (\uC190\uC704 \uD615\uC81C\uC758 \uD558\uC704 \uB178\uB4DC\uB85C)
 ChangeNodeLevelRightsAction.tooltip=\uCD5C\uC0C1\uC704 \uB178\uB4DC\uC758 \uC67C\uCABD\uC5D0\uC11C\uB294 \uB178\uB4DC\uAC00 \uC544\uB798\uB85C \uBC00\uB9BD\uB2C8\uB2E4. \uC190\uC704 \uD615\uC81C \uB178\uB4DC\uC758 \uD558\uC704 \uB178\uB4DC\uB85C \uBCC0\uD569\uB2C8\uB2E4. \uCD5C\uC0C1\uC704 \uB178\uB4DC\uC758 \uC624\uB978\uCABD\uC5D0\uC11C\uB294 \uB178\uB4DC\uAC00 \uC704\uCABD\uC73C\uB85C \uBC00\uB9BD\uB2C8\uB2E4. \uCD5C\uC0C1\uC704 \uB178\uB4DC \uC790\uCCB4\uC5D0\uC11C\uB294 \uB178\uB4DC [...]
-choose_background_color=\uBC30\uACBD\uC0C9 \uC120\uD0DD:
 choose_cloud_color=\uAD6C\uB984 \uC0C9\uC0C1 \uC120\uD0DD:
 choose_edge_color=\uC904\uAE30 \uC0C9 \uC120\uD0DD
 choose_map_background_color=\uC9C0\uB3C4 \uBC30\uACBD\uC0C9 \uACE0\uB974\uAE30
@@ -209,6 +207,8 @@ ClearLinkAnchorAction.tooltip=<html>\uC774\uC804\uC5D0 \uC124\uC815\uD55C \uB178
 CloneAction.text=\uBCF5\uC0AC\uBCF8 \uBD99\uC5EC\uB123\uAE30
 close_btn=\uB2EB\uAE30(&C)
 CloseAction.text=\uC774 \uC9C0\uB3C4 \uB2EB\uAE30
+CloseAllMapsAction.text=\uBAA8\uB4E0 \uC9C0\uB3C4 \uB2EB\uAE30
+CloseAllOtherMapsAction.text=\uC774\uAC83 \uBE7C\uACE0 \uBAA8\uB4E0 \uC9C0\uB3C4 \uB2EB\uAE30
 cloud_shapes=\uAD6C\uB984 \uBAA8\uC591
 CloudAction.text=\uAD6C\uB984 \uCD94\uAC00 / \uC81C\uAC70 (\uAE30\uBCF8 \uC124\uC815)
 CloudColorAction.text=\uAD6C\uB984 \uC0C9\uC0C1...
@@ -216,6 +216,15 @@ CloudShapeAction.ARC.text=\uC6D0\uD638
 CloudShapeAction.RECT.text=\uC9C1\uC0AC\uAC01\uD615
 CloudShapeAction.ROUND_RECT.text=\uC9C1\uC0AC\uAC01\uD615 (\uB465\uADFC \uBAA8\uC11C\uB9AC)
 CloudShapeAction.STAR.text=\uBCC4 \uBAA8\uC591
+collection.copy.presentation=\uD504\uB9AC\uC820\uD14C\uC774\uC158 \uBCF5\uC0AC
+collection.copy.slide=\uC2AC\uB77C\uC774\uB4DC \uBCF5\uC0AC
+collection.delete=\uC0AD\uC81C
+collection.down=\uC544\uB798
+collection.move=\uC774\uB3D9
+collection.moveTo=\uC704\uCE58\uB85C \uC774\uB3D9
+collection.new.presentation=\uC0C8\uB85C\uC6B4 \uD504\uB808\uC820\uD14C\uC774\uC158
+collection.new.slide=\uC0C8\uB85C\uC6B4 \uC2AC\uB77C\uC774\uB4DC
+collection.up=\uC704
 ColorProperty.ResetColor=\uC0C9\uC0C1 \uCD08\uAE30\uD654
 combined=\uACB0\uD569
 condition=\uC870\uAC74
@@ -226,14 +235,16 @@ connector_label=\uC5F0\uACB0\uC120 \uB77C\uBCA8
 connector_lines=\uC5F0\uACB0\uC120 \uC885\uB958
 connector_shapes=\uC5F0\uACB0\uC120 \uBAA8\uC591
 ConnectorColorAction.text=\uC5F0\uACB0\uC120 \uC0C9\uC0C1...
+controls=\uC81C\uC5B4
 ConvertCloneToIndependentNodeAction.text=\uBCF5\uC0AC \uCDE8\uC18C
+copy_name={0} (\uBCF5\uC0AC)
 CopyAction.text=\uBCF5\uC0AC
 CopyAction.tooltip=\uC120\uD0DD\uD55C \uAC00\uC9C0 \uBCF5\uC0AC
 CopyAttributes.text=\uC18D\uC131 \uBCF5\uC0AC\uD558\uAE30
 CopyIDAction.text=\uB178\uB4DC ID \uBCF5\uC0AC
 CopyMapStylesAction.text=\uC9C0\uB3C4 \uAF34 \uBCF5\uC0AC...
 CopyNodeURIAction.text=\uB178\uB4DC URI \uBCF5\uC0AC
-copyright=\uC800\uC791\uAD8C \u00A9 2000-2016 \uD504\uB9AC\uD50C\uB808\uC778 \uD300\uACFC \uB3C4\uC640\uC8FC\uC2E0\uBD84\uB4E4
+copyright=\uC800\uC791\uAD8C \u00A9 2000-2017 \uD504\uB9AC\uD50C\uB808\uC778 \uD300\uACFC \uB3C4\uC640\uC8FC\uC2E0\uBD84\uB4E4
 CopySingleAction.text=\uB2E8\uC77C \uB178\uB4DC \uBCF5\uC0AC(&S)
 CopySingleAction.tooltip=\uC120\uD0DD\uD55C \uB178\uB4DC\uB9CC \uBCF5\uC0AC
 CopyStyleExtensionsAction.text=\uAF34 \uB178\uB4DC \uD655\uC7A5 \uD56D\uBAA9 \uBCF5\uC0AC
@@ -248,7 +259,7 @@ CutAction.text=\uC798\uB77C\uB0B4\uAE30(T)
 decrease_branch_font_size=\uB354 \uC791\uC740 \uAE00\uAF34
 DecreaseNodeFontAction.text=\uB354 \uC791\uC740 \uAE00\uAF34
 default=\uAE30\uBCF8 \uC124\uC815
-defaultAuxiliaryWordList=??a, the, of
+defaultAuxiliaryWordList=a, the, of
 DefaultColorAction.text=\uAE30\uBCF8 \uC0C9
 defaultstyle.attributes=\uC18D\uC131
 defaultstyle.details=\uC0C1\uC138
@@ -286,7 +297,7 @@ EdgeStyleAction.bezier.tooltip=<html>\uC904\uAE30\uB97C \uBD80\uB4DC\uB7EC\uC6B4
 EdgeStyleAction.hide_edge.text=\uC904\uAE30 \uC228\uAE30\uAE30
 EdgeStyleAction.hide_edge.tooltip=<html>\uC120\uD0DD\uD55C \uB178\uB4DC\uC5D0 \uB300\uD574 \uC0C1\uC704 \uB178\uB4DC\uB85C \uAC00\uB294 \uC904\uAE30\uB97C \uC810\uC120\uC73C\uB85C \uBCF4\uC5EC\uC90D\uB2C8\uB2E4. \uD574\uB2F9\uB418\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC904\uAE30\uB97C \uC228\uAE41\uB2C8\uB2E4.</html>
 EdgeStyleAction.horizontal.text=\uC218\uD3C9\uBA74
-EdgeStyleAction.horizontal.tooltip=<html>\uC904\uAE30\uC5D0 \uC218\uC9C1\uC120\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4.</html>
+EdgeStyleAction.horizontal.tooltip=<html>\uAC00\uC7A5\uC790\uB9AC\uC5D0 \uC218\uC9C1\uC120\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.</html>
 EdgeStyleAction.linear.text=\uC9C1\uC120
 EdgeStyleAction.linear.tooltip=<html>\uC904\uAE30\uB97C \uC9C1\uC120\uC73C\uB85C \uD45C\uC2DC</html>
 EdgeStyleAction.sharp_bezier.text=\uB0A0\uCE74\uB85C\uC6B4 \uC120\uD615
@@ -316,6 +327,7 @@ EditAction.text=\uB178\uB4DC \uD45C\uC81C \uC989\uC11D \uD3B8\uC9D1
 EditAttributesAction.text=\uC778\uB77C\uC778 \uC18D\uC131 \uD3B8\uC9D1
 EditDetailsAction.text=\uC0C1\uC138 \uC778 \uB77C\uC778 \uB178\uB4DC \uD3B8\uC9D1
 EditDetailsInDialogAction.text=\uB300\uD654\uC0C1\uC790\uC758 \uC0C1\uC138 \uB178\uB4DC \uD3B8\uC9D1
+editEdgeColors=\uBAA8\uC11C\uB9AC \uC0C9\uC0C1 \uD3B8\uC9D1
 EditFilterAction.text=\uAC70\uB984\uAE30 \uC791\uC131
 EditLongAction.text=\uB178\uB4DC \uD45C\uC81C\uB97C \uB300\uD654 \uC0C1\uC790\uC5D0\uC11C \uD3B8\uC9D1
 EditNoteInDialogAction.text=\uB300\uD654\uC0C1\uC790\uC758 \uBA54\uBAA8 \uD3B8\uC9D1
@@ -351,14 +363,14 @@ ExecuteScripts.noScriptsAvailable=\uC774\uC6A9 \uAC00\uB2A5 \uC2A4\uD06C\uB9BD\u
 ExecuteScripts.text=\uC2A4\uD06C\uB9BD\uD2B8
 ExecuteScriptSecurityError.text=\uC2A4\uD06C\uB9BD\uD2B8 \uC2E4\uD589 \uD558\uB294 \uB3D9\uC548 \uC624\uB958\uAC00 \uBC1C\uC0DD \uD588\uC2B5\uB2C8\uB2E4: {0}
 export_failed=\uB0B4\uBCF4\uB0B4\uAE30 \uC2E4\uD328
-export_pdf_text=PDF(\uD734\uB300\uC6A9 \uBB38\uC11C \uD615\uC2DD) text\uB85C \uB0B4\uBCF4\uB0B4\uAE30
-export_svg_text=SVG(Scalable Vector Graphic) \uD14D\uC2A4\uD2B8\uB85C \uB0B4\uBCF4\uB0B4\uAE30
 export_using_xslt=\uD504\uB9AC\uD50C\uB808\uC778 \uB0B4\uBCF4\uB0B4\uAE30
 ExportAction.text=\uC9C0\uB3C4 \uB0B4\uBCF4\uB0B4\uAE30...
+ExportAllPresentationsAction.text=\uBAA8\uB4E0 \uD504\uB808\uC820\uD14C\uC774\uC158\uC744 PNG \uADF8\uB9BC\uD30C\uC77C\uB85C \uB0B4\uBCF4\uB0B4\uAE30
 ExportBranchAction.text=\uC0C8\uB85C\uC6B4 \uC9C0\uB3C4\uB85C \uAC00\uC9C0\uB97C \uC774\uB3D9...
 ExportBranchToHTMLAction.text=\uAC00\uC9C0\uB97C HTML\uB85C \uB0B4\uBCF4\uB0B4\uAE30
 exported_file=\uD30C\uC77C {0}
 ExportPdf.text=PDF
+ExportPresentationAction.text=\uD604\uC7AC \uD504\uB808\uC820\uD14C\uC774\uC158\uC744 PNG \uADF8\uB9BC\uD30C\uC77C\uB85C \uB0B4\uBCF4\uB0B4\uAE30
 ExportSvg.text=SVG
 ExportToHTMLAction.text=HTML
 ExportToImage.jpg.text=JPEG
@@ -379,6 +391,7 @@ f_button_unassigned=<\uB3D9\uC791 \uC5C6\uC74C>
 FaqOpenURLAction.text=\uC790\uC8FC \uBB3B\uB294 \uC9C8\uBB38
 file=\uD30C\uC77C(&F)
 file_already_exists=\uD30C\uC77C {0} \uC740 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB36E\uC5B4\uC50C\uC6B8\uAE4C\uC694?
+file_not_accessible=\uD30C\uC77C {0}\uC744 \uC811\uADFC \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4
 file_not_found={0} \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC74C
 FileListFlavorHandler=\uD30C\uC77C\uB85C \uB9C1\uD06C
 FileProperties_BranchLeafCount=\uC120\uD0DD\uB41C \uAC00\uC9C0\uC758 \uCD5C\uD558\uC704 \uB178\uB4DC \uC218:
@@ -459,7 +472,7 @@ filter_style=\uAF34
 filter_time=\uB0A0\uC9DC \uAC70\uB984\uAE30
 FilterCondition=\uC870\uAC74\uBD80 \uAC70\uB984\uAE30
 filterConditions=\uC0AC\uC6A9\uC790\uC815\uC758 \uAC70\uB984\uAE30
-filterConditions.noActions=\uC774\uB984 \uC5C6\uB294 \uAC70\uB984\uB9DD
+filterConditions.noActions=\uC774\uB984 \uC5C6\uB294 \uAC70\uB984\uAE30
 filters_not_loaded=\uD30C\uC77C\uC774 \uC190\uC0C1\uB418\uC5B4 \uAC70\uB984\uAE30\uB97C \uBD88\uB7EC\uC62C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4
 find=\uCC3E\uAE30
 find_what=\uCC3E\uC744 \uB0B4\uC6A9
@@ -468,7 +481,7 @@ FindNextAction.text=\uB2E4\uC74C \uCC3E\uAE30
 FindPreviousAction.text=\uC774\uC804 \uCC3E\uAE30
 fit_background_to_page=\uD55C\uC7A5\uC73C\uB85C \uBC30\uACBD \uADF8\uB9BC\uC744 \uB9DE\uCD94\uAE30
 fit_map_to_page=\uD55C \uD398\uC774\uC9C0\uC5D0 \uB9DE\uCD94\uAE30(&F)
-fit_map_to_page_height=\uD55C \uD398\uC774\uC9C0\uC5D0 \uB192\uC774\uB97C \uB9DE\uCD94\uAE30(&H)
+fit_map_to_page_height=\uD55C \uD398\uC774\uC9C0\uC5D0 \uB192\uC774 \uB9DE\uCD94\uAE30(&H)
 fit_map_to_page_width=\uD55C \uD398\uC774\uC9C0\uC5D0 \uB108\uBE44\uB97C \uB9DE\uCD94\uAE30(&W)
 FitToPage.text=\uD398\uC774\uC9C0\uC5D0 \uB9DE\uAC8C \uC870\uC815
 FitToPage.tooltip=\uD604\uC7AC \uCC3D\uC5D0 \uC9C0\uB3C4 \uC804\uCCB4\uAC00 \uB4E4\uC5B4\uAC00\uB3C4\uB85D \uD655\uB300\uC728\uC744 \uC870\uC815\uD569\uB2C8\uB2E4.
@@ -634,6 +647,9 @@ icon_penguin=\uB9AC\uB205\uC2A4
 icon_positive=\uAE0D\uC815
 icon_prepare=\uB178\uB780\uC0C9 \uC2E0\uD638\uB4F1
 icon_revision=\uAC1C\uC815\uD310
+icon_revision-green=\uAC1C\uC815\uD310 \uCD08\uB85D
+icon_revision-pink=\uAC1C\uC815\uD310 \uB2F4\uD64D
+icon_revision-red=\uAC1C\uC815\uD310 \uBE68\uAC15
 icon_smiley-angry=\uD654\uB0A8
 icon_smiley-neutral=\uBB34\uD45C\uC815
 icon_smiley-oh=\uB180\uB78C
@@ -708,7 +724,7 @@ latex_editor=LaTeX \uC218\uC2DD \uD3B8\uC9D1
 LatexDeleteLatexAction.text=LaTeX \uC218\uC2DD \uC81C\uAC70
 LatexEditLatexAction.text=LaTeX \uC218\uC2DD \uD3B8\uC9D1...
 LatexInsertLatexAction.msg1=<html><i>\uAE30\uC874\uC758</i> LaTeX \uC218\uC2DD\uC744 \uC0BD\uC785\uD558\uB824\uACE0 \uD569\uB2C8\uB2E4.<br/>LaTeX\uC758 \uAE00\uC790/\uC218\uC2DD\uC744 \uB9CC\uB4E4 \uC218 \uC788\uB294 \uC0C8\uB85C\uC6B4 \uBC29\uBC95\uC774 \uC774 \uD398\uC774\uC9C0\uC5D0 \uC124\uBA85\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4:</html>
-LatexInsertLatexAction.msg2=<html>\uD55C\uB9C8\uB514\uB85C: <ul><li>\uB178\uB4DC\uC758 \uAE00\uC790\uC5D0 \uC811\uB450\uC5B4 "\\latex"\uB97C \uC785\uB825\uD558\uAC70\uB098</li><li><i>\uBCF4\uAE30->\uC18D\uC131 \uD328\uB110</i>\uC5D0\uC11C, \uB2E4\uC74C <i>\uD575\uC2EC \uAE00\uC790 -> \uD615\uC2DD -> Latex</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>\uC694\uC57D: <ul><li>\uB178\uB4DC \uAE00\uC790 \uC55E\uC5D0 " latex"\uB97C \uC0AC\uC6A9\uD558\uAC70\uB098</li><li><i>\uBCF4\uAE30 -> \uB3C4\uAD6C \uD328\uB110</i>,\uADF8 \uB2E4\uC74C\uC5D0 <i>\uD575\uC2EC \uAE00\uC790 -> \uC11C\uC2DD -> Latex</i>\uC744 \uC120\uD0DD</li></ul></html>
 LatexInsertLatexAction.text=LaTeX \uC218\uC2DD \uCD94\uAC00...
 latexPatternFormat=LaTeX
 LengthUnits.cm=\uC13C\uD2F0\uBBF8\uD130
@@ -718,7 +734,7 @@ LengthUnits.pt=\uD3EC\uC778\uD2B8
 LengthUnits.px=\uD53D\uC140
 less_than_two_selected_nodes=\uC5F0\uACB0\uD558\uB824\uBA74 \uB178\uB4DC\uAC00 2\uAC1C \uC774\uC0C1 \uC120\uD0DD\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
 license=\uD5C8\uAC00\uC11C: GPL 2 \uB610\uB294 \uC774\uD6C4
-license_text=<html> \uC774 \uD504\uB85C\uADF8\uB7A8\uC740 \uC790\uC720 \uC18C\uD504\uD2B8\uC6E8\uC5B4\uC785\uB2C8\uB2E4.<br> \uB2F9\uC2E0\uC740 \uC790\uC720 \uC18C\uD504\uD2B8\uC6E8\uC5B4 \uC7AC\uB2E8\uC774 \uBC1C\uD45C\uD55C GNU \uC77C\uBC18 \uACF5\uC911 \uC0AC\uC6A9 \uD5C8\uAC00\uC11C \uBC84\uC804 2\uB098<br> \uADF8 \uC774\uD6C4 \uBC84\uC804\uC5D0 \uB530\uB77C \uC774 \uD30C\uC77C\uC744 \uC7AC\uBC30\uD3EC\uD558\uAC70\uB098 \uC218\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.<br><br>\uC77 [...]
+license_text=<html>\uC774 \uD504\uB85C\uADF8\uB7A8\uC740 \uC790\uC720 \uC18C\uD504\uD2B8\uC6E8\uC5B4\uC785\uB2C8\uB2E4. \uB2F9\uC2E0\uC740 \uC790\uC720 \uC18C\uD504\uD2B8\uC6E8\uC5B4 \uC7AC\uB2E8\uC774 \uACF5\uD45C\uD55C GNU \uC77C\uBC18 \uACF5\uC911 \uB77C\uC774\uC120\uC2A4 \uBC84\uC804 2<br> \uB610\uB294 \uADF8 \uC774\uD6C4 \uBC84\uC804\uC744 \uC784\uC758\uB85C \uC120\uD0DD\uD574\uC11C \uADF8 \uADDC\uC815\uC5D0 \uB530\uB77C \uD504\uB85C\uADF8\uB7A8\uC744 \uC218\uC815\uD558\uAC70\uB098  [...]
 link_error=\uC798\uBABB\uB41C \uB9C1\uD06C "{0}"\uC740(\uB294) \uBD88\uB7EC\uC624\uC9C0 \uC54A\uC74C
 link_not_available_any_more=\uC5F0\uACB0\uB418\uC5C8\uB358 \uB178\uB4DC\uAC00 \uC0AD\uC81C\uB418\uC5C8\uC73C\uBBC0\uB85C \uC774 \uB9C1\uD06C\uB294 \uB354\uC774\uC0C1 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 link_not_found={0} \uB9C1\uD06C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
@@ -776,7 +792,7 @@ ManageConditionalStylesAction.text=\uC9C0\uB3C4\uC758 \uC870\uAC74\uBCC4 \uAF34
 ManageNodeConditionalStylesAction.text=\uB178\uB4DC\uC758 \uC870\uAC74\uBCC4 \uAF34 \uAD00\uB9AC
 map_already_exists=\uC774 \uC9C0\uB3C4\uB294 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB36E\uC5B4\uC4F0\uACA0\uC2B5\uB2C8\uAE4C?
 map_background=\uC9C0\uB3C4 \uBC30\uACBD
-map_background_image=\uBC30\uACBD \uADF8\uB9BC
+map_background_image=\uBC30\uACBD \uC774\uBBF8\uC9C0
 map_corrupted=\uC9C0\uB3C4\uAC00 \uC190\uC0C1\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC790\uC138\uD55C \uB0B4\uC6A9\uC744 \uBCF4\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 map_load_error={0} \uC9C0\uB3C4\uB97C \uBD88\uB7EC\uC62C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4
 map_locked_by_open={0} \uC9C0\uB3C4\uB294 \uC774\uBBF8 {1} \uC0AC\uC6A9\uC790\uC5D0 \uC758\uD574 \uD3B8\uC9D1\uB418\uACE0 \uC788\uC2B5\uB2C8\uB2E4. \uC77D\uAE30 \uC804\uC6A9\uC73C\uB85C \uC5F4\uB9BD\uB2C8\uB2E4.
@@ -784,7 +800,7 @@ map_locked_by_save_as={0} \uC9C0\uB3C4\uB294 {1} \uC0AC\uC6A9\uC790\uC5D0 \uC758
 map_not_saved=\uC774\uC804\uC5D0 \uC800\uC7A5\uB41C \uC801\uC774 \uC5C6\uB294 \uC9C0\uB3C4\uC785\uB2C8\uB2E4.
 MapBackgroundClearAction.text=\uC9C0\uC6B0\uAE30
 MapBackgroundColorAction.text=\uBC30\uACBD\uC0C9
-MapBackgroundImageAction.text=\uBC30\uACBD \uADF8\uB9BC...
+MapBackgroundImageAction.text=\uBC30\uACBD \uC774\uBBF8\uC9C0...
 maps=\uC9C0\uB3C4
 MaxNodeWidth.text=\uCD5C\uB300 \uB178\uB4DC \uB113\uC774 \uC124\uC815
 menu_applyStyle=\uAF34 \uC801\uC6A9
@@ -839,6 +855,9 @@ ModesMenuAction.File.text=\uD30C\uC77C \uD0D0\uC0C9\uAE30
 ModesMenuAction.MindMap.text=\uB9C8\uC778\uB4DC \uC9C0\uB3C4 \uD3B8\uC9D1\uAE30
 most_recent_files=\uAC00\uC7A5 \uCD5C\uADFC \uC9C0\uB3C4
 MoveAction.text=\uC774\uB3D9
+MoveSelectedNodeAction.CENTER.text=\uC120\uD0DD\uD55C \uB178\uB4DC\uB97C \uC911\uC559 \uC815\uB82C
+MoveSelectedNodeAction.EAST.text=\uC120\uD0DD\uB41C \uB178\uB4DC \uC624\uB978\uCABD\uC73C\uB85C \uC774\uB3D9
+MoveSelectedNodeAction.WEST.text=\uC120\uD0DD\uB41C \uB178\uB4DC \uC67C\uCABD\uC73C\uB85C \uC774\uB3D9
 MoveToRootAction.text=\uCD5C\uC0C1\uC704 \uB178\uB4DC\uB85C \uAC00\uAE30
 NameConditionAction.text=\uC774\uB984 \uC9C0\uC815
 navigate=\uD0D0\uC0C9(&N)
@@ -878,7 +897,7 @@ NextNodeAction.BACK.text=\uC774\uC804 \uB178\uB4DC\uB85C \uAC00\uAE30
 NextNodeAction.BACK_N_FOLD.text=\uC774\uC804 \uB178\uB4DC \uC774\uB3D9 (\uC811\uD798)
 NextNodeAction.FORWARD.text=\uB2E4\uC74C \uB178\uB4DC\uB85C \uAC00\uAE30
 NextNodeAction.FORWARD_N_FOLD.text=\uB2E4\uC74C \uB178\uB4DC\uB85C \uC774\uB3D9 (\uC811\uAE30)
-NextPresentationItemAction.text=\uB2E4\uC74C \uBC1C\uD45C \uD56D\uBAA9\uC744 \uD3B4\uAE30
+NextPresentationItemAction.text=\uB2E4\uC74C \uD504\uB808\uC820\uD14C\uC774\uC158 \uD56D\uBAA9 \uD3BC\uCE58\uAE30 (\uC811\uAE30)
 no=\uC544\uB2C8\uC624
 no_copy_attributes_before_paste_attributes=\uBA87\uAC1C\uB97C \uBCF5\uC0AC\uD558\uB294 \uB3D9\uC548, \uC18D\uC131\uC744 \uBD99\uC5EC\uB123\uAE30 \uD560\uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 NO_FORMAT=\uD14D\uC2A4\uD2B8
@@ -905,7 +924,7 @@ NodeExtensions.RemoveNodeExtensions=\uB178\uB4DC \uD655\uC7A5 \uAE30\uB2A5 \uC81
 NodeListAction.text=\uCC3E\uAE30 \uBC0F \uBC14\uAFB8\uAE30...
 NodeListAction.tooltip=\uBAA8\uB4E0 \uB178\uB4DC\uB97C \uAC70\uB984\uAE30 \uC18D\uC131\uACFC \uD568\uAED8 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uBAA9\uB85D\uC73C\uB85C \uBCF4\uC5EC\uC90D\uB2C8\uB2E4.
 NodeShapeAction.bubble.text=\uAC70\uD488\uBAA8\uC591 \uC678\uACFD\uC120
-NodeShapeAction.fork.text=\uD3EC\uD06C(\uBCF5\uC0AC??)
+NodeShapeAction.fork.text=\uD3EC\uD06C
 NodeShapeAction.narrow_hexagon.text=\uC881\uC740 \uC721\uAC01\uD615
 NodeShapeAction.oval.text=\uD0C0\uC6D0\uD615
 NodeShapeAction.rectangle.text=\uC0AC\uAC01\uD615
@@ -918,6 +937,7 @@ not_saved_for_image_error=\uD30C\uC77C \uC120\uD0DD\uAE30\uB97C \uD1B5\uD574 \uA
 not_saved_for_link_error=\uD30C\uC77C \uC120\uD0DD\uAE30\uB97C \uD1B5\uD574 \uACE0\uB9AC\uB97C \uC124\uC815\uD558\uAE30 \uC804\uC5D0 \uC9C0\uB3C4\uAC00 \uBA3C\uC800 \uC800\uC7A5\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4
 note_window_location=\uB178\uD2B8 \uD328\uB110 \uC704\uCE58
 notes=\uBA54\uBAA8
+NotFoldingNextPresentationItemAction.text=\uB2E4\uC74C \uBC1C\uD45C \uD56D\uBAA9\uC744 \uD3B4\uAE30
 NotificationOptions.CLOSE=\uB2EB\uAE30
 NotificationOptions.REMIND_ME_LATER=\uB098\uC911\uC5D0 \uC54C\uB9BC
 NotificationOptions.REMOVE_REMINDER=\uC54C\uB9BC\uC744 \uC81C\uAC70
@@ -944,6 +964,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=\uC790
 OptionPanel.ADD_CHILD=\uD558\uC704 \uB178\uB4DC \uCD94\uAC00
 OptionPanel.ADD_SIBLING=\uD615\uC81C \uB178\uB4DC \uCD94\uAC00
 OptionPanel.addons=\uBD80\uAC00 \uAE30\uB2A5
+OptionPanel.af=\uC544\uD504\uB9AC\uCE74 \uC5B4
 OptionPanel.always_fold_all_after_load=\uBAA8\uB450 \uC811\uAE30
 OptionPanel.always_load_last_maps=\uCD5C\uADFC \uC0C8\uB85C\uC6B4 \uC9C0\uB3C4 \uBD88\uB7EC\uC624\uAE30
 OptionPanel.always_load_last_maps.tooltip=\uC704\uC5D0\uC11C \uC124\uC815\uD55C \uC635\uC158\uC5D0 \uD574\uB2F9\uD558\uB294 \uB9C8\uC9C0\uB9C9 \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4. \uC120\uD0DD\uB41C \uC9C0\uB3C4 \uD30C\uC77C\uC744 \uC5F4\uAE30 \uC704\uD574 \uD504\uB9AC\uD50C\uB808\uC778\uB3C4 \uC2DC\uC791\uD569\uB2C8\uB2E4.
@@ -957,6 +978,8 @@ OptionPanel.antialias.tooltip=<html>\uC9C0\uB3C4 \uD654\uC9C8\uC744 \uACB0\uC815
 OptionPanel.antialias_all=\uBAA8\uB450 \uC548\uD2F0\uC54C\uB9AC\uC5B4\uC2A4 \uC801\uC6A9
 OptionPanel.antialias_edges=\uC904\uAE30 \uC548\uD2F0\uC54C\uB9AC\uC5B4\uC2A4
 OptionPanel.antialias_none=\uC548\uD2F0\uC54C\uB9AC\uC5B4\uC2A4 \uC0AC\uC6A9 \uC548\uD568
+OptionPanel.antialias_svg=\uC548\uD2F0\uC54C\uB9AC\uC5B4\uC2A4 SVG
+OptionPanel.antialias_svg.tooltip=<html>SVG \uB80C\uB354\uB9C1 \uD488\uC9C8\uC744 \uACB0\uC815\uD569\uB2C8\uB2E4. \uC548\uD2F0\uC54C\uB9AC\uC5B4\uC2A4 \uB9CE\uC544\uC9C0\uBA74 \uB354 \uC2DC\uAC04\uC774 \uAC78\uB9BD\uB2C8\uB2E4.</html>
 OptionPanel.Appearance=\uC0DD\uAE40\uC0C8
 OptionPanel.approximate_search_threshold=\uADFC\uC811\uD55C \uAC80\uC0C9 \uACB0\uACFC \uD45C\uC2DC \uC784\uACC4\uAC12
 OptionPanel.approximate_search_threshold.tooltip=<html>\uB300\uB7B5\uC801\uC778 \uAC80\uC0C9\uC5D0 \uB300\uD55C \uC784\uACC4 \uAC12\uC740 <br/><font size="2"> http://freeplane.sf.net/wiki/index.php/Approximate_search</font> \uC744 \uCC38\uACE0\uD558\uC2ED\uC2DC\uC694.<br/>(\uAC80\uC0C9\uC5B4\uC758 \uB354\uB192\uACE0 \uB354\uC801\uC740 \uC801\uC740 \uBCC0\uD654\uB294<br/> \uCC3E\uC544\uC9C8 \uAC83\uC785\uB2C8\uB2E4.)</html>
@@ -973,6 +996,8 @@ OptionPanel.Behaviour=\uB3D9\uC791 \uC124\uC815
 OptionPanel.bezier=\uBCA0\uC9C0\uC5B4 \uACE1\uC120
 OptionPanel.border_color=\uC0C9\uC0C1
 OptionPanel.border_color_matches_edge_color=\uBAA8\uC11C\uB9AC \uC0C9\uC0C1 \uC0AC\uC6A9
+OptionPanel.border_dash=\uD14C\uB450\uB9AC \uC120 \uC720\uD615
+OptionPanel.border_dash_matches_edge_dash=\uBAA8\uC11C\uB9AC \uC120 \uC720\uD615 \uC0AC\uC6A9
 OptionPanel.border_width=\uC120 \uB113\uC774
 OptionPanel.border_width_matches_edge_width=\uBAA8\uC11C\uB9AC \uB113\uC774 \uC0AC\uC6A9
 OptionPanel.bubble=\uAC70\uD488 \uBAA8\uC591
@@ -989,6 +1014,8 @@ OptionPanel.cloudcolor=\uAD6C\uB984 \uC0C9\uC0C1
 OptionPanel.cloudshape=\uAD6C\uB984 \uBAA8\uC591
 OptionPanel.combined=\uACB0\uD569
 OptionPanel.compare_as_number=\uC218\uCE58\uB85C \uBE44\uAD50
+OptionPanel.connector_arrows=\uC5F0\uACB0\uC790 \uD654\uC0B4\uD45C
+OptionPanel.connector_dash=\uC120 \uC720\uD615
 OptionPanel.convert_to_current_version=<html>\uC790\uB3D9\uC73C\uB85C \uC774\uC804 \uBC84\uC804 \uD504\uB9AC\uD50C\uB808\uC778 \uC9C0\uB3C4\uB97C<br>\uD604\uC7AC \uBC84\uC804\uC73C\uB85C \uBCC0\uD658\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>\uB9E4\uC6B0 \uD070 \uC9C0\uB3C4\uB294 \uBCC0\uD658\uD560 \uD544\uC694\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.<br>(\uC774\uAC83\uC740 \uC804\uBB38\uC9C0\uC2DD\uC785\uB2C8\uB2E4.) \uBCC0\uD658 \uC5C6\uC774\uB3C4 \uC9C0\uB3C4\uB97C \uC5F4 \uC218 \uC788\uC2B5\uB2C8\uB2E4.</html>
 OptionPanel.copyFormatToNewSibling=\uC0C8\uB85C\uC6B4 \uD615\uC81C\uB85C \uAF34 \uBCF5\uC0AC
@@ -996,6 +1023,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=\uC544\uC774\uCF58\uACFC \uD615\
 OptionPanel.cs=\uCCB4\uCF54\uC5B4 / \u010Desky
 OptionPanel.cut_nodes_without_question=\uD655\uC778\uD558\uC9C0 \uC54A\uACE0 \uB178\uB4DC\uB97C \uC790\uB97C\uAE4C\uC694?
 OptionPanel.cut_nodes_without_question.tooltip=\uCCB4\uD06C\uBC15\uC2A4\uB97C \uC124\uC815\uD558\uBA74 \uB178\uB4DC\uB294 \uD655\uC778\uD558\uC9C0 \uC54A\uACE0 \uC798\uB77C\uB0C5\uB2C8\uB2E4. \uC758\uB3C4\uD558\uC9C0 \uC798\uB77C\uB0B4\uB294 \uACBD\uC6B0 \uC815\uBCF4\uB97C \uC190\uC2E4\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+OptionPanel.cut_out_pictures_when_pasting_html=HTML\uC5D0\uC11C \uC774\uBBF8\uC9C0 \uC81C\uAC70
 OptionPanel.da=\uB374\uB9C8\uD06C\uC5B4 / dansk
 OptionPanel.date_format=\uD45C\uC900 \uB0A0\uC9DC \uD615\uC2DD
 OptionPanel.date_format.tooltip=SHORT, MEDIUM, LONG \uB610\uB294 FULL \uB610\uB294 "MM/dd/yyyy"\uC640 \uAC19\uC740 \uD328\uD134 \uB458\uC911 \uD558\uB098
@@ -1026,6 +1054,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=\uBAA8\uB4E0 \uC0C8\uB85C\uC
 OptionPanel.display_node_id=\uB178\uB4DC\uC758 ID \uD45C\uC2DC
 OptionPanel.edgecolor=\uC904\uAE30 \uC0C9\uC0C1
 OptionPanel.edgecolor.tooltip=\uC0C1\uC704 \uB178\uB4DC\uB85C \uAC00\uB294 \uC904\uAE30\uC758 \uC18D\uC131 (\uBAA8\uB4E0 \uD558\uC704 \uB178\uB4DC\uC5D0\uB3C4 \uC801\uC6A9\uB428)
+OptionPanel.edgedash=\uBAA8\uC11C\uB9AC \uC120 \uC720\uD615
 OptionPanel.edgestyle=\uC904\uAE30 \uAF34
 OptionPanel.edgestyle.tooltip=\uC0C1\uC704 \uB178\uB4DC\uB85C \uAC00\uB294 \uC904\uAE30\uC758 \uC18D\uC131 (\uBAA8\uB4E0 \uD558\uC704 \uB178\uB4DC\uC5D0\uB3C4 \uC801\uC6A9\uB428)
 OptionPanel.edgewidth=\uC904\uAE30 \uB108\uBE44
@@ -1082,6 +1111,7 @@ OptionPanel.groovy_editor_font.tooltip=\uC720\uB2C8\uCF54\uB4DC \uBB38\uC790\uAC
 OptionPanel.groovy_editor_font_size=\uADF8\uB8E8\uBE44 \uAD6C\uBB38 \uAC15\uC870 \uD3B8\uC9D1\uAE30\uC758 \uAE00\uAF34 \uD06C\uAE30
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=\uC904\uAE30 \uC228\uAE30\uAE30
+OptionPanel.hide_single_end_connectors=\uB2E8\uC77C \uB05D \uC5F0\uACB0\uC790 \uC228\uAE30\uAE30
 OptionPanel.highlight_formulas=\uC218\uC2DD \uB4DC\uB7EC\uB0B4\uAE30
 OptionPanel.horizontal=\uC9C0\uD3C9\uC120
 OptionPanel.hr=\uD06C\uB85C\uC544\uD2F0\uC544\uC5B4 / hrvatski
@@ -1090,13 +1120,14 @@ OptionPanel.html_export_based_on_headings=\uC81C\uBAA9\uC5D0 \uB530\uB77C
 OptionPanel.html_export_fold_all=\uBAA8\uB4E0 \uB0B4\uC6A9 \uC811\uAE30
 OptionPanel.html_export_fold_currently_folded=\uC811\uD78C \uAC00\uC9C0\uB4E4\uC740 \uC811\uD788\uAC8C
 OptionPanel.html_export_folding=\uC811\uD78C \uC0C1\uD0DC\uB97C HTML\uB85C \uB0B4\uBCF4\uB0B4\uAE30
-OptionPanel.html_export_no_folding=\uAC00\uC9C0\uAC00 \uC811\uD788\uC9C0 \uC54A\uAC8C
+OptionPanel.html_export_no_folding=\uC811\uD788\uC9C0 \uC54A\uC74C
 OptionPanel.hu=\uD5DD\uAC00\uB9AC\uC5B4 / Magyar
 OptionPanel.ic_disable=\uBE44\uD65C\uC131\uD654
 OptionPanel.ic_file=\uB514\uC2A4\uD06C \uC0AC\uC6A9
 OptionPanel.ic_ram=\uB7A8\uC5D0\uC11C
 OptionPanel.icon=\uC544\uC774\uCF58
 OptionPanel.icon.tooltip=\uC801\uC6A9\uB418\uBA74 \uD574\uB2F9 \uB178\uB4DC\uB294 \uC774 \uC544\uC774\uCF58\uC73C\uB85C \uC124\uC815\uB429\uB2C8\uB2E4.
+OptionPanel.icon_size=\uC544\uC774\uCF58 \uD06C\uAE30
 OptionPanel.icons.list=\uD45C\uC2DC\uB41C \uD45C\uC900 \uC544\uC774\uCF58 \uBAA9\uB85D
 OptionPanel.icons.list.tooltip=\uC5EC\uAE30, \uD45C\uC900 \uC544\uC774\uCF58\uC744 \uC8FC\uBB38\uD558\uAC70\uB098 \uBE44\uD65C\uC131\uD654 \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC544\uC774\uCF58\uB4E4\uC740 ';'\uC73C\uB85C \uAD6C\uBD84\uD574\uC57C\uD569\uB2C8\uB2E4.
 OptionPanel.id=\uC778\uB3C4\uB124\uC2DC\uC544\uC5B4 / Bahasa Indonesia
@@ -1109,7 +1140,7 @@ OptionPanel.ja=\uC77C\uBCF8\uC5B4 / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=\uAE00\uC790 \uAD6C\uBD84
 OptionPanel.key_type_action=\uD0A4 \uC785\uB825 \uC2DC
 OptionPanel.Keystrokes=\uB2E8\uCD95\uD0A4
-OptionPanel.ko=\uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
+OptionPanel.ko=Korean / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=\uAE00\uAF34 \uAC00\uC871
 OptionPanel.label_font_size=\uAE00\uAF34 \uD06C\uAE30
 OptionPanel.language=\uC5B8\uC5B4
@@ -1138,6 +1169,8 @@ OptionPanel.lookandfeel.scaleuifonts=\uD06C\uAE30 UI \uAE00\uAF34
 OptionPanel.lookandfeel.scaleuifonts.tooltip=\uACE0\uBC00\uB3C4 \uBAA8\uB2C8\uD130\uC5D0 \uC720\uC6A9
 OptionPanel.lookandfeel.tooltip=<html>\uBAA8\uC591\uACFC \uB290\uB08C. \uC0AC\uC6A9\uD558\uAE30'\uAE08\uC18D','\uCC3D','\uBAA8\uD2F0\uBE0C','GTK'\uB97C \uC9C0\uC6D0\uD558\uACE0, '\uB9E5'\uC740 \uB9E5 OS\uC5D0\uC11C\uB9CC \uC0AC\uC6A9\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. \uAE30\uBCF8\uAC12\uC740 \uAE30\uBCF8 \uBAA8\uC591\uACFC \uB290\uB08C\uC774 \uC0AC\uC6A9\uB429\uB2C8\uB2E4. \uC790\uC2E0\uC758 \uBAA8\uC591\uACFC \uB290\uB08C\uC744 \uB123\uAE38 \uC6D0\uD560\uACBD\uC6B0, \uC5EC\uAE30\uC5D [...]
 OptionPanel.lt=Lt
+OptionPanel.markClones=\uD398\uC778\uD2B8 \uBCF5\uC81C \uD45C\uC2DC
+OptionPanel.markSelectedClones=\uC120\uD0DD\uD55C \uD398\uC778\uD2B8 \uBCF5\uC81C \uB178\uB4DC \uD45C\uC2DC
 OptionPanel.max_displayed_node_count=\uCD5C\uB300 \uD45C\uC2DC\uB41C \uB178\uB4DC \uC218
 OptionPanel.max_image_width=\uCD5C\uB300 \uCD08\uAE30 \uC774\uBBF8\uC9C0 \uB113\uC774
 OptionPanel.max_image_width.tooltip=\uC0C8\uB85C\uC6B4 \uC774\uBBF8\uC9C0\uB294 \uC774 \uB113\uC774\uB85C \uD06C\uAE30 \uC870\uC815\uB429\uB2C8\uB2E4
@@ -1146,8 +1179,10 @@ OptionPanel.max_menu_item_count.tooltip=\uD55C \uD558\uC704 \uBA54\uB274\uC5D0 \
 OptionPanel.max_node_width=\uCD5C\uB300 \uB178\uB4DC \uB108\uBE44
 OptionPanel.max_node_width.tooltip=<html>\uD53D\uC140\uC5D0\uC11C \uAE30\uBCF8 \uCD5C\uB300 \uB178\uB4DC \uB113\uC774</html>
 OptionPanel.max_shortened_text_length=\uB2E8\uCD95\uB41C \uBB38\uC790\uC5F4\uC758 \uCD5C\uB300 \uB108\uBE44
+OptionPanel.menuItemFontSize=\uCC28\uB9BC\uD45C \uD56D\uBAA9 \uAE00\uAF34 \uD06C\uAE30
 OptionPanel.metal=\uBA54\uD0C8
 OptionPanel.min_node_width=\uCD5C\uC18C \uB178\uB4DC \uB108\uBE44
+OptionPanel.monitor_size_inches=\uBAA8\uB2C8\uD130 \uD06C\uAE30 (\uC778\uCE58)
 OptionPanel.motif=\uBAA8\uD2F0\uD504(\uD478\uB978\uACC4\uC5F4)
 OptionPanel.narrow_hexagon=\uC881\uC740 \uC721\uAC01\uD615
 OptionPanel.nb=\uB178\uB974\uC6E8\uC774\uC5B4 Bokm\u00E5l / Norsk bokm\u00E5l
@@ -1189,11 +1224,13 @@ OptionPanel.paint_connectors_behind=\uB178\uB4DC \uB4A4\uCABD\uC73C\uB85C \uC5F0
 OptionPanel.parse_data=\uC22B\uC790\uC640 \uB0A0\uC9DC-\uC2DC\uAC04 \uC785\uB825\uC744 \uC778\uC2DD
 OptionPanel.parse_data.tooltip=\uB0A0\uC9DC, \uB0A0\uC9DC-\uC2DC\uAC04 \uADF8\uB9AC\uACE0 \uC22B\uC790 \uC785\uB825\uC5D0\uB300\uD55C \uAD6C\uBB38\uBD84\uC11D\uC744 \uD558\uACE0 \uD45C\uC900\uD615\uC2DD\uC744 \uC801\uC6A9\uD569\uB2C8\uB2E4. \uC608: 100,000.00, 12/31, 12/31/99, 1999-12-31 \uC640 1999-12-31 23:59
 OptionPanel.parse_formulas=\uC218\uC2DD\uC744 \uC778\uC2DD
-OptionPanel.parse_formulas.tooltip='=' \uB85C \uC2DC\uC791 \uB178\uB4DC\uC5D0\uC11C \uC218\uC2DD\uC744 \uAD6C\uBB38 \uBD84\uC11D\uD569\uB2C8\uB2E4: http://www.freeplane.org/wiki/index.php/Formulas\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
+OptionPanel.parse_formulas.tooltip='=' \uB85C \uC2DC\uC791\uD55C \uB178\uB4DC\uC5D0\uC11C \uC218\uC2DD\uC744 \uAD6C\uBB38 \uBD84\uC11D\uD569\uB2C8\uB2E4: http://www.freeplane.org/wiki/index.php/Formulas\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
 OptionPanel.parse_latex=LaTeX \uB97C \uC778\uC2DD\uD558\uAE30
 OptionPanel.parse_latex.tooltip=\uD615\uC2DD\uC774\uB098 \uC811\uB450\uC0AC\uB85C LaTeX\uC758 \uC218\uC2DD\uC744 \uC778\uC2DD: http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane \uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
 OptionPanel.PASTE_HTML=HTML\uB85C \uBD99\uC5EC\uB123\uAE30
 OptionPanel.PASTE_PLAIN_TEXT=\uC77C\uBC18 \uD14D\uC2A4\uD2B8\uB85C \uBD99\uC5EC\uB123\uAE30
+OptionPanel.pasteImagesFromFiles=\uD30C\uC77C\uC5D0\uC11C \uC774\uBBF8\uC9C0 \uBD99\uC5EC\uB123\uAE30
+OptionPanel.pasteImagesFromFiles.tooltip=\uC774\uBBF8\uC9C0 \uD30C\uC77C\uC744 \uC9C0\uB3C4\uC5D0 \uB04C\uC5B4 \uB193\uC73C\uBA74 \uC774\uBBF8\uC9C0 \uC0BD\uC785
 OptionPanel.path_property_may_not_be_empty=\uACBD\uB85C \uC18D\uC131\uC740 \uBE44\uC6CC \uC9C0\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBCC0\uACBD \uB0B4\uC6A9\uC774 \uBCF5\uADC0 \uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 OptionPanel.patternname=\uC774\uB984
 OptionPanel.patternname.tooltip=\uC911\uBCF5\uB418\uC9C0 \uC54A\uC740 \uD328\uD134 \uC774\uB984
@@ -1202,8 +1239,18 @@ OptionPanel.placenewbranches=\uC0C8\uB85C\uC6B4 \uAC00\uC9C0 \uB9CC\uB4E4\uAE30
 OptionPanel.placenewbranches.tooltip=<html>\uC0C8\uB85C\uC6B4 \uAC00\uC9C0\uB97C \uBC30\uCE58 \uD560 \uACF3. \uC720\uD6A8\uD55C \uAC12\uC740 '\uCCAB \uBC88\uC9F8'\uACFC '\uB9C8\uC9C0\uB9C9'\uC785\uB2C8\uB2E4</html>
 OptionPanel.plugin.tooltip=\uBE44 \uD575\uC2EC \uD50C\uB7EC\uADF8\uC778.
 OptionPanel.plugins=\uD50C\uB7EC\uADF8\uC778
-OptionPanel.presentation_dimmer_transparency=\uBC1C\uD45C \uBAA8\uB4DC \uD22C\uBA85\uB3C4 \uC870\uC808
-OptionPanel.presentation_mode=\uBC1C\uD45C \uBAA8\uB4DC
+OptionPanel.Presentation=\uD504\uB808\uC820\uD14C\uC774\uC158
+OptionPanel.presentation.combineAll=\uBAA8\uB4E0 \uD504\uB9AC\uC820\uD14C\uC774\uC158 \uACB0\uD569
+OptionPanel.presentation.exportDirectory=\uB0B4\uBCF4\uB0B4\uAE30\uB41C \uD504\uB808\uC820\uD14C\uC774\uC158 \uB514\uB809\uD1A0\uB9AC \uC774\uB984
+OptionPanel.presentation.maxDropBoxRowCount=\uB4DC\uB86D \uB2E4\uC6B4 \uC0C1\uC790\uC758 \uCD5C\uB300 \uD589 \uC218
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=\uD504\uB9AC\uC820\uD14C\uC774\uC158 \uBC0F \uC2AC\uB77C\uC774\uB4DC \uC120\uD0DD\uAE30\uC5D0 \uC801\uC6A9
+OptionPanel.presentation.processesEscapeKey=ESC \uD0A4\uB294 \uD504\uB808\uC820\uD14C\uC774\uC158\uC744 \uC885\uB8CC
+OptionPanel.presentation.processesNavigationKeys=\uD654\uC0B4\uD45C \uD0A4\uB294 \uD504\uB808\uC820\uD14C\uC774\uC158\uC744 \uC81C\uC5B4
+OptionPanel.presentation.slideDisplaysAllNodes=\uC790\uB3D9\uC73C\uB85C \uBAA8\uB4E0 \uC2AC\uB77C\uC774\uB4DC \uB178\uB4DC \uD3BC\uCE58\uAE30
+OptionPanel.presentation.slowMotion=\uB290\uB9AC\uAC8C
+OptionPanel.presentation.switchToFullScreen=\uC804\uCCB4 \uD654\uBA74 \uD65C\uC131\uD654
+OptionPanel.presentation.switchToSpotlight=\uC2A4\uD3EC\uD2B8\uB77C\uC774\uD2B8?? \uD65C\uC131\uD654
+OptionPanel.presentation.zoom=\uC9C0\uB3C4 \uD655\uB300 \uC0AC\uC6A9
 OptionPanel.printonwhitebackground=<html>\uC778\uC1C4\uD558\uAE30\uC704\uD55C \uD770\uC0C9 \uBC30\uACBD</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\uC778\uC1C4\uD560\uB54C \uD56D\uC0C1 \uD770\uC0C9 \uBC30\uACBD\uC744 \uC0AC\uC6A9\uD558\uAE30??</html>
 OptionPanel.pt_BR=\uD3EC\uB974\uD22C\uAC08\uC5B4 (\uBE0C\uB77C\uC9C8) / Portugu\u00EAs (Brasil)
@@ -1213,12 +1260,12 @@ OptionPanel.rectangle=\uC0AC\uAC01\uD615
 OptionPanel.relative=\uC0C1\uB300 \uACBD\uB85C
 OptionPanel.remind_type_of_new_nodes.tooltip=<html>"\uC9C8\uBB38\uD558\uAE30"\uB294 (\uAD81\uAE08\uD55C\uAC83\uC774 \uC788\uC744\uB54C) \uC0AC\uC6A9\uD560\uC218 \uC788\uC2B5\uB2C8\uB2E4. <BR>"\uC608"\uB294 \uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8 \uD3B8\uC9D1\uAE30\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.<BR>"\uC544\uB2C8\uC624"\uB294 \uC77C\uBC18 \uD14D\uC2A4\uD2B8 \uD3B8\uC9D1\uAE30\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.</html>
 OptionPanel.remind_use_rich_text_in_new_nodes=\uBD99\uC5EC\uB123\uC744 \uB178\uB4DC\uC758 \uC11C\uC2DD \uAE00\uC790\uB97C \uC0AC\uC6A9
-OptionPanel.remindersBlink=\uAE5C\uBC15\uC774?? \uC54C\uB9AC\uBBF8
+OptionPanel.remindersBlink=\uC54C\uB9BC\uC744 \uAE5C\uBC15\uC784
 OptionPanel.remindersShowNotifications=\uC54C\uB9BC \uD31D\uC5C5 \uD45C\uC2DC
 OptionPanel.remindersStandardDelay=\uC54C\uB9BC \uC9C0\uC5F0
 OptionPanel.remove_notes_without_question=\uC9C8\uBB38 \uC5C6\uC774 \uBA54\uBAA8\uB97C \uC81C\uAC70\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 OptionPanel.remove_notes_without_question.tooltip=\uC774 \uD655\uC778\uB780\uC744 \uC124\uC815\uD558\uBA74 \uC120\uD0DD\uD55C \uB178\uB4DC\uC5D0 \uC18D\uD558\uB294 \uBA54\uBAA8\uAC00 \uD655\uC778\uC5C6\uC774 \uC0AD\uC81C\uB429\uB2C8\uB2E4. \uC758\uB3C4\uD558\uC9C0 \uC54A\uACE0 \uB204\uB978 \uACBD\uC6B0 \uC815\uBCF4\uC758 \uC190\uC2E4\uC744 \uBC1C\uC0DD\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
-OptionPanel.resources_use_default_font_for_notes_too=\uBA54\uBAA8\uC758 \uAE30\uBCF8 \uAE00\uAF34\uB3C4 \uC0AC\uC6A9\uD569\uB2C8\uB2E4
+OptionPanel.resources_use_default_font_for_notes_too=\uC8FC\uC11D\uC5D0\uB3C4 \uAE30\uBCF8 \uAE00\uAF34 \uC0AC\uC6A9
 OptionPanel.resources_use_margin_top_zero_for_notes=\uBA54\uBAA8 \uC704\uCABD \uC5EC\uBC31\uC744 \uC81C\uAC70
 OptionPanel.revision_color=\uAC1C\uC815\uD310 \uC0C9\uC0C1
 OptionPanel.revision_color.tooltip=\uBC14\uB010 \uB178\uB4DC\uC5D0\uB300\uD55C \uBC30\uACBD\uC0C9\uC0C1.
@@ -1242,7 +1289,7 @@ OptionPanel.scrollOnUnfold=\uB178\uB4DC\uB97C \uD3BC\uCE5C\uD6C4 \uC9C0\uB3C4 ??
 OptionPanel.selection_method=\uB178\uB4DC \uC120\uD0DD \uBC29\uBC95
 OptionPanel.selection_method.tooltip=<html>\uB2E4\uC74C \uC2A4\uC704\uCE58\uC640 \uD568\uAED8 \uC9C0\uC5F0\uB420 \uC120\uD0DD \uC2A4\uD0A4\uB9C8.\uC790\uB3D9 \uC635\uC158\uC744 \uD65C\uC131\uD654 / \uBE44\uD65C\uC131\uD654 \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC5B4\uCA0C\uB4E0 auto.properties\uC5D0 \uC800\uC7A5\uB418\uB294 \uAC83\uB4E4\uC744 \uC218\uC815 \uD558\uC9C0 \uB9C8\uC2ED\uC2DC\uC624.</html>
 OptionPanel.selection_method_by_click=\uD074\uB9AD\uC73C\uB85C
-OptionPanel.selection_method_delayed=\uB9C8\uC6B0\uC2A4\uB97C \uAC00\uC838\uAC00\uACE0 \uC57D\uAC04\uC758 \uC9C0\uC5F0 \uD6C4
+OptionPanel.selection_method_delayed=\uC9C0\uC5F0\uB428
 OptionPanel.selection_method_direct=\uB9C8\uC6B0\uC2A4\uB97C \uAC00\uC838\uAC00\uBA74 \uBC14\uB85C \uC120\uD0DD
 OptionPanel.separator.accessories/plugins/AutomaticLayout.properties_PatternSeparatorName=\uD328\uD134
 OptionPanel.separator.anti_alias=\uC548\uD2F0\uC54C\uB9AC\uC5B4\uC2A4
@@ -1251,6 +1298,8 @@ OptionPanel.separator.automatic_save=\uC790\uB3D9 \uC800\uC7A5
 OptionPanel.separator.behaviour=\uB3D9\uC791 \uC124\uC815
 OptionPanel.separator.browser=\uBE0C\uB77C\uC6B0\uC800
 OptionPanel.separator.cache=\uCE90\uC26C
+OptionPanel.separator.clones=\uBCF5\uC81C
+OptionPanel.separator.cloud=\uAD6C\uB984
 OptionPanel.separator.CloudControls=\uAD6C\uB984
 OptionPanel.separator.commands_for_the_program=\uD504\uB85C\uADF8\uB7A8 \uBA85\uB839\uC5B4
 OptionPanel.separator.connectors=\uC5F0\uACB0\uC120
@@ -1269,7 +1318,9 @@ OptionPanel.separator.html_export=Html \uB0B4\uBCF4\uB0B4\uAE30
 OptionPanel.separator.html_import=Html \uAC00\uC838\uC624\uAE30
 OptionPanel.separator.hyperlink_types=\uB9C1\uD06C \uD615\uD0DC
 OptionPanel.separator.icon_properties=\uC544\uC774\uCF58
+OptionPanel.separator.IconControls=\uC544\uC774\uCF58
 OptionPanel.separator.icons="\uC544\uC774\uCF58 \uC120\uD0DD..."\uC5D0\uC11C\uC758 \uC544\uC774\uCF58
+OptionPanel.separator.Icons=\uC544\uC774\uCF58
 OptionPanel.separator.initial_map_size=\uCD08\uAE30 \uC9C0\uB3C4 \uD06C\uAE30
 OptionPanel.separator.inline_editor=\uC778-\uB77C\uC778 \uB178\uB4DC \uD3B8\uC9D1\uAE30
 OptionPanel.separator.JoinNodesAction=\uB178\uB4DC \uC5F0\uACB0\uC911
@@ -1294,6 +1345,7 @@ OptionPanel.separator.other_defaults=\uAE30\uD0C0 \uAE30\uBCF8\uAC12
 OptionPanel.separator.others=\uB2E4\uB978 \uD0A4 \uBC14\uC778\uB529
 OptionPanel.separator.outline_view=\uAC1C\uC694 \uBCF4\uAE30
 OptionPanel.separator.patterns=\uD328\uD134
+OptionPanel.separator.presentation=\uD504\uB808\uC820\uD14C\uC774\uC158
 OptionPanel.separator.reminderOptions=\uC54C\uB9BC(\uC54C\uB9BC\uB9DE\uB098?) \uC635\uC158
 OptionPanel.separator.RichTextEditor=\uC11C\uC2DD \uC788\uB294 \uD14D\uC2A4\uD2B8 \uD3B8\uC9D1\uAE30
 OptionPanel.separator.root_node_appearance=\uCD5C\uC0C1\uC704 \uB178\uB4DC \uBAA8\uC591
@@ -1309,7 +1361,8 @@ OptionPanel.separator.spelling=\uC2A4\uD3A0 \uCCB4\uD06C \uC635\uC158
 OptionPanel.separator.SplitToWordsAction=\uB178\uB4DC\uB97C \uB2E8\uC5B4 \uB2E8\uC704\uB85C \uB098\uB204\uAE30
 OptionPanel.separator.status=\uC0C1\uD0DC \uC904
 OptionPanel.separator.surveys=\uC124\uBB38\uC870\uC0AC
-OptionPanel.separator.tooltip=\uB3C4\uAD6C \uD301 \uC2DC\uAC04
+OptionPanel.separator.svg_icons=SVG \uC544\uC774\uCF58
+OptionPanel.separator.tooltip=\uB3C4\uAD6C\uC0AC\uC6A9\uBC95
 OptionPanel.separator.undo=\uC2E4\uD589 \uCDE8\uC18C
 OptionPanel.separator.updates=\uD504\uB85C\uADF8\uB7A8 \uAC31\uC2E0
 OptionPanel.set_property_text=\uBCC0\uACBD
@@ -1321,9 +1374,12 @@ OptionPanel.shape_vertical_margin=\uC218\uC9C1 \uC5EC\uBC31
 OptionPanel.sharp_bezier=\uC608\uB9AC\uD55C \uACE1\uC120
 OptionPanel.sharp_linear=\uC608\uB9AC\uD55C \uC9C1\uC120
 OptionPanel.shouldCenterSmallMaps=\uC791\uC740 \uC9C0\uB3C4 \uC911\uC559\uC73C\uB85C
+OptionPanel.show_connectors=\uC5F0\uACB0\uC120 \uD45C\uC2DC
 OptionPanel.show_icon_for_attributes=\uC18D\uC131 \uAD00\uB828 \uC544\uC774\uCF58 \uBCF4\uAE30
+OptionPanel.show_icons=\uC544\uC774\uCF58 \uD45C\uC2DC
 OptionPanel.show_less_than_N_nodes_by_default_after_load=\uC9C0\uB3C4\uB97C \uBD88\uB7EC\uC624\uAC70\uB098 \uC77C\uBD80 \uB178\uB4DC\uB97C \uD3BC\uCE68
 OptionPanel.show_node_tooltips=\uB3C4\uAD6C \uD301 \uD45C\uC2DC
+OptionPanel.show_note_icon_in_tooltip=\uB3C4\uAD6C\uC0AC\uC6A9\uBC95\uC5D0 \uC8FC\uC11D \uC544\uC774\uCF58 \uD45C\uC2DC
 OptionPanel.show_note_icons=\uBA54\uBAA8 \uC544\uC774\uCF58 \uBCF4\uAE30
 OptionPanel.show_styles_in_tooltip=\uB3C4\uAD6C \uB3C4\uC6C0\uB9D0\uC5D0\uC11C \uB178\uB4DC \uAF34 \uBCF4\uAE30
 OptionPanel.signed_script_are_trusted=\uC2E0\uB8B0 \uC11C\uBA85\uB41C \uC2A4\uD06C\uB9BD\uD2B8 (\uAD8C\uC7A5\uD568).
@@ -1339,7 +1395,7 @@ OptionPanel.single_instance_force.tooltip=\uBD88\uB7EC\uC62C \uD30C\uC77C\uC774
 OptionPanel.sk=\uC2AC\uB85C\uBC14\uD0A4\uC544\uC5B4 / sloven\u010Dina
 OptionPanel.skip_template_selection=\uC11C\uC2DD \uC120\uD0DD \uB300\uD654\uC0C1\uC790 \uAC74\uB108\uB6F0\uAE30
 OptionPanel.sl=\uC2AC\uB85C\uBCA0\uB2C8\uC544\uC5B4 / sloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=\uC120\uD0DD\uD55C \uB178\uB4DC\uB85C \uB290\uB9B0 \uC2A4\uD06C\uB864\uB9C1
+OptionPanel.slow_scroll_selected_node=\uC120\uD0DD\uD55C \uB178\uB4DC\uB97C \uBD80\uB4DC\uB7FD\uAC8C \uC2A4\uD06C\uB864
 OptionPanel.spelling_opt_case_sensitive=\uB300\uC18C\uBB38\uC790 \uAD6C\uBD84??(\uCF00\uC774\uC2A4 \uC13C\uC2A4\uD2F0\uBE0C)
 OptionPanel.spelling_opt_ignore_all_caps_words=\uB300\uBB38\uC790\uB85C \uB41C \uBAA8\uB4E0 \uB2E8\uC5B4 \uBB34\uC2DC\uD558\uAE30.
 OptionPanel.spelling_opt_ignore_capitalization=\uC2DC\uC791 \uB2E8\uC5B4\uC5D0 \uB300\uBB38\uC790 \uBB34\uC2DC\uD558\uAE30
@@ -1351,14 +1407,17 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=\uB2E8\uC5B4\uC5D0\uC11C
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=\uC6D0\uB798 \uBE48 \uB178\uB4DC\uB97C \uB0A8\uAE30\uAE30
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=\uD589\uC758 \uB178\uB4DC \uBC88\uD638
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=\uC138\uBD80 \uC0AC\uD56D\uC744 \uC6D0\uBCF8 \uAE00\uB85C \uC800\uC7A5
+OptionPanel.spotlight=\uC2A4\uD3EC\uD2B8\uB77C\uC774\uD2B8
+OptionPanel.spotlight_background_color=\uC2A4\uD3EC\uD2B8\uB77C\uC774\uD2B8 \uBC30\uACBD \uC0C9\uC0C1
 OptionPanel.sr=\uC138\uB974\uBE44\uC544\uC5B4 / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=\uD45C\uC900 \uC11C\uC2DD \uD30C\uC77C
-OptionPanel.standardbackgroundcolor=\uB178\uB4DC \uD45C\uC900 \uBC30\uACBD\uC0C9
+OptionPanel.standardbackgroundcolor=\uD45C\uC900 \uBC30\uACBD \uC0C9\uC0C1
 OptionPanel.standardbackgroundcolor.tooltip=<html>HTML \uD45C\uAE30\uBC95\uC758 \uD45C\uC900 \uBC30\uACBD \uC0C9\uC0C1</html>
-OptionPanel.standardcloudcolor=\uAD6C\uB984 \uD45C\uC900 \uC0C9\uC0C1
+OptionPanel.standardcloudcolor=\uD45C\uC900 \uAD6C\uB984 \uC0C9\uC0C1
 OptionPanel.standardcloudcolor.tooltip=<html>HTML \uD45C\uAE30\uBC95\uC758 \uD45C\uC900 \uAD6C\uB984 \uC0C9\uC0C1 </html>
 OptionPanel.standardcloudestyle=\uD45C\uC900 \uAD6C\uB984 \uAF34
 OptionPanel.standardcloudestyle.tooltip=<html>\uD45C\uC900 \uAD6C\uB984 \uAF34. \uD604\uC7AC, '\uBCA0\uC9C0\uC5B4??'\uAC00 \uC9C0\uC6D0\uB429\uB2C8\uB2E4</html>
+OptionPanel.standardcloudshape=\uD45C\uC900 \uAD6C\uB984 \uBAA8\uC591
 OptionPanel.standarddrawrectangleforselection=\uAC70\uD488\uC5D0\uC11C \uC120\uD0DD\uD55C \uB178\uB4DC\uB97C \uBCF4\uAE30
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>\uCCB4\uD06C\uD45C\uC2DC\uB294 \uAC70\uD488 \uC8FC\uBCC0\uC5D0\uC758\uD574 \uC120\uD0DD\uD55C \uB178\uB4DC\uB4E4 \uC785\uB2C8\uB2E4.</html>
 OptionPanel.standardlinkcolor=\uB9C1\uD06C \uD45C\uC900 \uC0C9\uC0C1
@@ -1381,6 +1440,7 @@ OptionPanel.time_for_automatic_save=\uC790\uB3D9\uC800\uC7A5\uD560 \uC2DC\uAC04\
 OptionPanel.time_for_automatic_save.tooltip=<html> \uC790\uB3D9\uC800\uC7A5 \uD65C\uC131\uD654\uC2DC \uC2DC\uAC04\uAC04\uACA9\uC785\uB2C8\uB2E4.(1/1000\uCD08): \uC790\uB3D9\uC800\uC7A5\uC744 \uBE44\uD65C\uC131\uD654\uD558\uB824\uBA74 \uC774 \uAC12\uC744 2000000000\uC73C\uB85C \uC124\uC815\uD558\uC138\uC694.</html>
 OptionPanel.time_for_delayed_selection=\uC120\uD0DD\uC2DC \uC9C0\uC5F0\uC2DC\uAC04
 OptionPanel.time_for_delayed_selection.tooltip=<html>\uC120\uD0DD \uB178\uB4DC  (\uBC00\uB9AC\uCD08)\uC5D0\uC11C \uB9C8\uC6B0\uC2A4\uAC00 \uB54C\uC758 \uC9C0\uC5F0 \uC2DC\uAC04\uC785\uB2C8\uB2E4.???? \uB9CC\uC57D \uB9C8\uC6B0\uC2A4\uC624\uBC84\uC5D0\uC11C \uC9C1\uC811 \uC120\uD0DD\uD558\uAE30\uB97C \uC6D0\uD55C\uB2E4\uBA74 \uC774 \uAC12\uC744 1\uB85C \uBCC0\uACBD \uD558\uC138\uC694.</html>
+OptionPanel.toolbar_icon_height=\uB3C4\uAD6C\uB9C9\uB300 \uC544\uC774\uCF58 \uB192\uC774
 OptionPanel.toolTipManager.dismissDelay=\uC9C0\uC5F0 \uD574\uC81C, ms
 OptionPanel.toolTipManager.initialDelay=\uC9C0\uC5F0 \uCD08\uAE30\uD654 [\uBC00\uB9AC\uCD08]
 OptionPanel.toolTipManager.max_tooltip_height=\uCD5C\uB300 \uB178\uB4DC \uD234\uD301?? \uB192\uC774
@@ -1390,7 +1450,7 @@ OptionPanel.toolTipManager.max_tooltip_width.tooltip=\uD53D\uC140\uB85C \uCD5C\u
 OptionPanel.toolTipManager.reshowDelay=\uB2E4\uC2DC\uBCF4\uAE30 \uC9C0\uC5F0, ms
 OptionPanel.tr=\uD130\uD0A4\uC5B4 / T\u00FCrk\u00E7e
 OptionPanel.uk_UA=\uC6B0\uD06C\uB77C\uC774\uB098\uC5B4 / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
-OptionPanel.undefined_font=\uC815\uC758\uC548\uB41C \uAE00\uAF34
+OptionPanel.undefined_font=\uBBF8\uC9C0\uC815 \uAE00\uAF34
 OptionPanel.undo_levels=\uC2E4\uD589 \uCDE8\uC18C \uB2E8\uACC4
 OptionPanel.undo_levels.tooltip=<html>\uC2E4\uD589\uCDE8\uC18C \uB0B4\uC5ED\uC744 \uC5BC\uB9C8\uB9CC\uD07C\uC758 \uB2E8\uACC4\uAE4C\uC9C0 \uC800\uC7A5\uD560\uAC83\uC778\uC9C0 \uC124\uC815\uD569\uB2C8\uB2E4.</html>
 OptionPanel.unfold_on_paste=\uB178\uB4DC\uB97C \uC811\uC740 \uC0C1\uD0DC\uB85C \uBD99\uC5EC\uB123\uAE30
@@ -1398,9 +1458,10 @@ OptionPanel.unfold_on_paste.tooltip=\uBD99\uC5EC\uB123\uAE30\uB098 \uB4DC\uB798\
 OptionPanel.uniform_shape=??\uC81C\uBCF5
 OptionPanel.use_common_out_point_for_root_node=\uCD5C\uC0C1\uC704 \uB178\uB4DC\uC5D0\uC11C \uBAA8\uB4E0 \uC904\uAE30\uB97C \uC2DC\uC791
 OptionPanel.use_common_out_point_for_root_node.tooltip=\uCD5C\uC0C1\uC704 \uB178\uB4DC\uC5D0\uC11C \uBAA8\uB4E0 \uC904\uAE30\uB97C \uC2DC\uC791
+OptionPanel.use_svg_icons=SVG \uC544\uC774\uCF58 \uC0AC\uC6A9
+OptionPanel.use_svg_icons.tooltip=<html>\uC544\uC774\uCF58\uC758 \uB80C\uB354\uB9C1 \uD488\uC9C8\uC744 \uACB0\uC815\uD569\uB2C8\uB2E4. SVG \uC544\uC774\uCF58 \uD45C\uC2DC\uC5D0 \uC2DC\uAC04\uC774 \uAC78\uB9BD\uB2C8\uB2E4.</html>
 OptionPanel.use_tabbed_pane=\uD0ED \uC0AC\uC6A9
 OptionPanel.use_tabbed_pane.tooltip=\uC120\uD0DD\uD558\uC2DC\uBA74 \uC9C0\uB3C4\uAC00 \uD0ED\uC5D0 \uD45C\uC2DC\uB429\uB2C8\uB2E4 (FireFox \uCC98\uB7FC :-) ).
-OptionPanel.user_defined_screen_resolution=\uC0AC\uC6A9\uC790 \uC815\uC758 \uD654\uBA74 \uD574\uC0C1\uB3C4 (dpi)
 OptionPanel.validate_classpath_needs_readaccess=\uC2A4\uD06C\uB9BD\uD305 : \uD074\uB798\uC2A4 \uACBD\uB85C\uB97C \uC124\uC815\uD560 \uB54C\uC774 \uD30C\uC77C\uC5D0 \uB300\uD55C \uC77D\uAE30 \uAD8C\uD55C\uC744 \uD5C8\uC6A9\uD574\uC57C\uD569\uB2C8\uB2E4!
 OptionPanel.validate_invalid_date_format=\uC798\uBABB\uB41C \uD45C\uC900 \uB0A0\uC9DC \uD615\uC2DD
 OptionPanel.validate_invalid_datetime_format=\uC798\uBABB\uB41C \uD45C\uC900 \uB0A0\uC9DC-\uC2DC\uAC04 \uD615\uC2DD
@@ -1460,7 +1521,7 @@ plugins/script_filter_error={0}\uC774 {1}\uC5D0\uC11C \uB17C\uB9AC\uD615 \uACB0\
 plugins/script_filter_execute_error=??\n\uB178\uB4DC {1} \uC5D0\uB300\uD55C:\n\uC2E4\uD589 \uC624\uB958 {0}\n{2}
 plugins/ScriptEditor.cancel=\uBCC0\uACBD \uC0AC\uD56D\uC744 \uC800\uC7A5\uD558\uC9C0 \uC54A\uACE0 \uC885\uB8CC(&D)
 plugins/ScriptEditor.exit=\uC800\uC7A5 \uD6C4 \uC885\uB8CC(&S)
-plugins/ScriptEditor.FORBIDDEN_ACTION=\uD504\uB9AC\uD50C\uB808\uC778 groovy scripts are restricted. The following {0,choice,0#File|1#Network|2#Exec} operation is forbidden: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. You can change this in the program settings.
+plugins/ScriptEditor.FORBIDDEN_ACTION=\uD504\uB9AC\uD50C\uB808\uC778\uC740 \uADF8\uB8E8\uBE44 \uC2A4\uD06C\uB9BD\uD2B8\uAC00 \uC81C\uD55C\uB418\uC5B4\uC788\uC2B5\uB2C8\uB2E4. \uB2E4\uC74C\uC758 {0,choice,0#\uD30C\uC77C|1#\uB124\uD2B8\uC6CC\uD06C|2#\uC2E4\uD589} \uC791\uC5C5\uC774 \uAE08\uC9C0\uB418\uC5C8\uC2B5\uB2C8\uB2E4: \n{1,choice,0#\uC811\uADFC|1#\uC5F0\uACB0|2#\uB300\uAE30|3#\uBA40\uD2F0\uCE90\uC2A4\uD2B8|4#\uD329\uD1A0\uB9AC\uC124\uC815|5#\uC2E4\uD589|6#\uC5F0\uACB0|7#\uC0AD\uC81C [...]
 plugins/ScriptEditor.menu_actions=\uB3D9\uC791(&A)
 plugins/ScriptEditor.new_script=\uC0C8\uB85C\uC6B4 \uC2A4\uD06C\uB9BD\uD2B8
 plugins/ScriptEditor.run=\uC2E4\uD589(&R)
@@ -1501,11 +1562,14 @@ plugins/TimeManagement.xml_todayButton=\uC624\uB298
 plugins/TimeManagement.xml_WindowTitle=\uC2DC\uAC04 \uAD00\uB9AC
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=\uCC3E\uAE30 \uBC0F \uBC14\uAFB8\uAE30
 preferences=\uD658\uACBD \uC124\uC815
+presentation=\uD504\uB808\uC820\uD14C\uC774\uC158
+presentation.combineAll=\uBAA8\uB4E0 \uD504\uB9AC\uC820\uD14C\uC774\uC158 \uACB0\uD569
 print_preview_title=\uC778\uC1C4 \uBBF8\uB9AC\uBCF4\uAE30
 PrintAction.text=\uC9C0\uB3C4 \uC778\uC1C4(P)...
 PrintDirectAction.text=\uC778\uC1C4
 printing_settings=\uC778\uC1C4 \uBE44\uC728
 PrintPreviewAction.text=\uC778\uC1C4 \uBBF8\uB9AC\uBCF4\uAE30...
+program_terminates=\uB0B4\uBD80 \uC624\uB958, \uD504\uB85C\uADF8\uB7A8\uC744 \uC885\uB8CC\uD569\uB2C8\uB2E4.
 progress=\uC9C4\uD589\uC728 \uC544\uC774\uCF58 (%)
 PropertyAction.dialog=\uD658\uACBD\uC124\uC815
 PropertyAction.text=\uD658\uACBD\uC124\uC815...
@@ -1530,7 +1594,7 @@ RedoFilterAction.text=\uAC70\uB984\uAE30 \uB3D9\uC791\uC744 \uB2E4\uC2DC \uC2E4\
 regular_expressions=\uC815\uADDC\uC2DD
 ReminderHookAction.text=\uC54C\uB9BC \uD45C\uC2DC \uC81C\uAC70
 ReminderHookAction.tooltip=\uB178\uB4DC\uC5D0\uC11C \uBBF8\uB9AC \uC54C\uB9BC\uC744 \uC81C\uAC70.
-reminderNotification=\uC54C\uB9BC
+reminderNotification=\uC54C\uB9BC \uC54C\uB9AC\uAE30
 remove_file_from_list_on_error=\uD30C\uC77C {0} \uC740 \uC5F4\uB9AC\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uB9C8\uC9C0\uB9C9\uC73C\uB85C \uC5F4\uB9B0 \uD30C\uC77C \uBAA9\uB85D\uC5D0\uC11C \uC81C\uAC70 \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 remove_shortcut_question=\uB2E8\uCD95\uD0A4\uB97C \uBC14\uAFB8\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 remove_shortcut_title=\uB2E8\uCD95\uD0A4\uB97C \uC81C\uAC70 \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
@@ -1565,7 +1629,7 @@ SaveAcceleratorPresetsAction.text=\uB2E8\uCD95\uD0A4 \uC124\uC815 \uC800\uC7A5\u
 SaveAction.text=\uC9C0\uB3C4 \uC800\uC7A5(&S)
 SaveAction_readonlyMsg=\uC774 \uC9C0\uB3C4\uB294 \uC77D\uAE30 \uC804\uC6A9\uC785\uB2C8\uB2E4. \uC9C0\uB3C4\uB97C \uC800\uC7A5\uD558\uB824\uBA74 ' \uD30C\uC77C-> \uC9C0\uB3C4\uB97C \uB2E4\uB978\uC774\uB984\uC73C\uB85C \uC800\uC7A5..' \uD558\uC2ED\uC2DC\uC624.
 SaveAction_readonlyTitle=\uC77D\uAE30 \uC804\uC6A9 \uC9C0\uB3C4\uB97C \uC800\uC7A5\uD558\uAE30
-SaveAll.text=\uC5F4\uB824 \uC788\uB294 \uC9C0\uB3C4 \uBAA8\uB450 \uC800\uC7A5(&A)
+SaveAll.text=\uBAA8\uB4E0 \uC9C0\uB3C4 \uC800\uC7A5(&A)
 SaveAll.tooltip=\uC5F4\uB824 \uC788\uB294 \uC9C0\uB3C4 \uBAA8\uB450 \uC800\uC7A5
 SaveAs_toReadonlyMsg={0} \uB294 \uC77D\uAE30 \uC804\uC6A9\uC785\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C\uB85C \uC800\uC7A5 \uD558\uC2ED\uC2DC\uC624.
 SaveAs_toReadonlyTitle=\uC77D\uAE30 \uC804\uC6A9 \uD30C\uC77C\uC744 \uC800\uC7A5\uD558\uAE30
@@ -1602,9 +1666,10 @@ selection_method_delayed=\uB9C8\uC6B0\uC2A4\uB97C \uAC00\uC838\uAC00\uBA74 \uC57
 selection_method_direct=\uB9C8\uC6B0\uC2A4\uB97C \uAC00\uC838\uAC00\uBA74 \uBC14\uB85C \uC120\uD0DD
 SelectNoteAction.text=\uBA54\uBAA8 \uD3B8\uC9D1 \uBCC0\uD658
 SelectNoteAction.tooltip=\uB178\uD2B8 \uD328\uB110\uC5D0\uC11C resp. \uB85C \uC804\uD658
+set_accelerator_on_next_click_helpmessage=\uC0C8\uB85C\uC6B4 \uD0A4\uBCF4\uB4DC \uBC14\uB85C\uAC00\uAE30\uB97C \uB9CC\uB4E4\uB824\uBA74 \uCC28\uB9BC\uD45C\uC5D0\uC11C \uC6D0\uD558\uB294 \uBA85\uB839\uC744 \uD074\uB9AD\uD558\uC2ED\uC2DC\uC624.
 SetAccelerator.dialogTitle=\uB2E8\uCD95\uD0A4 \uC9C0\uC815
 SetAccelerator.keystrokeDetected=\uD0A4\uC785\uB825 "{0}"\uC740 \uC5B4\uB5A0\uD55C \uBA54\uB274\uD56D\uBAA9\uC5D0\uB3C4 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-SetAcceleratorOnNextClickAction.text=\uB2E8\uCD95\uD0A4 \uC9C0\uC815...
+SetAcceleratorOnNextClickAction.text=\uB2E8\uCD95\uD0A4 \uC9C0\uC815
 SetAlwaysUnfoldedNodeFlagsAction.text=\uD3BC\uCCD0\uC9C4 \uB178\uB4DC \uC720\uC9C0
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=\uD604\uC7AC \uD3BC\uCCD0\uC9C4 \uB178\uB4DC \uC811\uD798 \uBC29\uC9C0
 SetImageByFileChooserAction.text=\uC774\uBBF8\uC9C0 (\uD30C\uC77C\uC120\uD0DD \uB610\uB294 \uB9C1\uD06C \uCD94\uAC00)...
@@ -1625,12 +1690,17 @@ ShowAncestorsAction.text=\uC0C1\uC704 \uB178\uB4DC \uBCF4\uAE30
 ShowAttributeDialogAction.text=\uC18D\uC131(\uC560\uD2B8\uB9AC\uBDF0\uD2B8) \uAD00\uB9AC\uC790 ...
 ShowDescendantsAction.text=\uD558\uC704 \uB178\uB4DC \uBCF4\uAE30
 ShowFilterToolbarAction.text=\uAC70\uB984\uAE30 \uB3C4\uAD6C \uB9C9\uB300
-ShowFormatPanel.text=\uC18D\uC131 \uD328\uB110
+ShowFirstSlideAction.text=\uCCAB \uC2AC\uB77C\uC774\uB4DC
+ShowFirstSlideAndStartPresentationAction.text=\uD504\uB808\uC820\uD14C\uC774\uC158\uC744 \uCC98\uC74C\uBD80\uD130 \uC2E4\uD589
+ShowFormatPanel.text=\uB3C4\uAD6C \uD310\uB12C
 ShowFormatPanel.tooltip=\uB178\uB4DC\uC640 \uC904\uAE30\uC758 \uC18D\uC131\uC744 \uD55C \uBC88\uC5D0 \uBCC0\uACBD\uD560 \uC218 \uC788\uB294 \uB300\uD654\uC0C1\uC790\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.
 ShowHideNoteAction.text=\uB178\uD2B8 \uCC3D
 ShowHideNoteAction.tooltip=\uB178\uD2B8 \uD328\uB110\uC774 \uB098\uD0C0\uB098\uAC70\uB098 \uC0AC\uB77C\uC9C0\uAC8C \uD569\uB2C8\uB2E4.
+ShowLastSlideAction.text=\uB9C8\uC9C0\uB9C9 \uC2AC\uB77C\uC774\uB4DC
 ShowNextChildAction.text=\uB2E4\uC74C \uD558\uC704 \uB178\uB4DC \uBCF4\uAE30
+ShowNextSlideAction.text=\uB2E4\uC74C \uC2AC\uB77C\uC774\uB4DC
 ShowNotesInMapAction.text=\uC9C0\uB3C4\uC5D0 \uBA54\uBAA8\uB97C \uD45C\uC2DC
+ShowPreviousSlideAction.text=\uC774\uC804 \uC2AC\uB77C\uC774\uB4DC
 ShowSelectedAttributesAction.text=\uC120\uD0DD\uD55C \uC18D\uC131 \uBCF4\uAE30
 ShowSelectionAsRectangleAction.text=\uC0AC\uAC01\uD615 \uBAA8\uC591\uC73C\uB85C \uC120\uD0DD \uCF1C\uAE30/\uB044\uAE30
 simplyhtml.aboutFrameTitle=\uD504\uB85C\uADF8\uB7A8 \uC815\uBCF4
@@ -1819,6 +1889,42 @@ simplyhtml.valignMiddle=\uC911\uAC04
 simplyhtml.valignTop=\uC704
 simplyhtml.wholeWordsOnly=\uC804\uCCB4 \uB2E8\uC5B4 \uC77C\uCE58
 simplyhtml.wholeWordsOnly.tooltip=\uC77C\uCE58\uD558\uB294 \uD56D\uBAA9\uC744 \uC644\uC804\uD55C \uB2E8\uC5B4\uB9CC\uC73C\uB85C \uC81C\uD55C\uD569\uB2C8\uB2E4.
+slide.add=\uCD94\uAC00
+slide.add.tooltip=\uC2AC\uB77C\uC774\uB4DC\uC5D0 \uD604\uC7AC \uC120\uD0DD\uB41C \uB178\uB4DC\uB97C \uCD94\uAC00
+slide.at_center.tooltip=\uC911\uC559
+slide.content=\uC2AC\uB77C\uC774\uB4DC \uB0B4\uC6A9
+slide.descendants=\uD558\uC704 \uD45C\uC2DC
+slide.edge=\uC5EC\uBC31
+slide.filter=\uAC70\uB984\uAE30
+slide.first=\uCC98\uC74C
+slide.last=\uB9C8\uC9C0\uB9C9
+slide.next=\uB2E4\uC74C
+slide.nofilter=\uAC70\uB984\uAE30 \uC5C6\uC74C
+slide.on_the_left.tooltip=\uC67C\uCABD
+slide.on_the_right.tooltip=\uC67C\uCABD\uC5D0
+slide.placenode=\uC120\uD0DD\uB41C \uB178\uB4DC \uBC30\uCE58
+slide.placenode.tooltip=\uC2AC\uB77C\uC774\uB4DC\uAC00 \uC81C\uC2DC \uB420 \uB54C
+slide.present=\uD604\uC7AC
+slide.presentation=\uD504\uB9AC\uC820\uD14C\uC774\uC158
+slide.presentations=\uD504\uB9AC\uC820\uD14C\uC774\uC158
+slide.previous=\uC774\uC804
+slide.remove=\uC81C\uAC70
+slide.remove.tooltip=\uC2AC\uB77C\uC774\uB4DC\uC5D0\uC11C \uD604\uC7AC \uC120\uD0DD\uB41C \uB178\uB4DC \uC81C\uAC70
+slide.select=\uC120\uD0DD
+slide.select.tooltip=\uC9C0\uB3C4\uC5D0\uC11C \uC2AC\uB77C\uC774\uB4DC \uB178\uB4DC \uC120\uD0DD
+slide.set=\uC124\uC815
+slide.set.tooltip=\uD604\uC7AC \uC120\uD0DD\uB41C \uC2AC\uB77C\uC774\uB4DC \uB0B4\uC6A9 \uB178\uB4DC \uB9CC\uB4E4\uAE30
+slide.setfilter=\uAC70\uB984\uAE30 \uC124\uC815
+slide.setfilter.tooltip=\uC2AC\uB77C\uC774\uB4DC\uAC00 \uD45C\uC2DC \uB420 \uB54C \uC801\uC6A9 \uD560 \uAC70\uB984\uAE30 \uC124\uC815 \uB610\uB294 \uC81C\uAC70
+slide.setfoldingstate=\uC811\uAE30 \uC124\uC815
+slide.setfoldingstate.tooltip=\uC2AC\uB77C\uC774\uB4DC\uAC00 \uD45C\uC2DC\uB418\uBA74 \uD604\uC7AC \uC811\uD798 \uBCF5\uC6D0
+slide.setzoom=\uD655\uB300/\uCD95\uC18C \uC124\uC815
+slide.setzoom.tooltip=\uC2AC\uB77C\uC774\uB4DC\uAC00 \uD45C\uC2DC \uB420 \uB54C \uC801\uC6A9\uB41C \uC9C0\uB3C4 \uD655\uB300 / \uCD95\uC18C \uC124\uC815 \uB610\uB294 \uC81C\uAC70
+slide.showancestors=\uC0C1\uC704 \uD45C\uC2DC
+slide.showonlyselected=\uC120\uD0DD\uB41C \uB178\uB4DC\uB4E4\uB9CC \uD45C\uC2DC
+slide.showonlyselected.tooltip=\uC2AC\uB77C\uC774\uB4DC\uAC00 \uD45C\uC2DC\uB420\uB54C \uB2E4\uB978 \uB178\uB4DC \uC228\uAE30\uAE30
+slide.slides=\uC2AC\uB77C\uC774\uB4DC
+slide.stop=\uBA48\uCDA4
 SortNodes.text=\uD558\uC704 \uB178\uB4DC \uC815\uB82C
 SortNodes.tooltip=\uBAA8\uB4E0 \uD558\uC704 \uB178\uB4DC\uB4E4\uC744 \uC54C\uD30C\uBCB3 \uC21C\uC73C\uB85C \uC815\uB82C\uD569\uB2C8\uB2E4.
 split=&\uB098\uB204\uAE30(&S)
@@ -1827,7 +1933,10 @@ SplitNode.text=\uB178\uB4DC \uB098\uB204\uAE30
 SplitNode.tooltip=<html>\uB178\uB4DC\uB294 \uB098\uB20C\uC218 \uC5C6\uC2B5\uB2C8\uB2E4.</html>
 SplitToWordsAction.text=\uC904\uC5D0\uC11C {0} \uAC1C\uC758 \uB2E8\uC5B4\uB85C \uB098\uB204\uAE30
 STANDARD_FORMAT=\uD45C\uC900
+StartPresentationAction.text=\uD504\uB9AC\uC820\uD14C\uC774\uC158 \uC2E4\uD589
+StartPresentationOrShowNextSlideAction.text=\uD504\uB808\uC820\uD14C\uC774\uC158 \uC2E4\uD589/\uB2E4\uC74C \uC2AC\uB77C\uC774\uB4DC
 stop_processing=\uBA48\uCDA4
+StopPresentationAction.text=\uD504\uB808\uC820\uD14C\uC774\uC158 \uBA48\uCDA4
 StringFlavorHandler=\uB178\uB4DC \uACC4\uCE35 \uAD6C\uC870\uB85C \uC77C\uBC18 \uD14D\uC2A4\uD2B8
 StructuredHtmlFlavorHandler=\uB178\uB4DC \uACC4\uCE35 \uAD6C\uC870\uB85C HTML
 style=\uAF34
@@ -1891,7 +2000,6 @@ ToggleMenubarAction.text=\uBA54\uB274 \uBCF4\uC774\uAE30/\uC228\uAE30\uAE30
 ToggleScrollbarsAction.text=\uC2A4\uD06C\uB864 \uB9C9\uB300
 ToggleStatusAction.text=\uC0C1\uD0DC \uD45C\uC2DC\uC904 \uD45C\uC2DC
 ToggleToolbarAction.text=\uB3C4\uAD6C \uB9C9\uB300(T)
-toolbars=\uB3C4\uAD6C \uB9C9\uB300
 TranslatedElement.BORDER=\uAE00\uC790 \uD14C\uB450\uB9AC
 TranslatedElement.TEXT=\uAE00\uC790
 TranslatedElement.TOOLTIP=\uB3C4\uAD6C \uB3C4\uC6C0\uB9D0
diff --git a/freeplane/resources/translations/Resources_lt.properties b/freeplane/resources/translations/Resources_lt.properties
index c857580..0657b58 100644
--- a/freeplane/resources/translations/Resources_lt.properties
+++ b/freeplane/resources/translations/Resources_lt.properties
@@ -1,4 +1,7 @@
+about_text=Freeplane - nemokama min\u010Di\u0173 \u017Eem\u0117lapi\u0173 sudarymo ir mokymosi programin\u0117 \u012Franga
 AboutAction.text=Apie
+acceleratorPresets=Greitasis klavi\u0161as nustato
+accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Keisti ra\u0161t\u0105
 accessories/plugins/EncryptNode.properties_0=\u012Eveskite u\u017Ekoduotos at\u0161akos slapta\u017Eod\u012F
 accessories/plugins/EncryptNode.properties_1=Slapta\u017Eod\u017Eiai nesutampa arba yra per trumpi.
 accessories/plugins/EncryptNode.properties_2=\u012Eveskite slapta\u017Eod\u012F:
@@ -45,7 +48,6 @@ cannot_move_to_child=Perkelti motinin\u0119 at\u0161ak\u0105 \u012F dukterin\u01
 CenterAction.text=Centruoti
 ChangeConnectorArrowsAction.backward.text=Atgal
 ChangeConnectorArrowsAction.forward.text=Pirmyn
-choose_background_color=Pasirinkite fono spalv\u0105:
 choose_cloud_color=Pasirinkite debesies spalv\u0105:
 choose_edge_color=Pasirinkite kra\u0161tin\u0117s spalv\u0105
 choose_node_background_color=Pasirinkite fonin\u0119 at\u0161akos spalv\u0105:
@@ -88,8 +90,6 @@ enter_base_url=Ketinu \u012Fkelti reliatyvias nuorodas. \u012Eveskite bazin\u011
 enter_confirms='Enter' patvirtina
 EnterPassword.text=Atrakinti/u\u017Erakinti u\u017Ekoduot\u0105 at\u0161ak\u0105 / \u017Eem\u0117lap\u012F
 error_creating_directory=Nepavyksta sukurti aplanko eksportavimui.
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 ExportAction.text=Eksportuoti
 ExportBranchToHTMLAction.text=\u0160ak\u0105 \u012F HTML
 ExportPdf.text=\u012E PDF...
diff --git a/freeplane/resources/translations/Resources_nb.properties b/freeplane/resources/translations/Resources_nb.properties
index af25a3d..aa1e8b1 100644
--- a/freeplane/resources/translations/Resources_nb.properties
+++ b/freeplane/resources/translations/Resources_nb.properties
@@ -19,8 +19,6 @@ accessories/plugins/ExportWithTWiki.tooltip=Eksporterer kartet som et TWiki-doku
 accessories/plugins/ExportWithXSLT.tooltip=Eksporterer kartet ved hjelp av XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Som Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Eksporterer kartet som en java nettleser applet.
-accessories/plugins/ExportWithXSLT_Flash.text=Som Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Eksporterer kartet som en flash-aplikasjon.
 accessories/plugins/ExportWithXSLT_HTML.text=Som XHTML (JavaScript versjon)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Som XHTML (klikkbart kart som bilde - versjon)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Ressurser fra RESOURCES-noden til TaskJuggler-filen...
@@ -131,7 +129,6 @@ cannot_add_parent_to_root=Rotnoden kan ikke legges til en ny foreldre.
 cannot_join_nodes_with_children=Kan ikke forbinde noder med barn
 cannot_move_to_child=Du kan ikke flytte en node til et av dens blader.
 CenterAction.text=Sentrer
-CenterSelectedNodeAction.text=Sentrer valgt node
 ChangeConnectorArrowsAction.backward.text=Tilbake
 ChangeConnectorArrowsAction.forward.text=Frem
 ChangeConnectorArrowsAction.none.text=Ingen
@@ -141,7 +138,6 @@ ChangeNodeLevelLeftsAction.text=Node til venstre
 ChangeNodeLevelLeftsAction.tooltip=Til venstre for roten er noden(e) vendt nedover. De(n) blir barn til sine s\u00F8sken over. Til h\u00F8yre for roten er noden(e) vendt oppover. Direkte p\u00E5 roten bytter noden(e) side.
 ChangeNodeLevelRightsAction.text=Node til h\u00F8yre
 ChangeNodeLevelRightsAction.tooltip=Til h\u00F8yre for roten er noden(e) vendt nedover. De(n) blir barn til sine s\u00F8sken over. Til venstre for roten er noden(e) vendt oppover. Direkte p\u00E5 roten bytter noden(e) side.
-choose_background_color=Velg bakgrunnsfarge:
 choose_cloud_color=Velg Sky-farge:
 choose_edge_color=Velg rammefarge
 choose_map_background_color=Velg bakgrunnsfarge for kart
@@ -226,8 +222,6 @@ EnterPassword.text=Skift mellom kryptert / ukryptert
 error=Feil
 error_applying_template=Feil under bruk av XSL-mal.
 error_creating_directory=F\u00E5r ikke opprettet omr\u00E5de for eksport.
-export_pdf_text=Flyttbart dokumentformat (PDF)
-export_svg_text=Skalerbar vektorgrafikk (SVG)
 ExportAction.text=Eksporter kart\u2026
 ExportBranchToHTMLAction.text=Eksporter gren til HTML
 ExportPdf.text=Som PDF...
@@ -424,6 +418,7 @@ modes=Visninger
 ModesMenuAction.File.text=File Explorer[translate me]
 ModesMenuAction.MindMap.text=Mind Map Editor[translate me]
 most_recent_files=Sist brukte filer
+MoveSelectedNodeAction.CENTER.text=Sentrer valgt node
 MoveToRootAction.text=Flytt til rot
 navigate=Naviger
 NavigationNextMapAction.text=Neste kart
diff --git a/freeplane/resources/translations/Resources_nl.properties b/freeplane/resources/translations/Resources_nl.properties
index 6f25dd1..2484c03 100644
--- a/freeplane/resources/translations/Resources_nl.properties
+++ b/freeplane/resources/translations/Resources_nl.properties
@@ -12,16 +12,16 @@ accessories/plugins/EncryptNode.properties_4=Geef je wachtwoord.
 accessories/plugins/EncryptNode.properties_5=<html> Let op: de sterkte van de beveiliging<br> hangt af van de kwaliteit (voorspelbaarheid) van je wachtwoord.
 accessories/plugins/EncryptNode.properties_6=OK
 accessories/plugins/EncryptNode.properties_7=Annuleer
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Je kunt alleen de beveiliging van een knoop met wachtwoord  in- en uitschakelen. Voeg een wachtwoord toe via het menu Extra.
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Je kunt alleen de beveiliging van een knoop met wachtwoord in- en uitschakelen. Voeg een wachtwoord toe via het menu Extra.
 accessories/plugins/EncryptNode.properties_select_me=Kies mij om verder te gaan!
 accessories/plugins/EncryptNode.properties_wrong_password=Het wachtwoord is onjuist.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start\u2026
+accessories/plugins/Export_JavaWebStart.tooltip=De map voor Java Web Start exporteren.
 accessories/plugins/ExportWithTWiki.text=TWiki\u2026
 accessories/plugins/ExportWithTWiki.tooltip=Exporteren mindmap als TWiki document.
 accessories/plugins/ExportWithXSLT.tooltip=Dit is een algemene export methode.
 accessories/plugins/ExportWithXSLT_Applet.text=Java Applet\u2026
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporteren mindmap als java browser applet.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash\u2026
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporteren mindmap als flash toepassing.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript versie)\u2026
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML, Klikbare mindmap
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=TJI, Bronnen Taskjuggler
@@ -58,10 +58,10 @@ addons.installer.missing.properties=Missende eigenschappen: {0}
 addons.installer.missing.translation=Ontbrekende vertaling {0} voor locale {1}
 addons.installer.no.scripts=Geen scripts aanwezig
 addons.installer.no.zipdata=Geen zip data gevonden
-addons.installer.nonstandard.permissions=Het script vereist de volgende permissie die op dit moment niet zijn ingeschakeled: {0}. \nMoeten ze standaard worden ingeschakeld ?
+addons.installer.nonstandard.permissions=Het script vereist de volgende permissie die op dit moment niet zijn ingeschakeled: {0}. \nMoeten ze standaard worden ingeschakeld?
 addons.installer.one.child.expected=Er zou precies \u00E9\u00E9n kind van {0} moeten zijn.
 addons.installer.script.name.suffix=Naam van script heeft geen type aanduiding zoals ".groovy"
-addons.installer.script.no.execution_mode=Geen  "execution_mode" attribuut gedefinieer voor {0}
+addons.installer.script.no.execution_mode=Geen "execution_mode" attribuut gedefinieerd voor {0}
 addons.installer.script.no.menulocation=Geen "menuLocation" attribuut gedefinieerd voor {0}
 addons.installer.script.no.menutitle=Geen "menuTitleKey" attribuut gedefinieerd voor {0}
 addons.installer.script.no.permissions=Geen permissies gedefinieerd voor {0}
@@ -73,7 +73,7 @@ addons.installer.too.old=Huidige Freeplane versie {0} is te oud. Deze plug-in ve
 addons.installer.unknown.deinstallation.rules=Onbekende regels voor deinstallatie {0}
 addons.installer.update=Update van versie {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Je moet alleen add-ons installeren van een bron die je vertrouwt. Kwaadaardige software kan schade toebrengen aan gegevens of je privacy.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Toevoegen attributen uit stijl
 AddStyleAttributes.tooltip=Toevoegen attributen uit stijl
 AllMapsNodeListAction.text=Zoeken en vervangen alle mindmaps
@@ -85,7 +85,7 @@ antialias_none=Niets verzachten
 apply=&Toepassen
 ApplyAction.text=Toepassen
 ApplyFormatPlugin.text=Algemene knoopstijl wijzigen...
-ApplyFormatPlugin.tooltip=Toont dialoogvenster waarin alle eigenschappen van knopen en lijnen  in \u00E9\u00E9n keer gewijzigd kunnen worden....
+ApplyFormatPlugin.tooltip=Toont dialoogvenster waarin alle eigenschappen van knopen en lijnen in \u00E9\u00E9n keer gewijzigd kunnen worden.
 ApplyNoFilteringAction.text=Stoppen filteren
 ApplySelectedViewConditionAction.text=Niet-geselecteerde knopen verbergen
 ApplyToVisibleAction.text=Verder filteren (verfijnen)
@@ -149,7 +149,7 @@ AutomaticLayout.HEADINGS=Voor kopjes (headings)
 AutomaticLayout.level=Kop {0}
 AutomaticLayout.level.root=Titel
 AutomaticLayoutAction.text=Opmaken per knoopniveau
-AutomaticLayoutAction.tooltip=<html> Herstelt de standaardopmaak van de  mindmap. <br>Het eerste niveau is zwart, het tweede blauw enz.</html>
+AutomaticLayoutAction.tooltip=<html>Herstelt de standaardopmaak van de mindmap.<br>Het eerste niveau is zwart, het tweede blauw enz.</html>
 AutomaticLayoutControllerAction.ALL.text=voor alle knopen
 AutomaticLayoutControllerAction.COLUMNS.text=kolommen
 AutomaticLayoutControllerAction.HEADINGS.text=voor niet-bladeren
@@ -184,7 +184,6 @@ cannot_join_nodes_with_children=Knopen met takken (kindknopen) kunnen niet worde
 cannot_move_into_child_node=de onderliggende knoop is niet beschikbaar
 cannot_move_to_child=Een ouderknoop kan niet direkt aan zijn kindknoop worden gehangen.
 CenterAction.text=Centreren
-CenterSelectedNodeAction.text=Geselecteerde knoop centreren
 ChangeConnectorArrowsAction.backward.text=Pijl achteruit
 ChangeConnectorArrowsAction.both.text=Pijlen naar beide kanten
 ChangeConnectorArrowsAction.forward.text=Pijl vooruit
@@ -198,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=Naar beneden en ouderniveau
 ChangeNodeLevelLeftsAction.tooltip=Geselecteerde knopen links van de stamknoop verplaatsen naar boven en worden kindknopen van de knoop boven de huidige knoop. Knopen rechts van de stamknoop verplaatsen naar boven. Hierop is een uitzondering: knopen direct links of rechts van de stamknoop verplaatsen naar de andere zijde van de stamknoop.
 ChangeNodeLevelRightsAction.text=Naar boven en kindniveau
 ChangeNodeLevelRightsAction.tooltip=Geselecteerde knopen rechts van de stamknoop verplaatsen naar beneden en worden kindknopen van de knoop onder de huidge knoop. Knopen links van de stamknoop verplaatsen naar boven. Hierop is een uitzondering: knopen direct links of rechts van de stamknoop verplaatsen naar de andere zijde van de stamknoop.
-choose_background_color=Kies achtergrondkleur:
 choose_cloud_color=Kies wolkkleur:
 choose_edge_color=Kies takkleur
 choose_map_background_color=Kies achtergrondkleur mindmap
@@ -209,6 +207,8 @@ ClearLinkAnchorAction.tooltip=<html>wis eerder ingesteld knoopanker</html>
 CloneAction.text=Plakken kloon
 close_btn=Sluiten
 CloseAction.text=Sluiten mindmap
+CloseAllMapsAction.text=Alle mappen sluiten
+CloseAllOtherMapsAction.text=Alle andere mappen sluiten
 cloud_shapes=Wolk vormen
 CloudAction.text=Maken/verwijderen wolk
 CloudColorAction.text=Kleur wolk...
@@ -216,6 +216,15 @@ CloudShapeAction.ARC.text=Boog
 CloudShapeAction.RECT.text=Rechthoek
 CloudShapeAction.ROUND_RECT.text=Afgeronde rechthoek
 CloudShapeAction.STAR.text=Ster
+collection.copy.presentation=Presentatie kopi\u00EBren
+collection.copy.slide=Dia kopi\u00EBren
+collection.delete=Verwijderen
+collection.down=Naar beneden
+collection.move=Verplaatsen
+collection.moveTo=Naar positie verplaatsen
+collection.new.presentation=Nieuwe presentatie
+collection.new.slide=Nieuwe dia
+collection.up=Naar boven
 ColorProperty.ResetColor=Kleur herstellen
 combined=Gecombineerd
 condition=Conditie
@@ -226,14 +235,16 @@ connector_label=Label bij verbindingslijn
 connector_lines=Lijnvorm verbindingslijn
 connector_shapes=Bochtvorm verbindingslijn
 ConnectorColorAction.text=Kleur verbindingslijn...
+controls=Besturingselementen
 ConvertCloneToIndependentNodeAction.text=Ontklonen
+copy_name={0} (kopi\u00EBren)
 CopyAction.text=Kopi\u00EBren
 CopyAction.tooltip=Kopieer geselecteerde tak
 CopyAttributes.text=Kopi\u00EBren attributen
 CopyIDAction.text=Kopi\u00EBren knoop-ID
 CopyMapStylesAction.text=kopieer Mindmapstijl van\u2026
 CopyNodeURIAction.text=Kopieer URI van knoop
-copyright=Copyright \u00A9 2000-2016 Freeplane team en anderen
+copyright=Copyright \u00A9 2000-2017 Freeplane team en anderen
 CopySingleAction.text=Kopi\u00EBren zonder zijtakken
 CopySingleAction.tooltip=Kopieer alleen de geselecteerde knoop
 CopyStyleExtensionsAction.text=Toevoegen uit stijlsjabloon
@@ -299,7 +310,7 @@ EdgeWidthAction_width_parent.text=Als ouderknoop
 EdgeWidthAction_width_thin.text=Dun
 edit=Be&werken
 edit.decision=HTML Editor
-edit.edit_rich_text=Wil je opmaak zoals Vet en Schuin gebruiken ?
+edit.edit_rich_text=Wil je opmaak zoals Vet en Schuin gebruiken?
 edit_details=Bewerken knoopdetails
 edit_end_label=<html>Connector<br>label
 edit_label_font_family=Lettertype
@@ -316,6 +327,7 @@ EditAction.text=Bewerken knoopkern (snel)
 EditAttributesAction.text=Toevoegen en bewerken attribuut
 EditDetailsAction.text=Bewerken knoopdetails (snel)
 EditDetailsInDialogAction.text=Bewerken knoopdetails in apart venster
+editEdgeColors=Lijn kleuren bewerken
 EditFilterAction.text=Componeren filter
 EditLongAction.text=Bewerken knoopkern in apart venster
 EditNoteInDialogAction.text=Bewerken knoopnotitie
@@ -351,14 +363,14 @@ ExecuteScripts.noScriptsAvailable=Niet aanwezig
 ExecuteScripts.text=Beschikbare groovy scripts
 ExecuteScriptSecurityError.text=Er is een fout opgetreden bij de uitvoering van script: {0}
 export_failed=xporteren is mislukt
-export_pdf_text=PDF, Portable Document Format
-export_svg_text=SVG, Scalable Vector Graphic
 export_using_xslt=Exporteren naar:
 ExportAction.text=Exporteren...
+ExportAllPresentationsAction.text=Alle presentaties exporteren als PNG-afbeeldingen
 ExportBranchAction.text=Exporteren tak als nieuwe mindmap...
 ExportBranchToHTMLAction.text=HTML, volledige tak
 exported_file={0} bestand
 ExportPdf.text=PDF, Portable Document Format
+ExportPresentationAction.text=De huidige presentatie exporteren als PNG-afbeeldingen
 ExportSvg.text=SVG, Scalable Vector Graphics
 ExportToHTMLAction.text=HTML, hele mindmap
 ExportToImage.jpg.text=JPEG, gecomprimeerd beeld
@@ -379,6 +391,7 @@ f_button_unassigned=<geen actie>
 FaqOpenURLAction.text=FAQ
 file=&Bestand
 file_already_exists=Het bestand {0} bestaat al. Wil je het overschrijven?
+file_not_accessible=Bestand {0} is niet beschikbaar
 file_not_found=Bestand {0} niet gevonden
 FileListFlavorHandler=Snelkoppelingen naar bestanden
 FileProperties_BranchLeafCount=Aaantal bladknopen in geselecteerde tak(ken)
@@ -408,7 +421,7 @@ FileRevisionsDialog.title=Bestandsversies(revisies)
 filter=Filteren
 filter_add=&Toevoegen
 filter_and=&En
-filter_any_text=Kern, details of notitie
+filter_any_text=Knoopkern, details of notitie
 filter_clone_snapshot=Opgeslagen klonen van selectie
 filter_clones=Klonen van selectie
 filter_conditions=Filters
@@ -476,7 +489,7 @@ fold=Dichtvouwen (verbergen)
 FoldAllAction.text=Alle afstammelingen dichtvouwen
 FoldAllAction.tooltip=<html> Alle afstammelingen dichtvouwen.</html>
 FoldOneLevelAction.text=E\u00E9n niveau dichtvouwen
-FoldOneLevelAction.tooltip=<html>  E\u00E9n niveau dichtvouwen.</html>
+FoldOneLevelAction.tooltip=<html>E\u00E9n niveau dichtvouwen.</html>
 follow_clone=Binnen ''{0}''
 follow_graphical_link=Ga naar ''{0}''
 FollowLinkAction.text=Openen snelkoppeling
@@ -634,6 +647,9 @@ icon_penguin=Linux
 icon_positive=Positief
 icon_prepare=Geel verkeerslicht
 icon_revision=Revisie
+icon_revision-green=Revisie groen
+icon_revision-pink=Revisie roze
+icon_revision-red=Revisie rood
 icon_smiley-angry=Boos
 icon_smiley-neutral=Geen idee
 icon_smiley-oh=Verrassing
@@ -665,7 +681,7 @@ IconGroupPopupAction.signs.text=Tekens
 IconGroupPopupAction.smiley.text=Smiley
 IconGroupPopupAction.time.text=Tijd
 IconGroupPopupAction.user.text=Gebruikerpictogrammen
-IconProgressExtended10Action.text=Grote schijf  met 10% punt
+IconProgressExtended10Action.text=Grote schijf met 10% punt
 IconProgressExtended10Action.tooltip=<html>Voegt schijf toe met punt die 10% groter wordt bij dubbel rechtsklikken. .<br>Control + dubbel rechtsklikken vermindert het percentage of verwijdert de schijfpunt..</html>
 IconProgressExtended25Action.text=Grote schijf met 25% punt
 IconProgressExtended25Action.tooltip=<html>Voegt %schijf toe punt die 25% groter wordt bij dubbel rechtsklikken..<br> Control +dubbel linksklikken verkleint of verwijdert de schijfpunt.</html>
@@ -708,7 +724,7 @@ latex_editor=Bewerken LaTeX formule
 LatexDeleteLatexAction.text=Verwijderen formule (LaTex)
 LatexEditLatexAction.text=Bewerken formule (LaTeX)...
 LatexInsertLatexAction.msg1=<html>Je probeert een <i>legacy</i>LaTeX formule in te voegen.<br/>De nieuwe manier om een LaTeX tekst/formule te maken wordt op deze pagina beschreven:</html>
-LatexInsertLatexAction.msg2=<html>In het kort: <ul><li>gebruik een "\\latex " prefix in de knooptekst of</li><li><i>Bekijk->Properties panel</i>, dan <i>Kerntekst->Format->Latex</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>In het kort: <ul><li>een "\\latex" voorvoegsel in knooptekst gebruiken of</li> <li><i>Beeld -> Toolscherm</i>, vervolgens <i>Tekst knoopkern -> Opmaak -> Latex</i></li></ul></html>
 LatexInsertLatexAction.text=Toevoegen formule (LaTeX)...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -718,7 +734,7 @@ LengthUnits.pt=pt
 LengthUnits.px=px
 less_than_two_selected_nodes=Je moet minstens twee knopen selecteren om een snelkoppeling te maken.
 license=Licentie
-license_text=<html>Dit programma is gratis software; U kunt het opnieuw distribueren en- of<br>aanpassen onder de voorwaarden van de GNU General Public License<br>zoals gepubliceerd door de Free Software Foundation; versie 2<br>van de licentie, of (naar eigen keuze) een latere versie.<br><br>Dit programma is verstrekt in de hoop dat het bruikbaar is ,<br>maar zonder enige garantie te geven over de<br>verhandelbaarheid of geschiktheid voor een specifiek doel. Zie de <br>GNU General Public [...]
+license_text=<html>Dit programma is gratis software; U kunt het opnieuw distribueren en- of<br>aanpassen onder de voorwaarden van de GNU General Public License<br>zoals gepubliceerd door de Free Software Foundation; versie 2<br>van de licentie, of (naar eigen keuze) een latere versie.<br><br>Dit programma is verstrekt in de hoop dat het bruikbaar is ,<br>maar zonder enige garantie te geven over de<br>verhandelbaarheid of geschiktheid voor een specifiek doel. Zie de <br>GNU General Public [...]
 link_error=Onjuiste koppeling "{0}" niet geopend
 link_not_available_any_more=De koppeling werkt niet meer. De knoop is ondertussen verwijderd.
 link_not_found=Koppeling {0} niet gevonden.
@@ -739,7 +755,7 @@ MainView.errorUpdateText=Fout bij het instellen van de tekst voor input: {0}.
 MakeLinkFromAnchorAction.text=Maken koppeling vanaf anker
 MakeLinkFromAnchorAction.tooltip=<html>maken koppeling van <br/>de ankerknoop naar de geselekteerde knoop; ook tussen mindmaps</html>
 MakeLinkToAnchorAction.text=Maken koppeling naar anker
-MakeLinkToAnchorAction.tooltip=<html>maken van een koppeling  van<br/>de geselekteerde knoop naar de ankerknoop;ook tussen mind maps</html>
+MakeLinkToAnchorAction.tooltip=<html>een koppeling maken van de geselecteerde knoop<br/>naar de ankerknoop; ook tussen mind maps</html>
 ManageAddOnsAction.text=Add-ons
 ManageAddOnsDialog.activate=Activeren
 ManageAddOnsDialog.activation.success={0} wordt actief na een herstart.
@@ -758,7 +774,7 @@ ManageAddOnsDialog.install=&Installeren
 ManageAddOnsDialog.install.from.known.location=Installeren add-on van een bekende locatie
 ManageAddOnsDialog.install.tooltip=Vul hier de URL van een add-on installatie in
 ManageAddOnsDialog.map.not.opened=Mindmap {0} lijkt niet geopend.
-ManageAddOnsDialog.really.deinstall=Echt {0} dinstalleren ?
+ManageAddOnsDialog.really.deinstall=Echt {0} deinstalleren?
 ManageAddOnsDialog.search=Add-ons zoeken
 ManageAddOnsDialog.search.file=Zoeken
 ManageAddOnsDialog.select.tooltip=Selecteren bestand
@@ -839,6 +855,9 @@ ModesMenuAction.File.text=Bestandsverkenner
 ModesMenuAction.MindMap.text=Mindmapbewerker
 most_recent_files=&Onlangs geopend
 MoveAction.text=Verplaatsen
+MoveSelectedNodeAction.CENTER.text=Geselecteerde knoop centreren
+MoveSelectedNodeAction.EAST.text=Geselecteerde knoop naar rechts verplaatsen
+MoveSelectedNodeAction.WEST.text=Geselecteerde knoop naar links verplaatsen
 MoveToRootAction.text=Naar stamknoop
 NameConditionAction.text=Naam toekennen
 navigate=Navigeren
@@ -865,7 +884,7 @@ NewerFileRevisionsFoundDialog.title=Er zijn nieuwere bestandsversies gevonden!
 NewFreeNodeAction.text=Nieuwe zwevende knoop
 NewLevelStyleAction.text=Toevoegen automatische opmaakstijlniveau
 newmap.install.addon.question={0} lijkt een add-on \nWilje deze installeren?\n(Kies "Nee" om normaal te openen.)
-newmap.install.addon.title=Add-on installeren ?
+newmap.install.addon.title=Add-on installeren?
 NewMapAction.text=Nieuwe mindmap
 NewMapViewAction.text=Nieuwe mindmap afbeelding
 NewParentNode.text=Nieuwe ouderknoop (niveau hoger)
@@ -878,7 +897,7 @@ NextNodeAction.BACK.text=Naar vorige knoop
 NextNodeAction.BACK_N_FOLD.text=Naar vorige knoop (dichtvouwen)
 NextNodeAction.FORWARD.text=Naar volgende knoop
 NextNodeAction.FORWARD_N_FOLD.text=Naar volgende knoop (dichtvouwen)
-NextPresentationItemAction.text=Uitvouwen volgend presentatieitem
+NextPresentationItemAction.text=Het volgende presentatie item openvouwen
 no=Nee
 no_copy_attributes_before_paste_attributes=Het is niet mogelijk attributen te plakken voordat deze zijn gekopieerd.
 NO_FORMAT=Tekst
@@ -914,10 +933,11 @@ NodeUpAction.text=Knoop naar boven
 nonboldify_branch=Vet uitschakelen
 nonitalicise_branch=Schuin uitschakelen
 normal=Normaal
-not_saved_for_image_error=De mindmap moet opgeslagen worden voordat je een afbeelding kunt toevoegen met  de bestandskiezer of via een snelkoppeling
+not_saved_for_image_error=De mindmap moet opgeslagen worden voordat je een afbeelding kunt toevoegen met de bestandskiezer of via een snelkoppeling
 not_saved_for_link_error=De mindmap moet zijn voor je met de bestandskiezer een snelkoppeling kunt toevoegen
 note_window_location=Positie notitiehulpvenster
 notes=Knoopnotitie
+NotFoldingNextPresentationItemAction.text=Uitvouwen volgend presentatieitem
 NotificationOptions.CLOSE=Sluit
 NotificationOptions.REMIND_ME_LATER=Later herinneren
 NotificationOptions.REMOVE_REMINDER=Verwijder herinnnering
@@ -944,6 +964,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Stijle
 OptionPanel.ADD_CHILD=Toevoegen kindknoop
 OptionPanel.ADD_SIBLING=Toevoegen onderliggende knoop (sibling)
 OptionPanel.addons=Add-ons
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Alles dichtvouwen
 OptionPanel.always_load_last_maps=Openen laatste en nieuwe mindmapbestanden
 OptionPanel.always_load_last_maps.tooltip=Open de laatste bestanden zoals aangegeven door bovenstaande opties en start FP met een geselecteerde mindmap.
@@ -957,6 +978,8 @@ OptionPanel.antialias.tooltip=<html> Bepaalt de kwaliteit van de mindmap. Meer v
 OptionPanel.antialias_all=Alles verzachten
 OptionPanel.antialias_edges=(Afstammings)lijnen verzachten
 OptionPanel.antialias_none=Niets verzachten
+OptionPanel.antialias_svg=SVGs verzachten
+OptionPanel.antialias_svg.tooltip=<html>Bepaalt de kwaliteit van de SVG weergaven. Meer verzachting kost meer tijd.</html>
 OptionPanel.Appearance=Voorkomen
 OptionPanel.approximate_search_threshold=Drempel voor zoeken bij benadering
 OptionPanel.approximate_search_threshold.tooltip=<html>Drempel voor benaderend passen<br/><font size="2">zie http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(groter betekent dat de gevonden term meer lijkt op de zoekterm<br/>)</html>
@@ -973,10 +996,12 @@ OptionPanel.Behaviour=Gedrag
 OptionPanel.bezier=Ronde bocht
 OptionPanel.border_color=Kleur
 OptionPanel.border_color_matches_edge_color=Kleur van tak gebruiken
+OptionPanel.border_dash=Lijntype voor rand
+OptionPanel.border_dash_matches_edge_dash=Gebruik lijntype van tak
 OptionPanel.border_width=Lijndikte
 OptionPanel.border_width_matches_edge_width=Takdikte gebruiken
 OptionPanel.bubble=Knoopomlijning
-OptionPanel.ca=Catalaans  / Catal\u00E0
+OptionPanel.ca=Catalaans / Catal\u00E0
 OptionPanel.Cancel=Annuleren
 OptionPanel.center_selected_node=Centreren geselecteerde knopen
 OptionPanel.check_updates_automatically=Bij de start controleren of er nieuwe programmaonderdelen zijn
@@ -989,26 +1014,29 @@ OptionPanel.cloudcolor=Kleur wolk
 OptionPanel.cloudshape=Vorm wolk
 OptionPanel.combined=Gecombineerd
 OptionPanel.compare_as_number=Vergelijken als getallen
-OptionPanel.convert_to_current_version=<html>  Automatisch oudere Freeplane versies <br> naar de huidige versie converteren ?</html>
-OptionPanel.convert_to_current_version.tooltip=<html> Alleen voor gevorderde gebruikers die weten wat ze doen:<br>alleen heel grote mindmaps die niet geconverteerd hoeven worden<br>kun je openen zonder conversie.</html>
+OptionPanel.connector_arrows=Pijlen voor verbindingslijn
+OptionPanel.connector_dash=Lijntype
+OptionPanel.convert_to_current_version=<html>Automatisch oudere Freeplane versies<br>naar de huidige versie converteren?</html>
+OptionPanel.convert_to_current_version.tooltip=<html>Alleen voor gevorderde gebruikers die weten wat ze doen:<br>alleen heel grote mindmaps die niet geconverteerd hoeven worden<br>kun je openen zonder conversie.</html>
 OptionPanel.copyFormatToNewSibling=Kopi\u00EBren opmaak naar nieuwe broers en zussen
 OptionPanel.copyFormatToNewSiblingIncludesIcons=Opmaak met pictogrammen kopi\u00EBren
-OptionPanel.cs=Tsjechisch  \u010Desky
+OptionPanel.cs=Tsjechisch / \u010Desky
 OptionPanel.cut_nodes_without_question=Knopen knippen zonder bevestiging?
 OptionPanel.cut_nodes_without_question.tooltip=Indien het vinkje is gezet worden alle knopen zonder bevestigingsvraag gekipt. Per ongeluk knippen geeft informatieverlies.
-OptionPanel.da=Deens  / Dansk
+OptionPanel.cut_out_pictures_when_pasting_html=HTML afbeeldingen verwijderen
+OptionPanel.da=Deens / Dansk
 OptionPanel.date_format=Standaard opmaak datum
-OptionPanel.date_format.tooltip=Ofwel SHORT, MEDIUM, LONG of FULL of een patroon zoals "MM/dd/yyyy"
+OptionPanel.date_format.tooltip=Ofwel SHORT, MEDIUM, LONG of FULL of een patroon zoals "dd-mm-yyyy"
 OptionPanel.datetime_format=Staandaard opmaak datum-tijd
-OptionPanel.datetime_format.tooltip=<datestyle>,<timestyle> (with KORT, MEDIUM, LONG or FULL as style) or a full pattern like "M/d/yyyy hh:mm"
-OptionPanel.de=Duits  / Deutsch
+OptionPanel.datetime_format.tooltip=U kunt <datumformaat>,<tijdformaat> beide met het formaat SHORT, MEDIUM, LONG of FULL vullen of een volledig patroon invullen zoals "dd-mm-yyyy HH:mm"
+OptionPanel.de=Duits / Deutsch
 OptionPanel.default=Standaard knoopstijl
 OptionPanel.default_attribute_key_column_width=Standaarbreedte attribuutnaam
 OptionPanel.default_attribute_value_column_width=Standaardbreedte attribuutwaarde
 OptionPanel.default_browser_command_mac=Standaard browsercommando Mac
 OptionPanel.default_browser_command_mac.tooltip=<html> Standaard browsercommando voor Mac OS</html>
 OptionPanel.default_browser_command_other_os=Standaard browsercommando ander besturingssysteem
-OptionPanel.default_browser_command_other_os.tooltip=<html>  Dit is typisch voor Linux:</html>
+OptionPanel.default_browser_command_other_os.tooltip=<html>Dit is typisch voor Linux:</html>
 OptionPanel.default_browser_command_windows_9x=Standaard browsercommando voor Windows 9x
 OptionPanel.default_browser_command_windows_9x.tooltip=<html> Voor Windows (de "" tekens zijn noodzakelijk voor links die een "=" in de URL hebben).</html>
 OptionPanel.default_browser_command_windows_nt=Standaard browsercommando Windows NT
@@ -1017,8 +1045,8 @@ OptionPanel.default_charset=Karakterset
 OptionPanel.default_save_dir=Standaardmap
 OptionPanel.Defaults=Instellingen
 OptionPanel.delete_automatic_saves_at_exit=Verwijderen reservekopie bij afsluiten
-OptionPanel.delete_automatic_saves_at_exit.tooltip=<html>  Als de reservebestanden tijdens het normaal afsluiten van Freeplane moeten worden verwijderd, zet deze instelling op ja</html>
-OptionPanel.delete_nodes_without_question=Knopen verwijderen zonder bevestiging ?
+OptionPanel.delete_automatic_saves_at_exit.tooltip=<html>Als de reservebestanden tijdens het normaal afsluiten van Freeplane moeten worden verwijderd, zet deze instelling op ja</html>
+OptionPanel.delete_nodes_without_question=Knopen verwijderen zonder bevestiging?
 OptionPanel.delete_nodes_without_question.tooltip=Als het vinkje is gezet worden knopen zonder bevestigingsvraag verwijderd. Bij vergissingen leidt dit tot informatieverlies.
 OptionPanel.disable_cursor_move_paper=Met de cursor verschuiven van mindmap(pagina)uitschakelen
 OptionPanel.disable_cursor_move_paper.tooltip=<html> De cursor voor verschuiven van de mindmap(pagina) niet tonen tijdens het verslepen</html>
@@ -1026,6 +1054,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Standaard: kern bewerken bin
 OptionPanel.display_node_id=Tonen knoop-ID
 OptionPanel.edgecolor=Kleur tak
 OptionPanel.edgecolor.tooltip=Opmaak van de tak naar de ouderknoop (wordt ook toegepast op de eigen kindknopen)
+OptionPanel.edgedash=Lijntype voor tak
 OptionPanel.edgestyle=Vorm tak
 OptionPanel.edgestyle.tooltip=Opmaak van de tak naar de ouderknoop; deze wordt ook toegepast op de eigen kindknopen
 OptionPanel.edgewidth=Dikte tak
@@ -1034,7 +1063,7 @@ OptionPanel.EDIT_CURRENT=Inhoud overschrijven
 OptionPanel.edit_on_double_click=Bewerkingsmode na dubbelklikken
 OptionPanel.editor_extra_width=Extra diktestap
 OptionPanel.editor_extra_width.tooltip=<html>Bepaalt het aantal pixels waarmee de knoopbreedte groter wordt als de tekst te breed is..</html>
-OptionPanel.el=Grieks \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
+OptionPanel.el=Grieks / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__buttons_above=Knoppen aan de bovenkant
 OptionPanel.el__enter_confirms_by_default=Entertoets dient standaard als bevestiging
 OptionPanel.el__max_default_window_height=Maximum hoogte standaardvenster
@@ -1042,10 +1071,10 @@ OptionPanel.el__max_default_window_width=Maximum breedte standaardvenster
 OptionPanel.el__min_default_window_height=Minimum hoogte standaardvenster
 OptionPanel.el__min_default_window_width=Minimum breedte standaardvenster
 OptionPanel.el__position_window_below_node=Positie venster onder knoop
-OptionPanel.en=Engels  / English
+OptionPanel.en=Engels / English
 OptionPanel.Environment=Omgeving
-OptionPanel.es=Spaans  / espa\u00F1ol, castellano
-OptionPanel.et=Ests  / eesti, eesti keel
+OptionPanel.es=Spaans / espa\u00F1ol, castellano
+OptionPanel.et=Ests / eesti, eesti keel
 OptionPanel.eu=Baskisch
 OptionPanel.execute_scripts_without_asking=Uitvoeren van scripts ingeschakeld
 OptionPanel.execute_scripts_without_asking.tooltip=<html> Freeplane scripts kunnen bijna elke actie uitvoeren op je computer. <br>Voer dus geen scripts uit waarvan je niet zeker bent dat ze veilig zijn.</html>
@@ -1058,9 +1087,9 @@ OptionPanel.execute_scripts_without_network_restriction.tooltip=<html> <body> To
 OptionPanel.execute_scripts_without_write_restriction=Bestandsoperaties toestaan (NIET aanbevolen)
 OptionPanel.execute_scripts_without_write_restriction.tooltip=<html> <body>Als je Groovy scrips schrijftoegang tot bestanden nodig hebben (schrijven, wissen (!)),<br>moet je deze optie toestaan.<br>Normaal met leestoegang.<br>Maar gebruik met zorg omdat kwaadaardige scripts je computer kunnen beschadigen!</body></html>
 OptionPanel.experimental_file_locking_on=Experimenteel: bestanden beveiligen
-OptionPanel.experimental_file_locking_on.tooltip=<html>  Experimentele functie</html>
+OptionPanel.experimental_file_locking_on.tooltip=<html>Experimentele functie</html>
 OptionPanel.export_icons_in_html=Pictogrammen in HTML exporteren
-OptionPanel.export_icons_in_html.tooltip=<html>  Aangeven of de uit Freeplane ge\u00EBxporteerde HTML ook pictogrammen moet bevatten. Het probleem met pictogrammen is dat de snelkoppelingen naar de pictogrammen in de ge\u00EBxporteerde HTML vaak niet werken.</html>
+OptionPanel.export_icons_in_html.tooltip=<html>Aangeven of de uit Freeplane ge\u00EBxporteerde HTML ook pictogrammen moet bevatten. Het probleem met pictogrammen is dat de snelkoppelingen naar de pictogrammen in de ge\u00EBxporteerde HTML vaak niet werken.</html>
 OptionPanel.exported_image_resolution_dpi=Geexporteerde beeldresolutie (in DPI)
 OptionPanel.Files=Bestanden
 OptionPanel.first=Eerste
@@ -1073,7 +1102,7 @@ OptionPanel.format_locale=Regionale instellingen voor gegevensopmaak
 OptionPanel.format_locale.tooltip=Localisatieinstelling voor opmaak en verwerken van gegevens
 OptionPanel.formula_disable_caching=Uitschakelen cache formuleberekening (cache)
 OptionPanel.formula_disable_plugin=Uitschakelen formule plugin
-OptionPanel.fr=Frans  / Fran\u00E7ais
+OptionPanel.fr=Frans / Fran\u00E7ais
 OptionPanel.gl=Galicisch / Galego
 OptionPanel.goto_note_end_on_edit=Veplaats notietiecursor naar het eind
 OptionPanel.grid_size=Raster afstand
@@ -1082,6 +1111,7 @@ OptionPanel.groovy_editor_font.tooltip=Gebruik 'Dialog' of 'Monospaced'als je un
 OptionPanel.groovy_editor_font_size=Lettergrootte voor Groovy Syntax Highlighting Editor
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Verborgen
+OptionPanel.hide_single_end_connectors=Verbindingslijnen met 1 uiteinde verbergen
 OptionPanel.highlight_formulas=Accentueren formules
 OptionPanel.horizontal=Rechte bocht
 OptionPanel.hr=Kroatisch / Hrvatski
@@ -1091,12 +1121,13 @@ OptionPanel.html_export_fold_all=Alles dichtvouwen
 OptionPanel.html_export_fold_currently_folded=Alleen openvouwen wat nu op de mindmap zichtbaar is
 OptionPanel.html_export_folding=HTML-export met dichtvouwen
 OptionPanel.html_export_no_folding=Alle takken openvouwen
-OptionPanel.hu=Hongaars /  / Magyar
+OptionPanel.hu=Hongaars / Magyar
 OptionPanel.ic_disable=Uitschakelen
 OptionPanel.ic_file=Gebruik schijf
 OptionPanel.ic_ram=gebruikt RAM geheugen
 OptionPanel.icon=Pictogram
 OptionPanel.icon.tooltip=De knoop krijgt dit pictogram.
+OptionPanel.icon_size=Grootte pictogram
 OptionPanel.icons.list=Lijst met standaardpictogrammen
 OptionPanel.icons.list.tooltip=Hier kun je de standaardpictogrammen instellen. De pictogrammen moeten worden gescheiden door ';'.
 OptionPanel.id=Indonesisch / Bahasa Indonesia
@@ -1104,19 +1135,19 @@ OptionPanel.IGNORE=Doe niets
 OptionPanel.il__enter_confirms_by_default=Standaard bevestiging met Enter
 OptionPanel.image_cache=voor afbeeldingen
 OptionPanel.indentationUsesTabsInTextOutput=Gebruik tabs in tekst
-OptionPanel.it=Italiaans  / Italiano
-OptionPanel.ja=Japans  / \u65E5\u672C\u8A9E
+OptionPanel.it=Italiaans / Italiano
+OptionPanel.ja=Japans / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=Scheidingsteken tekst
 OptionPanel.key_type_action=Bij toetsindruk
 OptionPanel.Keystrokes=Sneltoetsen
-OptionPanel.ko=Koreaans  / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
+OptionPanel.ko=Koreaans / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Naam lettertype
 OptionPanel.label_font_size=Grootte lettertype
 OptionPanel.language=Taal
 OptionPanel.language.tooltip=<html> Dit is de taal die het programma zou moeten gebruiken. 'Automatisch' probeert de huidige taal van de gebruiker te laden.</html>
 OptionPanel.last=Laatste
 OptionPanel.last_opened_list_length=Lengte van de lijst van recent geopende bestanden
-OptionPanel.latex_disable_editor=Uitschakelen LaTeX Syntax Highlighting Edidtor
+OptionPanel.latex_disable_editor=Uitschakelen LaTeX Syntax Highlighting Editor
 OptionPanel.latex_disable_editor.tooltip=Controleer dit als je problemen hebt met de LaTeX editor
 OptionPanel.latex_editor_font=Lettertype voor LaTeX Syntax Highlighting Editor
 OptionPanel.latex_editor_font.tooltip=Gebruik 'Dialog'of 'Monospaced'als je unicode karakters nodig hebt!
@@ -1138,6 +1169,8 @@ OptionPanel.lookandfeel.scaleuifonts=Schaal lettertypes gebruikersinterface
 OptionPanel.lookandfeel.scaleuifonts.tooltip=Bruikbaar voor schermen met hoge resolutie
 OptionPanel.lookandfeel.tooltip=<html> De gebruiksomgeving waarin je wil werken. 'metaal, 'windows', 'motief' en 'gtk' worden ondersteund, 'mac' kan enkel gebruikt worden bij MacOS. Standaard betekent dat de standaard gebruikersomgeving wordt gebruikt. Als je hier je eigen gebruiksomgeving wil gebruiken, vul dan hier de klassenaam in en zorg er voor dat de benodigde jar-bestanden geladen worden. Als er problemen zijn met de gebruiksomgeving, kies hier dan 'niets'. Dat werkt voor applets</html>
 OptionPanel.lt=Lithuanian / Kalba
+OptionPanel.markClones=Kleur kloonmarkering
+OptionPanel.markSelectedClones=Kleur kloonmarkering bij selectie
 OptionPanel.max_displayed_node_count=Maximum aantal zichtbare knopen
 OptionPanel.max_image_width=Maximum beginbreedte afbeelding
 OptionPanel.max_image_width.tooltip=Nieuwe afbeeldingen worden verkleind tot deze breedte
@@ -1145,15 +1178,17 @@ OptionPanel.max_menu_item_count=Maximum aantal menu's
 OptionPanel.max_menu_item_count.tooltip=Beperken aantal items per submenu, minimaal 10
 OptionPanel.max_node_width=Maximum knoopbreedte
 OptionPanel.max_shortened_text_length=Maximale beperking knooplengte
+OptionPanel.menuItemFontSize=Lettertype grootte voor menus
 OptionPanel.metal=Metaal
 OptionPanel.min_node_width=Minimum knoopbreedte
+OptionPanel.monitor_size_inches=Monitor grootte (inches)
 OptionPanel.motif=Motief
 OptionPanel.narrow_hexagon=Nauwe zeshoek
 OptionPanel.nb=Noors / Norsk bokm\u00E5l
 OptionPanel.never_save_folding=Nooit
 OptionPanel.neverShowSurvey=Nooit vragen, enqu\u00EAtes of tips laten zien
-OptionPanel.nl=Nederlands, Vlaams  / Nederlands, Vlaams
-OptionPanel.nn=Noors  / Norsk nynorsk
+OptionPanel.nl=Nederlands, Vlaams / Nederlands, Vlaams
+OptionPanel.nn=Noors / Norsk nynorsk
 OptionPanel.nodebackgroundcolor=Achtergrondkleur
 OptionPanel.nodebackgroundcolor.tooltip=Achtergrondkleur knoop indien niet geselecteerd.
 OptionPanel.nodecolor=Tekstkleur
@@ -1168,13 +1203,13 @@ OptionPanel.nodeformat.tooltip=<htm>Text replacement and/or formatting:<ul><li><
 OptionPanel.nodenumbering=Knoop nummering
 OptionPanel.nodenumbering.tooltip=Toevoegen volgnummer (b.v. 1.3.1) aan basis knooptekst.
 OptionPanel.nodeshape=Knoopvorm
-OptionPanel.nodetext=Basistekst
+OptionPanel.nodetext=Tekst knoopkern
 OptionPanel.nodetext.tooltip=Hier kun je de knooptekst intypen. De tekst die al in de knoop stond wordt daarbij gewist.
 OptionPanel.nothing=Niets
 OptionPanel.number_format=Standaard opmaak getal
 OptionPanel.number_format.tooltip=Een patroon met '#' voor optionele of '0' voor verplichte cijfers. Voorbeelden: "0.00", "0.0%", "$#.00", "#0"
 OptionPanel.number_of_different_files_for_automatic_save=Aantal verschillende reservebestanden bij automatisch bewaren
-OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>  Aantal verschillende reservebestanden dat tijdens het werken automatisch wordt bewaard. De eerste keer automatisch bewaren gebeurt in het eerste bestand enz. Wanneer het laatste bestand gevuld is, wordt het eerste reservebestand overschreven, enz.</html>
+OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html>Aantal verschillende reservebestanden dat tijdens het werken automatisch wordt bewaard. De eerste keer automatisch bewaren gebeurt in het eerste bestand enz. Wanneer het laatste bestand gevuld is, wordt het eerste reservebestand overschreven, enz.</html>
 OptionPanel.OK=Bewaren
 OptionPanel.org.freeplane.plugin.bugreport=Beleid
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Altijd verzenden
@@ -1193,16 +1228,28 @@ OptionPanel.parse_latex=LaTeX herkennen
 OptionPanel.parse_latex.tooltip=LaTeX formules herkennen op basis van opmaak of voorvoegsel. Zie http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Plakken als opgemaakte tekst (HTML)
 OptionPanel.PASTE_PLAIN_TEXT=Plakken zonder opmaak
+OptionPanel.pasteImagesFromFiles=Afbeeldingen vanuit bestanden plakken
+OptionPanel.pasteImagesFromFiles.tooltip=Afbeelding invoegen als een afbeeldingsbestand naar de map gesleept wordt
 OptionPanel.path_property_may_not_be_empty=Pad mag niet leeg zijn!/Wijziging is ongedaan gemaakt.
 OptionPanel.patternname=Naam
 OptionPanel.patternname.tooltip=Unieke naam voor opmaakprofiel
-OptionPanel.pl=Pools  / Polski
+OptionPanel.pl=Pools / Polski
 OptionPanel.placenewbranches=Nieuwe takken maken
 OptionPanel.placenewbranches.tooltip=<html> Waar nieuwe takken gemaakt moeten worden. Geldige waarden zijn 'eerst' en 'laatst' </html>
 OptionPanel.plugin.tooltip=Uitbreidingsplugins.
 OptionPanel.plugins=Plugins
-OptionPanel.presentation_dimmer_transparency=Presentatie minder transparantie
-OptionPanel.presentation_mode=Presentatiemode
+OptionPanel.Presentation=Presentatie
+OptionPanel.presentation.combineAll=Alle presentaties samenvoegen
+OptionPanel.presentation.exportDirectory=de naam van de map van de ge\u00EBxporteerde presentatie
+OptionPanel.presentation.maxDropBoxRowCount=Maximaal aantal rijen in de drop-down box
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Is van toepassing op presentatie en dia keuzemogelijkheden
+OptionPanel.presentation.processesEscapeKey=De ESCAPE toets be\u00EBindigd de presentatie
+OptionPanel.presentation.processesNavigationKeys=Navigatietoetsen besturen presentatie
+OptionPanel.presentation.slideDisplaysAllNodes=Alle dia knopen automatisch openvouwen
+OptionPanel.presentation.slowMotion=Slow motion
+OptionPanel.presentation.switchToFullScreen=Volledig scherm
+OptionPanel.presentation.switchToSpotlight=Spotlight activeren
+OptionPanel.presentation.zoom=Map zoom gebruiken
 OptionPanel.printonwhitebackground=<html> Witte achtergrond bij het printen</html>
 OptionPanel.printonwhitebackground.tooltip=<html> Altijd een witte achtergrond bij het printen</html>
 OptionPanel.pt_BR=Portugees (Brazilie) / Portugu\u00EAs (Brasil)
@@ -1215,14 +1262,14 @@ OptionPanel.remind_use_rich_text_in_new_nodes=Gebruik uitgebreide tekstopmaak vo
 OptionPanel.remindersBlink=Herinneringen knipperen
 OptionPanel.remindersShowNotifications=Herinneringen laten een pop-up bericht zien
 OptionPanel.remindersStandardDelay=Uitstel van herinneringen
-OptionPanel.remove_notes_without_question=Notitie(venster) verwijderen zonder bevestiging ?
+OptionPanel.remove_notes_without_question=Notitie(venster) verwijderen zonder bevestiging?
 OptionPanel.remove_notes_without_question.tooltip=Indien ingesteld: geselecteerde knopen verwijderen zonder te vragen.
 OptionPanel.resources_use_default_font_for_notes_too=Gebruik standaard lettertype ook voor notities
 OptionPanel.resources_use_margin_top_zero_for_notes=Verwijderen bovenmarge voor notities
 OptionPanel.revision_color=Revisiekleur
 OptionPanel.revision_color.tooltip=Achtergrondkleur voor gewijzigde knopen.
 OptionPanel.ROUND_RECT=Afgeronde rechthoek
-OptionPanel.ru=Russisch   / \u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A
+OptionPanel.ru=Russisch / \u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A
 OptionPanel.save_folding=De situatie van open/dichtvouwen bewaren
 OptionPanel.save_folding_if_map_is_changed=Als de mindmap is veranderd
 OptionPanel.save_last_visited_node=De laatste posities in de mindmap bewaren
@@ -1241,7 +1288,7 @@ OptionPanel.scrollbar_increment=Snelheid
 OptionPanel.scrolling_speed=Automatische scroll-snelheid van mindmap
 OptionPanel.scrollOnUnfold=Mindmap opschuiven na het openvouwen van een knoop
 OptionPanel.selection_method=Selectiemethode
-OptionPanel.selection_method.tooltip=<html>  Met volgende schakelaar kun je het vertraagde selectieschema inschakelen/uitschakelen. Automatische opties. Wijzig deze  niet omdat ze toch in auto.properties bewaard zullen worden.</html>
+OptionPanel.selection_method.tooltip=<html>Met volgende schakelaar kun je het vertraagde selectieschema inschakelen/uitschakelen. Automatische opties. Wijzig deze niet omdat ze toch in auto.properties bewaard zullen worden.</html>
 OptionPanel.selection_method_by_click=Door te klikken
 OptionPanel.selection_method_delayed=Vertraagd
 OptionPanel.selection_method_direct=Onmiddellijk
@@ -1252,6 +1299,8 @@ OptionPanel.separator.automatic_save=Automatisch bewaren
 OptionPanel.separator.behaviour=Gedrag
 OptionPanel.separator.browser=Browser
 OptionPanel.separator.cache=Cache
+OptionPanel.separator.clones=Klonen
+OptionPanel.separator.cloud=Wolk
 OptionPanel.separator.CloudControls=Opmaak wolk
 OptionPanel.separator.commands_for_the_program=Commando's voor het programma
 OptionPanel.separator.connectors=Verbindingslijnen en labels
@@ -1270,7 +1319,9 @@ OptionPanel.separator.html_export=HTML-exporteren
 OptionPanel.separator.html_import=HTML Importeren
 OptionPanel.separator.hyperlink_types=Types snelkoppelingen
 OptionPanel.separator.icon_properties=Pictogrammen
+OptionPanel.separator.IconControls=Pictogrammen
 OptionPanel.separator.icons=Pictogrammen in "Pictogram selecteren\u2026"
+OptionPanel.separator.Icons=Pictogrammen
 OptionPanel.separator.initial_map_size=Initi\u00EBle grootte mindmap
 OptionPanel.separator.inline_editor=Geintegreerd knoopbewerkingsvenster
 OptionPanel.separator.JoinNodesAction=Knopen samenvoegen
@@ -1284,17 +1335,18 @@ OptionPanel.separator.new_node_commands=Commando's voor nieuwe knopen
 OptionPanel.separator.node_editing_commands=Commando's voor het bewerken van knopen
 OptionPanel.separator.node_navigation_commands=Commando's voor navigatie
 OptionPanel.separator.NodeBorder=Knooprand
-OptionPanel.separator.NodeColors=Kleur hele kern
-OptionPanel.separator.NodeFont=Lettertype hele kern
+OptionPanel.separator.NodeColors=Kleur knoopkern
+OptionPanel.separator.NodeFont=Lettertype knoopkern
 OptionPanel.separator.NodeShape=Vorm knoop
 OptionPanel.separator.NodeStyle=Opmaakstijl knoop
-OptionPanel.separator.NodeText=Opmaak kern
+OptionPanel.separator.NodeText=Tekst knoopkern
 OptionPanel.separator.notifications=Bevestigingen
 OptionPanel.separator.org.freeplane.plugin.bugreport=Automatische foutmelding
 OptionPanel.separator.other_defaults=Andere standaardinstellingen
 OptionPanel.separator.others=Andere sneltoetsen
 OptionPanel.separator.outline_view=Overzichtsweergave
 OptionPanel.separator.patterns=Opmaakpatronen
+OptionPanel.separator.presentation=Presentatie
 OptionPanel.separator.reminderOptions=Opties voor herinneringen
 OptionPanel.separator.RichTextEditor=Bewerken in dialoogvenster
 OptionPanel.separator.root_node_appearance=Opmaak stamknoop
@@ -1310,7 +1362,8 @@ OptionPanel.separator.spelling=Opties voor spellingscontrole
 OptionPanel.separator.SplitToWordsAction=Knopen in woorden splitsen
 OptionPanel.separator.status=Statuslijn
 OptionPanel.separator.surveys=Enqu\u00EAtes
-OptionPanel.separator.tooltip=Tijdsintervallen voor tooltips
+OptionPanel.separator.svg_icons=SVG pictogrammen
+OptionPanel.separator.tooltip=Tooltips
 OptionPanel.separator.undo=Ongedaan maken bewerken
 OptionPanel.separator.updates=Nieuwe programmaonderdelen
 OptionPanel.set_property_text=Aanpassen
@@ -1322,25 +1375,28 @@ OptionPanel.shape_vertical_margin=Verticale marge
 OptionPanel.sharp_bezier=Taps toelopend bocht
 OptionPanel.sharp_linear=Tapstoelopend recht
 OptionPanel.shouldCenterSmallMaps=Kleine mappen centreren
+OptionPanel.show_connectors=Verbindingslijnen tonen
 OptionPanel.show_icon_for_attributes=Het pictogram voor attributen tonen
+OptionPanel.show_icons=Pictogrammen tonen
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Uit mindmap overnemen of enkele knopen openvouwen
-OptionPanel.show_node_tooltips=Tonen tooltip van knoop
+OptionPanel.show_node_tooltips=Tooltips tonen
+OptionPanel.show_note_icon_in_tooltip=Notitie pictogram in tooltip tonen
 OptionPanel.show_note_icons=Het pictogram voor notities tonen
-OptionPanel.show_styles_in_tooltip=Tonen knoopstijl in tooltip
+OptionPanel.show_styles_in_tooltip=Knoopstijl in tooltips tonen
 OptionPanel.signed_script_are_trusted=Vertrouw ondertekende scripts (aanbevolen).
 OptionPanel.signed_script_are_trusted.tooltip=Uitvoeren script zonder beperkingen indien getekend door een vertouwde partij zoals Freeplane's auteurs of jijzelf.
 OptionPanel.simplyhtml.default_paste_mode=Standaardwijze voor plakken
 OptionPanel.single_backup_directory=Gebruik dezelfde directory voor back-up bestanden
-OptionPanel.single_backup_directory.tooltip=<html>  Als bestanden van backups en automatisch bewaren in bijelkaar in een directory geplaatst moeten worden, in plaats van in een subdirectory in de directory waarin de mindmap staat. </html>
+OptionPanel.single_backup_directory.tooltip=<html>Als bestanden van backups en automatisch bewaren in bijelkaar in een directory geplaatst moeten worden, in plaats van in een subdirectory in de directory waarin de mindmap staat. </html>
 OptionPanel.single_backup_directory_path=Backup directory (als bovenstaande optie geselecteerd is)
-OptionPanel.single_backup_directory_path.tooltip=<html>  Gaat boven defaut <freeplaneuserdir>/.backup</html>
+OptionPanel.single_backup_directory_path.tooltip=<html>Gaat boven defaut <freeplaneuserdir>/.backup</html>
 OptionPanel.single_instance=Open bestanden in een lopende instantie
 OptionPanel.single_instance_force=Vermijd in ieder geval tweede instantie
 OptionPanel.single_instance_force.tooltip=Voorkom tweede instantie ook als geen file wordt geladen
-OptionPanel.sk=Slovaaks  / sloven\u010Dina
+OptionPanel.sk=Slovaaks / sloven\u010Dina
 OptionPanel.skip_template_selection=Selecteren van sjabloon overslaan
-OptionPanel.sl=Slowenisch  / sloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=Langzaam naar de geselecteerde knoop scrollen
+OptionPanel.sl=Sloveens / sloven\u0161\u010Dina
+OptionPanel.slow_scroll_selected_node=Geleidelijk naar de geselecteerde knoop scrollen
 OptionPanel.spelling_opt_case_sensitive=Hoofdlettergevoelig
 OptionPanel.spelling_opt_ignore_all_caps_words=Negeer alle hoofdletterwoorden.
 OptionPanel.spelling_opt_ignore_capitalization=Negeer hoofdletter aan het begin van een woord
@@ -1352,14 +1408,17 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Verbindingstekens binnen
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=De oorspronkelijke knoop leeglaten
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=Aantal woorden per knoop na splitsing
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=Oorspronkelijke tekst als knoopdetail opslaan
+OptionPanel.spotlight=Spotlight
+OptionPanel.spotlight_background_color=Spotlight achtergrond kleur
 OptionPanel.sr=Servisch / \u0441\u0440\u043F\u0441\u043A\u0438
-OptionPanel.standard_template=Standaard  sjabloon
+OptionPanel.standard_template=Standaard sjabloon
 OptionPanel.standardbackgroundcolor=Standaard achtergrondkleur
 OptionPanel.standardbackgroundcolor.tooltip=<html> De standaard achtergrondkleur in html-notatie </html>
 OptionPanel.standardcloudcolor=Standaard wolkkleur
 OptionPanel.standardcloudcolor.tooltip=<html> De standaard wolkkleur in html-notatie </html>
 OptionPanel.standardcloudestyle=Standaard wolkstijl
 OptionPanel.standardcloudestyle.tooltip=<html> De standaard wolkstijl. Op dit moment is enkel 'bocht' mogelijk</html>
+OptionPanel.standardcloudshape=Standaard wolkvorm
 OptionPanel.standarddrawrectangleforselection=Tonen geselecteerde knopen met een omlijning
 OptionPanel.standarddrawrectangleforselection.tooltip=<html> Markeren geselecteerde knopen met een omlijning.</html>
 OptionPanel.standardlinkcolor=Standaard kleur voor een snelkoppeling
@@ -1379,9 +1438,10 @@ OptionPanel.sv=Zweeds/ svenska
 OptionPanel.text.use_ctrl_key=Gebruik 'Toewijzen sneltoets' van het menu Extra
 OptionPanel.textalignment=Uitlijning tekst
 OptionPanel.time_for_automatic_save=Tijdsinterval voor automatisch bewaren
-OptionPanel.time_for_automatic_save.tooltip=<html>  tussentijd voor automatisch bewaren in miliseconden; Om automatisch bewaren uit te schakelen, zet je dit getal op 2000000000.</html>
+OptionPanel.time_for_automatic_save.tooltip=<html>Pauze tussen twee automatisch bewaaracties in milliseconden. Om automatisch bewaren uit te schakelen, zet je dit getal op 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Tijd voor vertraagde selectie
-OptionPanel.time_for_delayed_selection.tooltip=<html>  Tijd voor de vertraagde selectie van knopen wanneer de muis er over gaat (in msec). Wijzig deze waarde naar 1 wanneer je onmiddellijke selectie wil wanneer de muis over een knoop gaat.</html>
+OptionPanel.time_for_delayed_selection.tooltip=<html>Tijd voor de vertraagde selectie van knopen wanneer de muis er over gaat (in msec). Wijzig deze waarde naar 1 wanneer je onmiddellijke selectie wil wanneer de muis over een knoop gaat.</html>
+OptionPanel.toolbar_icon_height=Hoogte pictogrammen op werkbalken
 OptionPanel.toolTipManager.dismissDelay=Vertraging voor het laten verdwijnen, ms
 OptionPanel.toolTipManager.initialDelay=Beginvertraging, ms
 OptionPanel.toolTipManager.max_tooltip_height=Maximale hoogte knoop tooltip
@@ -1390,7 +1450,7 @@ OptionPanel.toolTipManager.max_tooltip_width=Maximale breedte knoop tooltip
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=De maximale breedte van een tooltip in pixels.
 OptionPanel.toolTipManager.reshowDelay=Vertraging in het opnieuw laten zien, ms
 OptionPanel.tr=Turks
-OptionPanel.uk_UA=Ukrainisch /  \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
+OptionPanel.uk_UA=Oekra\u00EFens / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Niet-gedefinieerd lettertype
 OptionPanel.undo_levels=Aantal stappen
 OptionPanel.undo_levels.tooltip=<html> Bepaalt hoeveel stappen bewaard worden en zo ongedaan kunnen worden gemaakt met de "Ongedaan maken" knop.</html>
@@ -1399,9 +1459,10 @@ OptionPanel.unfold_on_paste.tooltip=Openvouwen bij plakken of bij verplaatsen
 OptionPanel.uniform_shape=Uniform
 OptionPanel.use_common_out_point_for_root_node=Alle takken beginnen bij de stamknoop
 OptionPanel.use_common_out_point_for_root_node.tooltip=Alle takken beginnen de stamknoop
+OptionPanel.use_svg_icons=SVG pictogrammen gebruiken
+OptionPanel.use_svg_icons.tooltip=<html>Bepaalt de kwaliteit waarmee pictogrammen worden weergegeven. De weergave van SVG pictogrammen is langzamer.</html>
 OptionPanel.use_tabbed_pane=Gebruiken tabbladen
 OptionPanel.use_tabbed_pane.tooltip=Als deze is aangevinkt, worden de mindmaps onder tabbladen weergegeven (net zoals in Firefox :-)).
-OptionPanel.user_defined_screen_resolution=Gebruikersinstelling schermresolutie (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripting: Wanneer je het klassepad instelt moet je ook leestoegang geven!
 OptionPanel.validate_invalid_date_format=Onjuist standaard opmaak datum
 OptionPanel.validate_invalid_datetime_format=Onjuiste standaard opmaak datum-tijd
@@ -1416,7 +1477,7 @@ OptionPanel.wheel_velocity=Snelheid
 OptionPanel.wheel_velocity.tooltip=Een hogere waarde geeft snellere respons op het muiswiel in de map.
 OptionPanel.wide_hexagon=Brede zeshoek
 OptionPanel.windows=Vensters
-OptionPanel.zh_CN=Chinees vereenvoudigd / \u7B80\u4F53\u5B57
+OptionPanel.zh_CN=Chinees, vereenvoudigd / \u7B80\u4F53\u5B57
 OptionPanel.zh_TW=Chinees, traditioneel / \u7E41\u9AD4\u5B57
 org.freeplane.plugin.bugreport.agree=Verzenden
 org.freeplane.plugin.bugreport.always_agree=Altijd verzenden
@@ -1468,7 +1529,7 @@ plugins/ScriptEditor.run=&Uitvoeren
 plugins/ScriptEditor.sign=Beveiligen script...
 plugins/ScriptEditor/window.Result=Resultaat:
 plugins/ScriptEditor/window.title=Scriptbewerker
-plugins/ScriptingEngine.illegalAccessToInternalAPI=Toegang tot interne API  (package {0} niet toegestaan). - Neem contact op met het Freeplane team als de API voor scripts niet krachtig genoeg is.
+plugins/ScriptingEngine.illegalAccessToInternalAPI=Onrechtmatige toegang tot de interne API (package {0}). - Neem contact op met het Freeplane team als de API voor scripts niet krachtig genoeg is.
 plugins/TimeList.xml_Created=Gemaakt
 plugins/TimeList.xml_Date=Datum
 plugins/TimeList.xml_Details=Details
@@ -1502,11 +1563,14 @@ plugins/TimeManagement.xml_todayButton=Vandaag
 plugins/TimeManagement.xml_WindowTitle=Herinneringen
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Zoeken en vervangen
 preferences=Voorkeuren
+presentation=Presentatie
+presentation.combineAll=Alle presentaties samenvoegen
 print_preview_title=Afdrukvoorbeeld
 PrintAction.text=Afdrukken mindmap...
 PrintDirectAction.text=Afdrukken
 printing_settings=Pagina-afdrukinstellingen
 PrintPreviewAction.text=Afdrukvoorbeeld...
+program_terminates=Interne fout, het programma is be\u00EBindigd.
 progress=Voortgangspictogram (%)
 PropertyAction.dialog=Instellingen
 PropertyAction.text=Instellingen...
@@ -1519,10 +1583,10 @@ QuitAction.text=Afsluiten Freeplane
 read_only=Alleen lezen
 ReadScriptError.text=Fout bij het lezen van het script
 really_convert_to_current_version=<html>Deze mindmap is met een oudere versie van Freeplane gemaakt.<br>Wilt u de mindmap vertalen naar het nieuwste formaat? (Aanbevolen)<br> Anders wordt het in het oude formaat geladen en kunnen er onverwachte dingen gebeuren.</html>
-really_cut_node=Knoop/knopen werkelijk knippen ?
-really_execute_script=Ben je zeker dat je de scripts in deze mindmap wil uitvoeren ? Het is mogelijk dat je computer wordt beschadigd.
-really_remove_node=Knopen echt verwijderen ?
-really_remove_notes=Knoopnotitie echt verwijderen ?
+really_cut_node=Knoop/knopen werkelijk knippen?
+really_execute_script=Ben je zeker dat je de scripts in deze mindmap wil uitvoeren? Het is mogelijk dat je computer wordt beschadigd.
+really_remove_node=Knopen echt verwijderen?
+really_remove_notes=Knoopnotitie echt verwijderen?
 ReapplyFilterAction.text=Opnieuw filteren (bijwerken)
 red=Rood
 RedefineStyleAction.text=Tot standaardknoopstijl maken
@@ -1533,7 +1597,7 @@ ReminderHookAction.text=Verwijderen herinnering
 ReminderHookAction.tooltip=Verwijderen herinnering uit een knoop.
 reminderNotification=Herinneringsbericht
 remove_file_from_list_on_error=Bestand (0) kon niet geopend worden. Verwijderen van de laatst gebruikte bestanden lijst?
-remove_shortcut_question=Sneltoets verwijderen ?
+remove_shortcut_question=Sneltoets verwijderen?
 RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Opengevouwen knopen resetten
 RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Alle knopen toestaan om dicht te vouwen
 RemoveAllIconsAction.text=Alle pictogrammen verwijderen
@@ -1548,8 +1612,8 @@ rename=&Hernoemen
 repair_link=Herstellen snelkoppeling
 repair_link_question=Kan de gekoppelde mindmap niet laden. Wilt u de koppeling handmatig herstellen?
 replace=Vervangen
-replace_shortcut_question=Deze sneltoets is op dit moment verbonden mer\n {0}.\nDeze koppeling verwijderen ?
-replace_shortcut_title=Sneltoets vervangen ?
+replace_shortcut_question=Deze sneltoets is op dit moment verbonden mer\n {0}.\nDeze koppeling verwijderen?
+replace_shortcut_title=Sneltoets vervangen?
 ReportBugAction.text=Melden van een fout
 RequestFeatureAction.text=Vragen om een nieuwe functie
 reset_to_default=Terug naar de standaardinstelling
@@ -1565,7 +1629,7 @@ SaveAcceleratorPresetsAction.text=Bewaren set sneltoetsen...
 SaveAction.text=Bewaren
 SaveAction_readonlyMsg=Deze mindmap is alleen-lezen. 'Bestand -> Bewaren als\u2026' gebruiken om deze mindmap op te slaan.
 SaveAction_readonlyTitle=Poging om een alleen-lezen mindmap op te slaan
-SaveAll.text=Bewaren alle open mindmaps
+SaveAll.text=Alle mappen opslaan
 SaveAll.tooltip=Bewaren alle open mindmaps
 SaveAs_toReadonlyMsg={0} is alleen-lezen. Gaarne als een ander bestand bewaren.
 SaveAs_toReadonlyTitle=Poging om een alleen-lezen bestand op te slaan
@@ -1577,7 +1641,7 @@ scheme_evaluate=Bereken!
 script_execution_disabled=Uitvoering van scripts is uitgeschakeld, zie Extra > Instellingen\u2026 > Plugins
 ScriptEditor.text=Bewerken scripts...
 ScriptEditor.tooltip=Laat toe om grotere scripts te maken in Freeplane.
-ScriptEditorPanel.changed_cancel=De scripts werden veranderd. Ben je zeker dat je de aanpassingen niet wil bewaren ?
+ScriptEditorPanel.changed_cancel=De scripts werden veranderd. Ben je zeker dat je de aanpassingen niet wil bewaren?
 scripting=Scripts
 scripting_api_generator_legend=Legenda
 scripting_api_generator_proxy=Proxy
@@ -1623,15 +1687,20 @@ SetShortenerStateAction.text=Minimaliseren knoop
 sf_login_required=Loging bij Source Forge vereist. Doorgaan?
 ShowAllAttributesAction.text=Tonen alle attibuten
 ShowAncestorsAction.text=Ook voorouders tonen
-ShowAttributeDialogAction.text=Tonen en verbergen attributen....
+ShowAttributeDialogAction.text=Tonen en verbergen attributen...
 ShowDescendantsAction.text=Ook afstammelingen tonen
 ShowFilterToolbarAction.text=Tonen filtermenu
-ShowFormatPanel.text=Tonen opmaakpaneel
+ShowFirstSlideAction.text=Eerste dia
+ShowFirstSlideAndStartPresentationAction.text=Presentatie vanaf het begin uitvoeren
+ShowFormatPanel.text=Toolscherm
 ShowFormatPanel.tooltip=Toont een dialoogvenster waarin de opmaak van een knoop en tak in tegelijkertijd kunnen worden veranderd.
 ShowHideNoteAction.text=Tonen notitiehulpvenster
 ShowHideNoteAction.tooltip=Laat het notitiehulpvenster verschijnen of verdwijnen.
+ShowLastSlideAction.text=Laatste dia
 ShowNextChildAction.text=Tonen volgend kind
+ShowNextSlideAction.text=Volgende dia
 ShowNotesInMapAction.text=Tonen notities bij knopen
+ShowPreviousSlideAction.text=Vorige dia
 ShowSelectedAttributesAction.text=Attributenbeheer
 ShowSelectionAsRectangleAction.text=Tonen rechthoekig selectiekader
 simplyhtml.aboutFrameTitle=Over deze toepassing
@@ -1717,7 +1786,7 @@ simplyhtml.imageFileDesc=Afbeeldingsbestanden
 simplyhtml.increaseFontSizeLabel=Groter
 simplyhtml.insertTableColLabel=Kolom invoegen
 simplyhtml.insertTableLabel=Tabel...
-simplyhtml.insertTableMsg=Hoeveel kolommen ?
+simplyhtml.insertTableMsg=Hoeveel kolommen?
 simplyhtml.insertTableRowLabel=Rij invoegen
 simplyhtml.insertTableTitle=Rij invoegen
 simplyhtml.italicName=Schuin
@@ -1790,7 +1859,7 @@ simplyhtml.sizeLabel=Grootte
 simplyhtml.standardStyleName=Standaard
 simplyhtml.strikeLabel=Doorhaling
 simplyhtml.styleLabel=Opmaakprofiel
-simplyhtml.styleNameInputText=Naam van het nieuwe opmaakprofiel ?
+simplyhtml.styleNameInputText=Naam van het nieuwe opmaakprofiel?
 simplyhtml.styleNameInputTitle=Het opmaakprofiel bewaren
 simplyhtml.tableBgColLabel=Achtergrondkleur:
 simplyhtml.tableDialogTitle=Opmaken tabel
@@ -1820,6 +1889,42 @@ simplyhtml.valignMiddle=Midden
 simplyhtml.valignTop=Boven
 simplyhtml.wholeWordsOnly=Alleen volledige woorden
 simplyhtml.wholeWordsOnly.tooltip=Beperk het zoeken tot hele woorden.
+slide.add=Toevoegen
+slide.add.tooltip=Geselecteerde knopen aan de dia toevoegen
+slide.at_center.tooltip=in het midden
+slide.content=Inhoud dia
+slide.descendants=Afstammelingen laten zien
+slide.edge=in de marge
+slide.filter=Filteren
+slide.first=Eerste
+slide.last=Laatste
+slide.next=Volgende
+slide.nofilter=Geen filter
+slide.on_the_left.tooltip=aan de linkerkant
+slide.on_the_right.tooltip=aan de linkerkant
+slide.placenode=De geselecteerde knoop plaatsen
+slide.placenode.tooltip=wanneer de dia gepresenteerd wordt
+slide.present=Presenteren
+slide.presentation=Presentatie
+slide.presentations=Presentaties
+slide.previous=Vorige
+slide.remove=Verwijderen
+slide.remove.tooltip=Geselecteerde knopen uit de dia verwijderen
+slide.select=Selecteren
+slide.select.tooltip=Knopen voor dia in de map selecteren
+slide.set=Instellen
+slide.set.tooltip=Als je de geselecteerde knopen in de inhoud van de dia wilt opnemen
+slide.setfilter=Filter instellen
+slide.setfilter.tooltip=Hiermee kun je de filter instellen of verwijderen als de dia wordt getoond
+slide.setfoldingstate=Het open- en dichtvouwen instellen
+slide.setfoldingstate.tooltip=Deze optie herstelt de huidige toestand van open- en dichtgevouwen knopen wanneer de dia wordt getoond
+slide.setzoom=Zoom instellen
+slide.setzoom.tooltip=Het in- of uitzoomen van de map tijdens het tonen van de dia instellen of verwijderen
+slide.showancestors=Voorouders laten zien
+slide.showonlyselected=Alleen geselecteerde knopen laten zien
+slide.showonlyselected.tooltip=Andere knopen verbergen wanneer de dia getoond wordt
+slide.slides=Dias
+slide.stop=Stoppen
 SortNodes.text=Alfabetisch sorteren kinderen
 SortNodes.tooltip=Alfabetisch sorteren alle kindknopen.
 split=Splitsen
@@ -1828,7 +1933,10 @@ SplitNode.text=Splitsen knoop
 SplitNode.tooltip=<html> Knoop is gesplitst</html>
 SplitToWordsAction.text=Splitsen met {0} woorden per regel
 STANDARD_FORMAT=Standaard
+StartPresentationAction.text=Presentatie uitvoeren
+StartPresentationOrShowNextSlideAction.text=Presentatie afspelen/Volgende dia
 stop_processing=Stoppen
+StopPresentationAction.text=Presentatie stoppen
 StringFlavorHandler=Van platte tekst naar hi\u00EBrarchie van knopen
 StructuredHtmlFlavorHandler=Van HTML maar hi\u00EBrarchie van knopen
 style=Stijlnaam
@@ -1861,7 +1969,7 @@ styles.user-defined=Gebruikerstijl toepassen
 styles.website=Website
 styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\nOver deze set opmaakprofielen\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Deze standaard was ontwikkeld na 11 jaar pedagogisch onderzoek over hoe het kennispr [...]
 styles_menu=Stijlen
-submenu_keystroke_in_use_error=Toets  {0} kan niet voor submenu {1} worden gebruikt. Toets vewijderd.
+submenu_keystroke_in_use_error=Toets {0} kan niet voor submenu {1} worden gebruikt. Toets vewijderd.
 summary_nodes=Groepsknopen
 summary_not_possible=Kan voor huidige selectie geen groepsknoop maken
 svg=SVG
@@ -1892,7 +2000,6 @@ ToggleMenubarAction.text=Tonen hoofdmenu
 ToggleScrollbarsAction.text=Schuifbalken
 ToggleStatusAction.text=Tonen statuslijn
 ToggleToolbarAction.text=Tonen werkmenu
-toolbars=Werkbalken
 TranslatedElement.BORDER=Tekst
 TranslatedElement.TEXT=Tekst
 TranslatedElement.TOOLTIP=Tooltip
@@ -1938,7 +2045,7 @@ user_zoom=Zoomfactor (0.0 - 2.0) voor afdrukken:
 userScripts=Beschikbare groovy scripts
 value_format=Opmaak waarde
 version_up_to_date=Je gebruikt al de meest recente versie
-view=Beel&d
+view=Beeld
 ViewLayoutTypeAction.OUTLINE.text=Tonen overzichtsweergave
 web_resources=Bronnen op het web
 WebDocuAction.text=Web Documentatie
diff --git a/freeplane/resources/translations/Resources_nn.properties b/freeplane/resources/translations/Resources_nn.properties
index 29b8796..75b285e 100644
--- a/freeplane/resources/translations/Resources_nn.properties
+++ b/freeplane/resources/translations/Resources_nn.properties
@@ -47,7 +47,6 @@ cannot_move_to_child=Kan ikkje flytta ein node til eit underordna niv\u00E5.
 CenterAction.text=Midtstill
 ChangeConnectorArrowsAction.backward.text=Tilbake
 ChangeConnectorArrowsAction.forward.text=Fram
-choose_background_color=Vel bakgrunnsfarge:
 choose_cloud_color=Vel skyfarge:
 choose_edge_color=Vel kantfarge
 choose_node_background_color=Vel bakgrunnsfarge for noden:
@@ -93,8 +92,6 @@ enter_base_url=Eg vil lima inn relative peikarar. Skriv inn grunnadressa (URL).
 enter_confirms=Enter stadfestar
 EnterPassword.text=Sl\u00E5 av/p\u00E5 kryptert/ukryptert
 error_creating_directory=Klarer ikkje laga eksportkatalog.
-export_pdf_text=Portabelt dokumentformat (PDF)
-export_svg_text=Skalerbar vektorgrafikk (SVG)
 ExportAction.text=Eksport
 ExportBranchToHTMLAction.text=Grein som HTML
 ExportPdf.text=Som PDF ...
diff --git a/freeplane/resources/translations/Resources_pl.properties b/freeplane/resources/translations/Resources_pl.properties
index bc8c0cb..46cf4ef 100644
--- a/freeplane/resources/translations/Resources_pl.properties
+++ b/freeplane/resources/translations/Resources_pl.properties
@@ -1,33 +1,33 @@
 about=O programie
-about_text=Freeplane - wolne oprogramowanie do budowania map pami\u0119ci i baz wiedzy
+about_text=Freeplane - wolne oprogramowanie do tworzenia map pami\u0119ci i wiedzy
 AboutAction.text=O programie
 acceleratorPresets=Ustawienia skr\u00F3t\u00F3w klawiszowych
 accelerators_loading_error=Nie mog\u0119 za\u0142adowa\u0107 skr\u00F3t\u00F3w klawiszowych z {0}
-accessories/plugins/ApplyFormatPlugin.dialog.title=Zmien format w\u0119z\u0142\u00F3w
+accessories/plugins/ApplyFormatPlugin.dialog.title=Zmie\u0144 format w\u0119z\u0142\u00F3w
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Zmie\u0144 szablon
-accessories/plugins/EncryptNode.properties_0=Podaj has\u0142o dla zakodowanego w\u0119z\u0142a
+accessories/plugins/EncryptNode.properties_0=Podaj has\u0142o dla zaszyfrowanego w\u0119z\u0142a
 accessories/plugins/EncryptNode.properties_1=Has\u0142a nie s\u0105 zgodne lub s\u0105 zbyt kr\u00F3tkie.
 accessories/plugins/EncryptNode.properties_2=Wprowad\u017A has\u0142o:
 accessories/plugins/EncryptNode.properties_3=Powt\u00F3rz has\u0142o:
 accessories/plugins/EncryptNode.properties_4=Podaj has\u0142o dla zaszyfrowanego w\u0119z\u0142a.
-accessories/plugins/EncryptNode.properties_5=Pami\u0119taj, \u017Ce si\u0142a szyfrowania zale\u017Cy prawie ca\u0142kowicie od trudno\u015Bci has\u0142a.
+accessories/plugins/EncryptNode.properties_5=<html>Pami\u0119taj, \u017Ce si\u0142a szyfrowania zale\u017Cy prawie ca\u0142kowicie od trudno\u015Bci has\u0142a.
 accessories/plugins/EncryptNode.properties_6=OK
 accessories/plugins/EncryptNode.properties_7=Anuluj
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Stan szyfrowania mo\u017Cna prze\u0142\u0105cza\u0107 tylko dla zaszyfrowanego w\u0119z\u0142a, kt\u00F3ry mo\u017Cesz wstawi\u0107 z menu Narz\u0119dzia.
-accessories/plugins/EncryptNode.properties_select_me=Nowa mindmapa
+accessories/plugins/EncryptNode.properties_select_me=Zaznacz by kontynuowa\u0107!
 accessories/plugins/EncryptNode.properties_wrong_password=Has\u0142o nie jest prawid\u0142owe.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Eksportuje map\u0119 do uruchomienia w java web.
 accessories/plugins/ExportWithTWiki.text=Jako TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Eksportuje map\u0119 jako dokument TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Jest to og\u00F3lna metoda eksportu.
 accessories/plugins/ExportWithXSLT_Applet.text=Do apletu Javy ...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Eksportuj map\u0119 do apletu javy.
-accessories/plugins/ExportWithXSLT_Flash.text=Do animacji Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Eksportuj map\u0119 do aplikacji flash.
-accessories/plugins/ExportWithXSLT_HTML.text=Do dokumentu XHTML (wersja JavaScript)...
-accessories/plugins/ExportWithXSLT_HTML3.text=Do dokumentu XHTML (widok ca\u0142ej mindmapy)...
-accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Zasoby z w\u0119z\u0142a RESOURCES do pliku TJI...
+accessories/plugins/ExportWithXSLT_HTML.text=XHTML (wersja JavaScript)...
+accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Wersja obrazu z map\u0105 do klikni\u0119cia)...
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Zasoby z w\u0119z\u0142a RESOURCES do pliku TaskJuggler...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Eksportuje zasoby z w\u0119z\u0142a RESOURCES do modu\u0142u Taskjugglera. </html>
-accessories/plugins/ExportWithXSLT_TASKSTJI.text=Zadania z w\u0119z\u0142a TASKS do pliku TJI...
+accessories/plugins/ExportWithXSLT_TASKSTJI.text=Zadania z w\u0119z\u0142a TASKS do pliku TaskJuggler...
 accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Eksportuje zadania z w\u0119z\u0142a TASKS do modu\u0142u Taskjugglera. </html>
 action_keystroke_in_use_error=Klawisz {0} wybrany dla polecenia {1} jest ju\u017C u\u017Cywany przez polecenie {2}
 active=Aktywny
@@ -36,6 +36,7 @@ actual_node_styles=Warunkowe style w\u0119z\u0142a zastosowane do w\u0119z\u0142
 add=Dodaj
 AddConnectorAction.text=Po\u0142\u0105cz
 AddElementaryConditionAction.text=Dodaj
+AddExecutionLinkAction.text=Dodaj hiper\u0142\u0105cze do wykonywania polecenia OS...
 AddLocalLinkAction.text=Dodaj odno\u015Bnik do innego w\u0119z\u0142a
 AddMenuItemLinkAction.text=Dodaj odno\u015Bnik do polecenia z menu...
 AddOnDetailsPanel.authored.by=autorstwa {0}
@@ -60,6 +61,7 @@ addons.installer.no.scripts=Nie znaleziono skrypt\u00F3w
 addons.installer.no.zipdata=Nie znaleziono spakowanych danych (zip)
 addons.installer.nonstandard.permissions=Skrypt wymaga nast\u0119puj\u0105cych uprawnie\u0144, kt\u00F3re nie s\u0105 aktualnie w\u0142\u0105czone: {0}.\nCzy maj\u0105 by\u0107 dodane do standardowych uprawnie\u0144?
 addons.installer.one.child.expected=Oczekiwany dok\u0142adnie jeden potomek {0}, ale otrzymano {1}.
+addons.installer.script.name.suffix=Nazwa skryptu {0} nie ma rozszerzenia ".groovy"
 addons.installer.script.no.execution_mode=Atrybut "execution_mode" nie zdefiniowany dla {0}
 addons.installer.script.no.menulocation=Atrybut "menuLocation" nie zdefiniowany dla {0}
 addons.installer.script.no.menutitle=Atrybut "menuTitleKey" nie zdefiniowany dla {0}
@@ -72,7 +74,7 @@ addons.installer.too.old=Aktualna wersja Freeplane {0} jest zbyt stara. Ten doda
 addons.installer.unknown.deinstallation.rules=Nieznane regu\u0142y odinstalowania {0}
 addons.installer.update=Aktualizacja z wersji {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Instalacja dodatk\u00F3w powinna odbywa\u0107 si\u0119 tylko z zaufanych \u017Ar\u00F3de\u0142. Z\u0142o\u015Bliwe oprogramowanie mo\u017Ce uszkodzi\u0107 twoje dane lub naruszy\u0107 twoj\u0105 prywatno\u015B\u0107.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Dodaj atrybuty ze stylu
 AddStyleAttributes.tooltip=Dodaj atrybuty z w\u0119z\u0142a stylu
 AllMapsNodeListAction.text=Znajd\u017A i zast\u0105p we wszystkich mapach
@@ -87,7 +89,7 @@ ApplyFormatPlugin.text=Zmie\u0144 format...
 ApplyFormatPlugin.tooltip=Wy\u015Bwietla okno, w kt\u00F3rym w\u0142a\u015Bciwo\u015Bci w\u0119z\u0142a i ga\u0142\u0119zi mog\u0105 zosta\u0107 zmienione jednocze\u015Bnie.
 ApplyNoFilteringAction.text=Nie filtruj
 ApplySelectedViewConditionAction.text=Filtruj wybrane w\u0119z\u0142y
-ApplyToVisibleAction.text=Stosuj do przefiltrowanych w\u0119z\u0142\u00F3w
+ApplyToVisibleAction.text=Zastosuj do przefiltrowanych w\u0119z\u0142\u00F3w
 as_parent=Jako rodzic
 AskForHelp.text=Popro\u015B o pomoc na forum
 AssignAttributesAction.text=Znajd\u017A i zamie\u0144 atrybuty...
@@ -95,12 +97,15 @@ attribute_delete=Usu\u0144 wszystkie warto\u015Bci
 attribute_delete_value=Usu\u0144 warto\u015B\u0107
 attribute_font_size_tooltip=Rozmiar czcionki atrybut\u00F3w
 attribute_list_box_label_text=Istniej\u0105ce warto\u015Bci
+attribute_name=Nazwa atrybutu
+attribute_name_or_value=Nazwa atrybutu lub warto\u015B\u0107
 attribute_replace=Zamie\u0144 na
 attribute_top=Wszystkie znane atrybuty wczytanych map
+attribute_value=Warto\u015B\u0107 atrybutu
 attributes_AddAttributeAction.text=Atrybuty w oknie dialogowym...
 attributes_adding_empty_attribute_error=Nazwa atrybutu musi sk\u0142ada\u0107 si\u0119 przynajmniej z jednego znaku
 attributes_all=Wszystkie atrybuty
-attributes_assign_dialog=Przypisz atrybuty (edytor)...
+attributes_assign_dialog=Edytor rozszerzonych atrybut\u00F3w
 attributes_attribute=Atrybuty
 attributes_close=Zamknij
 attributes_deselect_all=Nic
@@ -124,25 +129,30 @@ attributes_RemoveAllAttributesAction.text=Usu\u0144 wszystkie atrybuty
 attributes_RemoveFirstAttributeAction.text=Usu\u0144 pierwszy atrybut
 attributes_RemoveLastAttributeAction.text=Usu\u0144 ostatni atrybut
 attributes_restricted_attributes_tooltip=Ogranicz zestaw atrybut\u00F3w
-attributes_restricted_values_tooltip=Ogranicz zakres warto\u015Bci dla aktywnego atrybutu.
+attributes_restricted_values_tooltip=Ogranicz zakres warto\u015Bci dla aktywnego atrybutu
 attributes_restriction=Ograniczony zbi\u00F3r warto\u015Bci
 attributes_select_all=Wszystkie
 attributes_select_all_tooltip=Zaznacz / Odzancz wszystkie
 attributes_show=Poka\u017C
-attributes_skip_root=Pomi\u0144 korze\u0144
+attributes_skip_root=Pomi\u0144 w\u0119ze\u0142 korzenia
 attributes_visible=Zazanczone widoczne
 attributes_visible_tooltip=Zazanczone widoczne
 automatic_layout=Uk\u0142ad automatyczny
 automatic_layout_disabled=Wy\u0142\u0105czony
 automatically_save_message=Mapa zosta\u0142a automatycznie zapisana (pod nazw\u0105 {0}) ...
+AutomaticEdgeColor.FOR_BRANCHES=dla ga\u0142\u0119zi
+AutomaticEdgeColor.FOR_COLUMNS=dla kolumn
+AutomaticEdgeColor.FOR_LEVELS=dla poziom\u00F3w
+AutomaticEdgeColor.ON_BRANCH_CREATION=przy tworzeniu ga\u0142\u0119zi
 AutomaticEdgeColorHookAction.text=Automatyczny kolor ga\u0142\u0119zi
 AutomaticLayout.ALL=Dla wszystkich
 AutomaticLayout.HEADINGS=Dla nag\u0142\u00F3wk\u00F3w
 AutomaticLayout.level=Nag\u0142\u00F3wek {0}
 AutomaticLayout.level.root=Tytu\u0142
-AutomaticLayoutAction.text=Zastosuj automatyczne formatowanie
-AutomaticLayoutAction.tooltip=<html> Ustala wygl\u0105d mindmapy. Pierwszy poziom jest czarny, drugi niebieski, itd.</html>
+AutomaticLayoutAction.text=Zastosuj styl poziomu
+AutomaticLayoutAction.tooltip=<html>Poprawia wygl\u0105d mapy. Pierwszy poziom jest czarny, drugi niebieski, itd.</html>
 AutomaticLayoutControllerAction.ALL.text=dla wszystkich w\u0119z\u0142\u00F3w
+AutomaticLayoutControllerAction.COLUMNS.text=dla kolumn
 AutomaticLayoutControllerAction.HEADINGS.text=dla w\u0119z\u0142\u00F3w nie b\u0119d\u0105cych li\u015B\u0107mi
 AutomaticLayoutControllerAction.null.text=wy\u0142\u0105czone
 BackAction.text=Wstecz
@@ -151,7 +161,7 @@ background=T\u0142o
 bitmaps=Bitmapy
 black=Czarny
 BlinkingNodeHookAction.text=Migaj\u0105cy w\u0119ze\u0142
-BlinkingNodeHookAction.tooltip=<html> Spowoduje, \u017Ce w\u0119ze\u0142 b\u0119dzie miga\u0107. B\u0105d\u017A ostro\u017Cny. Nie u\u017Cywaj na zbyt wielu w\u0119z\u0142ach i <strong>nie razem z innym formatowaniem automatycznym</strong></html>
+BlinkingNodeHookAction.tooltip=<html>Spowoduje, \u017Ce w\u0119ze\u0142 b\u0119dzie miga\u0107. B\u0105d\u017A ostro\u017Cny. Nie u\u017Cywaj na zbyt wielu w\u0119z\u0142ach i <strong>nie razem z innym formatowaniem automatycznym</strong></html>
 blue=Niebieski
 BoldAction.text=Pogrubienie
 boldify_branch=Pogrubienie
@@ -159,20 +169,22 @@ branch=Ga\u0142\u0105\u017A
 browse=Przegl\u0105daj...
 calendar_attributes_panel=Kalendarz i atrybuty
 calendar_panel=Kalendarz
+can_not_clone_encrypted_node=Nie mo\u017Cna klonowa\u0107 zaszyfrowanych w\u0119z\u0142\u00F3w
 can_not_connect_to_info_server=Nie mo\u017Cna po\u0142\u0105czy\u0107 si\u0119 z serwerem
 can_not_delete_predefined_style=Nie mo\u017Cna usun\u0105\u0107 predefiniowanych styl\u00F3w
 can_not_delete_root_style=Nie mo\u017Cna usun\u0105\u0107 stylu korzenia
 can_not_delete_style_group=Nie mo\u017Cna usun\u0105\u0107 grupy styl\u00F3w
+can_not_encrypt_cloned_node=Nie mo\u017Cna zaszyfrowa\u0107 sklonowanych w\u0119z\u0142\u00F3w
 can_not_save_key_set=Nie mo\u017Cna zapisa\u0107 zestawu skr\u00F3t\u00F3w klawiszowych
 cancel=Anuluj
 CancelAction.text=Anuluj
 cannot_add_parent_diff_parents=Wszystkie w\u0119z\u0142y musz\u0105 mie\u0107 tego samego rodzica, aby u\u017Cy\u0107 tej funkcji.
-cannot_add_parent_to_root=Dla w\u0119z\u0142a korzenia (root) nie mo\u017Cna doda\u0107 rodzica.
-cannot_delete_root=W\u0119ze\u0142 korzenia (root) nie mo\u017Ce zosta\u0107 skasowany ani wyci\u0119ty.
-cannot_join_nodes_with_children=Nie mo\u017Cna \u0142\u0105czy\u0107 w\u0119z\u0142\u00F3w, kt\u00F3re posiadaj\u0105 potomk\u00F3w.
+cannot_add_parent_to_root=Dla w\u0119z\u0142a korzenia nie mo\u017Cna doda\u0107 rodzica.
+cannot_delete_root=W\u0119ze\u0142 korzenia nie mo\u017Ce zosta\u0107 skasowany ani wyci\u0119ty.
+cannot_join_nodes_with_children=Nie mo\u017Cna \u0142\u0105czy\u0107 w\u0119z\u0142\u00F3w posiadaj\u0105cych potomk\u00F3w
+cannot_move_into_child_node=Nie mo\u017Cna przenie\u015B\u0107 do w\u0119z\u0142a potomnego
 cannot_move_to_child=Nie mo\u017Cna przenie\u015B\u0107 w\u0119z\u0142a do jego potomka.
 CenterAction.text=Wy\u015Brodkuj
-CenterSelectedNodeAction.text=Wy\u015Brodkuj na zaznaczonym w\u0119\u017Ale
 ChangeConnectorArrowsAction.backward.text=Wstecz
 ChangeConnectorArrowsAction.both.text=Obie strza\u0142ki
 ChangeConnectorArrowsAction.forward.text=Dalej
@@ -183,23 +195,37 @@ ChangeConnectorShapeAction.EDGE_LIKE.text=Udawaj ga\u0142\u0105\u017A
 ChangeConnectorShapeAction.LINE.text=Linia
 ChangeConnectorShapeAction.LINEAR_PATH.text=\u015Acie\u017Cka liniowa
 ChangeNodeLevelLeftsAction.text=W\u0119ze\u0142 w lewo
-ChangeNodeLevelLeftsAction.tooltip=Je\u017Celi w\u0119z\u0142y s\u0105 z lewej strony to staj\u0105 si\u0119 potomkami swojego, znajduj\u0105cego si\u0119 powy\u017Cej s\u0105siada. Id\u0105c w prawo w\u0119z\u0142y przemieszczaj\u0105 si\u0119 wy\u017Cej, a gdy s\u00B9 najwy\u017Cszego poziomu zmieniaj\u0105 po\u0142o\u017Cenie na praw\u0105 stron\u0119.
+ChangeNodeLevelLeftsAction.tooltip=Je\u017Celi w\u0119z\u0142y s\u0105 z lewej strony to staj\u0105 si\u0119 potomkami swojego, znajduj\u0105cego si\u0119 powy\u017Cej s\u0105siada. Id\u0105c w prawo w\u0119z\u0142y przemieszczaj\u0105 si\u0119 wy\u017Cej, a gdy s\u0105 najwy\u017Cszego poziomu zmieniaj\u0105 po\u0142o\u017Cenie na praw\u0105 stron\u0119.
 ChangeNodeLevelRightsAction.text=W\u0119ze\u0142 w prawo
-ChangeNodeLevelRightsAction.tooltip=Je\u017Celi w\u0119z\u0142y s\u0105 z prawej strony to staj\u0105 si\u0119 potomkami swojego, znajduj\u0105cego si\u0119 powy\u017Cej s\u0105siada. Id\u0105c w lewo w\u0119z\u0142y przemieszczaj\u0105 si\u0119 wy\u017Cej, a gdy s\u00B9 najwy\u017Cszego poziomu zmieniaj\u0105 po\u0142o\u017Cenie na lew\u0105 stron\u0119.
-choose_background_color=Wybierz kolor t\u0142a:
+ChangeNodeLevelRightsAction.tooltip=Je\u017Celi w\u0119z\u0142y s\u0105 z prawej strony to staj\u0105 si\u0119 potomkami swojego, znajduj\u0105cego si\u0119 powy\u017Cej s\u0105siada. Id\u0105c w lewo w\u0119z\u0142y przemieszczaj\u0105 si\u0119 wy\u017Cej, a gdy s\u0105 najwy\u017Cszego poziomu zmieniaj\u0105 po\u0142o\u017Cenie na lew\u0105 stron\u0119.
 choose_cloud_color=Wybierz kolor chmurki:
 choose_edge_color=Wybierz kolor ga\u0142\u0119zi
 choose_map_background_color=Wybierz kolor t\u0142a mapy
 choose_node_background_color=Wybierz kolor t\u0142a w\u0119z\u0142a:
 choose_node_color=Wybierz kolor w\u0119z\u0142a:
+ClearLinkAnchorAction.text=Wy\u0142\u0105cz zakotwiczenie w\u0119z\u0142a
+ClearLinkAnchorAction.tooltip=<html>Wy\u0142\u0105cz zakotwiczenie w\u0119z\u0142a wcze\u015Bniej wybranego</html>
+CloneAction.text=Wklej klon
 close_btn=Zamknij
-CloseAction.text=Zamknij
+CloseAction.text=Zamknij aktywn\u0105 map\u0119
+CloseAllMapsAction.text=Zamknij wszystkie mapy
+CloseAllOtherMapsAction.text=Zamknij wszystkie inne mapy
+cloud_shapes=Kszta\u0142ty chmurek
 CloudAction.text=Chmurka
 CloudColorAction.text=Kolor chmurki...
 CloudShapeAction.ARC.text=\u0141uk
 CloudShapeAction.RECT.text=Prostok\u0105t
 CloudShapeAction.ROUND_RECT.text=Zaokr\u0105glony prostok\u0105t
 CloudShapeAction.STAR.text=Gwiazda
+collection.copy.presentation=Kopiuj prezentacj\u0119
+collection.copy.slide=Kopiuj slajd
+collection.delete=Usu\u0144
+collection.down=W d\u00F3\u0142
+collection.move=Przenie\u015B
+collection.moveTo=Przenie\u015B na pozycj\u0119
+collection.new.presentation=Nowa prezentacja
+collection.new.slide=Nowy slajd
+collection.up=W g\u00F3r\u0119
 ColorProperty.ResetColor=Domy\u015Blny
 combined=Ramka/bez ramki
 condition=Warunek
@@ -210,27 +236,33 @@ connector_label=Etykieta po\u0142\u0105czenia
 connector_lines=Linie po\u0142\u0105czenia
 connector_shapes=Kszta\u0142ty po\u0142\u0105czenia
 ConnectorColorAction.text=Kolor po\u0142\u0105czenia...
+controls=Ustawienia pask\u00F3w
+ConvertCloneToIndependentNodeAction.text=Roz\u0142\u0105cz klonowanie
+copy_name={0} (kopia)
 CopyAction.text=Kopiuj
 CopyAction.tooltip=Kopiuj zaznaczon\u0105 ga\u0142\u0105\u017A
 CopyAttributes.text=Kopiuj atrybuty
 CopyIDAction.text=Kopiuj ID w\u0119z\u0142a
 CopyMapStylesAction.text=Kopiuj style mapy z...
 CopyNodeURIAction.text=Kopiuj URI w\u0119z\u0142a
-CopySingleAction.text=Kopiuj bez potomk\u00F3w
+copyright=Copyright \u00A9 2000-2017 Zesp\u00F3\u0142 Freeplane i inni
+CopySingleAction.text=Kopiuj w\u0119ze\u0142 (bez potomk\u00F3w)
 CopySingleAction.tooltip=Kopiuje tylko zaznaczony w\u0119ze\u0142 bez ga\u0142\u0119zi
 CopyStyleExtensionsAction.text=Kopiuj rozszerzenia ze stylu
 corrupt_map=Zawarto\u015B\u0107 mapy jest uszkodzona
 CreateConjunctConditionAction.text=I (And)
 CreateDisjunctConditionAction.text=Lub (Or)
 CreateNotSatisfiedConditionAction.text=Nie (Not)
-CreationModificationPluginAction.text=Poka\u017C czas modyfikacji (po wskazaniu myszk\u0105)
-CreationModificationPluginAction.tooltip=<html> Ta funkcja \u015Bledzi czas tworzenia i modyfikacji w\u0119z\u0142\u00F3w</html>
+CreationModificationPluginAction.text=Pokazuj czasy modyfikacji
+CreationModificationPluginAction.tooltip=<html>Ta funkcja \u015Bledzi czas tworzenia i modyfikacji w\u0119z\u0142\u00F3w</html>
 current_dir=Mapy
 CutAction.text=Wytnij
 decrease_branch_font_size=Zmniejsz czcionk\u0119
 DecreaseNodeFontAction.text=Zmniejsz czcionk\u0119
 default=Domy\u015Blny
+defaultAuxiliaryWordList=a, the, of, i, lub, oraz, ale
 DefaultColorAction.text=Domy\u015Blny kolor
+defaultstyle.attributes=Atrybuty
 defaultstyle.details=Detale
 defaultstyle.floating=Swobodny w\u0119ze\u0142
 defaultstyle.note=Notatka
@@ -243,40 +275,51 @@ DeleteLevelStyleAction.text=Usu\u0144 styl poziomu
 DeleteStyleAction.text=Usu\u0144 styl
 DeleteUserStyleAction.text=Usu\u0144 styl zdefiniowany przez u\u017Cytkownika
 dialect_info.app=Plik mapy {0} by\u0142 utworzony w programie {1}.
-dialect_info.unknownApp=Za\u0142adowana mapa by\u0142a utworzona w nieznanym programie.
+dialect_info.later_version=Plik mapy {0} zosta\u0142 utworzony przy u\u017Cyciu p\u00F3\u017Aniejszej wersji tego programu.
+dialect_info.unknownApp=Plik mapy {0} zosta\u0142 utworzony w nieznanym programie.
 dialect_info.unknownURL=Strona internetowa jest nieznana.
 dialect_info.url=Odwied\u017A stron\u0119 internetow\u0105 programu {0} w celu uzyskania dodatkowych informacji.
 dialect_info.warning=Freeplane mo\u017Ce w niepoprawny spos\u00F3b otworzy\u0107, wy\u015Bwietli\u0107 lub zapisa\u0107 ten plik.
 DirectHtmlFlavorHandler=HTML jako pojedynczy w\u0119ze\u0142
 DocumentationAction.text=Dokumentacja
 down=D\u00F3\u0142
+DownConditionAction.text=W d\u00F3\u0142
 download=Pobierz
 dropped_file_error=Nie mo\u017Cna by\u0142o otworzy\u0107 przeci\u0105gni\u0119tych plik\u00F3w. Pow\u00F3d: {0}
 edge=Ga\u0142\u0105\u017A
 edge_is_formatted_by_style=Formatowanie ga\u0142\u0119zi jest kontrolowane przez styl. W razie potrzeby edytuj odpowiednie style.
 edge_style=Styl ga\u0142\u0119zi
 edge_width=Szeroko\u015B\u0107 ga\u0142\u0119zi
+edge_widths=Szeroko\u015B\u0107 ga\u0142\u0119zi
 EdgeColorAction.text=Kolor ga\u0142\u0119zi...
+EdgeProperties=W\u0142a\u015Bciwo\u015Bci ga\u0142\u0119zi
 EdgeStyleAction.bezier.text=Krzywa B\u00E9ziera
 EdgeStyleAction.bezier.tooltip=<html>Wy\u015Bwietla ga\u0142\u0105\u017A jako g\u0142adk\u0105 krzyw\u0105.</html>
 EdgeStyleAction.hide_edge.text=Ukryj ga\u0142\u0105\u017A
+EdgeStyleAction.hide_edge.tooltip=<html>Dla wybranych w\u0119z\u0142\u00F3w wy\u015Bwietlaj ga\u0142\u0105\u017A do elementu nadrz\u0119dnego jako lini\u0119 przerywan\u0105.<br>W przeciwnym razie ukryj ga\u0142\u0105\u017A.</html>
 EdgeStyleAction.horizontal.text=Pionowa
+EdgeStyleAction.horizontal.tooltip=<html>U\u017Cyj prostej prostopad\u0142ej do kraw\u0119dzi.</html>
 EdgeStyleAction.linear.text=Linia
+EdgeStyleAction.linear.tooltip=<html>Wy\u015Bwietl kraw\u0119d\u017A jako lini\u0119 prost\u0105.</html>
 EdgeStyleAction.sharp_bezier.text=Ostra krzywa B\u00E9ziera
+EdgeStyleAction.sharp_bezier.tooltip=<html>Wy\u015Bwietl ga\u0142\u0105\u017A jako g\u0142adk\u0105 krzyw\u0105 z ostrymi ko\u0144cami.</html>
 EdgeStyleAction.sharp_linear.text=Ostra linia
+EdgeStyleAction.sharp_linear.tooltip=<html>Wy\u015Bwietl ga\u0142\u0105\u017A jako lini\u0119 prost\u0105 z ostrymi ko\u0144cami.</html>
 EdgeStyleAsParentAction.text=Jak rodzic
+EdgeStyleAsParentAction.tooltip=<html>U\u017Cyj dla ga\u0142\u0119zi stylu w\u0119z\u0142a nadrz\u0119dnego.</html>
 EdgeWidthAction_width_parent.text=Jak rodzic
 EdgeWidthAction_width_thin.text=Cienka
 edit=Edycja
 edit.decision=Edytor HTML
 edit.edit_rich_text=Czy chcesz u\u017Cywa\u0107 formatowania czcionek takiego jak pogrubienie lub kursywa?
-edit_details=Edytuj detale w\u0119z\u0142a in-line...
+edit_details=Edytuj detale w\u0119z\u0142a
 edit_end_label=<html>Etykieta<br>po\u0142\u0105czenia
 edit_label_font_family=Czcionka
 edit_label_font_size=Wielko\u015B\u0107 czcionki
 edit_link_manually=Edytuj odno\u015Bnik...
-edit_long_node=Edytor tekstu w\u0119z\u0142a...
+edit_long_node=Edytor tekstu w\u0119z\u0142a
 edit_middle_label=<html>Etykieta<br>\u015Brodkowa
+edit_note=Edytuj notatk\u0119
 edit_source_label=<html>Etykieta<br>\u017Ar\u00F3d\u0142a
 edit_target_label=<html>Etykieta<br>celu
 edit_transparency_label=Przezroczysto\u015B\u0107
@@ -284,27 +327,33 @@ edit_width_label=Szeroko\u015B\u0107
 EditAction.text=Edytuj tekst w\u0119z\u0142a
 EditAttributesAction.text=Edytuj atrybuty
 EditDetailsAction.text=Edytuj detale w\u0119z\u0142a in-line
-EditDetailsInDialogAction.text=Edytor detali w\u0119z\u0142a...
+EditDetailsInDialogAction.text=Edytor detali w\u0119z\u0142a
+editEdgeColors=Edytuj kolory ga\u0142\u0119zi
 EditFilterAction.text=Edytuj filtr
-EditLongAction.text=Edytor tekstu w\u0119z\u0142a...
-EditNoteInDialogAction.text=Edytor notatki...
+EditLongAction.text=Edytor tekstu w\u0119z\u0142a
+EditNoteInDialogAction.text=Edytor notatki
 EditScript=Edytor skryptu...
 EditStylesAction.text=Edytuj style
-EncryptedMap.text=Utw\u00F3rz zaszyfrowan\u0105 mindmap\u0119...
-EncryptedMap.tooltip=<html> Tworzy now\u0105 zaszyfrowan\u0105 mindmap\u0119</html>
+EncryptedMap.text=Utw\u00F3rz zaszyfrowan\u0105 map\u0119...
+EncryptedMap.tooltip=Nowa zaszyfrowana mapa
+encryption=Szyfrowanie
 enter_base_url=Freeplane automatycznie wklei linki wzgl\u0119dne. Podaj bazowy URL.
+enter_command=Wpisz polecenie
 enter_condition_name=Wprowad\u017A nazw\u0119 nowego warunku
-enter_confirms=[Enter] potwierdza
+enter_confirms=Enter potwierdza
 enter_keyset_name=Podaj nazw\u0119 zestawu skr\u00F3t\u00F3w klawiszowych
 enter_map_url=Wprowad\u017A adres URL mapy
 enter_new_style_name=Wprowad\u017A nazw\u0119 nowego stylu
 enter_node_id=Wprowad\u017A ID w\u0119z\u0142a
+enter_zoom=Wpisz zoom
 EnterPassword.text=W\u0142\u0105cz/wy\u0142\u0105cz szyfrowanie
 error=B\u0142\u0105d
 error_applying_template=B\u0142\u0105d aplikowania szablonu XSL.
 error_creating_directory=Nie mo\u017Cna utworzy\u0107 katalogu.
+error_in_template=B\u0142\u0119dy w domy\u015Blnym szablonie mapy {0}. Spr\u00F3buj usun\u0105\u0107 ten plik.
 errornumber={0} b\u0142\u0119d\u00F3w
 ExecuteScript.available_modes_tooltip={0} jest dost\u0119pny dla
+ExecuteScript.script=Skrypt
 ExecuteScriptError.text=B\u0142\u0105d podczas wykonywania skryptu:\n{0}
 ExecuteScriptForAllNodes.text=Wykonaj wszystkie skrypty
 ExecuteScriptForSelectionAction.text=Wykonaj skrypty zaznaczonego w\u0119z\u0142a
@@ -315,14 +364,14 @@ ExecuteScripts.noScriptsAvailable=Brak dost\u0119pnych skrypt\u00F3w
 ExecuteScripts.text=Skrypty
 ExecuteScriptSecurityError.text=B\u0142\u0105d podczas wykonywania skryptu: {0}
 export_failed=Eksportowanie nie powiod\u0142o si\u0119
-export_pdf_text=Dokument PDF
-export_svg_text=Skalowalna grafika wektorowa (SVG)
 export_using_xslt=Eksportowanie u\u017Cywaj\u0105c XSLT
 ExportAction.text=Eksport mapy...
+ExportAllPresentationsAction.text=Eksportuj wszystkie prezentacje do obraz\u00F3w PNG
 ExportBranchAction.text=Przenie\u015B ga\u0142\u0105\u017A do nowej mapy...
-ExportBranchToHTMLAction.text=Ga\u0142\u0105\u017A do dokumentu HTML...
-exported_file=Plik {0}
+ExportBranchToHTMLAction.text=Ga\u0142\u0105\u017A do dokumentu HTML
+exported_file=plik {0}
 ExportPdf.text=Do dokumentu PDF...
+ExportPresentationAction.text=Eksportuj bie\u017C\u0105c\u0105 prezentacj\u0119 do obraz\u00F3w PNG
 ExportSvg.text=Do obrazu SVG...
 ExportToHTMLAction.text=Do dokumentu HTML...
 ExportToImage.jpg.text=Do obrazu JPEG...
@@ -337,14 +386,15 @@ ExternalImage_popupMenu_ResetZoom=Powi\u0119kszenie 1:1
 ExternalImageAddAction.text=Dodaj obrazek...
 ExternalImageChangeAction.text=Zmie\u0144 obrazek...
 ExternalImageRemoveAction.text=Usu\u0144 obrazek
-ExtractLinkFromTextAction.text=Odno\u015Bnik z tekstu w\u0119z\u0142a
-ExtractLinkFromTextAction.tooltip=Tworzy odno\u015Bnik na podstawie adresu w tek\u015Bcie w\u0119z\u0142a
+ExtractLinkFromTextAction.text=Utw\u00F3rz \u0142\u0105cze z tekstu w\u0119z\u0142a
+ExtractLinkFromTextAction.tooltip=Tworzy \u0142\u0105cze z adresu w tek\u015Bcie w\u0119z\u0142a
 extras=Narz\u0119dzia
 f_button_unassigned=<brak>
 FaqOpenURLAction.text=FAQ
 file=Plik
 file_already_exists=Plik {0} ju\u017C istnieje. Czy chcesz go nadpisa\u0107?
-file_not_found=Plik {0} nie zosta\u0142 znaleziony.
+file_not_accessible=Plik {0} jest niedost\u0119pny
+file_not_found=Plik {0} nie zosta\u0142 znaleziony
 FileListFlavorHandler=Odno\u015Bniki do plik\u00F3w
 FileProperties_BranchLeafCount=Liczba li\u015Bci w zaznaczonych ga\u0142\u0119ziach:
 FileProperties_BranchNodeCount=Liczba w\u0119z\u0142\u00F3w w zaznaczonych ga\u0142\u0119ziach:
@@ -374,6 +424,8 @@ filter=Filtr
 filter_add=Dodaj
 filter_and=I
 filter_any_text=Tekst, detale lub notatka
+filter_clone_snapshot=Zapisane klony dla wybranych w\u0119z\u0142\u00F3w
+filter_clones=Klony dla wybranych w\u0119z\u0142\u00F3w
 filter_conditions=Filtry
 filter_contains=Zawiera
 filter_created_after=Stworzono po
@@ -391,10 +443,13 @@ filter_is_equal_to=Jest r\u00F3wny
 filter_is_not_equal_to=Nie jest r\u00F3wny
 filter_leaf=Li\u015B\u0107
 filter_link=Odno\u015Bnik
+filter_match_approximately=Przybli\u017Cony
+filter_match_approximately_tooltip=<html>Czy pozwoli\u0107 na przybli\u017Cone dopasowania,<br/>, czyli wyszukanie 'files' znajdzie 'flies'.</html>
 filter_match_case=Uwzgl\u0119dnij wielko\u015B\u0107 liter
+filter_match_case_tooltip=Czy rozr\u00F3\u017Cnia\u0107 wielko\u015B\u0107 liter podczas dopasowywania.
 filter_modified_after=Zmodyfikowano po
 filter_modified_before=Zmodyfikowano przed
-filter_no_filtering=Nie filtruj
+filter_no_filtering=Nie filtruj (usu\u0144)
 filter_node=Tekst w\u0119z\u0142a
 filter_node_level=Poziom w\u0119z\u0142a
 filter_not=Nie jest
@@ -410,28 +465,34 @@ filter_reminder_after=zaplanowane po
 filter_reminder_before=zaplanowane przed
 filter_reminder_executed=ju\u017C uaktywnione
 filter_reminder_later=zaplanowane p\u00F3\u017Cniej
-filter_root=Korze\u0144
-filter_script=Skrypt
+filter_root=W\u0119ze\u0142 korzenia
+filter_script=Filtr skrypt\u00F3w
 filter_select=&Zaznacz
 filter_selected_node_view=Aktualnie zaznaczone w\u0119z\u0142y
-filter_selected_node_view_snapshot=Zachowane zaznaczenie
+filter_selected_node_view_snapshot=Zapisany wyb\u00F3r
 filter_style=Styl
 filter_time=Filtr daty
+FilterCondition=Warunki filtrowania
+filterConditions=Filtry u\u017Cytkownika
+filterConditions.noActions=Brak nazwanych filtr\u00F3w
 filters_not_loaded=Nie mo\u017Cna wczyta\u0107 filtru, plik uszkodzony
+find=Znajd\u017A
 find_what=Szukaj
 FindAction.text=Znajd\u017A...
 FindNextAction.text=Znajd\u017A nast\u0119pny
 FindPreviousAction.text=Znajd\u017A poprzedni
+fit_background_to_page=Dopasuj obraz t\u0142a do jednej strony
 fit_map_to_page=Dopasuj do strony
 fit_map_to_page_height=Dopasuj wysoko\u015B\u0107 do strony
 fit_map_to_page_width=Dopasuj szeroko\u015B\u0107 do strony
 FitToPage.text=Dopasuj do strony
-FitToPage.tooltip=<html> Ustawia powi\u0119kszenie tak, by ca\u0142a mindmapa zmie\u015Bci\u0142a si\u0119 w aktualnym oknie</html>
-fold=Zwi\u0144
+FitToPage.tooltip=Dostosowuje powi\u0119kszenie mapy do aktualnego okna.
+fold=Rozwi\u0144/Zwi\u0144
 FoldAllAction.text=Zwi\u0144 wszystko
-FoldAllAction.tooltip=<html> Zwija zaznaczone w\u0119z\u0142y i ich w\u0119z\u0142y potomne</html>
+FoldAllAction.tooltip=<html>Zwija zaznaczone w\u0119z\u0142y i ich w\u0119z\u0142y potomne</html>
 FoldOneLevelAction.text=Zwi\u0144 jeden poziom
-FoldOneLevelAction.tooltip=<html> Zwija zaznaczone w\u0119z\u0142y o jeden poziom</html>
+FoldOneLevelAction.tooltip=<html>Zwija zaznaczone w\u0119z\u0142y o jeden poziom</html>
+follow_clone=Wewn\u0105trz ''{0}''
 follow_graphical_link=Id\u017A do ''{0}''
 FollowLinkAction.text=Otw\u00F3rz odno\u015Bnik
 font=Czcionka
@@ -444,12 +505,12 @@ format_menu_edge_styles=Styl ga\u0142\u0119zi
 format_menu_edge_widths=Szeroko\u015B\u0107 ga\u0142\u0119zi
 format_panel=Formatowanie
 FormatCopy.text=Kopiuj formatowanie
-FormatCopy.tooltip=<html> Kopiuje formatowanie w\u0119z\u0142a</html>
+FormatCopy.tooltip=<html>Kopiuje formatowanie w\u0119z\u0142a</html>
 FormatPaste.text=Wklej formatowanie
-FormatPaste.tooltip=<html> Wkleja formatowanie w\u0119z\u0142a. Pami\u0119taj o wcze\u015Bniejszym skopiowaniu go z innego w\u0119z\u0142a</html>
+FormatPaste.tooltip=<html>Wkleja formatowanie w\u0119z\u0142a. Pami\u0119taj o wcze\u015Bniejszym skopiowaniu go z innego w\u0119z\u0142a</html>
 formats_not_loaded=Formatowania nie mog\u0105 by\u0107 za\u0142adowane, plik uszkodzony
-formula.error.attributeValueIsNull=Po wykonaniu warto\u015Bci\u0105 atrybutu "{0}" jest null
-formula.error.circularReference=Odwo\u0142anie cykliczne: Foru\u0142a w w\u0119\u017Ale "{0}" odwo\u0142uje si\u0119 do samej siebie.
+formula.error.attributeValueIsNull=Po wykonaniu warto\u015Bci\u0105 atrybutu ''{0}'' jest null.
+formula.error.circularReference=Odwo\u0142anie cykliczne: Formu\u0142a w w\u0119\u017Ale ''{0}'' odwo\u0142uje si\u0119 do samej siebie.
 formula.EvaluateAllAction.text=Wykonaj wszystko
 formula.EvaluateAllAction.tooltip=Wykonaj wszystkie formu\u0142y w bie\u017C\u0105cej mapie
 formula.menuname=Formu\u0142y
@@ -470,8 +531,10 @@ Freeplane.progress.startCreateController=Start kontrolera...
 Freeplane.progress.updateLookAndFeel=Aktualizowanie Look And Feel...
 freeplane_reverted=Freeplane_odtworzona_
 FreeplaneHelpStarter.text=Pomoc...
-FreeplaneHelpStarter.tooltip=<html> Rozszerzona pomoc Freeplane</html>
+FreeplaneHelpStarter.tooltip=Rozszerzona pomoc Freeplane
 GettingStartedAction.text=Szybkie wprowadzenie do Freeplane'a
+goto=Przejd\u017A do
+goto.noActions=Brak w\u0119z\u0142\u00F3w docelowych
 GotoLinkNodeAction.text=Id\u017A do odno\u015Bnika
 GotoNodeAction.text=Id\u017A do w\u0119z\u0142a o numrze ID...
 GrabKeyDialog.common.cancel=Anuluj
@@ -488,7 +551,7 @@ HideableAction.tooltip=<html>Zaznacza t\u0142o ka\u017Cdego zmodyfikowanego w\u0
 HideAllAttributesAction.text=Ukryj wszystkie atrybuty
 HierarchicalIcons2Action.text=Poka\u017C wsp\u00F3lne ikony potomk\u00F3w
 HierarchicalIconsAction.text=Poka\u017C ikony hierarchicznie
-HierarchicalIconsAction.tooltip=<html> Je\u015Bli jeden z potomk\u00F3w w\u0119z\u0142a ma ikon\u0119, to zostanie ona r\u00F3wnie\u017C wy\u015Bwietlona w w\u0119\u017Ale (rodzicu)</html>
+HierarchicalIconsAction.tooltip=Je\u015Bli jeden z potomk\u00F3w w\u0119z\u0142a ma ikon\u0119, to zostanie ona r\u00F3wnie\u017C wy\u015Bwietlona w w\u0119\u017Ale (rodzicu).
 hot_keys=Skr\u00F3ty klawiszowe
 hot_keys_table=Lista skr\u00F3t\u00F3w klawiszowych
 HotKeyInfoAction.text=Lista skr\u00F3t\u00F3w klawiszowych
@@ -504,6 +567,7 @@ icon_50%=50%
 icon_75%=75%
 icon_addition=Dodawanie
 icon_attach=Za\u0142\u0105cznik
+icon_audio=Audio
 icon_back=Wstecz
 icon_bee=Freeplane
 icon_bell=Pami\u0119taj
@@ -523,6 +587,7 @@ icon_division=Dzielenie
 icon_down=D\u00F3\u0142
 icon_edit=Poprawka
 icon_encrypted=Zabezpieczone
+icon_executable=Z\u0119batka
 icon_family=Rodzina
 icon_fema=Kobiety
 icon_female1=Kobieta1
@@ -555,7 +620,10 @@ icon_help=Pytanie
 icon_hourglass=Oczekuj\u0105cy
 icon_icon_not_found=Ikona nie znaleziona
 icon_idea=Pomys\u0142
+icon_image=Obrazek
 icon_info=Informacja
+icon_internet=Internet
+icon_internet_warning=Internet ostrze\u017Cenie
 icon_kaddressbook=Telefon
 icon_kmail=E-Mail
 icon_knotify=Muzyka
@@ -569,8 +637,10 @@ icon_male1=M\u0119\u017Cczyzna1
 icon_male2=M\u0119\u017Cczyzna2
 icon_males=M\u0119\u017Cczy\u017Ani
 icon_menu=Ikony
-icon_messagebox_warning=Uwaga!
+icon_messagebox_warning=Uwaga
+icon_mindmap=Mapa
 icon_multiplication=Mno\u017Cenie
+icon_narrative=Narracja
 icon_negative=Negatywne
 icon_neutral=Neutralne
 icon_password=Has\u0142o
@@ -578,7 +648,10 @@ icon_pencil=O\u0142\u00F3wek
 icon_penguin=Linux
 icon_positive=Pozytywne
 icon_prepare=\u017B\u00F3\u0142te \u015Bwiat\u0142o
-icon_revision=Poprawka
+icon_revision=Rewizja
+icon_revision-green=Rewizja zielony
+icon_revision-pink=Rewizja r\u00F3\u017Cowy
+icon_revision-red=Rewizja czerwony
 icon_smiley-angry=Z\u0142y
 icon_smiley-neutral=Oboj\u0119tny
 icon_smiley-oh=Zaskoczony
@@ -591,13 +664,15 @@ icon_up=G\u00F3ra
 icon_user_icon=Ikony u\u017Cytkownika
 icon_very_negative=Bardzo negatywne
 icon_very_positive=Bardzo pozytywne
+icon_video=Video
 icon_wizard=Magiczny
 icon_xmag=Do przemy\u015Blenia
-icon_yes=Uwaga!
+icon_yes=Uwaga
 IconGroupPopupAction.arrows.text=Strza\u0142ki
 IconGroupPopupAction.docs_folders.text=Dokumenty i katalogi
 IconGroupPopupAction.flags.text=Flagi
 IconGroupPopupAction.math.text=Matematyka
+IconGroupPopupAction.media.text=Media
 IconGroupPopupAction.miscellaneous.text=R\u00F3\u017Cne
 IconGroupPopupAction.nature.text=Natura
 IconGroupPopupAction.numbers.text=Priorytety
@@ -609,26 +684,33 @@ IconGroupPopupAction.smiley.text=Emotikony
 IconGroupPopupAction.time.text=Czas
 IconGroupPopupAction.user.text=Ikony u\u017Cytkownika
 IconProgressExtended10Action.text=Znacznik post\u0119pu +10%
+IconProgressExtended10Action.tooltip=<html>Dodaje wska\u017Anik post\u0119pu, kt\u00F3ry zwi\u0119ksza si\u0119 o 10% po podw\u00F3jnym klikni\u0119ciu lewego przycisku.<br>Control + podw\u00F3jne klikni\u0119cie lewego przycisku zmniejsza / usuwa wska\u017Anik.</html>
 IconProgressExtended25Action.text=Znacznik postepu +25%
+IconProgressExtended25Action.tooltip=<html>Dodaje wska\u017Anik post\u0119pu, kt\u00F3ry zwi\u0119ksza si\u0119 o 25% po podw\u00F3jnym klikni\u0119ciu lewego przycisku.<br>Control + podw\u00F3jne klikni\u0119cie lewego przycisku zmniejsza / usuwa wska\u017Anik.</html>
 IconProgressIconDownAction.text=Ikona post\u0119pu: dalej
+IconProgressIconDownAction.tooltip=Zmniejsza / wstawia / usuwa ikony post\u0119pu (100% -> 75% -> 50% -> 25% -> 0% -> usu\u0144).
 IconProgressIconUpAction.text=Ikona post\u0119pu: cofnij
+IconProgressIconUpAction.tooltip=Zwi\u0119ksza / wstawia ikony post\u0119pu (0% -> 25% -> 50% -> 75% -> 100% + OK).
 IconProgressRemoveAction.text=Usu\u0144 znacznik/ikon\u0119 post\u0119pu
+IconProgressRemoveAction.tooltip=Usuwa ikony post\u0119pu oraz rozszerzon\u0105 ikon\u0119 post\u0119pu.
+icons=Ikony
 IconSelectionPlugin.text=Wybierz ikon\u0119...
-IconSelectionPlugin.tooltip=<html> Otwiera okienko z dost\u0119pnymi ikonami</html>
+IconSelectionPlugin.tooltip=<html>Otwiera okienko z dost\u0119pnymi ikonami</html>
 image_covertLink=Zamie\u0144 odno\u015Bnik na obrazek
 ImageFlavorHandler=Obrazek (osobny plik)
 import=Import
 import_linked_branch_no_link=Wybrany w\u0119ze\u0142 nie zawiera odno\u015Bnika do pliku, kt\u00F3ry mo\u017Cna zaimportowa\u0107.
 ImportAction.text=Importuj
-ImportBranchAction.text=Mindmapy jako nowej ga\u0142\u0119zi...
+ImportBranchAction.text=Mapa jako nowa ga\u0142\u0105\u017A...
 ImportExplorerFavoritesAction.text=Ulubionych z Internet Explorer...
 ImportFolderStructureAction.text=Struktury katalog\u00F3w...
-ImportLinkedBranchAction.text=Odno\u015Bnika z zaznaczonego w\u0119z\u0142a...
+ImportLinkedBranchAction.text=Odno\u015Bnika z zaznaczonego w\u0119z\u0142a
 ImportLinkedBranchWithoutRootAction.text=Odno\u015Bnika z zaznaczonego w\u0119z\u0142a (bez korzenia)...
-ImportMindmanagerFiles.text=Mindmapa programu MindManager X5...
+ImportMindmanagerFiles.text=Mapa programu MindManager X5...
+ImportXmlFile.text=Importuj plik xml
 increase_branch_font_size=Zwi\u0119ksz czcionk\u0119
 IncreaseNodeFontAction.text=Zwi\u0119ksz czcionk\u0119
-internal_error_tooltip=B\u0142\u0105d wewn\u0119trzny. Klinij aby otworzy\u0107 ostatni plik logowania log.0
+internal_error_tooltip=Wyst\u0105pi\u0142 b\u0142\u0105d wewn\u0119trzny. Kliknij, aby otworzy\u0107 ostatni plik logowania log.0 i uzyska\u0107 wi\u0119cej informacji.
 invalid_export_file=Nieprawid\u0142owa nazwa eksportowanego pliku
 invalid_file_msg=Nie mog\u0119 znale\u017A\u0107 pliku dla {0}
 invalid_uri=Nieprawid\u0142owy URI {0}
@@ -637,29 +719,48 @@ invalid_url_msg=Nie mog\u0119 utworzy\u0107 prawid\u0142owego URL dla {0}
 ItalicAction.text=Pochylenie
 italicise_branch=Pochyl
 java_version=Wersja Java-y: {0}
+JoinNodesAction.separator.format=Po\u0142\u0105cz w\u0119z\u0142y z "{0}"
+lastOpenedMaps=Ostatnio otwarte mapy
+lastOpenedMaps.noActions=Brak map w historii
+latex_editor=Edytuj formu\u0142\u0119 LaTeX
 LatexDeleteLatexAction.text=Usu\u0144 formu\u0142\u0119 LaTeX-u
 LatexEditLatexAction.text=Edytuj formu\u0142\u0119 LaTeX-u...
+LatexInsertLatexAction.msg1=<html>Pr\u00F3bujesz wstawi\u0107 formu\u0142\u0119 <i> ze starszego </i> LaTeX-a.<br/> Nowy spos\u00F3b tworzenia tekstu/formu\u0142y LaTeX jest opisany na stronie:</html>
+LatexInsertLatexAction.msg2=<html>W skr\u00F3cie: <ul><li> u\u017Cyj przedrostka "\\latex " w tek\u015Bcie w\u0119z\u0142a lub </li><li><i> Widok->Ustawienia Pask\u00F3w->Panel narz\u0119dzi (Alt+P) </i>, a nast\u0119pnie <i> Formatowanie -> Tekst w\u0119z\u0142a -> Formatowanie -> Latex </i></li></ul></html>
 LatexInsertLatexAction.text=Wstaw formu\u0142\u0119 LaTeX-u...
+latexPatternFormat=LaTeX
+LengthUnits.cm=cm
+LengthUnits.in=cal
+LengthUnits.mm=mm
+LengthUnits.pt=pt
+LengthUnits.px=px
 less_than_two_selected_nodes=Wybierz co najmniej dwa w\u0119z\u0142y, aby utworzy\u0107 po\u0142\u0105czenie.
-license=Licencja
+license=Licencja: GPL 2 lub p\u00F3\u017Aniejsza
 license_text=<html>This program is free software; you can redistribute it and/or<br>modify it under the terms of the GNU General Public License<br>as published by the Free Software Foundation; either version 2<br>of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>GNU General Public  [...]
 LicenseAction.text=Licencja
 link_error=Nieprawid\u0142owy odno\u015Bnik "{0}" nie za\u0142adowany
 link_not_available_any_more=Po\u0142\u0105czenie jest nieaktualne. Jeden z w\u0119z\u0142\u00F3w zosta\u0142 usuni\u0119ty.
 link_not_found=Nie znaleziono odno\u015Bnika {0}.
-links=Odno\u015Bnik
+links=\u0141\u0105cze
 load=Wczytywanie
+load_accelerator_presets=Wczytaj
+load_accelerator_presets.noActions=Brak ustawie\u0144
 LoadAcceleratorPresetsAction.textPatterns.text=Wzorce tekstowe
-locking_failed_by_open=Zablokowanie mindmapy {0} niemo\u017Cliwe. Otwieram tylko do odczytu.
-locking_failed_by_save_as=Zablokowanie mindmapy {0} niemo\u017Cliwe. Polecenie "Zapisz jako..." anulowane.
-locking_old_lock_removed=Mindmapa {0} by\u0142a zablokowana przez u\u017Cytkownika {1}. Blokada zosta\u0142a usuni\u0119ta, bo jest zbyt stara.
+locking_failed_by_open=Zablokowanie mapy {0} niemo\u017Cliwe. Otwieram tylko do odczytu.
+locking_failed_by_save_as=Zablokowanie mapy {0} zako\u0144czy\u0142o si\u0119 niepowodzeniem. Polecenie Zapisz jako zosta\u0142o przerwane.
+locking_old_lock_removed=Mapa {0} by\u0142a zablokowana przez u\u017Cytkownika {1}. Blokada zosta\u0142a usuni\u0119ta, bo jest zbyt stara.
 long_node_changed_cancel=W\u0119ze\u0142 zosta\u0142 zmieniony. Porzuci\u0107 zmiany?
 long_node_changed_submit=W\u0119ze\u0142 zosta\u0142 zmieniony. Zapisa\u0107 zmiany?
 lots_of_links_warning=Czy na pewno chcesz utworzy\u0107 wiele odno\u015Bnik\u00F3w do tego samego w\u0119z\u0142a?
+main_menu=Menu
 main_resource_directory=Zasoby instalacji: {0}
 MainView.errorUpdateText=B\u0142\u0105d ustawienia tekstu dla wej\u015Bcia: {0}.
+MakeLinkFromAnchorAction.text=Utw\u00F3rz \u0142\u0105cze z zakotwiczonego w\u0119z\u0142a
+MakeLinkFromAnchorAction.tooltip=<html>utw\u00F3rz lokalne lub globalne \u0142\u0105cze z<br/>zakotwiczonego w\u0119z\u0142a do innego w\u0119z\u0142a</html>
+MakeLinkToAnchorAction.text=Utw\u00F3rz \u0142\u0105cze do zakotwiczonego w\u0119z\u0142a
+MakeLinkToAnchorAction.tooltip=<html>utw\u00F3rz lokalne lub globalne \u0142\u0105cze do<br/>zakotwiczonego w\u0119z\u0142a z innego w\u0119z\u0142a</html>
 ManageAddOnsAction.text=Dodatki
-ManageAddOnsDialog.activate=W\u0142\u0105czony
+ManageAddOnsDialog.activate=W\u0142\u0105cz
 ManageAddOnsDialog.activation.success={0} b\u0119dzie w\u0142\u0105czony po ponownym uruchomieniu programu.
 ManageAddOnsDialog.authored.by=autorstwa {0}
 ManageAddOnsDialog.cannot.activate=Nie mog\u0119 uruchomi\u0107: {0} ju\u017C jest uruchomony.
@@ -692,12 +793,18 @@ ManageAddOnsDialog.tab.manage.tooltip=Zarz\u0105dzaj zainstalowanymi dodatkami
 ManageAddOnsDialog.visit.addon.page=Odwied\u017A stron\u0119 dodatku...
 ManageConditionalStylesAction.text=Zarz\u0105dzaj stylami warunkowymi mapy
 ManageNodeConditionalStylesAction.text=Zarz\u0105dzaj stylami warunkowymi w\u0119z\u0142a
-map_already_exists=Mindmapa o podanej nazwie ju\u017C istnieje. Czy chcesz j\u0105 zamieni\u0107?
-map_corrupted=Mindmapa uszkodzona. Wy\u015Bwietli\u0107 szczeg\u00F3\u0142y?
-map_locked_by_open=Mindmapa {0} jest ju\u017C otwarta przez u\u017Cytkownika {1}. Otwieram tylko do odczytu.
-map_locked_by_save_as=Mindmapa {0} jest ju\u017C otwarta przez u\u017Cytkownika {1}. Polecenie "Zapisz jako..." niedost\u0119pne.
+map_already_exists=Mapa o podanej nazwie ju\u017C istnieje. Czy chcesz j\u0105 nadpisa\u0107?
+map_background=T\u0142o mapy
+map_background_image=Obraz t\u0142a
+map_corrupted=Mapa uszkodzona. Wy\u015Bwietli\u0107 szczeg\u00F3\u0142y?
+map_load_error=Nie uda\u0142o si\u0119 za\u0142adowa\u0107 mapy {0}
+map_locked_by_open=Mapa {0} jest ju\u017C otwarta przez u\u017Cytkownika {1}. Otwieram tylko do odczytu.
+map_locked_by_save_as=Mapa {0} jest ju\u017C otwarta przez u\u017Cytkownika {1}. Polecenie Zapisz jako... zosta\u0142o przerwane.
 map_not_saved=Mapa nie by\u0142a zapisywana.
+MapBackgroundClearAction.text=Usu\u0144 obraz t\u0142a
 MapBackgroundColorAction.text=Kolor t\u0142a
+MapBackgroundImageAction.text=Obraz t\u0142a...
+maps=Otwarte
 MaxNodeWidth.text=Ustaw maksymaln\u0105 szeroko\u015B\u0107 w\u0119z\u0142a
 menu_applyStyle=Zastosuj styl
 menu_attributes=Atrybuty
@@ -711,7 +818,7 @@ menu_error=B\u0142\u0105d w zdefiniowanej przez u\u017Cytkownika strukturze menu
 menu_extensions=Rozszerzenia w\u0119z\u0142a
 menu_group=Grupa w\u0119z\u0142\u00F3w
 menu_hoverView=Podpowiedzi
-menu_iconByCategory=Wybierz ikon\u0119 (kategorie)
+menu_iconByCategory=Ikony podziale na kategorie...
 menu_iconView=Ikony
 menu_image=Obrazek
 menu_insert=Wstaw
@@ -724,29 +831,36 @@ menu_node_features=W\u0142a\u015Bciwo\u015Bci w\u0119z\u0142a
 menu_nodes=W\u0119z\u0142y
 menu_nodeView=Tekst w\u0119z\u0142a
 menu_noteView=Notatki
+menu_openmaps=Mapy
 menu_remove_icons=Usu\u0144 ikony
 menu_removeAttribute=Usu\u0144 atrybut
 menu_select=Zaznacz
 menu_time=Zarz\u0105dzanie czasem
 menu_title=Tekst w\u0119z\u0142a
+menu_viewmode=Ustawienia widoku
 MenuUtils.invalid_menuitem={0} nie jest prawid\u0142owym kluczem (key) elementu menu.
 mindmap=Mapa
 MindMapNodesFlavorHandler=Hierarchia w\u0119z\u0142\u00F3w
 mindmaps=Mapy
-mindmaps_desc=Mindmapy (*.mm)
+mindmaps_desc=Mapy (*.mm)
 mindmaps_filter_desc=Filtry (*.mmfilter)
 MinNodeWidth.text=Ustaw minimaln\u0105 szeroko\u015B\u0107 w\u0119z\u0142a
 mode_Browse=Tryb przegl\u0105dania map
 mode_File=Tryb przegl\u0105dania plik\u00F3w
-mode_MindMap=Tryb mindmapy
+mode_MindMap=Tryb mapy
 mode_na=Tryb jest niedost\u0119pny
 mode_status=Tryb zmieniony na {0}
+mode_StyleMap=Edycja stylu
 mode_title=Freeplane - Tryb {0}
-modes=Tryb
+modes=Tryby
 ModesMenuAction.Browse.text=Przegl\u0105darka mapy
 ModesMenuAction.File.text=Drzewo katalog\u00F3w
-ModesMenuAction.MindMap.text=Edytor mapy
+ModesMenuAction.MindMap.text=Edytor map
 most_recent_files=Ostatnio otwierane
+MoveAction.text=Przenie\u015B
+MoveSelectedNodeAction.CENTER.text=Wy\u015Brodkuj wybrany w\u0119ze\u0142
+MoveSelectedNodeAction.EAST.text=Przesu\u0144 wybrany w\u0119ze\u0142 w prawo
+MoveSelectedNodeAction.WEST.text=Przenie\u015B wybrany w\u0119ze\u0142 w lewo
 MoveToRootAction.text=Przejd\u017A do korzenia
 NameConditionAction.text=Ustaw nazw\u0119
 navigate=Nawigacja
@@ -754,9 +868,9 @@ NavigationNextMapAction.text=Nast\u0119pna mapa
 NavigationPreviousMapAction.text=Poprzednia mapa
 new=Nowa mapa
 new_map_from_user_templates.text=Nowa mapa z szablonu...
-new_mindmap=Nowa mindmapa
+new_mindmap=Nowa mapa
 new_node=Nowy w\u0119ze\u0142
-new_node_as_sibling_not_possible_for_the_root=Nie mo\u017Cna utworzy\u0107 w\u0119z\u0142a r\u00F3wnorz\u0119dnego z korzeniem.
+new_node_as_sibling_not_possible_for_the_root=Nie mo\u017Cna utworzy\u0107 w\u0119z\u0142a r\u00F3wnorz\u0119dnego z korzeniem
 new_version_available=Dost\u0119pna nowa wersja ''{0}''
 NewChildAction.text=Nowy w\u0119ze\u0142 potomny
 NewerFileRevisionsFoundDialog.cancel=Pomi\u0144
@@ -770,13 +884,14 @@ NewerFileRevisionsFoundDialog.question=Znaleziono nowsze wersje {0}!
 NewerFileRevisionsFoundDialog.restore=Odtw\u00F3rz
 NewerFileRevisionsFoundDialog.restore.tooltip=Zast\u0105p {0} przez {1}
 NewerFileRevisionsFoundDialog.title=Znaleziono nowsze wersje pliku!
+NewFreeNodeAction.text=Nowy w\u0119ze\u0142 p\u0142ywaj\u0105cy
 NewLevelStyleAction.text=Dodaj styl poziomu
 newmap.install.addon.question={0} prawdopodobnie jest dodatkiem\nCzy chcesz go zainstalowa\u0107?\n(Wybierz "Nie" aby otworzy\u0107 jako map\u0119)
 newmap.install.addon.title=Zainstalowa\u0107 dodatek?
 NewMapAction.text=Nowa mapa
 NewMapViewAction.text=Otw\u00F3rz map\u0119 w nowym widoku
 NewParentNode.text=Utw\u00F3rz nowego rodzica
-NewParentNode.tooltip=<html> Wszystkie zaznaczone w\u0119z\u0142y przenosi do nowego rodzica</html>
+NewParentNode.tooltip=<html>Wszystkie zaznaczone w\u0119z\u0142y przenosi do nowego rodzica</html>
 NewPreviousSiblingAction.text=Nowy w\u0119ze\u0142 (powy\u017Cej)
 NewSiblingAction.text=Nowy w\u0119ze\u0142 (poni\u017Cej)
 NewSummaryAction.text=Nowy w\u0119ze\u0142 zbiorczy (zaznaczone w\u0119z\u0142y)
@@ -785,18 +900,21 @@ NextNodeAction.BACK.text=Id\u017A do poprzedniego w\u0119z\u0142a
 NextNodeAction.BACK_N_FOLD.text=Id\u017A do poprzedniego w\u0119z\u0142a (zwi\u0144)
 NextNodeAction.FORWARD.text=Id\u017A do nast\u0119pnego w\u0119z\u0142a
 NextNodeAction.FORWARD_N_FOLD.text=Id\u017A do nast\u0119pnego w\u0119z\u0142a (zwi\u0144)
+NextPresentationItemAction.text=Rozwi\u0144 nast\u0119pny element prezentacji (zwi\u0144 poprzedni)
 no=Nie
 no_copy_attributes_before_paste_attributes=Nie mo\u017Cesz wklei\u0107 atrybut\u00F3w zanim ich nie skopiowano.
 NO_FORMAT=Tekst
 no_format_copy_before_format_paste=Nie mo\u017Cna wklei\u0107 formatowania zanim nie skopiowano go z innego w\u0119z\u0142a.
-no_found_from=<html>Nie znaleziono wyra\u017Cenia "{0}" w w\u0119\u017Ale "{1}".</html>
-no_more_found_from=<html>Nie znaleziono wi\u0119cej wyra\u017Ce\u0144 "{0}" w w\u0119\u017Ale "{1}".</html>
+no_found_from=<html>Nie znaleziono wyra\u017Cenia <u>{0}</u> w w\u0119\u017Ale "{1}".</html>
+no_more_found_from=<html>Nie znaleziono wi\u0119cej wyra\u017Ce\u0144 <u>{0}</u> w w\u0119\u017Ale "{1}".</html>
 no_previous_find=Nie wprowadzono wyra\u017Cenia do wyszukiwania.
-no_styles_found_in_map=Nie znaleziono \u017Cadnych styl\u00F3w w mapie.
+no_styles_found_in_map=Nie znaleziono styl\u00F3w w mapie
+no_translation_strings_found=Nie znaleziono t\u0142umaczonych \u0142a\u0144cuch\u00F3w
 node=W\u0119ze\u0142
 node_changed_discard_changes=W\u0119ze\u0142 zosta\u0142 zmieniony. Porzuci\u0107 zmiany?
 node_is_write_protected=Docelowy w\u0119ze\u0142 jest zabezpieczony przed zapisem.
 node_location_help=Przeci\u0105ganie zmienia po\u0142o\u017Cenie w\u0119z\u0142a, ctrl+przeci\u0105ganie zmienia odleg\u0142o\u015Bci mi\u0119dzy ga\u0142\u0119ziami, dwuklik i ctrl+dwuklik resetuje po\u0142o\u017Cenia.
+node_popup_scripting=Skrypty
 node_selector=Zaznaczenie w\u0119z\u0142\u00F3w
 node_selector_message=Kliknij dwa razy aby zaznaczy\u0107 w\u0119ze\u0142
 node_styles=Style w\u0119z\u0142\u00F3w
@@ -807,82 +925,113 @@ NodeDownAction.text=Przesu\u0144 w\u0119ze\u0142 w d\u00F3\u0142
 NodeExtensions.EditNodeExtensions=Edytur rozszedzenia w\u0119z\u0142a
 NodeExtensions.RemoveNodeExtensions=Usu\u0144 rozszerzenia w\u0119z\u0142a
 NodeListAction.text=Znajd\u017A i zast\u0105p...
-NodeListAction.tooltip=<html> Wy\u015Bwietla daty utworzenia i modyfikacji wszystkich w\u0119z\u0142\u00F3w</html>
+NodeListAction.tooltip=Pokazuje wszystkie w\u0119z\u0142y jako list\u0119 przeszukiwan\u0105 z w\u0142a\u015Bciwo\u015Bciami filtru.
 NodeShapeAction.bubble.text=Ramka
 NodeShapeAction.fork.text=Bez ramki
+NodeShapeAction.narrow_hexagon.text=W\u0105ski sze\u015Bciok\u0105t
+NodeShapeAction.oval.text=Owal
+NodeShapeAction.rectangle.text=Prostok\u0105t
+NodeShapeAction.wide_hexagon.text=Szeroki sze\u015Bciok\u0105t
 NodeUpAction.text=Przesu\u0144 w\u0119ze\u0142 w g\u00F3r\u0119
 nonboldify_branch=Bez wyt\u0142uszczenia
 nonitalicise_branch=Bez kursywy
 normal=Zwyk\u0142y
 not_saved_for_image_error=Mapa musi by\u0107 zapisana zanim b\u0119dziesz m\u00F3g\u0142 wstawi\u0107 obrazek z okna wyboru pliku
-not_saved_for_link_error=Mindmapa musi zosta\u0107 zapisana przed wybraniem odno\u015Bnika do pliku.
+not_saved_for_link_error=Mapa musi zosta\u0107 zapisana przed ustawieniem odno\u015Bnika do pliku
 note_window_location=Po\u0142o\u017Cenie okna notatnika
 notes=Notatka
+NotFoldingNextPresentationItemAction.text=Rozwi\u0144 nast\u0119pny element prezentacji
+NotificationOptions.CLOSE=Zamknij
+NotificationOptions.REMIND_ME_LATER=Przypomnij mi p\u00F3\u017Aniej
+NotificationOptions.REMOVE_REMINDER=Usu\u0144 przypomnienie
+NotificationOptions.SELECT_NODE=Przejd\u017A do przypomnienia
 ok=OK
 OKAction.text=OK
 OnlineReference.text=Dokumentacja mapy online
+open_asMindMap=Mapa
 OpenAction.text=Otw\u00F3rz...
 OpenFreeplaneSiteAction.text=Strona domowa Freeplane
+OpenMapsAddLocation.text=Dodaj lokalizacj\u0119 OpenMaps...
+OpenMapsRemoveLocation.text=Usu\u0144 lokalizacj\u0119 OpenMaps
+OpenMapsViewLocation.text=Zobacz lokalizacj\u0119 OpenMaps...
 OpenPathAction.text=Otw\u00F3rz plik
 OpenURLMapAction.text=Otw\u00F3rz map\u0119 z URL...
 OpenUserDirAction.text=Otw\u00F3rz katalog u\u017Cytkownika
 option_changes_may_require_restart=Zmiany prawdopodobnie pojawi\u0105 si\u0119 dopiero po ponownym uruchomieniu programu Freeplane.
 OptionalDontShowMeAgainDialog.cancel=Nie
-OptionalDontShowMeAgainDialog.dontShowAgain=Nie pytaj ponownie
+OptionalDontShowMeAgainDialog.dontShowAgain=Nie pytaj ponownie.
 OptionalDontShowMeAgainDialog.ok=Tak
-OptionalDontShowMeAgainDialog.rememberMyDescision=Zapami\u0119taj moj\u0105 decyzj\u0119
+OptionalDontShowMeAgainDialog.rememberMyDescision=Zapami\u0119taj moj\u0105 decyzj\u0119.
 OptionPanel.absolute=bezwzgl\u0119dny
 OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Formatowanie automatyczne
 OptionPanel.ADD_CHILD=Dodaj potomka
 OptionPanel.ADD_SIBLING=Dodaj w\u0119ze\u0142 na tym samym poziomie
 OptionPanel.addons=Dodatki
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Zwi\u0144 wszystko
 OptionPanel.always_load_last_maps=\u0141aduj ostatnie i nowe mapy
-OptionPanel.always_load_last_maps.tooltip=Otwiera ostnie pliki wg powy\u017Cszych ustawie\u0144, nawet otwieraj\u0105c FP wybrany plik mapy
+OptionPanel.always_load_last_maps.tooltip=Otw\u00F3rz ostatnie pliki ustawione przez powy\u017Csze opcje, nawet uruchamiaj\u0105c FP z wybranym plikiem mapy.
 OptionPanel.always_save_folding=zawsze
 OptionPanel.always_save_folding_state=Zawsze zapisuj zmiany stanu zwini\u0119\u0107
 OptionPanel.always_save_folding_state.tooltip=Je\u017Celi w\u0142\u0105czone, ka\u017Cda zmiana zwini\u0119cia zaznacza map\u0119 jako zmodyfikowan\u0105 i przypomina o konieczno\u015Bci jej zapisania.
+OptionPanel.always_show_less_than_N_nodes_after_load=Rozwijaj kilka w\u0119z\u0142\u00F3w
 OptionPanel.always_unfold_all_after_load=Rozwi\u0144 wszystko
 OptionPanel.antialias=Antyaliasing
-OptionPanel.antialias.tooltip=<html> Okre\u015Bla jako\u015B\u0107 wy\u015Bwietlania mindmapy. Im wi\u0119cej antyaliasingu, tym wolniej dzia\u0142a Freeplane</html>
+OptionPanel.antialias.tooltip=<html>Okre\u015Bla jako\u015B\u0107 wy\u015Bwietlania mapy. Im wi\u0119cej wyg\u0142adzania, tym wolniej dzia\u0142a Freeplane</html>
 OptionPanel.antialias_all=Antyaliasing wszystkiego
-OptionPanel.antialias_edges=Antyaliasing ga\u0142\u0119zi
+OptionPanel.antialias_edges=Wyg\u0142adzanie ga\u0142\u0119zi
 OptionPanel.antialias_none=brak
+OptionPanel.antialias_svg=Wyg\u0142adzanie SVG
+OptionPanel.antialias_svg.tooltip=<html>Poprawia jako\u015B\u0107 renderowania SVG. Wyg\u0142adzanie zajmuje wi\u0119cej czasu.</html>
 OptionPanel.Appearance=Wygl\u0105d
+OptionPanel.approximate_search_threshold=Pr\u00F3g przybli\u017Conego dopasowania
+OptionPanel.approximate_search_threshold.tooltip=<html>Pr\u00F3g przybli\u017Conego dopasowania<br/><font size="2">zobacz http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(im wi\u0119kszy tym mniej wariant\u00F3w<br/>wyszukiwanego has\u0142a zostanie znalezione)</html>
 OptionPanel.ar=Arabski
 OptionPanel.ARC=\u0141uk
 OptionPanel.as_parent=Jak rodzic
 OptionPanel.ask=Pytaj
 OptionPanel.automatic=automatyczny
 OptionPanel.automaticFormat_level=Formatowanie automatyczne
-OptionPanel.automaticFormat_level1=Format korzenia
+OptionPanel.automaticFormat_level1=Format w\u0119z\u0142a korzenia
 OptionPanel.automaticFormat_level2=Format w\u0119z\u0142a pierwszego poziomu
 OptionPanel.backup_file_number=Ilo\u015B\u0107 przechowywanych kopii zapasowych
 OptionPanel.Behaviour=Spos\u00F3b dzia\u0142ania
 OptionPanel.bezier=bezier
+OptionPanel.border_color=Kolor
+OptionPanel.border_color_matches_edge_color=U\u017Cyj kolor ga\u0142\u0119zi
+OptionPanel.border_dash=Typ linii brzegowej
+OptionPanel.border_dash_matches_edge_dash=U\u017Cyj typ linii ga\u0142\u0119zi
+OptionPanel.border_width=Szeroko\u015B\u0107 linii
+OptionPanel.border_width_matches_edge_width=U\u017Cyj szeroko\u015Bci ga\u0142\u0119zi
 OptionPanel.bubble=ramka
 OptionPanel.ca=Katalo\u0144ski
 OptionPanel.Cancel=Anuluj
-OptionPanel.center_selected_node=Wy\u015Brodkuj wybrane w\u0119z\u0142y
+OptionPanel.center_selected_node=Automatycznie wy\u015Brodkowuj aktywny w\u0119ze\u0142
 OptionPanel.check_updates_automatically=Sprawdzaj dost\u0119pno\u015B\u0107 aktualizacji przy uruchomieniu
 OptionPanel.childpattern=Szablon potomka
 OptionPanel.childpattern.tooltip=Wybrany szablon zostanie zastosowany dla wszystkich potomk\u00F3w.
 OptionPanel.clear_all_setters=Prze\u0142\u0105cz wszystkie
+OptionPanel.clear_all_setters.tooltip=W\u0142\u0105cza lub wy\u0142\u0105cza wszystkie zmiany wskaza\u0144.
 OptionPanel.cloud=Chmurka
 OptionPanel.cloudcolor=Chmurka i kolor
 OptionPanel.cloudshape=Kszta\u0142t chmurki
 OptionPanel.combined=Ramka/bez ramki
 OptionPanel.compare_as_number=Por\u00F3wnaj jako liczby
+OptionPanel.connector_arrows=Strza\u0142ki po\u0142\u0105czenia
+OptionPanel.connector_dash=Rodzaj linii
 OptionPanel.convert_to_current_version=<html>Konwertowa\u0107 automatycznie mapy w starszej wersji Freeplane <br>do obecnej wersji?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Tylko dla bardzo du\u017Cych map, kt\u00F3re nie musz\u0105 by\u0107 konwertowane <br>(to jest wiedza ekspercka) mo\u017Cesz otwiera\u0107 mapy bez konwertowania.</html>
+OptionPanel.copyFormatToNewSibling=Kopiuj format do nowego rodze\u0144stwa
+OptionPanel.copyFormatToNewSiblingIncludesIcons=Kopiuj format z ikonami
 OptionPanel.cs=Czeski
 OptionPanel.cut_nodes_without_question=Wycina\u0107 w\u0119z\u0142y bez potwierdzania?
 OptionPanel.cut_nodes_without_question.tooltip=Je\u017Celi w\u0142\u0105czone, w\u0119z\u0142y b\u0119d\u0105 wycinane bez potwierdzania. Mo\u017Ce to spowodowa\u0107 utrat\u0119 danych przy przypadkowym u\u017Cyciu.
+OptionPanel.cut_out_pictures_when_pasting_html=Usu\u0144 obrazy z HTML
 OptionPanel.da=Du\u0144ski
 OptionPanel.date_format=Standardowe formatowanie daty
 OptionPanel.date_format.tooltip=Mo\u017Cliwe opcje: SHORT, MEDIUM, LONG, FULL lub wz\u00F3r typu "MM/dd/yyyy"
 OptionPanel.datetime_format=Standardowe formatowanie daty i czasu
-OptionPanel.datetime_format.tooltip=Zar\u00F3wno: <styl daty>,<styl czasu> (style: SHORT, MEDIUM, LONG lub FULL) lub pe\u0142ny wz\u00F3r typu "M/d/yyyy hh:mm"
+OptionPanel.datetime_format.tooltip=Zar\u00F3wno: <datestyle>,<timestyle> (style: SHORT, MEDIUM, LONG lub FULL) lub pe\u0142ny wz\u00F3r typu "M/d/yyyy hh:mm"
 OptionPanel.de=Niemiecki
 OptionPanel.default=domy\u015Blny
 OptionPanel.default_attribute_key_column_width=Domy\u015Blna szeroko\u015B\u0107 klucza atrybutu
@@ -896,22 +1045,25 @@ OptionPanel.default_browser_command_windows_9x.tooltip=<html> Dla Windows (znaki
 OptionPanel.default_browser_command_windows_nt=Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html> Dla Windows (znaki "" s\u0105 konieczne z powodu odno\u015Bnik\u00F3w, kt\u00F3re zawieraj\u0105 "=" w sobie)</html>
 OptionPanel.default_charset=Zestaw znak\u00F3w
+OptionPanel.default_save_dir=Domy\u015Blny katalog zapisywania
 OptionPanel.Defaults=Domy\u015Blne
 OptionPanel.delete_automatic_saves_at_exit=Usu\u0144 automatyczne kopie po zako\u0144czeniu programu
 OptionPanel.delete_automatic_saves_at_exit.tooltip=<html> Po normalnym zamkni\u0119ciu Freeplane b\u0119dzie usuwa\u0142 wszystkie automatycznie utworzone pliki</html>
 OptionPanel.delete_nodes_without_question=Usuwa\u0107 w\u0119z\u0142y bez potwierdzania?
 OptionPanel.delete_nodes_without_question.tooltip=Je\u017Celi w\u0142\u0105czone, w\u0119z\u0142y b\u0119d\u0105 usuwane bez potwierdzania. Mo\u017Ce to spowodowa\u0107 utrat\u0119 danych przy przypadkowym u\u017Cyciu.
 OptionPanel.disable_cursor_move_paper=Wy\u0142\u0105cz specjalny kursor podczas przewijania
-OptionPanel.disable_cursor_move_paper.tooltip=<html> Nie wy\u015Bwietlaj specjalnego kursora podczas przewijania za pomoc\u0105 przeci\u0105gania t\u0142a</html>
-OptionPanel.display_inline_editor_for_all_new_nodes=Wy\u015Bwietlaj edytor w mapie (inline)  dla wszystkich nowych w\u0119z\u0142\u00F3w
+OptionPanel.disable_cursor_move_paper.tooltip=<html>Nie wy\u015Bwietlaj specjalnego kursora podczas przewijania za pomoc\u0105 przeci\u0105gania t\u0142a</html>
+OptionPanel.display_inline_editor_for_all_new_nodes=Wy\u015Bwietlaj edytor liniowy dla wszystkich nowych w\u0119z\u0142\u00F3w
 OptionPanel.display_node_id=Wy\u015Bwietlaj ID w\u0119z\u0142a
 OptionPanel.edgecolor=Kolor ga\u0142\u0119zi
-OptionPanel.edgecolor.tooltip=Kopiuj w\u0142a\u015Bciwo\u015B\u0107 ga\u0142\u0119zi do w\u0119z\u0142a rodzica (dzia\u0142a te\u017C na wszytkich potomk\u00F3w)
+OptionPanel.edgecolor.tooltip=Kopiuj w\u0142a\u015Bciwo\u015B\u0107 ga\u0142\u0119zi do w\u0119z\u0142a rodzica (dzia\u0142a te\u017C na wszystkich potomk\u00F3w)
+OptionPanel.edgedash=Typ linii ga\u0142\u0119zi
 OptionPanel.edgestyle=Styl ga\u0142\u0119zi
-OptionPanel.edgestyle.tooltip=Kopiuj w\u0142a\u015Bciwo\u015B\u0107 ga\u0142\u0119zi do w\u0119z\u0142a rodzica (dzia\u0142a te\u017C na wszytkich potomk\u00F3w)
+OptionPanel.edgestyle.tooltip=Kopiuj w\u0142a\u015Bciwo\u015B\u0107 ga\u0142\u0119zi do w\u0119z\u0142a rodzica (dzia\u0142a te\u017C na wszystkich potomk\u00F3w)
 OptionPanel.edgewidth=Szeroko\u015B\u0107 ga\u0142\u0119zi
-OptionPanel.edgewidth.tooltip=Kopiuj w\u0142a\u015Bciwo\u015B\u0107 ga\u0142\u0119zi do w\u0119z\u0142a rodzica (dzia\u0142a te\u017C na wszytkich potomk\u00F3w)
+OptionPanel.edgewidth.tooltip=Kopiuj w\u0142a\u015Bciwo\u015B\u0107 ga\u0142\u0119zi do w\u0119z\u0142a rodzica (dzia\u0142a te\u017C na wszystkich potomk\u00F3w)
 OptionPanel.EDIT_CURRENT=Nadpisuj zawarto\u015B\u0107
+OptionPanel.edit_on_double_click=Edycja po podw\u00F3jnym klikni\u0119ciu
 OptionPanel.editor_extra_width=Krok zwi\u0119kszania szeroko\u015Bci w\u0119z\u0142a
 OptionPanel.editor_extra_width.tooltip=<html>Okre\u015Bla liczb\u0119 pikseli, o kt\u00F3r\u0105 zwi\u0119ksza si\u0119 szeroko\u015B\u0107 w\u0119z\u0142a je\u017Celi tekst wychodzi poza aktualn\u0105 szeroko\u015B\u0107.</html>
 OptionPanel.el=Grecki
@@ -926,6 +1078,7 @@ OptionPanel.en=Angielski
 OptionPanel.Environment=\u015Arodowisko
 OptionPanel.es=Hiszpa\u0144ski
 OptionPanel.et=Esto\u0144ski
+OptionPanel.eu=Baskijski
 OptionPanel.execute_scripts_without_asking=W\u0142\u0105czone wykonywanie skrypt\u00F3w bez potwierdzania
 OptionPanel.execute_scripts_without_asking.tooltip=<html>Skrypty Freeplane s\u0105 w zasadzie w stanie wykona\u0107 ka\u017Cd\u0105 czynno\u015B\u0107 na Twoim komputerze. <br>Tak wi\u0119c nie powiniene\u015B uruchamia\u0107 skrypt\u00F3w z niepewnych \u017Ar\u00F3de\u0142.</html>
 OptionPanel.execute_scripts_without_exec_restriction=Zezwalaj na uruchamianie zewn\u0119trznych aplikacji (NIE zalecane)
@@ -935,27 +1088,36 @@ OptionPanel.execute_scripts_without_file_restriction.tooltip=<html><body>Je\u017
 OptionPanel.execute_scripts_without_network_restriction=Zezwalaj na operacje sieciowe (NIE zalecane)
 OptionPanel.execute_scripts_without_network_restriction.tooltip=<html><body>Je\u017Celi Twoje skrypty Groovy musz\u0105 wykonywa\u0107 operacje sieciowe,<br>musisz w\u0142\u0105czy\u0107 t\u0105 opcj\u0119. <br>Ale u\u017Cywaj jej ostro\u017Cnie, poniewa\u017C z\u0142o\u015Bliwe skrypty mog\u0105 odczyta\u0107 Twoje prywatne informacje!</body></html>
 OptionPanel.execute_scripts_without_write_restriction=Pozw\u00F3l na operacje zapisywania plik\u00F3w (NIE polecane)
+OptionPanel.execute_scripts_without_write_restriction.tooltip=<html><body> Je\u015Bli skrypty Groovy potrzebuj\u0105 do zapisu dost\u0119pu do plik\u00F3w (write, delete (!)), Musisz w\u0142\u0105czy\u0107 t\u0119 opcj\u0119. <br>Zazwyczaj u\u017Cywany jest dost\u0119p do odczytu. <br>U\u017Cyj takich zmian ostro\u017Cnie, poniewa\u017C teraz szkodliwe skrypty mog\u0105 zaszkodzi\u0107 Twojemu komputerowi!</body></html>
 OptionPanel.experimental_file_locking_on=Eksperymentalne blokowanie plik\u00F3w
 OptionPanel.experimental_file_locking_on.tooltip=<html> Funkcja testowa. U\u017Cywasz na w\u0142asne ryzyko</html>
-OptionPanel.export_icons_in_html=Eksport ikon razem z HTML
+OptionPanel.export_icons_in_html=Eksportuj ikony w html
 OptionPanel.export_icons_in_html.tooltip=<html> Okre\u015Bla czy podczas eksportu do HTML maj\u0105 by\u0107 do\u0142\u0105czane ikony. Problem z ikonami polega na tym, \u017Ce cz\u0119sto odno\u015Bniki do nich przestaj\u0105 by\u0107 prawid\u0142owe po przeniesieniu na inny komputer.</html>
+OptionPanel.exported_image_resolution_dpi=Rozdzielczo\u015B\u0107 eksportowanego obrazu (w DPI)
 OptionPanel.Files=Pliki
 OptionPanel.first=pierwsza
+OptionPanel.fit_to_viewport=Dopasuj obraz t\u0142a do okna
+OptionPanel.fold_on_click_inside=Zwi\u0144 po klikni\u0119ciu wewn\u0105trz
 OptionPanel.foldingsymbolwidth=\u015Arednica symbolu zwini\u0119tych w\u0119z\u0142\u00F3w
 OptionPanel.foldingsymbolwidth.tooltip=<html> \u015Arednica okr\u0119gu obok zwini\u0119tych w\u0119z\u0142\u00F3w</html>
 OptionPanel.fork=bez ramki
 OptionPanel.format_locale=Lokalizacja formatowania
 OptionPanel.format_locale.tooltip=Ustawienia lokalizacji dla formatowania i przetwarzania danych
-OptionPanel.formula_disable_caching=Wy\u0142\u0105cz cache'owanie wykonywania formu\u0142
+OptionPanel.formula_disable_caching=Wy\u0142\u0105cz pami\u0119\u0107 podr\u0119czn\u0105 dla wykonywania formu\u0142
 OptionPanel.formula_disable_plugin=Wy\u0142\u0105cz wykonywanie formu\u0142
 OptionPanel.fr=Francuski
 OptionPanel.gl=Galicyjski
 OptionPanel.goto_note_end_on_edit=Przenie\u015B w notatce kursor na koniec
 OptionPanel.grid_size=Odleg\u0142o\u015Bci mi\u0119dzy punktami siatki(przyci\u0105ganie)
+OptionPanel.groovy_editor_font=Czcionka do pod\u015Bwietlenia sk\u0142adni Groovy
+OptionPanel.groovy_editor_font.tooltip=U\u017Cyj 'Dialog' lub 'Monospaced', je\u015Bli potrzebujesz znak\u00F3w Unicode!
+OptionPanel.groovy_editor_font_size=Rozmiar czcionki pod\u015Bwietlania sk\u0142adni Groovy
 OptionPanel.gtk=Gtk
-OptionPanel.hide_edge=ukryj kraw\u0119d\u017A
+OptionPanel.hide_edge=Ukryj kraw\u0119d\u017A
+OptionPanel.hide_single_end_connectors=Ukryj pojedyncze zako\u0144czenia po\u0142\u0105cze\u0144
+OptionPanel.highlight_formulas=Wyr\u00F3\u017Cnij formu\u0142y
 OptionPanel.horizontal=poziomo
-OptionPanel.hr=Horwacki
+OptionPanel.hr=Chorwacki
 OptionPanel.HTML=HTML
 OptionPanel.html_export_based_on_headings=jako esej
 OptionPanel.html_export_fold_all=Zwi\u0144 wszystko
@@ -963,15 +1125,22 @@ OptionPanel.html_export_fold_currently_folded=zwi\u0144 obecnie zwini\u0119te
 OptionPanel.html_export_folding=Zwijanie dokument\u00F3w HTML
 OptionPanel.html_export_no_folding=bez zwijania
 OptionPanel.hu=W\u0119gierski
+OptionPanel.ic_disable=Wy\u0142\u0105cz
+OptionPanel.ic_file=U\u017Cyj dysk
+OptionPanel.ic_ram=W pami\u0119ci
 OptionPanel.icon=Ikona
 OptionPanel.icon.tooltip=Je\u017Celi zaaplikujesz w\u0119ze\u0142 b\u0119dzie mia\u0142 dok\u0142adnie t\u0105 ikon\u0119.
+OptionPanel.icon_size=Rozmiar ikony
 OptionPanel.icons.list=Lista wy\u015Bwietlanych standardowych ikon
-OptionPanel.icons.list.tooltip=Tutaj mo\u017Cesz uporz\u0105dkowa\u0107 lub wy\u0142\u0105czy\u0107 standardowe ikony. Ikony musz\u0105 by\u0107 oddzielane znakiem ";".
+OptionPanel.icons.list.tooltip=Tutaj mo\u017Cesz uporz\u0105dkowa\u0107 lub wy\u0142\u0105czy\u0107 standardowe ikony. Ikony musz\u0105 by\u0107 oddzielane znakiem ';'.
 OptionPanel.id=Indonezyjski
 OptionPanel.IGNORE=Nic nie r\u00F3b
 OptionPanel.il__enter_confirms_by_default=Domy\u015Blnie Enter potwierdza
+OptionPanel.image_cache=dla obraz\u00F3w
+OptionPanel.indentationUsesTabsInTextOutput=U\u017Cyj tabulatory w tek\u015Bcie wyj\u015Bciowym
 OptionPanel.it=W\u0142oski
 OptionPanel.ja=Japo\u0144ski
+OptionPanel.JoinNodesAction.textSeparators=Separator tekstu
 OptionPanel.key_type_action=Przy naci\u015Bni\u0119ciu klawisza
 OptionPanel.Keystrokes=Klawiatura
 OptionPanel.ko=Korea\u0144ski
@@ -981,6 +1150,12 @@ OptionPanel.language=J\u0119zyk
 OptionPanel.language.tooltip=<html> To jest j\u0119zyk, kt\u00F3ry powinien zosta\u0107 u\u017Cyty przez program. 'automatyczny' pr\u00F3buje za\u0142adowa\u0107 j\u0119zyk systemowy</html>
 OptionPanel.last=ostatnia
 OptionPanel.last_opened_list_length=D\u0142ugo\u015B\u0107 listy ostatnio otwieranych
+OptionPanel.latex_disable_editor=Wy\u0142\u0105cz pod\u015Bwietlanie sk\u0142adni LaTeX
+OptionPanel.latex_disable_editor.tooltip=Sprawd\u017A to, je\u015Bli masz problemy z edytorem LaTeX
+OptionPanel.latex_editor_font=Czcionka do pod\u015Bwietlania sk\u0142adni LaTeX
+OptionPanel.latex_editor_font.tooltip=U\u017Cyj 'Dialog' lub 'Monospaced', je\u015Bli potrzebujesz znak\u00F3w Unicode!
+OptionPanel.latex_editor_font_size=Rozmiar czcionki do pod\u015Bwietlania sk\u0142adni LaTeX
+OptionPanel.latex_macros=Wsp\u00F3lne makra LaTeX
 OptionPanel.layout_map_on_text_change=Aktualizuj uk\u0142ad mapy podczas edycji
 OptionPanel.layout_map_on_text_change.tooltip=Wy\u0142\u0105cz, aby program dzia\u0142a\u0142 p\u0142ynniej
 OptionPanel.linear=liniowy
@@ -992,67 +1167,108 @@ OptionPanel.load_folding_from_map_default_unfold_all=Za\u0142aduj z mapy, lub ro
 OptionPanel.load_last_map=Automatycznie otw\u00F3rz ostatni\u0105 map\u0119
 OptionPanel.load_last_map.tooltip=<html>Je\u017Celi zaznaczone, podczas uruchamiania Freeplanea zostanie za\u0142adowana ostatnio otworzona mapa.</html>
 OptionPanel.load_last_maps=Otw\u00F3rz wszystkie mapy z poprzedzniej sesji
-OptionPanel.lookandfeel=Styl interfejsu u\u017Cytkownika (Look&Feel)
-OptionPanel.lookandfeel.tooltip=<html> Look&Feel - wygl\u0105d programu. Je\u015Bli chcesz u\u017Cy\u0107 w\u0142asnego, wprowad\u017A nazw\u0119 klasy i upewnij si\u0119, \u017Ce odpowiednie pliki *.jar s\u0105 \u0142adowane.<br>Je\u015Bli masz jaki\u015B problem z Look&Feel wybierz '\u017Baden'. Dzia\u0142a r\u00F3wnie\u017C z appletami</html>
+OptionPanel.lookandfeel=Styl interfejsu u\u017Cytkownika (Look and Feel)
+OptionPanel.lookandfeel.scaleuifonts=Skalowanie czcionek interfejsu u\u017Cytkownika
+OptionPanel.lookandfeel.scaleuifonts.tooltip=U\u017Cyteczne dla monitor\u00F3w o du\u017Cej rozdzielczo\u015Bci
+OptionPanel.lookandfeel.tooltip=<html>Look&Feel - wygl\u0105d programu. Je\u015Bli chcesz u\u017Cy\u0107 w\u0142asnego, wprowad\u017A nazw\u0119 klasy i upewnij si\u0119, \u017Ce odpowiednie pliki *.jar s\u0105 \u0142adowane.<br>Je\u015Bli masz jaki\u015B problem z Look&Feel wybierz '\u017Baden'. Dzia\u0142a r\u00F3wnie\u017C z appletami</html>
 OptionPanel.lt=Litewski
+OptionPanel.markClones=Maluj znaczniki klon\u00F3w
+OptionPanel.markSelectedClones=Maluj znaczniki dla wybranych klon\u00F3w
 OptionPanel.max_displayed_node_count=Maksymalna liczba wy\u015Bwietlanych w\u0119z\u0142\u00F3w
+OptionPanel.max_image_width=Maksymalna pocz\u0105tkowa szeroko\u015B\u0107 obrazu
+OptionPanel.max_image_width.tooltip=Nowe obrazy s\u0105 zmniejszane do szeroko\u015Bci
 OptionPanel.max_menu_item_count=Maksymalna liczba element\u00F3w menu
 OptionPanel.max_menu_item_count.tooltip=Ogranicza liczb\u0119 element\u00F3w w pojedynczym podmenu, najmniej 10
 OptionPanel.max_node_width=Maksymalna szeroko\u015B\u0107 w\u0119z\u0142a
 OptionPanel.max_node_width.tooltip=<html> Domy\u015Blna maksymalna szeroko\u015B\u0107 w\u0119z\u0142a w pikselach</html>
 OptionPanel.max_shortened_text_length=Maksymalna szeroko\u015B\u0107 skr\u00F3conego w\u0119z\u0142a
+OptionPanel.menuItemFontSize=Rozmiar czcionki dla element\u00F3w menu
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=Minimalna szeroko\u015B\u0107 w\u0119z\u0142a
+OptionPanel.monitor_size_inches=Rozmiar monitora (cale)
 OptionPanel.motif=Motif
+OptionPanel.narrow_hexagon=W\u0105ski sze\u015Bciok\u0105t
 OptionPanel.nb=Norweski Bokm\u00E5l
 OptionPanel.never_save_folding=nigdy
+OptionPanel.neverShowSurvey=Nigdy nie pokazuj pyta\u0144, ankiet i wskaz\u00F3wek
 OptionPanel.nl=Du\u0144ski, Flamandzki
 OptionPanel.nn=Norweski Nynorsk
-OptionPanel.nodebackgroundcolor=Kolor t\u0142a w\u0119z\u0142a...
-OptionPanel.nodebackgroundcolor.tooltip=nodebackgroundcolor.tooltip
+OptionPanel.nodebackgroundcolor=T\u0142o
+OptionPanel.nodebackgroundcolor.tooltip=T\u0142o w\u0119z\u0142a, gdy nie zosta\u0142 wybrany.
 OptionPanel.nodecolor=Kolor w\u0119z\u0142a
-OptionPanel.nodecolor.tooltip=nodecolor.tooltip
+OptionPanel.nodecolor.tooltip=Kolor tekstu w\u0119z\u0142a, je\u015Bli nie zosta\u0142 wybrany.
 OptionPanel.nodefontbold=Pogrubienie czcionki
+OptionPanel.nodefonthyperlink=Hiper\u0142\u0105cze
 OptionPanel.nodefontitalic=Kursywa
 OptionPanel.nodefontname=Czcionka w\u0119z\u0142a
 OptionPanel.nodefontsize=Wielko\u015B\u0107 czcionki w\u0119z\u0142a
 OptionPanel.nodeformat=Formatowanie
+OptionPanel.nodeformat.tooltip=<html>Zamiana tekstu i/lub formatowania: <ul><li><em>Rozszerzenie szablonu</em>(<tt>%s</tt> to oryginalny tekst), np. <tt>BEWARE: %s</tt><li><em>Formatowanie dat i liczb</em> - patrz przyk\u0142ady w polu wyboru</ul></html>
 OptionPanel.nodenumbering=Numeracja w\u0119z\u0142\u00F3w
-OptionPanel.nodenumbering.tooltip=Dodaje numer (np. 1.3.1) do tekstu w\u0119z\u0142a
+OptionPanel.nodenumbering.tooltip=Dodaje numer seryjny (np. 1.3.1) do tekstu w\u0119z\u0142a.
+OptionPanel.nodeshape=Kszta\u0142t w\u0119z\u0142a
 OptionPanel.nodetext=Edytuj w\u0119ze\u0142
-OptionPanel.nodetext.tooltip=nodetext.tooltip
+OptionPanel.nodetext.tooltip=Tutaj mo\u017Cna zdefiniowa\u0107 tekst w\u0119z\u0142a. Poprzedni tekst jest odrzucany, gdy ten wzorzec jest stosowany.
 OptionPanel.nothing=Nic
 OptionPanel.number_format=Standardowe formatowanie liczb
-OptionPanel.number_format.tooltip=Wzr\u00F3 zawieraj\u0105cy '#' dla opcjonalnych lub '0' dla obowi\u0105zkowych cyfr. Przyk\u0142ady:  "0.00", "0.0%", "$#.00", "#0"
-OptionPanel.number_of_different_files_for_automatic_save=Ilo\u015B\u0107 przechowywanych automatycznych kopii
-OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> liczba n r\u00F3\u017Cnych plik\u00F3w u\u017Cywanych do przechowywania automatycznych zapis\u00F3w. Pierwsza kopia jest przechowywana w pliku 1, a\u017C  do n+1-kopii, kt\u00F3ra jest zapisywana znowu w pliku 1 (cyklicznie)</html>
+OptionPanel.number_format.tooltip=Wz\u00F3r zawieraj\u0105cy '#' dla opcjonalnych lub '0' dla obowi\u0105zkowych cyfr. Przyk\u0142ady: "0.00", "0.0%", "$#.00", "#0"
+OptionPanel.number_of_different_files_for_automatic_save=Liczba przechowywanych automatycznych kopii
+OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> liczba n r\u00F3\u017Cnych plik\u00F3w u\u017Cywanych do przechowywania automatycznych zapis\u00F3w. Pierwsza kopia jest przechowywana w pierwszym pliku, odpowiednio a\u017C do n+1-kopii, kt\u00F3ra jest zapisywana znowu w pierwszym pliku (cyklicznie)</html>
 OptionPanel.OK=Zapisz ustawienia
 OptionPanel.org.freeplane.plugin.bugreport=Polityka
 OptionPanel.org.freeplane.plugin.bugreport.allowed=Zawsze wysy\u0142aj
 OptionPanel.org.freeplane.plugin.bugreport.ask=Poka\u017C okno dialogowe raportu
 OptionPanel.org.freeplane.plugin.bugreport.denied=Nigdy nie wysy\u0142aj
+OptionPanel.org.freeplane.plugin.bugreport.userid=Opcjonalny identyfikator do wys\u0142ania
 OptionPanel.outline_hgap=Pozioma odleg\u0142o\u015B\u0107
 OptionPanel.outline_vgap=Pionowa odleg\u0142o\u015B\u0107
+OptionPanel.oval=Owal
 OptionPanel.paint_connectors_behind=Rysuj po\u0142\u0105czenia za (poni\u017Cej) w\u0119z\u0142ami
 OptionPanel.parse_data=Rozpoznawaj liczby i dat\u0119-godzin\u0119
 OptionPanel.parse_data.tooltip=Pr\u00F3buje przetworzy\u0107 dat\u0119, dat\u0119-godzin\u0119 i liczby i zastosowa\u0107 stoandardowe formatowania. Przyk\u0142ady: 100,000.00, 12/31, 12/31/99, 1999-12-31 and 1999-12-31 23:59
+OptionPanel.parse_formulas=Rozpoznaj formu\u0142y
+OptionPanel.parse_formulas.tooltip=Parsuj formu\u0142y w w\u0119z\u0142ach zaczynaj\u0105ce si\u0119 od '=' Zobacz http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_latex=Rozpoznawaj LaTeX
+OptionPanel.parse_latex.tooltip=Rozpoznawaj formu\u0142y LaTeX po formacie lub przedrostkiem: Zobacz http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
+OptionPanel.PASTE_HTML=Wklej jako HTML
+OptionPanel.PASTE_PLAIN_TEXT=Wklej jako zwyk\u0142y tekst
+OptionPanel.pasteImagesFromFiles=Wklej obrazy z plik\u00F3w
+OptionPanel.pasteImagesFromFiles.tooltip=Wstaw obraz, je\u015Bli plik obrazu zostanie opuszczony na map\u0119
 OptionPanel.path_property_may_not_be_empty=W\u0142a\u015Bciwo\u015Bci \u015Bcie\u017Cki nie mog\u0105 by\u0107 puste. Zmiana zosta\u0142a anulowana.
 OptionPanel.patternname=Nazwa
 OptionPanel.patternname.tooltip=Unikatowa nazwa szablonu
 OptionPanel.pl=*Polski*
 OptionPanel.placenewbranches=Po\u0142o\u017Cenie nowych ga\u0142\u0119zi
-OptionPanel.placenewbranches.tooltip=<html> Gdzie umieszcza\u0107 nowe ga\u0142\u0119zie</html>
+OptionPanel.placenewbranches.tooltip=<html>Gdzie umieszcza\u0107 nowe ga\u0142\u0119zie. Poprawne warto\u015Bci to 'pierwsza' i 'ostatnia' </html>
+OptionPanel.plugin.tooltip=Dodatkowe wtyczki.
 OptionPanel.plugins=Wtyczki
+OptionPanel.Presentation=Prezentacja
+OptionPanel.presentation.combineAll=Po\u0142\u0105cz wszystkie prezentacje
+OptionPanel.presentation.exportDirectory=nazwa katalogu do eksportu prezentacji
+OptionPanel.presentation.maxDropBoxRowCount=Maksymalna liczba wierszy w rozwijanym polu
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Zastosuj do prezentacji i slajd\u00F3w
+OptionPanel.presentation.processesEscapeKey=Klawisz ESCAPE ko\u0144czy prezentacj\u0119
+OptionPanel.presentation.processesNavigationKeys=Klawisze strza\u0142ek steruj\u0105 prezentacj\u0105
+OptionPanel.presentation.slideDisplaysAllNodes=Automatycznie rozwi\u0144 wszystkich w\u0119z\u0142y slajd\u00F3w
+OptionPanel.presentation.slowMotion=Zwolnione tempo
+OptionPanel.presentation.switchToFullScreen=Aktywuj pe\u0142ny ekran
+OptionPanel.presentation.switchToSpotlight=Aktywuj \u015Bwiat\u0142o punktowe
+OptionPanel.presentation.zoom=U\u017Cyj zoomu mapy
 OptionPanel.printonwhitebackground=<html>Bia\u0142e t\u0142o przy wydruku</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Zawsze u\u017Cywaj bia\u0142ego t\u0142a przy wydruku</html>
 OptionPanel.pt_BR=Portugalski (Brazylia)
 OptionPanel.pt_PT=Portugalski (Portugalia)
 OptionPanel.RECT=Prostok\u0105t
+OptionPanel.rectangle=Prostok\u0105t
 OptionPanel.relative=wzgl\u0119dny
+OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Pytaj" zapyta Ci\u0119 (w razie w\u0105tpliwo\u015Bci).<br>"Tak" wy\u015Bwietla bogaty edytor tekstu.<br>"Nie" wy\u015Bwietla edytor tekstowy.</html>
 OptionPanel.remind_use_rich_text_in_new_nodes=U\u017Cywaj tekstu sformatowanego dla wklejanych w\u0119z\u0142\u00F3w
+OptionPanel.remindersBlink=Migaj\u0105ce przypomnienia
+OptionPanel.remindersShowNotifications=Wy\u015Bwietlaj powiadomienia dla przypomnie\u0144
+OptionPanel.remindersStandardDelay=Op\u00F3\u017Anienie przypomnienia
 OptionPanel.remove_notes_without_question=Usuwa\u0107 notatki bez potwierdzania?
 OptionPanel.remove_notes_without_question.tooltip=Je\u017Celi w\u0142\u0105czone, notatki nale\u017C\u0105ce do wybranych w\u0119z\u0142\u00F3w b\u0119d\u0105 usuwane bez potwierdzania. Mo\u017Ce to spowodowa\u0107 utrat\u0119 danych przy przypadkowym u\u017Cyciu.
-OptionPanel.resources_use_default_font_for_notes_too=U\u017Cywaj domy\u015Blnej czcionki tak\u017Ce dla notatek.
+OptionPanel.resources_use_default_font_for_notes_too=U\u017Cywaj domy\u015Blnej czcionki tak\u017Ce dla notatek
 OptionPanel.resources_use_margin_top_zero_for_notes=Usu\u0144 g\u00F3rny margines dla notatek
 OptionPanel.revision_color=Kolor wersji
 OptionPanel.revision_color.tooltip=Kolor t\u0142a dla zmodyfikowanych w\u0119z\u0142\u00F3w.
@@ -1060,25 +1276,33 @@ OptionPanel.ROUND_RECT=Zaokr\u0105glony prostok\u0105t
 OptionPanel.ru=Rosyjski
 OptionPanel.save_folding=Zapisuj zwini\u0119cia
 OptionPanel.save_folding_if_map_is_changed=je\u017Celi mapa zosta\u0142a zmodyfikowana
+OptionPanel.save_last_visited_node=Zapisz ostatni\u0105 pozycj\u0119 na mapie
 OptionPanel.save_modification_times=Zapisuj czas modyfikacji
 OptionPanel.script_classpath=classpath skrytpu: Katalogi zawieraj\u0105ce klasy lub/i JARy
 OptionPanel.script_classpath.tooltip=<html>Lista JAR\u00F3w i/lub katalog\u00F3w do dodania do \u015Bcie\u017Cki klas (classpath) skrypt\u00F3w i formu\u0142. <br>Use ; (Windows) or : (Linux, Mac) to separate entries.<br>Directories will be scanned for JARs and for .class files.<br>Paths that are not absolute are considered relative to the Freeplane user directory.<br>If you set the classpath you have to permit read access too!</html>
+OptionPanel.script_compilation_disabled_extensions=Nie mo\u017Cna skompilowa\u0107 rozszerzenia plik\u00F3w (zobacz podpowied\u017A)
+OptionPanel.script_compilation_disabled_extensions.tooltip=<html>Je\u015Bli wszystkie skrypty z dodatkowo zainstalowanymi j\u0119zykami (z wyj\u0105tkiem Groovy i JavaScript) maj\u0105 og\u00F3lny problem kompilacji - spr\u00F3buj doda\u0107 rozszerzenie pliku tutaj (lista rozdzielana przecinkami).</html>
 OptionPanel.script_directories=\u015Acie\u017Cka wyszukiwania skrypt\u00F3w
-OptionPanel.script_directories.tooltip=<html>Lista katalog\u00F3w.<br>U\u017Cyj ; (Windows) lub : (Linux, Mac) aby rozdzieli\u0107 wpisy.<br>\u015Acie\u017Cki nie b\u0119d\u0105ce bezwzgl\u0119dnymi s\u0105 traktowane jako wzgl\u0119de do katalogu u\u017Cytkownika Freeplane'a.</html>
+OptionPanel.script_directories.tooltip=<html>Lista katalog\u00F3w.<br>U\u017Cyj ; (Windows) lub : (Linux, Mac) aby rozdzieli\u0107 wpisy.<br>\u015Acie\u017Cki nie b\u0119d\u0105ce bezwzgl\u0119dnymi s\u0105 traktowane jako wzgl\u0119dne do katalogu u\u017Cytkownika Freeplane'a.</html>
 OptionPanel.script_user_key_name_for_signing=Opcjonalny alias klucza u\u017Cytkownika dla podpisywania skrypt\u00F3w
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>Je\u017Celi chcesz podpisywa\u0107 swoje skrypty, wpisz tutaj alias klucza. <br>Oczekuje si\u0119, \u017Ce klucz jest przechowywany w domy\u015Blnej bazie kluczy. <br>Has\u0142o tajnego klucza musi si\u0119 zgadza\u0107 z has\u0142em bazy kluczy (domy\u015Blnie).</html>
 OptionPanel.scrollbar_increment=Szybko\u015B\u0107 przewijania
+OptionPanel.scrolling_speed=Automatyczna szybko\u015B\u0107 przewijania mapy
+OptionPanel.scrollOnUnfold=Przewi\u0144 map\u0119 po rozwini\u0119ciu w\u0119z\u0142a
 OptionPanel.selection_method=Metoda zaznaczania
-OptionPanel.selection_method.tooltip=<html> Bezpo\u015Brednio: w\u0119ze\u0142 jest zaznaczany od razu po wskazaniu myszk\u0105<br>Z op\u00F3\u017Anieniem: w\u0119ze\u0142 jest zaznaczany po up\u0142yni\u0119ciu okre\u015Blonego czasu od wskazania myszk\u0105<br>Przez klikni\u0119cie: w\u0119ze\u0142 jest zaznaczany klikni\u0119ciu na nim myszk\u0105</html>
+OptionPanel.selection_method.tooltip=<html> za pomoc\u0105 nast\u0119puj\u0105cego prze\u0142\u0105cznika mo\u017Cna w\u0142\u0105czy\u0107/wy\u0142\u0105czy\u0107 schemat wyboru op\u00F3\u017Anionego. Opcje Auto. Nie zmie\u0144 ich, poniewa\u017C b\u0119d\u0105 one tak czy inaczej zapisywane w auto.properties.</html>
 OptionPanel.selection_method_by_click=przez klikni\u0119cie
 OptionPanel.selection_method_delayed=z op\u00F3\u017Anieniem
 OptionPanel.selection_method_direct=bezpo\u015Brednio
 OptionPanel.separator.accessories/plugins/AutomaticLayout.properties_PatternSeparatorName=Szablony
-OptionPanel.separator.anti_alias=Antyaliasing
+OptionPanel.separator.anti_alias=Wyg\u0142adzanie
 OptionPanel.separator.attributes=Atrybuty
 OptionPanel.separator.automatic_save=Automatyczne zapisywanie
 OptionPanel.separator.behaviour=Spos\u00F3b dzia\u0142ania
 OptionPanel.separator.browser=Domy\u015Blne polecenie przegl\u0105dania
+OptionPanel.separator.cache=Pami\u0119\u0107 podr\u0119czna
+OptionPanel.separator.clones=Klony
+OptionPanel.separator.cloud=Chmurki
 OptionPanel.separator.CloudControls=Chmurki
 OptionPanel.separator.commands_for_the_program=Polecenia programu
 OptionPanel.separator.connectors=Po\u0142\u0105czenia
@@ -1089,6 +1313,7 @@ OptionPanel.separator.default_styles=Domy\u015Blne style
 OptionPanel.separator.EdgeControls=Ga\u0142\u0119zie
 OptionPanel.separator.edit_long_node_window=Edytor w\u0119z\u0142\u00F3w
 OptionPanel.separator.editing=Ustawienia edytora
+OptionPanel.separator.export=Eksport
 OptionPanel.separator.files=Pliki
 OptionPanel.separator.formula=Formu\u0142y
 OptionPanel.separator.General=Og\u00F3lne
@@ -1096,17 +1321,22 @@ OptionPanel.separator.html_export=Eksport HTML
 OptionPanel.separator.html_import=Import Html
 OptionPanel.separator.hyperlink_types=Typ odno\u015Bnika
 OptionPanel.separator.icon_properties=Ikony
+OptionPanel.separator.IconControls=Ikony
 OptionPanel.separator.icons=Ikony w "Wybierz ikon\u0119..."
+OptionPanel.separator.Icons=Ikony
 OptionPanel.separator.initial_map_size=Pocz\u0105tkowy rozmiar mapy
 OptionPanel.separator.inline_editor=Edytor in-line w\u0119z\u0142a
+OptionPanel.separator.JoinNodesAction=\u0141\u0105czenie w\u0119z\u0142\u00F3w
 OptionPanel.separator.key_typing=Klawiatura
 OptionPanel.separator.language=J\u0119zyk
-OptionPanel.separator.load=Wczytaj
+OptionPanel.separator.latex=LaTeX
+OptionPanel.separator.load=Wczytywanie
 OptionPanel.separator.look_and_feel=Look and Feel
 OptionPanel.separator.mouse_wheel=K\u00F3\u0142ko myszy
 OptionPanel.separator.new_node_commands=Polecenia tworzenia nowych w\u0119z\u0142\u00F3w
 OptionPanel.separator.node_editing_commands=Polecenia edycji w\u0119z\u0142\u00F3w
 OptionPanel.separator.node_navigation_commands=Polecenia nawigacyjne
+OptionPanel.separator.NodeBorder=Granica w\u0119z\u0142a
 OptionPanel.separator.NodeColors=Kolory w\u0119z\u0142a
 OptionPanel.separator.NodeFont=Czcionka w\u0119z\u0142a
 OptionPanel.separator.NodeShape=Kszta\u0142t w\u0119z\u0142a
@@ -1118,7 +1348,10 @@ OptionPanel.separator.other_defaults=Inne ustawienia domy\u015Blne
 OptionPanel.separator.others=Inne skr\u00F3ty klawiszowe
 OptionPanel.separator.outline_view=Widok konspektu
 OptionPanel.separator.patterns=Szablony
-OptionPanel.separator.root_node_appearance=Wygl\u0105d w\u0119z\u0142a korzenia (Root)
+OptionPanel.separator.presentation=Prezentacja
+OptionPanel.separator.reminderOptions=Opcje przypomnienia
+OptionPanel.separator.RichTextEditor=Bogaty edytor tekstu
+OptionPanel.separator.root_node_appearance=Wygl\u0105d w\u0119z\u0142a korzenia
 OptionPanel.separator.save=Zapisz ustawienia
 OptionPanel.separator.scripting=Skrypty
 OptionPanel.separator.scrollbar=Pasek przewijania
@@ -1128,77 +1361,108 @@ OptionPanel.separator.selection_method=Metoda zaznaczania
 OptionPanel.separator.single_instance_mode=Pojedyncza instancja programu
 OptionPanel.separator.size_limits=Ograniczenie wielko\u015Bci
 OptionPanel.separator.spelling=Opcje sprawdzania pisowni
+OptionPanel.separator.SplitToWordsAction=Dzielenie w\u0119z\u0142a na s\u0142owa
 OptionPanel.separator.status=Wiersz statusu
-OptionPanel.separator.tooltip=Czas dymk\u00F3w podpowiedzi
+OptionPanel.separator.surveys=Ankiety
+OptionPanel.separator.svg_icons=Ikony SVG
+OptionPanel.separator.tooltip=Podpowiedzi
 OptionPanel.separator.undo=Cofnij
 OptionPanel.separator.updates=Aktualizacja programu
 OptionPanel.set_property_text=Zmie\u0144
 OptionPanel.set_property_text.tooltip=Pusty: nie dotykaj; Minus=Usu\u0144 w\u0142a\u015Bciwo\u015B\u0107 (ustaw warto\u015B\u0107 domy\u015Bln\u0105); Plus=Zmie\u0144 w\u0142a\u015Bciwo\u015B\u0107
 OptionPanel.setscript=Zmieni\u0107?
 OptionPanel.setscript.tooltip=Skrypt mo\u017Ce zosta\u0107 powi\u0105zany ze stylem.
+OptionPanel.shape_horizontal_margin=Margines poziomy
+OptionPanel.shape_vertical_margin=Margines pionowy
 OptionPanel.sharp_bezier=Ostra krzywa B\u00E9ziera
 OptionPanel.sharp_linear=Ostra linia
+OptionPanel.shouldCenterSmallMaps=Centruj ma\u0142e mapy
+OptionPanel.show_connectors=Poka\u017C linie po\u0142\u0105cze\u0144
 OptionPanel.show_icon_for_attributes=Poka\u017C ikony atrybut\u00F3w
-OptionPanel.show_node_tooltips=Wy\u015Bwietlaj dymki podpowiedzi dla w\u0119z\u0142\u00F3w
+OptionPanel.show_icons=Poka\u017C ikony
+OptionPanel.show_less_than_N_nodes_by_default_after_load=Za\u0142aduj z mapy lub rozwi\u0144 w\u0119z\u0142y
+OptionPanel.show_node_tooltips=Wy\u015Bwietlaj podpowiedzi dla w\u0119z\u0142\u00F3w
+OptionPanel.show_note_icon_in_tooltip=Poka\u017C ikon\u0119 notatki w podpowiedzi
 OptionPanel.show_note_icons=Poka\u017C ikony notatek
-OptionPanel.show_styles_in_tooltip=Wy\u015Bwietlaj style w\u0119z\u0142a w dymkach podpowiedzi
+OptionPanel.show_styles_in_tooltip=Wy\u015Bwietlaj style w\u0119z\u0142a w podpowiedzi
 OptionPanel.signed_script_are_trusted=Ufaj podpisanym skryptom (zalecane).
 OptionPanel.signed_script_are_trusted.tooltip=Je\u017Celi skrypty s\u0105 podpisane przez zaufanych dostawc\u00F3w (np. przez autor\u00F3w Freeplane lub przez Ciebie), s\u0105 wykowywane bez ogranicze\u0144.
-OptionPanel.single_backup_directory=U\u017Cyj pojedynczego katalogo dla kopii bezpiecze\u0144stwa plik\u00F3w
-OptionPanel.single_backup_directory.tooltip=Okre\u015Bla czy pliki kopii bezpiecze\u0144stwa i automatycznego zapisywania maj\u0105 by\u0107 zapisywane w jednym (globalnie) katalogu zamiast w podkatalogu katalogu w kt\u00F3rym znajduje si\u0119 mapa.
+OptionPanel.simplyhtml.default_paste_mode=Domy\u015Blny tryb wklejania
+OptionPanel.single_backup_directory=U\u017Cyj pojedynczego katalogu dla plik\u00F3w kopii zapasowych
+OptionPanel.single_backup_directory.tooltip=<html> Okre\u015Bla czy pliki kopii bezpiecze\u0144stwa i automatycznego zapisywania maj\u0105 by\u0107 zapisywane w jednym katalogu zamiast w podkatalogu katalogu w kt\u00F3rym znajduje si\u0119 mapa</html>
 OptionPanel.single_backup_directory_path=Katalog kopii bezpiecze\u0144stwa (je\u017Celi powy\u017Csze jest zaznaczone)
 OptionPanel.single_backup_directory_path.tooltip=<html>Zast\u0119puje domy\u015Blny <freeplaneuserdir>/.backup</html>
 OptionPanel.single_instance=Otwieraj pliki w dzia\u0142aj\u0105cej instancji
 OptionPanel.single_instance_force=Tylko jedna instancja programu
+OptionPanel.single_instance_force.tooltip=Unikaj drugiej instancji, nawet je\u015Bli nie ma pliku do za\u0142adowania
 OptionPanel.sk=S\u0142owacki
+OptionPanel.skip_template_selection=Nie pytaj o szablon dla nowej mapy
 OptionPanel.sl=S\u0142owe\u0144ski
+OptionPanel.slow_scroll_selected_node=Przewijaj wybrane w\u0119ze\u0142 p\u0142ynnie
 OptionPanel.spelling_opt_case_sensitive=Uwzgl\u0119dniaj wielko\u015B\u0107 znak\u00F3w
-OptionPanel.spelling_opt_ignore_all_caps_words=Ignoruj s\u0142owa pisane wielkimi literami
+OptionPanel.spelling_opt_ignore_all_caps_words=Ignoruj s\u0142owa pisane wielkimi literami.
+OptionPanel.spelling_opt_ignore_capitalization=Zignoruj du\u017Ce litery na pocz\u0105tku s\u0142owa
 OptionPanel.spelling_opt_ignore_words_with_numbers=Ignoruj s\u0142owa z cyframi
 OptionPanel.spelling_opt_suggestions_limit_dialog=Maksymalna ilo\u015B\u0107 sugestii w oknie dialogowym
 OptionPanel.spelling_opt_suggestions_limit_menu=Maksymalna ilo\u015B\u0107 sugestii w oknie w menu
+OptionPanel.SplitToWordsAction.auxiliaryWordList=lista s\u0142\u00F3w pomocniczych
+OptionPanel.SplitToWordsAction.charactersAcceptedInWord=znaki w s\u0142owach
+OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=pozostaw oryginalny w\u0119ze\u0142 pusty
+OptionPanel.SplitToWordsAction.nodeNumbersInLine=numer w\u0119z\u0142a w wierszu
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=zachowaj oryginalny tekst jako szczeg\u00F3\u0142y
+OptionPanel.spotlight=\u015Awiat\u0142o punktowe
+OptionPanel.spotlight_background_color=Kolor t\u0142a \u015Bwiat\u0142a punktowego
 OptionPanel.sr=Serbski
 OptionPanel.standard_template=Standardowy szablon
 OptionPanel.standardbackgroundcolor=Kolor t\u0142a
-OptionPanel.standardbackgroundcolor.tooltip=<html> Domy\u015Blny kolor t\u0142a (zapis HTML -  #RRGGBB z warto\u015Bciami szestnastkowymi)</html>
+OptionPanel.standardbackgroundcolor.tooltip=<html>Domy\u015Blny kolor t\u0142a w notacji HTML </html>
 OptionPanel.standardcloudcolor=Kolor chmurki
-OptionPanel.standardcloudcolor.tooltip=<html> Domy\u015Blny kolor chmurki (zapis HTML -  #RRGGBB z warto\u015Bciami szestnastkowymi)</html>
+OptionPanel.standardcloudcolor.tooltip=<html>Domy\u015Blny kolor chmurki w notacji HTML </html>
 OptionPanel.standardcloudestyle=Styl chmurki
-OptionPanel.standardcloudestyle.tooltip=<html> Domy\u015Blny styl chmurki. Obecnie tylko "Krzywa B\u00E9ziera" jest obs\u0142ugiwana</html>
-OptionPanel.standarddrawrectangleforselection=Wy\u015Bwietlaj zaznaczone w\u0119z\u0142y w balonach.
+OptionPanel.standardcloudestyle.tooltip=<html>Domy\u015Blny styl chmurki. </html>
+OptionPanel.standardcloudshape=Domy\u015Blny kszta\u0142t chmurek
+OptionPanel.standarddrawrectangleforselection=Wy\u015Bwietlaj zaznaczone w\u0119z\u0142y w balonach
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Zaznaczaj wybrane w\u0119z\u0142y poprzez otoczenie balonem.</html>
 OptionPanel.standardlinkcolor=Kolor po\u0142\u0105cze\u0144
-OptionPanel.standardlinkcolor.tooltip=<html> Domy\u015Blny kolor po\u0142\u0105cze\u0144 (zapis HTML -  #RRGGBB z warto\u015Bciami szestnastkowymi)</html>
+OptionPanel.standardlinkcolor.tooltip=<html>Domy\u015Blny kolor po\u0142\u0105cze\u0144 w notacji HTML </html>
 OptionPanel.standardlinkestyle=Styl po\u0142\u0105czenia
-OptionPanel.standardlinkestyle.tooltip=<html> Domy\u015Blny styl po\u0142\u0105czenia. Obecnie tylko "Krzywa B\u00E9ziera" jest obs\u0142ugiwana</html>
+OptionPanel.standardlinkestyle.tooltip=<html>Domy\u015Blny styl po\u0142\u0105czenia. Obecnie obs\u0142ugiwana jest tylko 'Krzywa B\u00E9ziera' </html>
 OptionPanel.standardselectednodecolor=Kolor zaznaczonego w\u0119z\u0142a
-OptionPanel.standardselectednodecolor.tooltip=<html> Domy\u015Blny kolor zaznaczonego w\u0119z\u0142a (zapis HTML -  #RRGGBB z warto\u015Bciami szestnastkowymi)</html>
+OptionPanel.standardselectednodecolor.tooltip=<html>Domy\u015Blny kolor zaznaczonego w\u0119z\u0142a w notacji HTML (#RRGGBB z warto\u015Bciami szestnastkowymi)</html>
 OptionPanel.standardselectednoderectanglecolor=Kolor balonu wybranego w\u0119z\u0142a
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Kolor balonu zaznaczaj\u0105cego wybrane w\u0119z\u0142y. W notacji html (#RRGGBB w warto\u015Bciach szesnastkowych) </html>
 OptionPanel.STAR=Gwiazda
-OptionPanel.structured_html_import=Importuj HTML jako struktur\u0119 w\u0119z\u0142\u00F3w.
+OptionPanel.statesymbolwidth=Szeroko\u015B\u0107 symbolu pa\u0144stwa
+OptionPanel.structured_html_import=Importuj HTML jako struktur\u0119 w\u0119z\u0142\u00F3w
 OptionPanel.structured_icon_toolbar=Grupuj ikony w pasku narz\u0119dziowym
 OptionPanel.summary=Podsumowanie
 OptionPanel.sv=Szwedzki
 OptionPanel.text.use_ctrl_key=U\u017Cyj 'Przypisz do skr\u00F3tu klawiszowego' z menu Narz\u0119dzia
+OptionPanel.textalignment=Wyr\u00F3wnanie tekstu
 OptionPanel.time_for_automatic_save=Czas pomi\u0119dzy zapisami (ms)
 OptionPanel.time_for_automatic_save.tooltip=<html> Czas pomi\u0119dzy kolejnymi automatycznymi zapisami. Ustaw na 2000000000, aby wy\u0142\u0105czy\u0107</html>
 OptionPanel.time_for_delayed_selection=Op\u00F3\u017Anienie (ms)
 OptionPanel.time_for_delayed_selection.tooltip=<html> Zmienia op\u00F3\u017Anienie zaznaczania. Ustaw na 1, je\u015Bli chcesz zaznacza\u0107 od razu po najechaniu myszk\u0105</html>
+OptionPanel.toolbar_icon_height=Wysoko\u015B\u0107 ikon w pasku narz\u0119dzi
 OptionPanel.toolTipManager.dismissDelay=Czas wy\u015Bwietlania, ms
 OptionPanel.toolTipManager.initialDelay=Op\u00F3\u017Anienie pocz\u0105tkowe, ms
+OptionPanel.toolTipManager.max_tooltip_height=Maksymalna wysoko\u015B\u0107 podpowiedzi
+OptionPanel.toolTipManager.max_tooltip_height.tooltip=Maksymalna wysoko\u015B\u0107 podpowiedzi w pikselach.
 OptionPanel.toolTipManager.max_tooltip_width=Szeroko\u015B\u0107 dymk\u00F3w podpowiedzi
-OptionPanel.toolTipManager.max_tooltip_width.tooltip=<html>Domy\u015Blna szeroko\u015B\u0107 dymku podpowiedzi w pikselach</html>
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Maksymalna szeroko\u015B\u0107 dymku podpowiedzi w pikselach.
 OptionPanel.toolTipManager.reshowDelay=Op\u00F3\u017Anienie ponownego wy\u015Bwietlenia, ms
 OptionPanel.tr=Turecki / T\u00FCrk\u00E7e
 OptionPanel.uk_UA=Ukrai\u0144ski
 OptionPanel.undefined_font=Niezdefiniowana czcionka
 OptionPanel.undo_levels=Ilo\u015B\u0107 zapami\u0119tanych operacji
-OptionPanel.undo_levels.tooltip=<html> Opisuje ile ostatnich operacji mo\u017Ce zosta\u0107 cofni\u0119tych</html>
+OptionPanel.undo_levels.tooltip=<html>Opisuje ile ostatnich operacji mo\u017Ce zosta\u0107 cofni\u0119tych poprzez "Cofinj"</html>
 OptionPanel.unfold_on_paste=Rozwi\u0144 w\u0119ze\u0142 przy wklejaniu
 OptionPanel.unfold_on_paste.tooltip=Rozwi\u0144 w\u0119ze\u0142 przy wklejaniu lub przeci\u0105ganiu
-OptionPanel.use_common_out_point_for_root_node=Ga\u0142\u0119zie wychodz\u0105 z jednego punktu z w\u0119z\u0142a korzenia (Root)
-OptionPanel.use_common_out_point_for_root_node.tooltip=Ga\u0142\u0119zie wychodz\u0105 z jednego punktu z w\u0119z\u0142a korzenia (Root)
+OptionPanel.uniform_shape=Mundur
+OptionPanel.use_common_out_point_for_root_node=Ga\u0142\u0119zie wychodz\u0105 z jednego punktu z w\u0119z\u0142a korzenia
+OptionPanel.use_common_out_point_for_root_node.tooltip=Ga\u0142\u0119zie wychodz\u0105 z jednego punktu z w\u0119z\u0142a korzenia
+OptionPanel.use_svg_icons=U\u017Cywaj ikon SVG
+OptionPanel.use_svg_icons.tooltip=<html>Okre\u015Bla jako\u015B\u0107 renderowania ikon. Ikony SVG potrzebuj\u0105 wi\u0119cej czasu.</html>
 OptionPanel.use_tabbed_pane=U\u017Cuwaj kart
 OptionPanel.use_tabbed_pane.tooltip=Je\u017Celi w\u0142\u0105czone, mapy b\u0119d\u0105 wy\u015Bwietlane w kartach (jak w Firefoksie).
 OptionPanel.validate_classpath_needs_readaccess=Skrypty: Kiedy ustawiasz \u015Bcie\u017Ck\u0119 klas 'classpath' musisz mie\u0107 prawa odczytu w tym katalogu!
@@ -1206,11 +1470,14 @@ OptionPanel.validate_invalid_date_format=Nieprawid\u0142owy standardowy format d
 OptionPanel.validate_invalid_datetime_format=Nieprawid\u0142owy standardowy format dnia-godziny
 OptionPanel.validate_invalid_number_format=Nieprawid\u0142owy standardowy format liczby
 OptionPanel.validate_write_without_read=Skrypty rozwa\u017C dodanie Read/File do Write/File.
-OptionPanel.validation_error=<html><body>B\u0142\u0119dy walidacji:<p><em>{0}</em><p>Zmie\u0144 ustawienia w preferecjach, \u017Ceby naprawi\u0107 b\u0142\u0119dy.</body></html>
+OptionPanel.validation_error=<html><body>B\u0142\u0119dy walidacji:<p><em>{0}</em><p>Zmie\u0144 ustawienia w preferencjach, \u017Ceby naprawi\u0107 b\u0142\u0119dy.</body></html>
 OptionPanel.validation_warning=<html><body>Ostrze\u017Cenia walidacji:<p><em>{0}</em></body></html>
+OptionPanel.vertical_child_gap=Przesuni\u0119cie mi\u0119dzy dzie\u0107mi
+OptionPanel.vertical_child_gap.tooltip=Pionowa odleg\u0142o\u015B\u0107 mi\u0119dzy w\u0119z\u0142ami potomnymi
 OptionPanel.vi=Wietnamski
 OptionPanel.wheel_velocity=Pr\u0119dko\u015B\u0107 k\u00F3\u0142ka
-OptionPanel.wheel_velocity.tooltip=Wy\u017Csza warto\u015B\u0107 powoduje szybsze poruszanie si\u0119 k\u00F3\u0142kiem myszy po mapie
+OptionPanel.wheel_velocity.tooltip=Wy\u017Csza warto\u015B\u0107 powoduje szybsze poruszanie si\u0119 k\u00F3\u0142kiem myszy po mapie.
+OptionPanel.wide_hexagon=Szeroki sze\u015Bciok\u0105t
 OptionPanel.windows=Windows
 OptionPanel.zh_CN=Chi\u0144ski (uproszczony)
 OptionPanel.zh_TW=Chi\u0144ski (tradycyjny)
@@ -1222,7 +1489,7 @@ org.freeplane.plugin.bugreport.dialog.title=Automatyczne raportowanie b\u0142\u0
 org.freeplane.plugin.bugreport.freeplane_team=Wiadomo\u015B\u0107 zespo\u0142u Freeplane
 org.freeplane.plugin.bugreport.lastreport=Otrzymany raport
 org.freeplane.plugin.bugreport.never=Nigdy nie pytaj mnie o pomoc
-org.freeplane.plugin.bugreport.question=<html>Freeplane posiada mechanizm automatycznego raportowania b\u0142\u0119d\u00F3w.<br>Zawarto\u015B\u0107 mapy ani \u017Cadne dane osobiste nie b\u0119d\u0105 nigdy wysy\u0142ane.<br>Raporty b\u0142\u0119d\u00F3w pomog\u0105 nam ulepszy\u0107 program.
+org.freeplane.plugin.bugreport.question=Freeplane posiada mechanizm automatycznego raportowania b\u0142\u0119d\u00F3w.
 org.freeplane.plugin.bugreport.report=Aktualny raport
 org.freeplane.plugin.bugreport.wanted_bug=Wyst\u0105pi\u0142 b\u0142\u0105d wewn\u0119trzny i zosta\u0142 automatycznie zg\u0142oszony.
 org.freeplane.plugin.script.NodeIdHighlighter.node_is_not_defined=W\u0119ze\u0142 {0} nie jes zdefiniowany
@@ -1252,10 +1519,11 @@ PeriodUnit.MONTH=miesi\u0119cy
 PeriodUnit.WEEK=tygodni
 PeriodUnit.YEAR=lat
 plugins/latex/LatexNodeHook.editorTitle=Edytuj formu\u0142\u0119 LaTeX-u
-plugins/script_filter=Filtr skryptowy {0}
+plugins/script_filter=Filtr skrypt\u00F3w {0}
 plugins/script_filter_error={0} powinien by\u0142 zwr\u00F3ci\u0107 warto\u015B\u0107 logiczn\u0105 dla {1}, ale zwr\u00F3ci\u0142 {2}
+plugins/script_filter_execute_error=Wyst\u0105pi\u0142 b\u0142\u0105d podczas wykonywania {0}\ndla w\u0119z\u0142a {1}:\n{2}
 plugins/ScriptEditor.cancel=Anuluj zmiany i wyjd\u017A
-plugins/ScriptEditor.exit=Koniec
+plugins/ScriptEditor.exit=Zapisz i wyjd\u017A
 plugins/ScriptEditor.FORBIDDEN_ACTION=Skrypty groovy maj\u0105 ograniczone uprawnienia. Nast\u0119puj\u0105ce {0,choice,0#File|1#Network|2#Exec} operacje s\u0105 zabronione: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write}. Mo\u017Cesz zmieni\u0107 te ustawienia w preferencjach.
 plugins/ScriptEditor.menu_actions=Akcje
 plugins/ScriptEditor.new_script=Nowy skrypt
@@ -1266,6 +1534,7 @@ plugins/ScriptEditor/window.title=Edytor skrypt\u00F3w
 plugins/ScriptingEngine.illegalAccessToInternalAPI=Nieprawid\u0142owy dost\u0119p do wewn\u0119trznego API (package {0}). - Prosimy o kontakt z zespo\u0142em Freeplane je\u017Celi obecne API nie udost\u0119pnia wystarczaj\u0105cych mo\u017Cliwo\u015Bci.
 plugins/TimeList.xml_Created=Utworzony
 plugins/TimeList.xml_Date=Data
+plugins/TimeList.xml_Details=Detale
 plugins/TimeList.xml_Icons=Ikony
 plugins/TimeList.xml_Modified=Zmieniony
 plugins/TimeList.xml_Notes=Notatki
@@ -1281,26 +1550,29 @@ plugins/TimeManagement.xml_hour=Godzina:
 plugins/TimeManagement.xml_menu_actions=Akcje
 plugins/TimeManagement.xml_minute=Minuta:
 plugins/TimeManagement.xml_reminderButton=Przypomnij mi tego dnia
-plugins/TimeManagement.xml_reminderButton_tooltip=<html> Po naci\u015Bni\u0119ciu alarm jest ustawiany na podany czas. Migaj\u0105ca ikona oznacza alarm.<br>Je\u015Bli zamkniesz mindmap\u0119, alarm zostanie odtworzony po jej ponownym otwarciu</html>
-plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html> Aktualnie mo\u017Ce by\u0107 tylko jedno przypomnienie dla w\u0119z\u0142a.<br>Aktualne przypomnienie jest zaplanowane na {0,date} {0,time}, tw\u00F3j wyb\u00F3r to {1,date} {1,time}.<br><br>Czy chcesz zmieni\u0107 przypomnienie w\u0119z\u0142a  (TAK) <br>lub zachowa\u0107 poprzednie (NIE)?</html>
-plugins/TimeManagement.xml_reminderNode_tooltip=<html> Przypomnienie zaplanowane na {0,date} {0,time}</html>
+plugins/TimeManagement.xml_reminderButton_tooltip=<html>Po naci\u015Bni\u0119ciu alarm jest ustawiany na podany czas. Migaj\u0105ca ikona oznacza alarm.<br>Je\u015Bli zamkniesz map\u0119, alarm zostanie odtworzony po jej ponownym otwarciu.</html>
+plugins/TimeManagement.xml_reminderNode_onlyOneDate=<html>Aktualnie mo\u017Ce by\u0107 tylko jedno przypomnienie dla w\u0119z\u0142a.<br>Aktualne przypomnienie jest zaplanowane na {0,date} {0,time}, tw\u00F3j wyb\u00F3r to {1,date} {1,time}.<br><br>Czy chcesz zmieni\u0107 przypomnienie w\u0119z\u0142a (TAK) <br>lub zachowa\u0107 poprzednie (NIE)?</html>
+plugins/TimeManagement.xml_reminderNode_tooltip=Przypomnienie zaplanowane na {0,date} {0,time}.
 plugins/TimeManagement.xml_remindLaterButton=Przypomnij p\u00F3\u017Aniej
 plugins/TimeManagement.xml_remindLaterButton_tooltip=Przypomnij p\u00F3\u017Aniej
 plugins/TimeManagement.xml_removeReminderButton=Usu\u0144 przypomnienie
-plugins/TimeManagement.xml_removeReminderButton_tooltip=<html> Usu\u0144 wszystkie przypomnienia dla zaznaczonych w\u0119z\u0142\u00F3w</html>
+plugins/TimeManagement.xml_removeReminderButton_tooltip=Usu\u0144 wszystkie przypomnienia dla zaznaczonych w\u0119z\u0142\u00F3w.
 plugins/TimeManagement.xml_Replace=Zamie\u0144
 plugins/TimeManagement.xml_Replace_All=Zamie\u0144 wszystko
 plugins/TimeManagement.xml_Replace_Selected=Zamie\u0144 zaznaczone
 plugins/TimeManagement.xml_Select=Zaznacz
 plugins/TimeManagement.xml_todayButton=Dzisiaj
-plugins/TimeManagement.xml_WindowTitle=Wybierz dat\u0119 przypomnienia
+plugins/TimeManagement.xml_WindowTitle=Zarz\u0105dzanie czasem
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Znajd\u017A i zast\u0105p
-preferences=Preferencje...
+preferences=Preferencje
+presentation=Prezentacja
+presentation.combineAll=Po\u0142\u0105cz wszystkie prezentacje
 print_preview_title=Podgl\u0105d wydruku
 PrintAction.text=Drukuj...
 PrintDirectAction.text=Drukuj
 printing_settings=Ustawienia drukowania
 PrintPreviewAction.text=Podgl\u0105d wydruku...
+program_terminates=B\u0142\u0105d wewn\u0119trzny, program zako\u0144czony.
 progress=Ikona post\u0119pu (%)
 PropertyAction.dialog=Preferencje
 PropertyAction.text=Preferencje...
@@ -1324,9 +1596,12 @@ RedoAction.text=Powt\u00F3rz
 RedoFilterAction.text=Powt\u00F3rz
 regular_expressions=Wyra\u017Cenia regularne
 ReminderHookAction.text=Usu\u0144 przypomnienie
-ReminderHookAction.tooltip=<html> Usuwa zaplanowane zadanie z w\u0119z\u0142a</html>
+ReminderHookAction.tooltip=Usuwa przypomnienie z w\u0119z\u0142a.
+reminderNotification=Zawiadomienie o przypomnieniu
 remove_file_from_list_on_error=Plik {0} nie otwarty. Czy usun\u0105\u0107 go z listy ostatio otwieranych plik\u00F3w?
 remove_shortcut_question=Wymie\u0144 skr\u00F3t klawiszowy?
+RemoveAllAlwaysUnfoldedNodeFlagsAction.text=Odblokuj zwijanie w\u0119z\u0142\u00F3w
+RemoveAllAlwaysUnfoldedNodeFlagsAction.tooltip=Pozwala na zwijanie wszystkich w\u0119z\u0142\u00F3w
 RemoveAllIconsAction.text=Usu\u0144 wszystkie ikony
 RemoveConnectorAction.text=Usu\u0144 po\u0142\u0105czenie
 RemoveEncryption.text=Usu\u0144 has\u0142o
@@ -1339,21 +1614,27 @@ rename=Zmie\u0144 nazw\u0119
 repair_link=Popraw odno\u015Bnik
 repair_link_question=Nie mo\u017Cna za\u0142adowa\u0107 mapy. Naprawi\u0107 odno\u015Bnik r\u0119cznie?
 replace=Zamie\u0144
-replace_shortcut_question=Ten skr\u00F3t klawiaturowy jest obecnie przypisany do\n {0}.\nZmieni\u0107 przypisanie?
+replace_shortcut_question=Ten skr\u00F3t klawiaturowy jest obecnie przypisany do\n  {0}.\nZmieni\u0107 przypisanie?
 replace_shortcut_title=Zamieni\u0107 skr\u00F3t?
 ReportBugAction.text=Zg\u0142o\u015B problem
 RequestFeatureAction.text=Zaproponuj now\u0105 funkcj\u0119
 reset_to_default=U\u017Cyj domy\u015Blnych
 ResetNodeLocationAction.text=Przywr\u00F3\u0107 domy\u015Blne po\u0142o\u017Cenie
-RevertAction.text=Odtw\u00F3rz z lokalnej historii.
+ResetStyleAction.text=Zresetuj styl w\u0119z\u0142a
+RevertAction.text=Odtw\u00F3rz z lokalnej historii
 RevisionPluginAction.text=Pod\u015Bwietlaj zmienione w\u0119z\u0142y
+save=Zapisz
 save_failed=Zapisywanie mapy {0} nie powiod\u0142o si\u0119.
 save_unsaved=Zapisa\u0107 nast\u0119puj\u0105c\u0105 map\u0119 my\u015Bli?
 save_unsaved_styles=Zapisa\u0107 style?
-SaveAcceleratorPresetsAction.text=Zapisz zestaw skr\u00F3t\u00F3w klawiszowych
+SaveAcceleratorPresetsAction.text=Zapisz zestaw skr\u00F3t\u00F3w klawiszowych...
 SaveAction.text=Zapisz
+SaveAction_readonlyMsg=Ta mapa jest tylko do odczytu. Prosz\u0119 u\u017Cyj 'Plik-> Zapisz jako...', aby zapisa\u0107 map\u0119.
+SaveAction_readonlyTitle=Pr\u00F3buj zapisa\u0107 map\u0119 tylko do odczytu
 SaveAll.text=Zapisz wszystko
-SaveAll.tooltip=Zapisz wszystkie otwarte mapy.
+SaveAll.tooltip=Zapisz wszystkie otwarte mapy
+SaveAs_toReadonlyMsg={0} jest tylko do odczytu. Zapisz do innego pliku.
+SaveAs_toReadonlyTitle=Pr\u00F3buj zapisa\u0107 plik tylko do odczytu
 SaveAsAction.text=Zapisz jako...
 saved=Zapisane
 saving_canceled=Zapisywanie anulowane
@@ -1361,19 +1642,24 @@ scanners_not_loaded=Skanery nie mog\u0142y by\u0107 za\u0142adowane, plik uszkod
 scheme_evaluate=Oce\u0144!
 script_execution_disabled=Wykonywanie skrypt\u00F3w wy\u0142\u0105czone (patrz Preferencje -> Wtyczki)
 ScriptEditor.text=Edytor skrypt\u00F3w...
-ScriptEditor.tooltip=Pozwala tworzy\u0107 wi\u0119ksze skrypty w programie Freeplane
+ScriptEditor.tooltip=Pozwala tworzy\u0107 wi\u0119ksze skrypty w programie Freeplane.
 ScriptEditorPanel.changed_cancel=Skrypty zosta\u0142y zmienione. Czy rzeczywi\u015Bcie chcesz porzuci\u0107 te zmiany?
+scripting=Skrypty
 scripting_api_generator_legend=Legenda
 scripting_api_generator_proxy=Proxy
 scripting_api_generator_title=API skrypt\u00F3w
 scripting_api_generator_utilities=Narz\u0119dzia
 scripting_api_generator_web=Zasoby sieciowe
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=Wykonaj skrypty na wszystkich wybranych w\u0119z\u0142ach
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=Wykonaj skrypty rekurencyjnie na wszystkich wybranych w\u0119z\u0142ach
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=Wykonaj skrypty na wybranym w\u0119\u017Ale
 select_favorites_folder=Wska\u017C katalog, w kt\u00F3rym znajduj\u0105 si\u0119 ulubione
 select_file_export_to=Wybierz plik do kt\u00F3rego wyeksportowa\u0107
 select_folder_for_importing=Wska\u017C katalog do zaimportowania
 select_icon=Wybierz ikon\u0119
 select_menu_item_dialog=Wybierz pozycj\u0119 z menu
 select_menu_item_root_node=Menu
+select_template=Wybierz szablon
 SelectAllAction.text=Zaznacz wszystkie widoczne w\u0119z\u0142y
 SelectBranchAction.text=Zaznacz potomk\u00F3w wybranego w\u0119z\u0142a
 SelectedPasteAction.text=Wklej jako...
@@ -1382,10 +1668,18 @@ selection_method_delayed=Z op\u00F3\u017Anieniem
 selection_method_direct=Zaznaczanie przez wskazanie mysz\u0105
 SelectNoteAction.text=Prze\u0142\u0105czenie edycji notatki
 SelectNoteAction.tooltip=Przej\u015Bcie z/do okienka edycji notatki
+set_accelerator_on_next_click_helpmessage=Kliknij na polecenie w menu, aby utworzy\u0107 dla niego skr\u00F3t klawiaturowy.
+SetAccelerator.dialogTitle=Przypisywanie skr\u00F3t\u00F3w klawiszowych
+SetAccelerator.keystrokeDetected=Skr\u00F3t klawiszowy ''{0}'' nie jest przypisany do \u017Cadnej pozycji menu.
 SetAcceleratorOnNextClickAction.text=Przypisz skr\u00F3t klawiszowy
+SetAlwaysUnfoldedNodeFlagsAction.text=Zablokuj zwijanie w\u0119z\u0142\u00F3w
+SetAlwaysUnfoldedNodeFlagsAction.tooltip=Zapobiega zwijaniu obecnie rozwini\u0119tych w\u0119z\u0142\u00F3w
 SetImageByFileChooserAction.text=Obraz (wybierz plik)...
+SetLinkAnchorAction.text=Zakotwicz w\u0119ze\u0142
+SetLinkAnchorAction.tooltip=<html>Zakotwicz wybrany w\u0119ze\u0142 jako element do<br/>utworzenia \u0142\u0105czy lokalnych lub globalnych.
+SetLinkAnchorAction.tooltip_anchored=<html>ustaw wybrany w\u0119ze\u0142 jako kotwic\u0119 do przysz\u0142ego <br/> tworzenia lokalnych lub globalnych link\u00F3w. Aktualna kotwica: <br/> {0}
 SetLinkByFileChooserAction.text=Odno\u015Bnik (wybierz plik)...
-SetLinkByTextFieldAction.text=Odno\u015Bnik (wprowad\u017A r\u0119cznie)...
+SetLinkByTextFieldAction.text=Dodanie lub modyfikacja \u0142\u0105cza...
 SetNodeLink.text=Ustaw odno\u015Bnik w\u0119z\u0142a...
 SetNoteWindowPosition.bottom.text=D\u00F3\u0142
 SetNoteWindowPosition.left.text=Lewo
@@ -1395,14 +1689,20 @@ SetShortenerStateAction.text=Minimalizuj w\u0119ze\u0142
 sf_login_required=Potrzebny login Source Forge. Kontynuowa\u0107?
 ShowAllAttributesAction.text=Poka\u017C wszystkie atrybuty
 ShowAncestorsAction.text=Poka\u017C przodk\u00F3w
-ShowAttributeDialogAction.text=Mened\u017Cer atrybut\u00F3w
+ShowAttributeDialogAction.text=Mened\u017Cer atrybut\u00F3w...
 ShowDescendantsAction.text=Poka\u017C potomk\u00F3w
 ShowFilterToolbarAction.text=Pasek filtr\u00F3w
-ShowFormatPanel.text=Panel formatowania
-ShowFormatPanel.tooltip=Otwiera okno dialowe, w kt\u00F3rym mog\u0105 by\u0107 zmieniane w\u0142a\u015Bciow\u015Bci w\u0119z\u0142\u00F3w i ga\u0142\u0119zi.
+ShowFirstSlideAction.text=Pierwszy slajd
+ShowFirstSlideAndStartPresentationAction.text=Uruchom prezentacj\u0119 od pocz\u0105tku
+ShowFormatPanel.text=Panel narz\u0119dziowy
+ShowFormatPanel.tooltip=Wy\u015Bwietla okno dialogowe, w kt\u00F3rym mo\u017Cna zmienia\u0107 atrybuty w\u0119z\u0142a i ga\u0142\u0119zi.
 ShowHideNoteAction.text=Poka\u017C/schowaj okno notatek
-ShowHideNoteAction.tooltip=Skr\u00F3t w menu do ma\u0142ych strza\u0142ek na linii oddzielaj\u0105cej
+ShowHideNoteAction.tooltip=Pozwala na znikanie/pojawianie si\u0119 panela notatek.
+ShowLastSlideAction.text=Ostatni slajd
+ShowNextChildAction.text=Poka\u017C nast\u0119pny potomny
+ShowNextSlideAction.text=Nast\u0119pny slajd
 ShowNotesInMapAction.text=Wy\u015Bwietlaj notatki w obszarze mapy
+ShowPreviousSlideAction.text=Poprzedni slajd
 ShowSelectedAttributesAction.text=Poka\u017C wybrane atrybuty
 ShowSelectionAsRectangleAction.text=Zaznaczaj pod\u015Bwietleniem t\u0142a w\u0119z\u0142a
 simplyhtml.aboutFrameTitle=O programie
@@ -1417,6 +1717,8 @@ simplyhtml.appendTableColLabel=Dodaj kolumn\u0119
 simplyhtml.appendTableRowLabel=Dodaj wiersz
 simplyhtml.applyCellAttrLabel=Zastosuj do
 simplyhtml.backgroundLabel=T\u0142o:
+simplyhtml.blackFontColorLabel=Czarny
+simplyhtml.blueFontColorLabel=Niebieski
 simplyhtml.boldItalicName=wyt\u0142uszczony+kursywa
 simplyhtml.boldName=wyt\u0142uszczony
 simplyhtml.borderColorLabel=Kolor ramki:
@@ -1446,6 +1748,7 @@ simplyhtml.cTagNamePara=Akapit
 simplyhtml.cTagNameUL=Lista wypunktowana
 simplyhtml.cutLabel=Wytnij
 simplyhtml.cutTip=wytnij do schowka
+simplyhtml.decreaseFontSizeLabel=Mniejszy
 simplyhtml.defaultDocName=Bez tytu\u0142u
 simplyhtml.deleteTableColLabel=Skasuj kolumn\u0119
 simplyhtml.deleteTableRowLabel=Skasuj wiersz
@@ -1478,9 +1781,11 @@ simplyhtml.formatParaLabel=Akapit...
 simplyhtml.formatParaTip=Zmiana format akapitu
 simplyhtml.formatTableLabel=Tabela...
 simplyhtml.formatTableTip=formatuj tabel\u0119
+simplyhtml.greenFontColorLabel=Zielony
 simplyhtml.helpLabel=Pomoc
 simplyhtml.htmlTabTitle=Kod HTML
 simplyhtml.imageFileDesc=Pliki z obrazkami
+simplyhtml.increaseFontSizeLabel=Wi\u0119kszy
 simplyhtml.insertTableColLabel=Wstaw kolumn\u0119
 simplyhtml.insertTableLabel=Tabela...
 simplyhtml.insertTableMsg=Ile kolumn?
@@ -1505,7 +1810,10 @@ simplyhtml.listTypeSquare=kwadratowe wypunktowanie
 simplyhtml.listTypeUpperAlpha=A.,B.,C.,D.
 simplyhtml.listTypeUpperRoman=I.,II.,III.,IV.
 simplyhtml.marginLabel=Zewn\u0119trzny
+simplyhtml.matchApproximately=Dopasuj w przybli\u017Ceniu
+simplyhtml.matchApproximately.tooltip=<html>Czy pozwoli\u0107 na przybli\u017Cone dopasowania,<br/>, czyli wyszukanie 'files' znajdzie 'flies'.</html>
 simplyhtml.matchCase=Rozr\u00F3\u017Cniaj du\u017Ce/ma\u0142e litery
+simplyhtml.matchCase.tooltip=Czy rozr\u00F3\u017Cnia\u0107 wielko\u015B\u0107 liter podczas dopasowywania.
 simplyhtml.newStyleDefaultName=nowy styl
 simplyhtml.nextTableCellLabel=Nast\u0119pna kom\u00F3rka
 simplyhtml.noLineLabel=brak
@@ -1520,15 +1828,19 @@ simplyhtml.paraAlignRightLabel=Do prawej
 simplyhtml.paraAlignRightTip=Wyr\u00F3wnaj akapit do prawej
 simplyhtml.paraStyleDialogTitle=Styl akapitu
 simplyhtml.paraTabLabel=Akapit
+simplyhtml.pasteHTMLLabel=Wklej HTML
 simplyhtml.pasteLabel=Wklej
+simplyhtml.pastePlainTextLabel=Wklej zwyk\u0142y tekst
 simplyhtml.pasteTip=wklej ze schowka
 simplyhtml.plainName=zwyk\u0142y
 simplyhtml.previewLabel=Podgl\u0105d
 simplyhtml.previewText=Tekst pogl\u0105du
 simplyhtml.prevTableCellLabel=Poprzednia kom\u00F3rka
 simplyhtml.printLabel=Drukuj...
+simplyhtml.redFontColorLabel=Czerwony
 simplyhtml.redoLabel=Powt\u00F3rz
 simplyhtml.redoTip=powt\u00F3rz
+simplyhtml.removeFontColorLabel=Usu\u0144 kolor
 simplyhtml.replace=Zamie\u0144...
 simplyhtml.replaceAll=Wszystkie
 simplyhtml.replaceDone=Wykonane
@@ -1538,9 +1850,13 @@ simplyhtml.replaceWith=Zast\u0105p przez:
 simplyhtml.replaceYes=Tak
 simplyhtml.rightLabel=po prawej:
 simplyhtml.searchDown=Szukaj w prz\u00F3d
+simplyhtml.searchDown.tooltip=Wyszukaj od g\u00F3ry do do\u0142u.
 simplyhtml.searchFromStart=Szukaj od pocz\u0105tku
+simplyhtml.searchFromStart.tooltip=Rozpocznij wyszukiwanie u g\u00F3ry zamiast od pozycji kursora.
 simplyhtml.searchUp=Szukaj wstecz
+simplyhtml.searchUp.tooltip=Szukaj od do\u0142u do g\u00F3ry.
 simplyhtml.selectAllLabel=Wybierz wszystko
+simplyhtml.selectedFontColorLabel=Wybrany kolor czcionki
 simplyhtml.sizeLabel=Rozmiar
 simplyhtml.standardStyleName=standardowy
 simplyhtml.strikeLabel=Przekre\u015Blenie
@@ -1574,14 +1890,55 @@ simplyhtml.valignLabel=Wyr\u00F3wnanie pionowe:
 simplyhtml.valignMiddle=do \u015Brodka
 simplyhtml.valignTop=do g\u00F3ry
 simplyhtml.wholeWordsOnly=Tylko ca\u0142e s\u0142owa
+simplyhtml.wholeWordsOnly.tooltip=Wyszukuj ca\u0142e s\u0142owa.
+slide.add=Dodaj
+slide.add.tooltip=Dodaj obecnie wybrane w\u0119z\u0142y do slajdu
+slide.at_center.tooltip=w centrum
+slide.content=Zawarto\u015B\u0107 slajdu
+slide.descendants=Poka\u017C potomk\u00F3w
+slide.edge=na marginesie
+slide.filter=Filtr
+slide.first=Pierwszy
+slide.last=Ostatni
+slide.next=Nast\u0119pny
+slide.nofilter=Brak filtra
+slide.on_the_left.tooltip=po lewej
+slide.on_the_right.tooltip=po lewej
+slide.placenode=Umie\u015B\u0107 wybrany w\u0119ze\u0142
+slide.placenode.tooltip=kiedy prezentowany jest slajd
+slide.present=Prezentuj
+slide.presentation=Prezentacja
+slide.presentations=Prezentacje
+slide.previous=Poprzedni
+slide.remove=Usu\u0144
+slide.remove.tooltip=Usu\u0144 zaznaczone w\u0119z\u0142y z slajdu
+slide.select=Wybierz
+slide.select.tooltip=Wybierz w\u0119z\u0142y slajdu na mapie
+slide.set=Ustaw
+slide.set.tooltip=Zr\u00F3b wybrane w\u0119z\u0142y jako tre\u015B\u0107 slajd\u00F3w
+slide.setfilter=Ustaw filtr
+slide.setfilter.tooltip=Ustaw lub usu\u0144 filtr stosowany przy wy\u015Bwietleniu slajd
+slide.setfoldingstate=Ustaw zwijanie
+slide.setfoldingstate.tooltip=Przywr\u00F3\u0107 bie\u017C\u0105ce zwijanie w pokazie slajd\u00F3w
+slide.setzoom=Ustaw powi\u0119kszenie
+slide.setzoom.tooltip=Ustawia lub usuwa powi\u0119kszenie mapy przy pokazie slajd\u00F3w
+slide.showancestors=Poka\u017C przodk\u00F3w
+slide.showonlyselected=Poka\u017C tylko wybrane w\u0119z\u0142y
+slide.showonlyselected.tooltip=Ukryj inne w\u0119z\u0142y przy pokazie slajdu
+slide.slides=Slajdy
+slide.stop=Stop
 SortNodes.text=Sortuj potomne
-SortNodes.tooltip=Sortuje w\u0119z\u0142y potomne automatycznie
+SortNodes.tooltip=Sortuje wszystkie w\u0119z\u0142y potomne alfabetycznie.
 split=&Podziel
 SplitConditionAction.text=Podziel
 SplitNode.text=Podziel w\u0119ze\u0142
 SplitNode.tooltip=<html>W\u0119ze\u0142 jest podzielony</html>
+SplitToWordsAction.text=Podziel wed\u0142ug {0} wyrazy w wierszu
 STANDARD_FORMAT=Standardowe
+StartPresentationAction.text=Uruchom prezentacj\u0119
+StartPresentationOrShowNextSlideAction.text=Uruchom prezentacj\u0119/Nast\u0119pny slajd
 stop_processing=Stop
+StopPresentationAction.text=Zatrzymaj prezentacj\u0119
 StringFlavorHandler=Tekst niesformatowany jako hierarchia w\u0119z\u0142\u00F3w
 StructuredHtmlFlavorHandler=HTML jako hierarchia w\u0119z\u0142\u00F3w
 style=Styl
@@ -1612,16 +1969,29 @@ styles.subtopic=Podtytu\u0142
 styles.topic=Tytu\u0142
 styles.user-defined=Style zdefiniowane przez u\u017Cytkownika
 styles.website=Strona sieciowa
+styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\n O tym zestawie stylu\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n Niniejsza norma zosta\u0142a opracowana po 11 latach bada\u0144 pedagogicznych o tym, jak uc [...]
 styles_menu=Dost\u0119pne style
 submenu_keystroke_in_use_error=Naci\u015Bni\u0119cie klawiszy {0} nie mo\u017Ce by\u0107 u\u017Cyty dla podmenu {1}. Naci\u015Bni\u0119cie klawiszy usuni\u0119te.
 summary_nodes=W\u0119z\u0142y zbiorcze
 summary_not_possible=Nie mo\u017Cna utworzy\u0107 w\u0119z\u0142a zbiorczego dla aktualnego zaznaczenia
 svg=SVG
 template_dir=Szablony standardowe
+TextAlignAction.CENTER.text=Wy\u015Brodkuj tekst
+TextAlignAction.DEFAULT.text=Domy\u015Blnie
+TextAlignAction.LEFT.text=Wyr\u00F3wnaj tekst do lewej
+TextAlignAction.RIGHT.text=Wyr\u00F3wnaj tekst do prawej
+textalignment=Wyr\u00F3wnanie tekstu
+TextChangeHotKeyAction.text=Set text change hot key (t\u0142umaczenie)
 TimeListAction.text=Poka\u017C zaplanowane zadania...
-TimeListAction.tooltip=<html> Wy\u015Bwietla wszystkie zaplanowane zadania wraz z odpowiednimi w\u0119z\u0142ami</html>
+TimeListAction.tooltip=Wy\u015Bwietla wszystkie zaplanowane czasy wraz z odpowiadaj\u0105cymi im w\u0119z\u0142ami.
 TimeManagementAction.text=Poka\u017C kalendarz...
-TimeManagementAction.tooltip=<html> Pokazuje modu\u0142 kalendarza autorstwa Kai Toedter</html>
+TimeManagementAction.tooltip=<html>Pokazuje modu\u0142 kalendarza autorstwa Kai Toedter</html>
+TimePeriodUnits.days=dni
+TimePeriodUnits.hours=godziny
+TimePeriodUnits.minutes=minuty
+TimePeriodUnits.ms=ms
+TimePeriodUnits.seconds=sekundy
+TimePeriodUnits.weeks=tygodnie
 ToggleChildrenFoldedAction.text=Zwi\u0144/rozwi\u0144 w\u0119z\u0142y potomne
 ToggleDetailsAction.text=Ukryj detale
 ToggleFBarAction.text=Pasek klawiszy funkcyjnych (F-Bar)
@@ -1629,9 +1999,14 @@ ToggleFoldedAction.text=Zwi\u0144/rozwi\u0144 w\u0119ze\u0142
 ToggleFullScreenAction.text=Tryb pe\u0142noekranowy
 ToggleLeftToolbarAction.text=Pasek ikon
 ToggleMenubarAction.text=W\u0142\u0105cz/wy\u0142\u0105cz menu
+ToggleScrollbarsAction.text=Paski przewijania
 ToggleStatusAction.text=Wiersz statusu
 ToggleToolbarAction.text=Pasek narz\u0119dzi
-toolbars=Paski narz\u0119dzi
+TranslatedElement.BORDER=Tekst obramowania
+TranslatedElement.TEXT=Tekst
+TranslatedElement.TOOLTIP=Podpowied\u017A
+uiTextChanger.originalTextIsNotDefined=Brak tekstu
+uiTextChanger.replaceText=Zmiana tekstu polece\u0144 menu
 undefined_error=Nieoczekiwany b\u0142\u0105d. Prosz\u0119 prze\u015Blij o nim wiadomo\u015B\u0107.
 underline=Podkre\u015Blenie
 UnderlineAction.text=Podkre\u015Blenie
@@ -1640,29 +2015,44 @@ UndoAction.text=Cofnij
 UndoFilterAction.text=Cofnij
 unfold=Rozwi\u0144
 UnfoldAllAction.text=Rozwi\u0144 wszystko
-UnfoldAllAction.tooltip=<html> Rozwija zaznaczone w\u0119z\u0142y i ich w\u0119z\u0142y potomne</html>
+UnfoldAllAction.tooltip=<html>Rozwija zaznaczone w\u0119z\u0142y i ich w\u0119z\u0142y potomne</html>
 UnfoldOneLevelAction.text=Rozwi\u0144 jeden poziom
-UnfoldOneLevelAction.tooltip=<html> Rozwija zaznaczone w\u0119z\u0142y o jeden poziom</html>
+UnfoldOneLevelAction.tooltip=Rozwija zaznaczone w\u0119z\u0142y o jeden poziom.
+unparsedLatexPatternFormat=Nie parsowany LaTeX
 up=Do g\u00F3ry
+UpConditionAction.text=W g\u00F3r\u0119
 update_failed=Aktualizacja nie powiod\u0142a si\u0119 z komunikatem {0}
 UpdateCheckAction.text=Sprawd\u017A dost\u0119pno\u015B\u0107 aktualizacji
 updatecheckdialog=Sprawdzanie aktualizacji
-url_error=B\u0142\u0105d! Niepoprawny URL.
+updater.component=Sk\u0142adnik
+updater.goToDownload=Przejd\u017A do pobierania
+updater.version.installed=Zainstalowana wersja
+updater.version.latest=Ostatnia wersja
+updater.version.noUpdateUrl=Brak adresu URL lub strony g\u0142\u00F3wnej dla tego dodatku.
+updater.version.unknown=nieznany
+updater.version.unreachable=Nieosi\u0105galne \u017Ar\u00F3d\u0142o:
+updater.viewChangelog=Wy\u015Bwietl dziennik zmian
+url_error=Ten URL jest niepoprawny!
 url_load_error=Nie mo\u017Cna za\u0142adowa\u0107 mindmapy z URL:
-url_open_error=Nie mo\u017Cna otworzy\u0107 URL {0}
+url_open_error=Nie mo\u017Cna otworzy\u0107 URL {0}.
 used_in_menu=Ten skr\u00F3t nie mo\u017Ce by\u0107 ustawiony, bo jest u\u017Cywany jako skr\u00F3t menu.
 UsePlainTextAction.text=Przekszta\u0142\u0107 na tekst niesformatowany
 user_config_folder=Katalog konfiguracji u\u017Cytkownika: {0}
+user_defined_filters=Filtry u\u017Cytkownika
 user_defined_scale=Skala zdefiniowana przez u\u017Cytkownika
-user_defined_zoom=u\u017Cytkownika...
+user_defined_zoom=U\u017Cytkownika
 user_defined_zoom_status_bar=Zmiana powi\u0119kszenia do warto\u015Bci {0}%.
 user_icon=Ikona u\u017Cytkownika "{0}"
 user_template_dir=Szablony u\u017Cytkownika
 user_zoom=Powi\u0119kszenie wydruku (0.0 - 2.0):
+userScripts=Skrypty
+value_format=Format warto\u015Bci
 version_up_to_date=Ju\u017C u\u017Cywasz najnowszej wersji programu
 view=Widok
 ViewLayoutTypeAction.OUTLINE.text=Widok konspektu
+web_resources=Zasoby internetowe
 WebDocuAction.text=Dokumentacja webowa
+WhatsNewAction.text=Co nowego w Freeplane 1.5.x
 width=Szeroko\u015B\u0107
 wrong_regexp=Nieprawid\u0142owe wyra\u017Cenie regularne "{0}", b\u0142\u0105d {1}
 xslt_export.html=Dokument HTML
@@ -1675,5 +2065,6 @@ xslt_export.ms_word=Word XML (od 2003)
 xslt_export.text=Tekst niesformatowany
 xslt_export_not_possible=Eksport Freeplane XSLT niemo\u017Cliwy
 yes=Tak
+zoom=Powi\u0119kszenie
 ZoomInAction.text=Powi\u0119ksz
 ZoomOutAction.text=Pomniejsz
diff --git a/freeplane/resources/translations/Resources_pt_BR.properties b/freeplane/resources/translations/Resources_pt_BR.properties
index 742ff2e..0d441a9 100644
--- a/freeplane/resources/translations/Resources_pt_BR.properties
+++ b/freeplane/resources/translations/Resources_pt_BR.properties
@@ -15,13 +15,12 @@ accessories/plugins/EncryptNode.properties_7=Cancelar
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Voc\u00EA s\u00F3 pode ativar ou desativar a criptografia de n\u00F3s criptografados. Por favor insira um n\u00F3 desse tipo usando o menu Ferramentas.
 accessories/plugins/EncryptNode.properties_select_me=Me selecione para continuar!
 accessories/plugins/EncryptNode.properties_wrong_password=A senha est\u00E1 incorreta.
+accessories/plugins/Export_JavaWebStart.text=Iniciando Java Web...
 accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exporta o mapa como um documento TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Este \u00E9 um m\u00E9todo padr\u00E3o de exportar utilizando scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Applet Java...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporta o mapa como um applet Java de navegador.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporta o mapa como uma aplica\u00E7\u00E3o Flash.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (vers\u00E3o JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Vers\u00E3o com imagem de mapa clic\u00E1vel)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Recursos do n\u00F3 RESOURCES para o arquivo TaskJuggler...
@@ -186,7 +185,6 @@ cannot_join_nodes_with_children=N\u00E3o \u00E9 poss\u00EDvel unificar n\u00F3s
 cannot_move_into_child_node=N\u00E3o pode ser movido para um n\u00F3 filho
 cannot_move_to_child=N\u00E3o \u00E9 poss\u00EDvel mover o n\u00F3 para um de seus filhos.
 CenterAction.text=Centralizar
-CenterSelectedNodeAction.text=Centralizar o n\u00F3 selecionado
 ChangeConnectorArrowsAction.backward.text=Desenhar seta para tr\u00E1s
 ChangeConnectorArrowsAction.both.text=Desenhar setas para frente e para tr\u00E1s
 ChangeConnectorArrowsAction.forward.text=Desenhar seta para frente
@@ -200,7 +198,6 @@ ChangeNodeLevelLeftsAction.text=Mover n\u00F3 para Esquerda
 ChangeNodeLevelLeftsAction.tooltip=No lado esquerdo da raiz o(s) n\u00F3(s) \u00E9/s\u00E3o deslocado(s) para baixo. Eles se tornam filhos dos seus n\u00F3s g\u00EAmeos. No lado direito da raiz o(s) n\u00F3(s) \u00E9/s\u00E3o deslocado(s)para cima. Diretamente na raiz, o(s) n\u00F3(s) muda(m) de lado.
 ChangeNodeLevelRightsAction.text=Mover n\u00F3 para a Direita
 ChangeNodeLevelRightsAction.tooltip=No lado direito da raiz os n\u00F3s s\u00E3o deslocados para baixo. Eles se tornam filhos da crian\u00E7a acima. No lado esquerdo da raiz os n\u00F3s s\u00E3o deslocados para cima. Diretamente na raiz, os n\u00F3s mudam de lado.
-choose_background_color=Escolha a cor de fundo:
 choose_cloud_color=Escolha a cor da nuvem:
 choose_edge_color=Escolha a cor da borda
 choose_map_background_color=Escolha a cor de fundo do mapa
@@ -236,7 +233,7 @@ CopyIDAction.text=Copiar ID do n\u00F3
 CopyMapStylesAction.text=Copiar o estilo do mapa de...
 CopyMapStylesAction.tooltip=Com esta fun\u00E7\u00E3o voc\u00EA ir\u00E1 pegar os padr\u00F5es de configura\u00E7\u00F5es de outro mapa j\u00E1 existente e ir\u00E1 aplicar no mapa selecionado
 CopyNodeURIAction.text=Copiar URI do n\u00F3
-copyright=Direitos autorais 2000-2016 Time Freeplane e outros
+copyright=Direitos autorais 2000-2017 Time Freeplane e outros
 CopySingleAction.text=Copiar Apenas o N\u00F3 Selecionado
 CopySingleAction.tooltip=Copiar apenas o n\u00F3 selecionado
 CopyStyleExtensionsAction.text=Copiar extens\u00F5es do estilo de n\u00F3
@@ -356,8 +353,6 @@ ExecuteScripts.noScriptsAvailable=Nenhum dispon\u00EDvel
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=Um erro ocorreu durante a execu\u00E7\u00E3o do "script": {0}
 export_failed=A exporta\u00E7\u00E3o falhou
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Exporta\u00E7\u00E3o de arquivo freeplane
 ExportAction.text=Exportar mapa...
 ExportBranchAction.text=Mover ramos para novo mapa...
@@ -706,7 +701,6 @@ latex_editor=Editor LaTeX
 LatexDeleteLatexAction.text=Remover f\u00F3rmula LaTeX
 LatexEditLatexAction.text=Editar f\u00F3rmula LaTeX...
 LatexInsertLatexAction.msg1=<html>Voc\u00EA est\u00E1 tentando inserir uma f\u00F3rmula <i>legacy</i> do LaTeX.<br/> A nova maneira de se criar um texto ou f\u00F3rmula LaTeX est\u00E1 descrito na p\u00E1gina: </html>
-LatexInsertLatexAction.msg2=<html>Em resumo: <ul><li>use um prefixo "\\latex" no n\u00F3 de texto ou</li><li><i>Vizualizar->Painel de Propriedades</i>, em seguida <i>Texto Principal->Formatar->LaTeX</i></li></ul></html>
 LatexInsertLatexAction.text=Adicionar f\u00F3rmula LaTeX...
 latexPatternFormat=LaTeX
 less_than_two_selected_nodes=\u00C9 preciso selecionar ao menos dois n\u00F3s para estabelecer um link.
@@ -828,6 +822,7 @@ ModesMenuAction.File.text=Gerenciador de arquivos
 ModesMenuAction.MindMap.text=Editor de mapa mental
 most_recent_files=Arquivos mais recentes
 MoveAction.text=Mover
+MoveSelectedNodeAction.CENTER.text=Centralizar o n\u00F3 selecionado
 MoveToRootAction.text=Mover para raiz
 NameConditionAction.text=Defina o nome
 navigate=&Navegar
@@ -868,7 +863,6 @@ NextNodeAction.BACK.text=V\u00E1 para o n\u00F3 anterior
 NextNodeAction.BACK_N_FOLD.text=V\u00E1 para o n\u00F3 anterior (colapsar)
 NextNodeAction.FORWARD.text=V\u00E1 para o pr\u00F3ximo n\u00F3
 NextNodeAction.FORWARD_N_FOLD.text=Ir para o pr\u00F3ximo n\u00F3 (recolher)
-NextPresentationItemAction.text=Expandir novo item da apresenta\u00E7\u00E3o
 no=N\u00E3o
 no_copy_attributes_before_paste_attributes=N\u00E3o \u00E9 poss\u00EDvel colar atributos, enquanto alguns n\u00E3o tenham sido copiados.
 NO_FORMAT=Texto
@@ -902,6 +896,7 @@ not_saved_for_image_error=O mapa deve ser salvo antes que voc\u00EA possa escolh
 not_saved_for_link_error=O mapa precisa ser salvo antes que voc\u00EA possa setar uma refer\u00EAncia pelo seletor de arquivos
 note_window_location=posi\u00E7\u00E3o do painel de anota\u00E7\u00F5es
 notes=Anota\u00E7\u00E3o
+NotFoldingNextPresentationItemAction.text=Expandir novo item da apresenta\u00E7\u00E3o
 ok=OK
 OKAction.text=OK
 OnlineReference.text=mapas da documenta\u00E7\u00E3o online
@@ -1162,8 +1157,6 @@ OptionPanel.placenewbranches=Colocar novos balc\u00F5es
 OptionPanel.placenewbranches.tooltip=<html>Onde posicionar os novos balc\u00F5es. Valores v\u00E1lidos s\u00E3o 'primeiro' e '\u00FAltimo' </html>
 OptionPanel.plugin.tooltip=Plugin n\u00E3o-n\u00FAcleo.
 OptionPanel.plugins=Plugins
-OptionPanel.presentation_dimmer_transparency=Apresenta\u00E7\u00E3o redutor de transpar\u00EAncia
-OptionPanel.presentation_mode=Modo de apresenta\u00E7\u00E3o
 OptionPanel.printonwhitebackground=<html>Fundo branco para impress\u00E3o</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Sempre usar fundo branco para impress\u00E3o</html>
 OptionPanel.pt_BR=Portugu\u00EAs brasileiro
@@ -1261,7 +1254,6 @@ OptionPanel.separator.size_limits=Limites de tamanho
 OptionPanel.separator.spelling=Op\u00E7\u00F5es do verificador ortogr\u00E1fico
 OptionPanel.separator.SplitToWordsAction=Dividindo o n\u00F3 por palavras
 OptionPanel.separator.status=Linha de status
-OptionPanel.separator.tooltip=Tempos de dica de ferramenta
 OptionPanel.separator.undo=Desfazer
 OptionPanel.separator.updates=Atualiza\u00E7\u00F5es do programa
 OptionPanel.set_property_text=Mudar
@@ -1336,7 +1328,6 @@ OptionPanel.use_common_out_point_for_root_node=Bordas come\u00E7am de um ponto n
 OptionPanel.use_common_out_point_for_root_node.tooltip=Bordas come\u00E7am de um ponto no n\u00F3 raiz
 OptionPanel.use_tabbed_pane=Usar abas
 OptionPanel.use_tabbed_pane.tooltip=Se selecionado os mapas sao mostrados em abas (como no FireFox :-) ).
-OptionPanel.user_defined_screen_resolution=Resolu\u00E7\u00E3o de tela definida pelo usu\u00E1rio (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripts: Ao definir o caminho de classe voc\u00EA tem que permitir acesso de leitura em arquivos!
 OptionPanel.validate_invalid_date_format=Padr\u00E3o inv\u00E1lido no formato da data
 OptionPanel.validate_invalid_datetime_format=Padr\u00E3o inv\u00E1lido no formato da data e hora
@@ -1552,7 +1543,6 @@ ShowAncestorsAction.text=Mostra ancestrais
 ShowAttributeDialogAction.text=Gerenciador de atributos...
 ShowDescendantsAction.text=Mostra descendentes
 ShowFilterToolbarAction.text=Barra de Filtro (Est\u00E1 Relacionada a Fun\u00E7\u00E3o de Localizar)
-ShowFormatPanel.text=Painel de propriedades
 ShowFormatPanel.tooltip=Apresentar uma caixa de di\u00E1logo na qual atributos de n\u00F3 e borda podem ser alterados ao mesmo tempo.
 ShowHideNoteAction.text=Mostra/esconde janela de notas
 ShowHideNoteAction.tooltip=Is a menu short cut for the little arrows on the splitting line.
@@ -1804,7 +1794,6 @@ ToggleScrollbarsAction.tooltip=Recomenda-se manter esta Barra Oculta.
 ToggleStatusAction.text=Barra de Status
 ToggleStatusAction.tooltip=Recomenda-se manter esta Barra Oculta.
 ToggleToolbarAction.text=Barra de Ferramentas
-toolbars=Barras de ferramentas
 undefined_error=Um erro inesperado ocorreu. Por favor tente reportar um erro.
 underline=Sublinhado
 UnderlineAction.text=Sublinhado
diff --git a/freeplane/resources/translations/Resources_pt_PT.properties b/freeplane/resources/translations/Resources_pt_PT.properties
index bce7236..e7a2a51 100644
--- a/freeplane/resources/translations/Resources_pt_PT.properties
+++ b/freeplane/resources/translations/Resources_pt_PT.properties
@@ -4,7 +4,7 @@ acceleratorPresets=Atalhos predefinidos
 accelerators_loading_error=Imposs\u00EDvel carregar os atalhos de {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Alterar formato dos n\u00F3s
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Alterar padr\u00E3o
-accessories/plugins/EncryptNode.properties_0=Escolha uma senha para o n\u00F3 encriptado
+accessories/plugins/EncryptNode.properties_0=Escolha a senha para o n\u00F3 protegido (encriptado)
 accessories/plugins/EncryptNode.properties_1=As senhas s\u00E3o muito curtas ou n\u00E3o coincidem.
 accessories/plugins/EncryptNode.properties_2=Insira a senha:
 accessories/plugins/EncryptNode.properties_3=Repita a senha:
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Cancelar
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=S\u00F3 se pode alternar o estado de encripta\u00E7\u00E3o num n\u00F3 j\u00E1 encriptado. Insira um n\u00F3 encriptado a partir do menu Ferramentas.
 accessories/plugins/EncryptNode.properties_select_me=Marque-me para continuar!
 accessories/plugins/EncryptNode.properties_wrong_password=A senha n\u00E3o est\u00E1 correcta.
+accessories/plugins/Export_JavaWebStart.text=In\u00EDcio com Java Web...
+accessories/plugins/Export_JavaWebStart.tooltip=Exporta o mapa para in\u00EDcio com Java Web.
 accessories/plugins/ExportWithTWiki.text=Como TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exporta o mapa como um documento TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=Este \u00E9 um m\u00E9todo de exporta\u00E7\u00E3o uniforme utilizando scripts XSLT.
 accessories/plugins/ExportWithXSLT_Applet.text=Como Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exporta o mapa como applet Java para o navegador.
-accessories/plugins/ExportWithXSLT_Flash.text=Como Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exporta o mapa como aplica\u00E7\u00E3o Flash.
 accessories/plugins/ExportWithXSLT_HTML.text=Como XHTML (vers\u00E3o JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=Como XHTML (vers\u00E3o imagem de mapa clic\u00E1vel)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Recursos do n\u00F3 RECURSOS para o ficheiro TaskJuggler...
@@ -69,11 +69,11 @@ addons.installer.success=Instala\u00E7\u00E3o com sucesso.\nA nova extens\u00E3o
 addons.installer.success.update=Actualiza\u00E7\u00E3o de {0} para {1} com sucesso.\nAlgumas fun\u00E7\u00F5es poder\u00E3o s\u00F3 estar dispon\u00EDveis ap\u00F3s reiniciar.
 addons.installer.title=Instalador de extens\u00F5es
 addons.installer.too.new=A vers\u00E3o do Freeplane {0} \u00E9 demasiado recente. Esta extens\u00E3o suporta no m\u00E1ximo a {1}
-addons.installer.too.old=A vers\u00E3o do Freeplane {0} \u00E9 demasiado antiga. Este suplemento requer pelo menos a {1}
+addons.installer.too.old=A vers\u00E3o do Freeplane {0} \u00E9 demasiado antiga. Esta extens\u00E3o requer pelo menos a {1}
 addons.installer.unknown.deinstallation.rules=Regras de desinstala\u00E7\u00E3o {0} desconhecidas
 addons.installer.update=Actualizar da vers\u00E3o {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">S\u00F3 deve instalar extens\u00F5es de fontes seguras. Programas maliciosos podem danificar os seus dados ou violar a sua privacidade.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Adicionar atributos de estilo
 AddStyleAttributes.tooltip=Adicionar atributos de estilo do n\u00F3
 AllMapsNodeListAction.text=Localizar e substituir em todos os mapas
@@ -186,7 +186,6 @@ cannot_join_nodes_with_children=Imposs\u00EDvel juntar n\u00F3s com filhos
 cannot_move_into_child_node=Imposs\u00EDvel mover para n\u00F3-filho
 cannot_move_to_child=Imposs\u00EDvel mover um n\u00F3 para um dos seus n\u00F3s-filho.
 CenterAction.text=Centrar
-CenterSelectedNodeAction.text=Centrar n\u00F3 seleccionado
 ChangeConnectorArrowsAction.backward.text=Desenhar seta atr\u00E1s
 ChangeConnectorArrowsAction.both.text=Desenhar seta dupla
 ChangeConnectorArrowsAction.forward.text=Desenhar seta adiante
@@ -200,7 +199,6 @@ ChangeNodeLevelLeftsAction.text=Mover n\u00F3 para a esquerda
 ChangeNodeLevelLeftsAction.tooltip=\u00C0 esquerda da raiz os n\u00F3s s\u00E3o empurrados para baixo. Tornam-se filhos dos n\u00F3s-m\u00E3e acima. \u00C0 direita da raiz os n\u00F3s s\u00E3o empurrados para cima. Directamente na raiz, os n\u00F3s mudam de lado.
 ChangeNodeLevelRightsAction.text=Mover n\u00F3 \u00E0 direita
 ChangeNodeLevelRightsAction.tooltip=\u00C0 esquerda da raiz os n\u00F3s s\u00E3o empurrados para baixo. Tornam-se filhos dos n\u00F3s-m\u00E3e acima. \u00C0 direita da raiz os n\u00F3s s\u00E3o empurrados para cima. Directamente na raiz, os n\u00F3s mudam de lado.
-choose_background_color=Escolha a cor do fundo:
 choose_cloud_color=Escolha a cor da nuvem:
 choose_edge_color=Escolha a cor da linha:
 choose_map_background_color=Escolha a cor do fundo do mapa:
@@ -211,6 +209,8 @@ ClearLinkAnchorAction.tooltip=<html>eliminar \u00E2ncora do n\u00F3 previamente
 CloneAction.text=Colar clone
 close_btn=Fe&char
 CloseAction.text=Fechar o mapa actual
+CloseAllMapsAction.text=Fechar todos os mapas
+CloseAllOtherMapsAction.text=Fechar todos os outros mapas
 cloud_shapes=Formas da nuvem
 CloudAction.text=Adicionar/remover nuvem
 CloudColorAction.text=Cor da nuvem...
@@ -218,6 +218,15 @@ CloudShapeAction.ARC.text=Arco
 CloudShapeAction.RECT.text=Rect\u00E2ngulo
 CloudShapeAction.ROUND_RECT.text=Rect\u00E2ngulo arredondado
 CloudShapeAction.STAR.text=Estrela
+collection.copy.presentation=Copiar apresenta\u00E7\u00E3o
+collection.copy.slide=Copiar diapositivo
+collection.delete=Eliminar
+collection.down=Abaixo
+collection.move=Mover
+collection.moveTo=Mover para posi\u00E7\u00E3o
+collection.new.presentation=Nova apresenta\u00E7\u00E3o
+collection.new.slide=Novo diapositivo
+collection.up=Acima
 ColorProperty.ResetColor=Repor cor
 combined=Combinado
 condition=Condi\u00E7\u00E3o
@@ -228,14 +237,16 @@ connector_label=R\u00F3tulo da liga\u00E7\u00E3o
 connector_lines=Linhas da liga\u00E7\u00E3o
 connector_shapes=Formas da liga\u00E7\u00E3o
 ConnectorColorAction.text=Cor da liga\u00E7\u00E3o...
+controls=Controlos
 ConvertCloneToIndependentNodeAction.text=Desfazer clonagem
+copy_name={0} (c\u00F3pia)
 CopyAction.text=Copiar
 CopyAction.tooltip=Copiar ramo seleccionado
 CopyAttributes.text=Copiar atributos
 CopyIDAction.text=Copiar ID do n\u00F3
 CopyMapStylesAction.text=Copiar estilo do mapa de...
 CopyNodeURIAction.text=Copiar URL do n\u00F3
-copyright=Copyright \u00A9 2000-2016 Equipa do Freeplane e outros
+copyright=Copyright \u00A9 2000-2017 Equipa do Freeplane e outros
 CopySingleAction.text=Copiar n\u00F3 (simples)
 CopySingleAction.tooltip=Copiar s\u00F3 o n\u00F3 seleccionado
 CopyStyleExtensionsAction.text=Copiar extens\u00F5es do n\u00F3 de estilo
@@ -318,6 +329,7 @@ EditAction.text=Editar n\u00FAcleo do n\u00F3 em linha
 EditAttributesAction.text=Editar atributos em linha
 EditDetailsAction.text=Editar detalhes do n\u00F3 em linha
 EditDetailsInDialogAction.text=Editar detalhes do n\u00F3 em janela
+editEdgeColors=Editar cores da margem
 EditFilterAction.text=Compor filtro
 EditLongAction.text=Editar n\u00FAcleo do n\u00F3 em janela
 EditNoteInDialogAction.text=Editar nota em janela
@@ -353,14 +365,14 @@ ExecuteScripts.noScriptsAvailable=Nenhum dispon\u00EDvel
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=Ocorreu um erro durante a execu\u00E7\u00E3o do script: {0}
 export_failed=Falha na exporta\u00E7\u00E3o
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Exportar para Freeplane
 ExportAction.text=Exportar mapa...
+ExportAllPresentationsAction.text=Exportar todas as apresenta\u00E7\u00F5es para PNG
 ExportBranchAction.text=Mover ramo para novo mapa...
 ExportBranchToHTMLAction.text=Ramo como HTML
 exported_file=ficheiro {0}
 ExportPdf.text=Como PDF...
+ExportPresentationAction.text=Exportar apresenta\u00E7\u00E3o actual para PNG
 ExportSvg.text=Como SVG...
 ExportToHTMLAction.text=Como HTML...
 ExportToImage.jpg.text=Como JPEG...
@@ -382,6 +394,7 @@ f_button_unassigned=<nenhuma ac\u00E7\u00E3o>
 FaqOpenURLAction.text=FAQ
 file=&Ficheiro
 file_already_exists=O ficheiro {0} j\u00E1 existe. Quer substitu\u00ED-lo?
+file_not_accessible=Ficheiro {0} inacess\u00EDvel
 file_not_found=Ficheiro {0} n\u00E3o encontrado
 FileListFlavorHandler=Liga\u00E7\u00F5es a ficheiros
 FileProperties_BranchLeafCount=N\u00FAmero de n\u00F3s finais nos ramos seleccionados:
@@ -637,6 +650,9 @@ icon_penguin=Linux
 icon_positive=Positivo
 icon_prepare=Sem\u00E1foro amarelo
 icon_revision=Revis\u00E3o
+icon_revision-green=Revis\u00E3o verde
+icon_revision-pink=Revis\u00E3o rosa
+icon_revision-red=Revis\u00E3o vermelha
 icon_smiley-angry=Zangado
 icon_smiley-neutral=Neutro
 icon_smiley-oh=Surpreso
@@ -711,7 +727,7 @@ latex_editor=Editar f\u00F3rmula LaTex
 LatexDeleteLatexAction.text=Remover f\u00F3rmula LaTeX
 LatexEditLatexAction.text=Editar f\u00F3rmula LaTeX...
 LatexInsertLatexAction.msg1=<html>Est\u00E1 a tentar inserir uma f\u00F3rmula LaTex <i>antiga</i>.<br/>A nova forma de criar texto/f\u00F3rmulas LaTeX \u00E9 descrita nesta p\u00E1gina:</html>
-LatexInsertLatexAction.msg2=<html>Em resumo: <ul><li>use um prefixo "\\latex " no n\u00F3 de texto ou</li><li><i>Ver->Barras de ferramentas->Janela de propriedades</i> e depois <i>Texto do n\u00FAcleo->Formato->LaTeX</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>Abreviando: <ul><li>use um prefixo "\\latex " no texto do n\u00F3 ou</li><li><i>Ver->Painel de propriedades</i>, separador Formatar, <i>Texto do n\u00FAleo->Formato->LaTeX</i></li></ul></html>
 LatexInsertLatexAction.text=Adicionar f\u00F3rmula LaTeX...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -842,6 +858,9 @@ ModesMenuAction.File.text=Explorador de ficheiros
 ModesMenuAction.MindMap.text=Editor de mapa mental
 most_recent_files=Mapas mais recentes
 MoveAction.text=Mover
+MoveSelectedNodeAction.CENTER.text=Centrar n\u00F3 seleccionado
+MoveSelectedNodeAction.EAST.text=Mover n\u00F3 seleccionado \u00E0 direita
+MoveSelectedNodeAction.WEST.text=Mover n\u00F3 seleccionado \u00E0 esquerda
 MoveToRootAction.text=Ir para a raiz
 NameConditionAction.text=Definir nome
 navigate=&Navegar
@@ -881,7 +900,7 @@ NextNodeAction.BACK.text=Ir para o n\u00F3 anterior
 NextNodeAction.BACK_N_FOLD.text=Ir para o n\u00F3 anterior (dobrar)
 NextNodeAction.FORWARD.text=Ir para o n\u00F3 seguinte
 NextNodeAction.FORWARD_N_FOLD.text=Ir para o n\u00F3 seguinte (dobrar)
-NextPresentationItemAction.text=Desdobrar o pr\u00F3ximo item da apresenta\u00E7\u00E3o
+NextPresentationItemAction.text=Desdobrar item seguinte (dobrar)
 no=N\u00E3o
 no_copy_attributes_before_paste_attributes=N\u00E3o pode colar atributos sem primeiro os ter copiado.
 NO_FORMAT=Texto
@@ -923,6 +942,7 @@ not_saved_for_image_error=O mapa tem de ser gravado antes de definir uma imagem
 not_saved_for_link_error=O mapa tem que ser gravado antes de definir uma liga\u00E7\u00E3o com o selector de ficheiros
 note_window_location=Posi\u00E7\u00E3o do painel de notas
 notes=Nota
+NotFoldingNextPresentationItemAction.text=Desdobrar o pr\u00F3ximo item da apresenta\u00E7\u00E3o
 NotificationOptions.CLOSE=Fechar
 NotificationOptions.REMIND_ME_LATER=Relembrar mais tarde
 NotificationOptions.REMOVE_REMINDER=Remover lembrete
@@ -949,6 +969,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Padr\u
 OptionPanel.ADD_CHILD=Adicionar n\u00F3-filho
 OptionPanel.ADD_SIBLING=Adicionar n\u00F3-irm\u00E3o
 OptionPanel.addons=Extens\u00F5es
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Dobrar todos
 OptionPanel.always_load_last_maps=Carregar \u00FAltimo e novo mapas
 OptionPanel.always_load_last_maps.tooltip=Abrir os \u00FAltimos ficheiros definidos pelas op\u00E7\u00F5es acima, mesmo abrindo o Freeplane com um mapa concreto.
@@ -962,10 +983,12 @@ OptionPanel.antialias.tooltip=<html>Determina a qualidade do mapa. Mais suaviza\
 OptionPanel.antialias_all=Suavizar tudo
 OptionPanel.antialias_edges=Suavizar linhas
 OptionPanel.antialias_none=N\u00E3o suavizar
+OptionPanel.antialias_svg=SVGs suavizados
+OptionPanel.antialias_svg.tooltip=<html>Determina a qualidade do desenho de SVGs. Mais suaviza\u00E7\u00E3o requer mais tempo</html>
 OptionPanel.Appearance=Apar\u00EAncia
 OptionPanel.approximate_search_threshold=Limite para resultados aproximados
 OptionPanel.approximate_search_threshold.tooltip=<html>Limite para resultados aproximados<br/>Veja <font size="2">http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(quanto mais alto menos varia\u00E7\u00F5es<br/>do termo procurado ser\u00E3o encontradas).</html>
-OptionPanel.ar=\u00C1rabe / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
+OptionPanel.ar=\u00C1rabe /\u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=Arco
 OptionPanel.as_parent=Como n\u00F3-m\u00E3e
 OptionPanel.ask=Pergunta
@@ -978,6 +1001,8 @@ OptionPanel.Behaviour=Comportamento
 OptionPanel.bezier=Curva suave (B\u00E9zier)
 OptionPanel.border_color=Cor
 OptionPanel.border_color_matches_edge_color=Usar cor da linha
+OptionPanel.border_dash=Tipo de linha de contorno
+OptionPanel.border_dash_matches_edge_dash=Usar tipo de linha da margem
 OptionPanel.border_width=Espessura da linha
 OptionPanel.border_width_matches_edge_width=Usar espessura da linha
 OptionPanel.bubble=Bolha
@@ -994,6 +1019,8 @@ OptionPanel.cloudcolor=Cor da nuvem
 OptionPanel.cloudshape=Forma da nuvem
 OptionPanel.combined=Combinado
 OptionPanel.compare_as_number=Comparar como n\u00FAmeros
+OptionPanel.connector_arrows=Setas da liga\u00E7\u00E3o
+OptionPanel.connector_dash=Tipo de linha
 OptionPanel.convert_to_current_version=<html>Converter automaticamente mapas de vers\u00F5es anteriores<br/>do Freeplane para a vers\u00E3o atual?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>S\u00F3 pode abrir mapas sem convers\u00E3o para mapas muito grandes <br/>que n\u00E3o precisem de ser convertidos (isto \u00E9 conhecimento especializado).</html>
 OptionPanel.copyFormatToNewSibling=Copiar formato para novos n\u00F3s-irm\u00E3o
@@ -1001,6 +1028,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=Copiar formato com \u00EDcones
 OptionPanel.cs=Checo / \u010Desky
 OptionPanel.cut_nodes_without_question=Cortar n\u00F3s sem confirma\u00E7\u00E3o?
 OptionPanel.cut_nodes_without_question.tooltip=Se esta caixa estiver marcada os n\u00F3s s\u00E3o cortados sem confirma\u00E7\u00E3o. Isto pode causar perda n\u00E3o intencional de informa\u00E7\u00E3o.
+OptionPanel.cut_out_pictures_when_pasting_html=Remover imagens de HTML
 OptionPanel.da=Dinamarqu\u00EAs/Dansk
 OptionPanel.date_format=Formato de data padr\u00E3o
 OptionPanel.date_format.tooltip=CURTO, M\u00C9DIO, LONGO, COMPLETO ou um padr\u00E3o como "MM/dd/aaaa"
@@ -1031,6 +1059,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Mostrar editor em linha para
 OptionPanel.display_node_id=Mostrar ID do n\u00F3
 OptionPanel.edgecolor=Cor da linha
 OptionPanel.edgecolor.tooltip=Propriedade da linha do n\u00F3-m\u00E3e (tamb\u00E9m \u00E9 aplicado aos n\u00F3s-filho)
+OptionPanel.edgedash=Tipo de linha da margem
 OptionPanel.edgestyle=Estilo da linha
 OptionPanel.edgestyle.tooltip=Propriedade da linha do n\u00F3-m\u00E3e (tamb\u00E9m \u00E9 aplicado aos n\u00F3s-filho)
 OptionPanel.edgewidth=Espessura da linha
@@ -1087,6 +1116,7 @@ OptionPanel.groovy_editor_font.tooltip=Utilize 'Di\u00E1logo' ou 'Mono-espa\u00E
 OptionPanel.groovy_editor_font_size=Tamanho da letra do editor Groovy Syntax Highlighting
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Ocultar linha
+OptionPanel.hide_single_end_connectors=Ocultar liga\u00E7\u00F5es finais simples
 OptionPanel.highlight_formulas=Real\u00E7ar f\u00F3rmulas
 OptionPanel.horizontal=Horizontal
 OptionPanel.hr=Croata/hrvatski
@@ -1102,6 +1132,7 @@ OptionPanel.ic_file=Usar o disco
 OptionPanel.ic_ram=Na RAM
 OptionPanel.icon=\u00CDcone
 OptionPanel.icon.tooltip=Se aplicado, o n\u00F3 ter\u00E1 precisamente este \u00EDcone.
+OptionPanel.icon_size=Tamanho do \u00EDcone
 OptionPanel.icons.list=Lista de \u00EDcones padr\u00E3o mostrados
 OptionPanel.icons.list.tooltip=Aqui pode ordenar ou desactivar os \u00EDcones padr\u00E3o. Os \u00EDcones t\u00EAm de estar separados por ";".
 OptionPanel.id=Indon\u00E9sio/Bahasa Indonesia
@@ -1143,6 +1174,8 @@ OptionPanel.lookandfeel.scaleuifonts=Escalar letra do UI
 OptionPanel.lookandfeel.scaleuifonts.tooltip=\u00DAtil para monitores de alta densidade
 OptionPanel.lookandfeel.tooltip=<html>O aspecto visual a utilizar. S\u00E3o aceites 'metal','windows','motif', 'gtk' s\u00E3o suportados, 'mac' s\u00F3 est\u00E1 dispon\u00EDvel em MacOS. Predefinido significa que ser\u00E1 usado o aspecto visual predefinido. Se quiser usar o seu pr\u00F3prio aspecto visual, indique o nome de classe e assegure-se que os correspondentes ficheiros .jar est\u00E3o carregados. Se tiver problemas, escolha 'Nada'. Funciona para applets</html>
 OptionPanel.lt=Lituano/kalba
+OptionPanel.markClones=Pintar marcas de clonagem
+OptionPanel.markSelectedClones=Pintar marcas de clonagem para selec\u00E7\u00E3o
 OptionPanel.max_displayed_node_count=N\u00FAmero m\u00E1ximo de n\u00F3s mostrados
 OptionPanel.max_image_width=Largura m\u00E1xima da imagem inicial
 OptionPanel.max_image_width.tooltip=As novas imagens s\u00E3o ajustadas a esta largura
@@ -1151,8 +1184,10 @@ OptionPanel.max_menu_item_count.tooltip=Limita o n\u00FAmero de itens num sub-me
 OptionPanel.max_node_width=Largura m\u00E1xima do n\u00F3
 OptionPanel.max_node_width.tooltip=<html>O valor m\u00E1ximo da largura do n\u00F3 em pixels</html>
 OptionPanel.max_shortened_text_length=Largura m\u00E1xima de texto abreviado
+OptionPanel.menuItemFontSize=Tamanho da letra do item de menu
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=Largura m\u00EDnima do n\u00F3
+OptionPanel.monitor_size_inches=Tamanho do ecr\u00E3 (pol)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Hex\u00E1gono estreito
 OptionPanel.nb=Noruegu\u00EAs Bokm\u00E5l/Norsk bokm\u00E5l
@@ -1199,6 +1234,8 @@ OptionPanel.parse_latex=Reconhecer LaTeX
 OptionPanel.parse_latex.tooltip=Reconhecer f\u00F3rmulas LaTeX por formato ou prefixo: veja http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Colar como HTML
 OptionPanel.PASTE_PLAIN_TEXT=Colar como texto simples
+OptionPanel.pasteImagesFromFiles=Colar imagens de ficheiros
+OptionPanel.pasteImagesFromFiles.tooltip=Inserir imagem se o ficheiro for largado no mapa
 OptionPanel.path_property_may_not_be_empty=O caminho da propriedade n\u00E3o pode estar vazio! A altera\u00E7\u00E3o foi revertida.
 OptionPanel.patternname=Nome
 OptionPanel.patternname.tooltip=Nome \u00FAnico do padr\u00E3o
@@ -1207,8 +1244,18 @@ OptionPanel.placenewbranches=Colocar novos ramos
 OptionPanel.placenewbranches.tooltip=<html>Onde colocar novos ramos. Valores v\u00E1lidos s\u00E3o 'primeiro' e '\u00FAltimo' </html>
 OptionPanel.plugin.tooltip=Extens\u00F5es n\u00E3o nucleares.
 OptionPanel.plugins=Extens\u00F5es
-OptionPanel.presentation_dimmer_transparency=Regulador de transpar\u00EAncia da apresenta\u00E7\u00E3o
-OptionPanel.presentation_mode=Modo Apresenta\u00E7\u00E3o
+OptionPanel.Presentation=Apresenta\u00E7\u00E3o
+OptionPanel.presentation.combineAll=Combinar todas as apresenta\u00E7\u00F5es
+OptionPanel.presentation.exportDirectory=Nome da pasta da apresenta\u00E7\u00E3o exportada
+OptionPanel.presentation.maxDropBoxRowCount=M\u00E1ximo de linhas na lista pendente
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Aplica-se a selectores de apresenta\u00E7\u00F5es e diaporamas
+OptionPanel.presentation.processesEscapeKey=Tecla Esc termina a apresenta\u00E7\u00E3o
+OptionPanel.presentation.processesNavigationKeys=Teclas de navega\u00E7\u00E3o controlam a apresenta\u00E7\u00E3o
+OptionPanel.presentation.slideDisplaysAllNodes=Desdobrar n\u00F3s diapositivo automaticamente
+OptionPanel.presentation.slowMotion=C\u00E2mara lenta
+OptionPanel.presentation.switchToFullScreen=Activar ecr\u00E3 completo
+OptionPanel.presentation.switchToSpotlight=Activar foco
+OptionPanel.presentation.zoom=Usar amplia\u00E7\u00E3o
 OptionPanel.printonwhitebackground=<html>Fundo branco para impress\u00E3o</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Usar sempre um fundo branco para impress\u00E3o</html>
 OptionPanel.pt_BR=Portuguese(Brazil)/Portugu\u00EAs(Brasil)
@@ -1256,6 +1303,8 @@ OptionPanel.separator.automatic_save=Grava\u00E7\u00E3o autom\u00E1tica
 OptionPanel.separator.behaviour=Comportamento
 OptionPanel.separator.browser=Navegador
 OptionPanel.separator.cache=Mem\u00F3ria
+OptionPanel.separator.clones=Clones
+OptionPanel.separator.cloud=Nuvem
 OptionPanel.separator.CloudControls=Nuvens
 OptionPanel.separator.commands_for_the_program=Comandos para o programa
 OptionPanel.separator.connectors=Liga\u00E7\u00F5es
@@ -1274,7 +1323,9 @@ OptionPanel.separator.html_export=Exporta\u00E7\u00E3o HTML
 OptionPanel.separator.html_import=Importa\u00E7\u00E3o HTML
 OptionPanel.separator.hyperlink_types=Tipos de hiperliga\u00E7\u00E3o
 OptionPanel.separator.icon_properties=\u00CDcones
+OptionPanel.separator.IconControls=\u00CDcones
 OptionPanel.separator.icons=\u00CDcones em "Seleccionar \u00EDcone..."
+OptionPanel.separator.Icons=\u00CDcones
 OptionPanel.separator.initial_map_size=Tamanho inicial do mapa
 OptionPanel.separator.inline_editor=Editor em linha de n\u00F3s
 OptionPanel.separator.JoinNodesAction=Unir n\u00F3s
@@ -1299,6 +1350,7 @@ OptionPanel.separator.other_defaults=Outras predefini\u00E7\u00F5es
 OptionPanel.separator.others=Outros v\u00EDnculos chave
 OptionPanel.separator.outline_view=Vista de destaque
 OptionPanel.separator.patterns=Padr\u00F5es
+OptionPanel.separator.presentation=Apresenta\u00E7\u00E3o
 OptionPanel.separator.reminderOptions=Op\u00E7\u00F5es de lembretes
 OptionPanel.separator.RichTextEditor=Editor de Rich-Text
 OptionPanel.separator.root_node_appearance=Apar\u00EAncia do n\u00F3-raiz
@@ -1314,7 +1366,8 @@ OptionPanel.separator.spelling=Op\u00E7\u00F5es de verifica\u00E7\u00E3o ortogr\
 OptionPanel.separator.SplitToWordsAction=Dividir n\u00F3 em palavras
 OptionPanel.separator.status=Linha de estado
 OptionPanel.separator.surveys=Question\u00E1rios
-OptionPanel.separator.tooltip=Tempo das sugest\u00F5es
+OptionPanel.separator.svg_icons=\u00CDcones SVG
+OptionPanel.separator.tooltip=Sugest\u00F5es
 OptionPanel.separator.undo=Desfazer
 OptionPanel.separator.updates=Actualiza\u00E7\u00F5es do programa
 OptionPanel.set_property_text=Alterar
@@ -1326,9 +1379,12 @@ OptionPanel.shape_vertical_margin=Margem vertical
 OptionPanel.sharp_bezier=Curva precisa (B\u00E9zier)
 OptionPanel.sharp_linear=Linear precisa
 OptionPanel.shouldCenterSmallMaps=Centrar mapas pequenos
+OptionPanel.show_connectors=Mostrar linhas de liga\u00E7\u00E3o
 OptionPanel.show_icon_for_attributes=Mostrar \u00EDcone para atributos
+OptionPanel.show_icons=Mostrar \u00EDcones
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Carregar do mapa ou desdobrar alguns n\u00F3s
 OptionPanel.show_node_tooltips=Mostrar sugest\u00F5es
+OptionPanel.show_note_icon_in_tooltip=Mostrar \u00EDcone de nota na sugest\u00E3o
 OptionPanel.show_note_icons=Mostrar \u00EDcones de notas
 OptionPanel.show_styles_in_tooltip=Mostrar estilos de n\u00F3s nas sugest\u00F5es
 OptionPanel.signed_script_are_trusted=Confiar em scripts assinados (recomendado).
@@ -1344,7 +1400,7 @@ OptionPanel.single_instance_force.tooltip=Evitar uma segunda inst\u00E2ncia mesm
 OptionPanel.sk=Eslovaco/sloven\u010Dina
 OptionPanel.skip_template_selection=Saltar di\u00E1logo de selec\u00E7\u00E3o de modelo
 OptionPanel.sl=Esloveno/sloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=Rolar lentamente para o n\u00F3 seleccionado
+OptionPanel.slow_scroll_selected_node=Rolar suavemente o n\u00F3 seleccionado
 OptionPanel.small_bubble=Bolha pequena
 OptionPanel.small_wide_hexagon=Hex\u00E1gono pequeno
 OptionPanel.spelling_opt_case_sensitive=Distinguir mai\u00FAsculas/min\u00FAsculas
@@ -1358,6 +1414,8 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=Caracteres em palavras
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=manter n\u00F3 original vazio
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=n\u00FAmero do n\u00F3 na linha
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=gravar texto original como detalhes
+OptionPanel.spotlight=Foco
+OptionPanel.spotlight_background_color=Cor de fundo do foco
 OptionPanel.sr=S\u00E9rvio/\u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Ficheiro modelo padr\u00E3o
 OptionPanel.standardbackgroundcolor=Cor padr\u00E3o do fundo
@@ -1366,6 +1424,7 @@ OptionPanel.standardcloudcolor=Cor padr\u00E3o da nuvem
 OptionPanel.standardcloudcolor.tooltip=<html>A cor padr\u00E3o da nuvem em nota\u00E7\u00E3o HTML</html>
 OptionPanel.standardcloudestyle=Estilo padr\u00E3o da nuvem
 OptionPanel.standardcloudestyle.tooltip=<html>O estilo padr\u00E3o da nuvem.</html>
+OptionPanel.standardcloudshape=Forma padr\u00E3o da nuvem
 OptionPanel.standarddrawrectangleforselection=Mostrar n\u00F3s seleccionados em bolhas
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Marcar os n\u00F3s seleccionados com bolhas.</html>
 OptionPanel.standardlinkcolor=Cor padr\u00E3o da liga\u00E7\u00E3o
@@ -1388,6 +1447,7 @@ OptionPanel.time_for_automatic_save=Tempo para grava\u00E7\u00E3o autom\u00E1tic
 OptionPanel.time_for_automatic_save.tooltip=<html> tempo decorrido entre duas grava\u00E7\u00F5es autom\u00E1ticas (em ms): para desactivar grava\u00E7\u00F5es autom\u00E1ticas defina este n\u00FAmero para 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Tempo para atraso da selec\u00E7\u00E3o
 OptionPanel.time_for_delayed_selection.tooltip=<html>O tempo de atraso na selec\u00E7\u00E3o quando o rato est\u00E1 sobre os n\u00F3s (em ms). Altere este valor para 1 se quiser que a selec\u00E7\u00E3o se fa\u00E7a imediatamente ao passar do rato.</html>
+OptionPanel.toolbar_icon_height=Altura do \u00EDcone na barra
 OptionPanel.toolTipManager.dismissDelay=Atraso de sa\u00EDda, ms
 OptionPanel.toolTipManager.initialDelay=Atraso inicial, ms
 OptionPanel.toolTipManager.max_tooltip_height=Altura m\u00E1xima da sugest\u00E3o do n\u00F3
@@ -1405,9 +1465,10 @@ OptionPanel.unfold_on_paste.tooltip=Desdobrar o n\u00F3 ao colar ou arrastar e l
 OptionPanel.uniform_shape=Uniforme
 OptionPanel.use_common_out_point_for_root_node=As linhas come\u00E7am num ponto do n\u00F3-raiz
 OptionPanel.use_common_out_point_for_root_node.tooltip=As linhas come\u00E7am num ponto do n\u00F3-raiz
+OptionPanel.use_svg_icons=Usar \u00EDcones SVG
+OptionPanel.use_svg_icons.tooltip=<html>Determina a qualidade dos \u00EDcones em SVG. Requer mais tempo.</html>
 OptionPanel.use_tabbed_pane=Utilizar separadores
 OptionPanel.use_tabbed_pane.tooltip=Se marcada os mapas s\u00E3o exibidos em separadores (como no FireFox :-) ).
-OptionPanel.user_defined_screen_resolution=Resolu\u00E7\u00E3o de ecr\u00E3 definida pelo utilizador (DPI)
 OptionPanel.validate_classpath_needs_readaccess=Scripts: ao definir o caminho de classe tem de permitir o acesso de leitura dos ficheiros!
 OptionPanel.validate_invalid_date_format=Formato padr\u00E3o de data inv\u00E1lido
 OptionPanel.validate_invalid_datetime_format=Formato padr\u00E3o de data/hora inv\u00E1lido
@@ -1467,7 +1528,7 @@ plugins/script_filter_error={0} devia ter devolvido um valor booleano em {1} mas
 plugins/script_filter_execute_error=Erro ao executar {0}\npara o n\u00F3 {1}:\n{2}
 plugins/ScriptEditor.cancel=&Descartar altera\u00E7\u00F5es e sair
 plugins/ScriptEditor.exit=Gravar e&sair
-plugins/ScriptEditor.FORBIDDEN_ACTION=Os scripts groovy do Freeplane est\u00E3o restringidos. A opera\u00E7\u00E3o  {0,choice,0#File|1#Network|2#Exec} seguinte est\u00E1 proibida: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}. Pode fazer altera\u00E7\u00F5es nas defini\u00E7\u00F5es do programa.
+plugins/ScriptEditor.FORBIDDEN_ACTION=Os scripts groovy do Freeplane est\u00E3o restringidos. A opera\u00E7\u00E3o  {0,choice,0#File|1#Network|2#Exec} seguinte est\u00E1 proibida:\n{1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write} {2}.\nPode fazer altera\u00E7\u00F5es nas defini\u00E7\u00F5es do programa.
 plugins/ScriptEditor.menu_actions=&Ac\u00E7\u00F5es
 plugins/ScriptEditor.new_script=Novo script
 plugins/ScriptEditor.run=Executa&r
@@ -1508,11 +1569,14 @@ plugins/TimeManagement.xml_todayButton=Repor calend\u00E1rio
 plugins/TimeManagement.xml_WindowTitle=Gerir tempo
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Procurar & Substituir
 preferences=Prefer\u00EAncias
+presentation=Apresenta\u00E7\u00E3o
+presentation.combineAll=Combinar todas as apresenta\u00E7\u00F5es
 print_preview_title=Antever impress\u00E3o
 PrintAction.text=Imprimir mapa...
 PrintDirectAction.text=Imprimir
 printing_settings=Escala de impress\u00E3o
 PrintPreviewAction.text=Antever impress\u00E3o...
+program_terminates=Erro interno, programa terminado.
 progress=\u00CDcone de progresso (%)
 PropertyAction.dialog=Prefer\u00EAncias
 PropertyAction.text=Prefer\u00EAncias...
@@ -1571,7 +1635,7 @@ SaveAcceleratorPresetsAction.text=Gravar conjunto de atalhos...
 SaveAction.text=&Gravar mapa
 SaveAction_readonlyMsg=Este mapa \u00E9 s\u00F3 de leitura. Por favor, use "Ficheiro->Gravar mapa como..." para gravar este mapa.
 SaveAction_readonlyTitle=Tentativa de gravar mapa s\u00F3 de leitura
-SaveAll.text=Gr&avar todos os mapas abertos
+SaveAll.text=Gr&avar todos os mapas
 SaveAll.tooltip=Grava todos os mapas abertos
 SaveAs_toReadonlyMsg={0} \u00E9 s\u00F3 de leitura. Por favor, grave num ficheiro diferente.
 SaveAs_toReadonlyTitle=Tentativa de gravar num ficheiro s\u00F3 de leitura
@@ -1632,12 +1696,17 @@ ShowAncestorsAction.text=Mostrar ascendentes
 ShowAttributeDialogAction.text=Gerir atributos...
 ShowDescendantsAction.text=Mostrar descendentes
 ShowFilterToolbarAction.text=Barra de ferramentas de filtros
+ShowFirstSlideAction.text=Primeiro diapositivo
+ShowFirstSlideAndStartPresentationAction.text=Ver apresenta\u00E7\u00E3o desde o in\u00EDcio
 ShowFormatPanel.text=Painel de propriedades
 ShowFormatPanel.tooltip=Mostra um painel onde os atributos do n\u00F3 e da linha podem ser alterados simultaneamente.
 ShowHideNoteAction.text=Mostrar a janela de notas
 ShowHideNoteAction.tooltip=Mostra/oculta a janela de notas.
+ShowLastSlideAction.text=\u00DAltimo diapositivo
 ShowNextChildAction.text=Mostrar n\u00F3-filho seguinte
+ShowNextSlideAction.text=Diapositivo seguinte
 ShowNotesInMapAction.text=Mostrar notas no mapa
+ShowPreviousSlideAction.text=Diapositivo anterior
 ShowSelectedAttributesAction.text=Mostrar atributos seleccionados
 ShowSelectionAsRectangleAction.text=Selec\u00E7\u00E3o rectangular
 simplyhtml.aboutFrameTitle=Acerca desta aplica\u00E7\u00E3o
@@ -1826,6 +1895,42 @@ simplyhtml.valignMiddle=ao centro
 simplyhtml.valignTop=em cima
 simplyhtml.wholeWordsOnly=S\u00F3 palavras inteiras
 simplyhtml.wholeWordsOnly.tooltip=Restringir resultados a palavras inteiras.
+slide.add=Adicionar
+slide.add.tooltip=Adicionar n\u00F3s seleccionados ao diapositivo
+slide.at_center.tooltip=ao centro
+slide.content=Conte\u00FAdo do diapositivo
+slide.descendants=Mostrar descendentes
+slide.edge=na margem
+slide.filter=Filtrar
+slide.first=Primeiro
+slide.last=\u00DAltimo
+slide.next=Seguinte
+slide.nofilter=Sem filtro
+slide.on_the_left.tooltip=\u00E0 esquerda
+slide.on_the_right.tooltip=\u00E0 direita
+slide.placenode=P\u00F4r o n\u00F3 seleccionado
+slide.placenode.tooltip=com diapositivo exibido
+slide.present=Presente
+slide.presentation=Apresenta\u00E7\u00E3o
+slide.presentations=Apresenta\u00E7\u00F5es
+slide.previous=Anterior
+slide.remove=Remover
+slide.remove.tooltip=Remover n\u00F3s seleccionados do diapositivo
+slide.select=Seleccionar
+slide.select.tooltip=Seleccionar n\u00F3s de diapositivo no mapa
+slide.set=Definir
+slide.set.tooltip=Tornar os n\u00F3s seleccionados em conte\u00FAdo do diapositivo
+slide.setfilter=Definir filtro
+slide.setfilter.tooltip=Definir/Remover filtro a aplicar na execu\u00E7\u00E3o do diaporama
+slide.setfoldingstate=Definir dobra
+slide.setfoldingstate.tooltip=Restaurar dobras actuais ao mostrar diapositivo
+slide.setzoom=Definir amplia\u00E7\u00E3o
+slide.setzoom.tooltip=Definir/Remover amplia\u00E7\u00E3o aplicada ao mostrar o diapositivo
+slide.showancestors=Mostrar ascendentes
+slide.showonlyselected=Mostrar s\u00F3 os n\u00F3s seleccionados
+slide.showonlyselected.tooltip=Ocultar outros n\u00F3s ao mostrar diapositivo
+slide.slides=Diapositivos
+slide.stop=Parar
 SortNodes.text=Ordenar n\u00F3s-filho
 SortNodes.tooltip=Ordena alfabeticamente todos os n\u00F3s-filho.
 split=&Dividir
@@ -1834,7 +1939,10 @@ SplitNode.text=Dividir n\u00F3
 SplitNode.tooltip=<html>O n\u00F3 est\u00E1 dividido</html>
 SplitToWordsAction.text=Dividir com {0} palavras na linha
 STANDARD_FORMAT=Padr\u00E3o
+StartPresentationAction.text=Ver apresenta\u00E7\u00E3o
+StartPresentationOrShowNextSlideAction.text=Apresenta\u00E7\u00E3o/Diapositivo seguinte
 stop_processing=Parar
+StopPresentationAction.text=Parar apresenta\u00E7\u00E3o
 StringFlavorHandler=Texto simples como hierarquia dos n\u00F3s
 StructuredHtmlFlavorHandler=HTML como hierarquia dos n\u00F3s
 style=Estilo
@@ -1898,7 +2006,6 @@ ToggleMenubarAction.text=Barra de menus
 ToggleScrollbarsAction.text=Barras de rolamento
 ToggleStatusAction.text=Mostrar barra de estado
 ToggleToolbarAction.text=Barra de ferramentas
-toolbars=Barras de ferramentas
 TranslatedElement.BORDER=Texto do contorno
 TranslatedElement.TEXT=Texto
 TranslatedElement.TOOLTIP=Sugest\u00E3o
diff --git a/freeplane/resources/translations/Resources_ru.properties b/freeplane/resources/translations/Resources_ru.properties
index 547dbd3..3ec516d 100644
--- a/freeplane/resources/translations/Resources_ru.properties
+++ b/freeplane/resources/translations/Resources_ru.properties
@@ -1,5 +1,5 @@
 about_text=Freeplane - \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0434\u043B\u044F \u0440\u0430\u0431\u043E\u0442\u044B \u0441 \u043A\u0430\u0440\u0442\u0430\u043C\u0438 \u043F\u0430\u043C\u044F\u0442\u0438 \u0438 \u043F\u0440\u0438\u043D\u044F\u0442\u0438\u044F \u0440\u0435\u0448\u0435\u043D\u0438\u0439
-AboutAction.text=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435...
+AboutAction.text=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435
 acceleratorPresets=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435 \u0433\u043E\u0440\u044F\u0447\u0438\u0435 \u043A\u043B\u0430\u0432\u0438\u0448\u0438
 accelerators_loading_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0430\u043A\u0441\u0435\u043B\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u0432 \u0438\u0437 {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0444\u043E\u0440\u043C\u0430\u0442 \u0443\u0437\u043B\u043E\u0432
@@ -20,8 +20,6 @@ accessories/plugins/ExportWithTWiki.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440
 accessories/plugins/ExportWithXSLT.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0447\u0435\u0440\u0435\u0437 XSLT - \u0441\u043A\u0440\u0438\u043F\u0442.
 accessories/plugins/ExportWithXSLT_Applet.text=\u041A\u0430\u043A java-\u0430\u043F\u043F\u043B\u0435\u0442...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u0430\u043A java-\u0430\u043F\u043F\u043B\u0435\u0442 \u0434\u043B\u044F \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435.
-accessories/plugins/ExportWithXSLT_Flash.text=\u041A\u0430\u043A Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u0430\u043A flash \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0443.
 accessories/plugins/ExportWithXSLT_HTML.text=\u041A\u0430\u043A XHTML (\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C JavaScript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=\u041A\u0430\u043A XHTML (\u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F \u0441 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u043E\u0439)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u0420\u0435\u0441\u0443\u0440\u0441\u044B \u0438\u0437 \u0443\u0437\u043B\u0430 RESOURCES \u0432 \u0444\u0430\u0439\u043B \u0434\u043B\u044F Taskjuggler...
@@ -186,7 +184,6 @@ cannot_join_nodes_with_children=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436
 cannot_move_into_child_node=\u041D\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044F \u043F\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u0434\u043E\u0447\u0435\u0440\u043D\u0438\u0439 \u0443\u0437\u0435\u043B
 cannot_move_to_child=\u0423\u0437\u0435\u043B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0451\u043D \u0432 \u0441\u0432\u043E\u0439 \u0434\u043E\u0447\u0435\u0440\u043D\u0438\u0439 \u0443\u0437\u0435\u043B.
 CenterAction.text=\u0426\u0435\u043D\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C
-CenterSelectedNodeAction.text=\u0426\u0435\u043D\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u043C\u0435\u0447\u0435\u043D\u044B\u0439 \u0443\u0437\u0435\u043B
 ChangeConnectorArrowsAction.backward.text=\u041D\u0430\u0437\u0430\u0434
 ChangeConnectorArrowsAction.both.text=\u041D\u0430 \u043E\u0431\u043E\u0438\u0445 \u043A\u043E\u043D\u0446\u0430\u0445
 ChangeConnectorArrowsAction.forward.text=\u0412\u043F\u0435\u0440\u0451\u0434
@@ -200,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=\u0423\u0437\u0435\u043B \u0432\u043B\u0435\u043
 ChangeNodeLevelLeftsAction.tooltip=\u0421 \u043B\u0435\u0432\u043E\u0439 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0442 \u043A\u043E\u0440\u043D\u044F \u0443\u0437\u043B\u044B \u0441\u043C\u0435\u0449\u0430\u044E\u0442\u0441\u044F \u0432\u043D\u0438\u0437 \u0438 \u0441\u0442\u0430\u043D\u043E\u0432\u044F\u0442\u0441\u044F \u043F\u043E\u0434\u0447\u0438\u043D\u0451\u043D\u043D\u044B\u043C\u0438 \u0443\u0437\u043B\u0430\u043C\u0438 \u0432\u044B\u0448\u0435\u043B\u0435\u0436\u0430\ [...]
 ChangeNodeLevelRightsAction.text=\u0423\u0437\u0435\u043B \u0432\u043F\u0440\u0430\u0432\u043E
 ChangeNodeLevelRightsAction.tooltip=\u0421 \u043F\u0440\u0430\u0432\u043E\u0439 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0442 \u043A\u043E\u0440\u043D\u044F \u0443\u0437\u043B\u044B \u0441\u043C\u0435\u0449\u0430\u044E\u0442\u0441\u044F \u0432\u043D\u0438\u0437 \u0438 \u0441\u0442\u0430\u043D\u043E\u0432\u044F\u0442\u0441\u044F \u043F\u043E\u0434\u0447\u0438\u043D\u0451\u043D\u043D\u044B\u043C\u0438 \u0443\u0437\u043B\u0430\u043C\u0438 \u0432\u044B\u0448\u0435\u043B\u0435\u0436 [...]
-choose_background_color=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0446\u0432\u0435\u0442 \u0444\u043E\u043D\u0430:
 choose_cloud_color=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0446\u0432\u0435\u0442 \u043E\u0431\u043B\u0430\u043A\u0430:
 choose_edge_color=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0446\u0432\u0435\u0442 \u0440\u0435\u0431\u0440\u0430
 choose_map_background_color=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0446\u0432\u0435\u0442 \u0444\u043E\u043D\u0430 \u0434\u043B\u044F \u043A\u0430\u0440\u0442\u044B
@@ -211,6 +207,8 @@ ClearLinkAnchorAction.tooltip=<html>\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u
 CloneAction.text=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043A\u043B\u043E\u043D
 close_btn=&\u0417\u0430\u043A\u0440\u044B\u0442\u044C
 CloseAction.text=&\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u043A\u0430\u0440\u0442\u0443
+CloseAllMapsAction.text=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0432\u0441\u0435 \u043A\u0430\u0440\u0442\u044B
+CloseAllOtherMapsAction.text=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\u0435 \u043A\u0430\u0440\u0442\u044B
 cloud_shapes=\u0424\u043E\u0440\u043C\u044B \u043E\u0431\u043B\u0430\u043A\u043E\u0432
 CloudAction.text=\u041E\u0431\u043B\u0430\u043A\u043E
 CloudColorAction.text=\u0426\u0432\u0435\u0442 \u043E\u0431\u043B\u0430\u043A\u0430 ...
@@ -218,6 +216,11 @@ CloudShapeAction.ARC.text=\u0414\u0443\u0433\u0430
 CloudShapeAction.RECT.text=\u041F\u0440\u044F\u043C\u043E\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
 CloudShapeAction.ROUND_RECT.text=\u0417\u0430\u043A\u0440\u0443\u0433\u043B\u0451\u043D\u043D\u044B\u0439 \u043F\u0440\u044F\u043C\u043E\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
 CloudShapeAction.STAR.text=\u0417\u0432\u0435\u0437\u0434\u0430
+collection.copy.presentation=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u044E
+collection.copy.slide=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043B\u0430\u0439\u0434
+collection.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
+collection.new.presentation=\u041D\u043E\u0432\u0430\u044F \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u044F
+collection.new.slide=\u041D\u043E\u0432\u044B\u0439 \u0441\u043B\u0430\u0439\u0434
 ColorProperty.ResetColor=\u0412\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0438\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u0446\u0432\u0435\u0442
 combined=\u041A\u043E\u043C\u0431\u0438\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439
 condition=\u0423\u0441\u043B\u043E\u0432\u0438\u0435
@@ -229,13 +232,14 @@ connector_lines=\u041B\u0438\u043D\u0438\u0438 \u0441\u043E\u0435\u0434\u0438\u0
 connector_shapes=\u0424\u043E\u0440\u043C\u044B \u0441\u043E\u0435\u0434\u0438\u043D\u0438\u0442\u0435\u043B\u044F
 ConnectorColorAction.text=\u0426\u0432\u0435\u0442 \u0441\u0432\u044F\u0437\u0438...
 ConvertCloneToIndependentNodeAction.text=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043A\u043B\u043E\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
+copy_name={0} (\u043A\u043E\u043F\u0438\u044F)
 CopyAction.text=&\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C
 CopyAction.tooltip=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u0443\u044E \u0432\u0435\u0442\u0432\u044C
 CopyAttributes.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0410\u0442\u0440\u0438\u0431\u0443\u0442\u044B
 CopyIDAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C I&D \u0443\u0437\u043B\u0430
 CopyMapStylesAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0438\u043B\u044C \u043A\u0430\u0440\u0442\u044B \u0438\u0437...
 CopyNodeURIAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C URI \u0443\u0437\u043B\u0430
-copyright=2000-2016 \\u00A9 \u041F\u0440\u0430\u0432\u0430 \u043F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u0430\u0442 \u043A\u043E\u043C\u0430\u043D\u0434\u0435 Freeplane team \u0438 \u0434\u0440\u0443\u0433\u0438\u043C \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u0430
+copyright=2000-2017 \\u00A9 \u041F\u0440\u0430\u0432\u0430 \u043F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u0430\u0442 \u043A\u043E\u043C\u0430\u043D\u0434\u0435 Freeplane team \u0438 \u0434\u0440\u0443\u0433\u0438\u043C \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u0430
 CopySingleAction.text=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u044D\u0442\u043E\u0442 \u0443\u0437\u0435\u043B
 CopySingleAction.tooltip=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u0443\u0437\u0435\u043B
 CopyStyleExtensionsAction.text=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u0438\u0437 \u0441\u0442\u0438\u043B\u044F
@@ -352,8 +356,6 @@ ExecuteScripts.noScriptsAvailable=\u041D\u0435 \u0434\u043E\u0441\u0442\u0443\u0
 ExecuteScripts.text=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u044B
 ExecuteScriptSecurityError.text=\u0412\u043E \u0432\u0440\u0435\u043C\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0430 \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430: {0}
 export_failed=\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C
-export_pdf_text=\u0424\u043E\u0440\u043C\u0430\u0442 PDF
-export_svg_text=\u041C\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u0443\u0435\u043C\u0430\u044F \u0412\u0435\u043A\u0442\u043E\u0440\u043D\u0430\u044F \u0413\u0440\u0430\u0444\u0438\u043A\u0430 (SVG)
 export_using_xslt=Freeplane \u044D\u043A\u0441\u043F\u043E\u0440\u0442
 ExportAction.text=&\u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u0430\u0440\u0442\u0443...
 ExportBranchAction.text=\u0412\u0435\u0442\u0432\u044C \u043A\u0430\u043A \u043D\u043E\u0432\u0443\u044E \u043A\u0430\u0440\u0442\u0443 ...
@@ -709,7 +711,6 @@ latex_editor=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\
 LatexDeleteLatexAction.text=\u0423\u0434\u0430\u043B\u0438\u0442\u044C LaTe&X \u0444\u043E\u0440\u043C\u0443\u043B\u0443
 LatexEditLatexAction.text=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C &LaTeX \u0444\u043E\u0440\u043C\u0443\u043B\u0443...
 LatexInsertLatexAction.msg1=<html>\u0412\u044B \u043F\u044B\u0442\u0430\u0435\u0442\u0435\u0441\u044C \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C <i>\u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0443\u044E</i> \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTeX.<br/>\u041D\u043E\u0432\u044B\u0439 \u0441\u043F\u043E\u0441\u043E\u0431 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F LaTeX \u0442\u0435\u043A\u0441\u0442\u0430/\u0444\u043E\u0440\u043C\u0443\u043B \u043E\u043F\u0438\u04 [...]
-LatexInsertLatexAction.msg2=<html>\u0412 \u043A\u0440\u0430\u0434\u0446\u0435: <ul><li>\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u043F\u0440\u0435\u0444\u0438\u043A\u0441 "\\latex " \u0432 \u0442\u0435\u043A\u0441\u0442\u0435 \u0443\u0437\u043B\u0430 \u0438\u043B\u0438</li><li><i>\u0412\u0438\u0434 -> \u041F\u0430\u043D\u0435\u043B\u044C \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F </i>, \u0437\u0430\u0442\u0435\u043C <i>  [...]
 LatexInsertLatexAction.text=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C &LaTeX \u0444\u043E\u0440\u043C\u0443\u043B\u0443...
 latexPatternFormat=LaTeX
 LengthUnits.cm=\u0441\u043C
@@ -736,7 +737,7 @@ long_node_changed_submit=\u0412\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u043B
 lots_of_links_warning=\u0412\u044B \u0441\u043E\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044C \u0441\u043E\u0437\u0434\u0430\u0442\u044C \u043C\u043D\u043E\u0433\u043E \u0441\u0432\u044F\u0437\u0435\u0439 \u0441\u0440\u0430\u0437\u0443. \u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u044D\u0442\u043E\u0433\u043E \u0445\u043E\u0442\u0438\u0442\u0435?
 main_menu=\u041C\u0435\u043D\u044E
 main_resource_directory=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043E\u0447\u043D\u044B\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044B: {0}
-MainView.errorUpdateText=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u0432\u043E\u0434\u0430 \u0442\u0435\u043A\u0441\u0442\u0430: {0}\n\u0422\u0435\u043A\u0441\u0442 \u043E\u0448\u0438\u0431\u043A\u0438: {1}
+MainView.errorUpdateText=\u041E\u0448\u0438\u0431\u043A\u0430 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0438 \u0442\u0435\u043A\u0441\u0442\u0430 \u0434\u043B\u044F \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0433\u043E \u0432\u0432\u043E\u0434\u0430: {0}.
 MakeLinkFromAnchorAction.text=\u0421\u0434\u0435\u043B\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u0438\u0437 \u044F\u043A\u043E\u0440\u044F
 MakeLinkFromAnchorAction.tooltip=<html>\u0441\u043E\u0437\u0434\u0430\u0442\u044C \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u0443\u044E \u0438\u043B\u0438 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0443\u044E \u0441\u0441\u044B\u043B\u043A\u0443 \u043E\u0442 \u0443\u0437\u043B\u0430-\u044F\u043A\u043E\u0440\u044F<br/>\u043A \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C\u0443 \u0443\u0437\u043B\u0443</html>
 MakeLinkToAnchorAction.text=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\u0430 \u044F\u043A\u043E\u0440\u044C
@@ -847,6 +848,7 @@ ModesMenuAction.File.text=\u041E\u0431\u043E\u0437\u0440\u0435\u0432\u0430\u0442
 ModesMenuAction.MindMap.text=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043A\u0430\u0440\u0442 \u043C\u044B\u0448\u043B\u0435\u043D\u0438\u044F
 most_recent_files=&\u041D\u0435\u0434\u0430\u0432\u043D\u0438\u0435 \u0444\u0430\u0439\u043B\u044B
 MoveAction.text=\u041F\u0435\u0440\u0435\u043D\u0435\u0441\u0442\u0438
+MoveSelectedNodeAction.CENTER.text=\u0426\u0435\u043D\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E\u043C\u0435\u0447\u0435\u043D\u044B\u0439 \u0443\u0437\u0435\u043B
 MoveToRootAction.text=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u043A\u043E\u0440\u043D\u0435\u0432\u043E\u0439 \u0443\u0437\u0435\u043B
 NameConditionAction.text=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0438\u043C\u044F
 navigate=&\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
@@ -866,7 +868,7 @@ NewerFileRevisionsFoundDialog.file_name=\u0424\u0430\u0439\u043B
 NewerFileRevisionsFoundDialog.file_size=\u0411\u0430\u0439\u0442(\u043E\u0432)
 NewerFileRevisionsFoundDialog.open=&\u041E\u0442\u043A\u0440\u044B\u0442\u044C
 NewerFileRevisionsFoundDialog.open.tooltip=\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0444\u0430\u0439\u043B, \u0434\u0430\u0436\u0435 \u0435\u0441\u043B\u0438 \u043E\u043D \u0443\u0441\u0442\u0430\u0440\u0435\u043B
-NewerFileRevisionsFoundDialog.question=\u041D\u0430\u0439\u0434\u0435\u043D\u0430 \u043D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F {0}!\n\u0412\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u043E\u0442\u043A\u0440\u044B\u0442\u044C {0} (\u0441\u043C. \u043F\u0435\u0440\u0432\u0443\u044E \u0441\u0442\u0440\u043E\u043A\u0443) \u043D\u0435\u0441\u043C\u043E\u0442\u0440\u044F \u043D\u0430 \u044D\u0442\u043E?\n\u0414\u043B\u044F \u0437\u0430\u043C\u0435\u043D\u044B {0} \u0430 [...]
+NewerFileRevisionsFoundDialog.question=\u041D\u0430\u0439\u0434\u0435\u043D\u0430 \u043D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F {0}!
 NewerFileRevisionsFoundDialog.restore=\u0412\u043E&\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C
 NewerFileRevisionsFoundDialog.restore.tooltip=\u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C {0} \u043D\u0430 {1}
 NewerFileRevisionsFoundDialog.title=\u041E\u0431\u043D\u043E\u0440\u0443\u0436\u0435\u043D\u0430 \u043D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F \u0444\u0430\u0439\u043B\u0430!
@@ -886,7 +888,6 @@ NextNodeAction.BACK.text=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\
 NextNodeAction.BACK_N_FOLD.text=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0448\u0438\u0439 \u0443\u0437\u0435\u043B (\u0441\u0432\u0435\u0440\u043D\u0443\u0442\u044C)
 NextNodeAction.FORWARD.text=\u0421\u043B\u0435\u0434\u0443\u0449\u0438\u0439 \u0443\u0437\u0435\u043B
 NextNodeAction.FORWARD_N_FOLD.text=\u0421\u043B\u0435\u0434\u0443\u0449\u0438\u0439 \u0443\u0437\u0435\u043B (\u0441\u0432\u0435\u0440\u043D\u0443\u0442\u044C)
-NextPresentationItemAction.text=\u0420\u0430\u0437\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u043F\u0443\u043D\u043A\u0442 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0438
 no=\u041D\u0435\u0442
 no_copy_attributes_before_paste_attributes=\u0412\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044B, \u043F\u043E\u043A\u0430 \u043D\u0435 \u0441\u043A\u043E\u043F\u0438\u0440\u0443\u0435\u0442\u0435 \u043A\u0430\u043A\u0438\u0435-\u043D\u0438\u0431\u0443\u0434\u044C.
 NO_FORMAT=\u0422\u0435\u043A\u0441\u0442
@@ -912,8 +913,8 @@ NodeExtensions.EditNodeExtensions=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u04
 NodeExtensions.RemoveNodeExtensions=\u0423\u0431\u0440\u0430\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0443\u0437\u043B\u0430
 NodeListAction.text=\u041D\u0430\u0439\u0442\u0438 \u0438 \u0437\u0430\u043C\u0435\u043D\u0438\u0442\u044C...
 NodeListAction.tooltip=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441\u0435 \u0443\u0437\u043B\u044B \u043A\u0430\u043A \u0441\u043F\u0438\u0441\u043E\u043A \u0441 \u043F\u043E\u0438\u0441\u043A\u043E\u043C \u0438 \u0444\u0438\u043B\u044C\u0442\u0440\u043E\u043C.
-NodeShapeAction.bubble.text=\u0422\u0438\u043F \u0443\u0437\u043B\u0430 "&\u041E\u0432\u0430\u043B"
-NodeShapeAction.fork.text=\u0422\u0438\u043F \u0443\u0437\u043B\u0430 "&\u041A\u0440\u0438\u0432\u0430\u044F"
+NodeShapeAction.bubble.text=\u041E\u0432\u0430\u043B
+NodeShapeAction.fork.text=\u041A\u0440\u0438\u0432\u0430\u044F
 NodeShapeAction.narrow_hexagon.text=\u0423\u0437\u043A\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
 NodeShapeAction.oval.text=\u041E\u0432\u0430\u043B
 NodeShapeAction.rectangle.text=\u041F\u0440\u044F\u043C\u043E\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A
@@ -926,6 +927,7 @@ not_saved_for_image_error=\u041A\u0430\u0440\u0442\u0430 \u0434\u043E\u043B\u043
 not_saved_for_link_error=\u041A\u0430\u0440\u0442\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0430 \u043F\u0435\u0440\u0435\u0434 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435\u043C \u0444\u0430\u0439\u043B\u043E\u0432\u043E\u0439 \u0441\u0441\u044B\u043B\u043A\u0438
 note_window_location=\u041F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u0439
 notes=\u0417\u0430\u043C\u0435\u0442\u043A\u0430
+NotFoldingNextPresentationItemAction.text=\u0420\u0430\u0437\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u043F\u0443\u043D\u043A\u0442 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0438
 NotificationOptions.CLOSE=\u0417\u0430\u043A\u0440\u044B\u0442\u044C
 NotificationOptions.REMIND_ME_LATER=\u041D\u0430\u043F\u043E\u043C\u043D\u0438\u0442\u044C \u043F\u043E\u0437\u0436\u0435
 NotificationOptions.REMOVE_REMINDER=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u043D\u0438\u0435
@@ -968,7 +970,7 @@ OptionPanel.antialias_none=\u041D\u0435 \u0441\u0433\u043B\u0430\u0436\u0438\u04
 OptionPanel.Appearance=\u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u0432\u0438\u0434
 OptionPanel.approximate_search_threshold=\u041F\u043E\u0440\u043E\u0433\u043E\u0432\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043B\u044F \u043F\u0440\u0438\u0431\u043B\u0438\u0437\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u0441\u0440\u0430\u0432\u043D\u0435\u043D\u0438\u044F
 OptionPanel.approximate_search_threshold.tooltip=<html>\u041F\u043E\u0440\u043E\u0433\u043E\u0432\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0434\u043B\u044F \u043F\u0440\u0438\u0431\u043B\u0438\u0437\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u0441\u0440\u0430\u0432\u043D\u0435\u043D\u0438\u044F<br/><font size="2">\u0441\u043C. http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(\u0447\u0435\u043C \u0432\u044B\u0448\u0435 \u0437\u043D\u0 [...]
-OptionPanel.ar=\u0410\u0440\u0430\u0431\u0441\u043A\u0438\u0439
+OptionPanel.ar=\u0410\u0440\u0430\u0431\u0441\u043A\u0438\u0439 / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.ARC=\u0414\u0443\u0433\u0430
 OptionPanel.as_parent=\u041A\u0430\u043A \u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C
 OptionPanel.ask=\u0421\u043F\u0440\u043E\u0441\u0438\u0442\u044C
@@ -1001,7 +1003,7 @@ OptionPanel.convert_to_current_version=<html>\u0410\u0432\u0442\u043E\u043C\u043
 OptionPanel.convert_to_current_version.tooltip=<html>\u0422\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u043E\u0447\u0435\u043D\u044C \u0431\u043E\u043B\u044C\u0448\u0438\u0445 \u043A\u0430\u0440\u0442 \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043D\u0435 \u043D\u0443\u0436\u043D\u043E \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C <br>(\u0434\u043B\u044F \u043E\u043F\u044B\u0442\u043D\u044B\u0445 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0 [...]
 OptionPanel.copyFormatToNewSibling=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043D\u0430 \u0434\u043E\u0447\u0435\u0440\u043D\u0438\u0439 \u0443\u0437\u0435\u043B
 OptionPanel.copyFormatToNewSiblingIncludesIcons=\u0421\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u043E\u0440\u043C\u0430\u0442 \u0441 \u0438\u043A\u043E\u043D\u043A\u0430\u043C\u0438
-OptionPanel.cs=\u0427\u0435\u0448\u0441\u043A\u0438\u0439
+OptionPanel.cs=\u0427\u0435\u0448\u0441\u043A\u0438\u0439 / \u010Desky
 OptionPanel.cut_nodes_without_question=\u0412\u044B\u0440\u0435\u0437\u0430\u0442\u044C \u0443\u0437\u043B\u044B \u0431\u0435\u0437 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F?
 OptionPanel.cut_nodes_without_question.tooltip=\u0415\u0441\u043B\u0438 \u044D\u0442\u043E\u0442 \u0444\u043B\u0430\u0433 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D \u0443\u0437\u043B\u044B \u0432\u044B\u0440\u0435\u0437\u0430\u044E\u0442\u0441\u044F \u0431\u0435\u0437 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F. \u042D\u0442\u043E \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u0432\u0430\u0442\u044C \u043F\u043E\u0442\u0435\u0440\ [...]
 OptionPanel.da=\u0414\u0430\u0442\u0441\u043A\u0438\u0439
@@ -1042,7 +1044,7 @@ OptionPanel.EDIT_CURRENT=\u041F\u0435\u0440\u0435\u043F\u0438\u0441\u0430\u0442\
 OptionPanel.edit_on_double_click=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u043E \u0434\u0432\u043E\u0439\u043D\u043E\u043C\u0443 \u0449\u0435\u043B\u0447\u043A\u0443
 OptionPanel.editor_extra_width=\u041E\u0441\u043E\u0431\u044B\u0439 \u0438\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0448\u0438\u0440\u0438\u043D\u044B
 OptionPanel.editor_extra_width.tooltip=<html>\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442, \u043D\u0430 \u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0438\u043A\u0441\u0435\u043B\u0435\u0439 \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0442\u044C \u0448\u0438\u0440\u0438\u043D\u0443 \u0443\u0437\u043B\u0430, \u0435\u0441\u043B\u0438 \u0442\u0435\u043A\u0441\u0442 \u0432\u044B\u0445\u043E\u0434\u0438\u0442 \u0437\u0430 \u0442\u0435\u043A\u0443\u0449\u0438\u [...]
-OptionPanel.el=\u0413\u0440\u0435\u0447\u0435\u0441\u043A\u0438\u0439
+OptionPanel.el=\u0413\u0440\u0435\u0447\u0435\u0441\u043A\u0438\u0439 / \u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC
 OptionPanel.el__buttons_above=\u041A\u043D\u043E\u043F\u043A\u0438 \u0441\u0432\u0435\u0440\u0445\u0443
 OptionPanel.el__enter_confirms_by_default=<\u0412\u0412\u041E\u0414> \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u0434\u0438\u0430\u043B\u043E\u0433
 OptionPanel.el__max_default_window_height=\u041D\u0430\u0438\u0431\u043E\u043B\u044C\u0448\u0430\u044F \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0430\u044F \u0432\u044B\u0441\u043E\u0442\u0430 \u043E\u043A\u043D\u0430
@@ -1113,11 +1115,11 @@ OptionPanel.il__enter_confirms_by_default=<\u0412\u0412\u041E\u0414> \u043F\u043
 OptionPanel.image_cache=\u0434\u043B\u044F \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439
 OptionPanel.indentationUsesTabsInTextOutput=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0442\u0430\u0431\u0443\u043B\u044F\u0446\u0438\u0438 \u0432 \u0432\u044B\u0432\u043E\u0434\u0435 \u0442\u0435\u043A\u0441\u0442\u0430
 OptionPanel.it=\u0418\u0442\u0430\u043B\u044C\u044F\u043D\u0441\u043A\u0438\u0439
-OptionPanel.ja=\u042F\u043F\u043E\u043D\u0441\u043A\u0438\u0439
+OptionPanel.ja=\u042F\u043F\u043E\u043D\u0441\u043A\u0438\u0439 / \u65E5\u672C\u8A9E
 OptionPanel.JoinNodesAction.textSeparators=\u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0442\u0435\u043A\u0441\u0442\u0430
 OptionPanel.key_type_action=\u041F\u0440\u0438 \u043D\u0430\u0431\u043E\u0440\u0435
 OptionPanel.Keystrokes=\u041A\u043B\u0430\u0432\u0438\u0448\u0438
-OptionPanel.ko=\u041A\u043E\u0440\u0435\u0439\u0441\u043A\u0438\u0439
+OptionPanel.ko=\u041A\u043E\u0440\u0435\u0439\u0441\u043A\u0438\u0439 / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0448\u0440\u0438\u0444\u0442\u0430
 OptionPanel.label_font_size=\u0420\u0430\u0437\u043C\u0435\u0440 \u0448\u0440\u0438\u0444\u0442\u0430
 OptionPanel.language=\u042F\u0437\u044B\u043A
@@ -1200,8 +1202,6 @@ OptionPanel.placenewbranches=\u041F\u043E\u0437\u0438\u0446\u0438\u044F \u043D\u
 OptionPanel.placenewbranches.tooltip=<html>\u0413\u0434\u0435 \u0440\u0430\u0437\u043C\u0435\u0449\u0430\u0442\u044C \u043D\u043E\u0432\u044B\u0435 \u0443\u0437\u043B\u044B. \u0412\u043E\u0437\u043C\u043E\u0436\u043D\u044B \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F "\u043F\u0435\u0440\u0432\u044B\u0439" \u0438 "\u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439" </html>
 OptionPanel.plugin.tooltip=\u041D\u0435 \u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0435 \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F.
 OptionPanel.plugins=\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
-OptionPanel.presentation_dimmer_transparency=\u041F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u044F \u0438\u0441\u0447\u0435\u0437\u0430\u0435\u0442, \u0441\u0442\u0430\u043D\u043E\u0432\u044F\u0441\u044C \u043F\u0440\u043E\u0437\u0440\u0430\u0447\u043D\u043E\u0439
-OptionPanel.presentation_mode=\u0420\u0435\u0436\u0438\u043C \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0438
 OptionPanel.printonwhitebackground=<html>\u041F\u0435\u0447\u0430\u0442\u0430\u0442\u044C \u043D\u0430 \u0431\u0435\u043B\u043E\u043C \u0444\u043E\u043D\u0435</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u0412\u0441\u0435\u0433\u0434\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0434\u043B\u044F \u043F\u0435\u0447\u0430\u0442\u0438 \u0431\u0435\u043B\u044B\u0439 \u0444\u043E\u043D</html>
 OptionPanel.pt_BR=\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u044C\u0441\u043A\u0438\u0439 (\u0411\u0440\u0430\u0437\u0438\u043B\u0438\u044F)
@@ -1296,7 +1296,6 @@ OptionPanel.separator.single_instance_mode=\u0417\u0430\u043F\u0443\u0441\u043A
 OptionPanel.separator.size_limits=\u041E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 \u0440\u0430\u0437\u043C\u0435\u0440\u0430
 OptionPanel.separator.spelling=\u041E\u043F\u0446\u0438\u0438 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438 \u043E\u0440\u0444\u043E\u0433\u0440\u0430\u0444\u0438\u0438
 OptionPanel.separator.status=\u0421\u0442\u0440\u043E\u043A\u0430 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u044F
-OptionPanel.separator.tooltip=\u0414\u043B\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438
 OptionPanel.separator.undo=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
 OptionPanel.separator.updates=\u041F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u0435\u0442\u0441\u044F
 OptionPanel.set_property_text=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C
@@ -1319,8 +1318,8 @@ OptionPanel.single_backup_directory_path.tooltip=<html>\u041F\u0435\u0440\u0435\
 OptionPanel.single_instance=\u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0432 \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u043D\u043E\u043C \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u0435
 OptionPanel.single_instance_force=\u0417\u0430\u043F\u0440\u0435\u0442 \u0437\u0430\u043F\u0443\u0441\u043A\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u043D\u044B\u0445 \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u043E\u0432 \u043F\u0440\u0438 \u043B\u044E\u0431\u044B\u0445 \u043E\u0431\u0441\u0442\u043E\u044F\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430\u0445
 OptionPanel.single_instance_force.tooltip=\u0418\u0437\u0431\u0435\u0433\u0430\u0442\u044C \u0437\u0430\u043F\u0443\u0441\u043A\u0430 \u0432\u0442\u043E\u0440\u043E\u0439 \u043A\u043E\u043F\u0438\u0438 \u0434\u0430\u0436\u0435 \u043F\u0440\u0438 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043C\u043E\u0433\u043E \u0444\u0430\u0439\u043B\u0430
-OptionPanel.sk=\u0421\u043B\u043E\u0432\u0430\u0446\u043A\u0438\u0439
-OptionPanel.sl=\u0421\u043B\u043E\u0432\u0435\u043D\u0441\u043A\u0438\u0439
+OptionPanel.sk=\u0421\u043B\u043E\u0432\u0430\u0446\u043A\u0438\u0439 / sloven\u010Dina
+OptionPanel.sl=\u0421\u043B\u043E\u0432\u0435\u043D\u0441\u043A\u0438\u0439 / sloven\u0161\u010Dina
 OptionPanel.slow_scroll_selected_node=\u041C\u0435\u0434\u043B\u0435\u043D\u043D\u0430\u044F \u043F\u0440\u043E\u043A\u0440\u0443\u0442\u043A\u0430 \u0434\u043E \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u0433\u043E \u0443\u0437\u043B\u0430
 OptionPanel.spelling_opt_case_sensitive=\u0427\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043A \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0443
 OptionPanel.spelling_opt_ignore_all_caps_words=\u0418\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0432\u0441\u0435\u0445 \u0441\u043B\u043E\u0432 \u0432 \u0432\u0435\u0440\u0445\u043D\u0435\u043C \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0435.
@@ -1331,9 +1330,9 @@ OptionPanel.spelling_opt_suggestions_limit_menu=\u041C\u0430\u043A\u0441\u0438\u
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u043B\u043E\u0432 \u0432 \u0441\u0442\u0440\u043E\u043A\u0435
 OptionPanel.sr=\u0421\u0435\u0440\u0431\u0441\u043A\u0438\u0439 / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0444\u0430\u0439\u043B \u0448\u0430\u0431\u043B\u043E\u043D\u0430
-OptionPanel.standardbackgroundcolor=\u0426\u0432\u0435\u0442 \u0444\u043E\u043D\u0430
+OptionPanel.standardbackgroundcolor=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0446\u0432\u0435\u0442 \u0444\u043E\u043D\u0430
 OptionPanel.standardbackgroundcolor.tooltip=<html>\u0426\u0432\u0435\u0442 \u0444\u043E\u043D\u0430 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F HTML-\u043D\u043E\u0442\u0430\u0446\u0438\u044F (\u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0432 \u0432\u0438\u0434\u0435 #RRGGBB)</html>
-OptionPanel.standardcloudcolor=\u0426\u0432\u0435\u0442 \u043E\u0431\u043B\u0430\u043A\u043E\u0432
+OptionPanel.standardcloudcolor=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0446\u0432\u0435\u0442 \u043E\u0431\u043B\u0430\u043A\u043E\u0432
 OptionPanel.standardcloudcolor.tooltip=<html>\u0426\u0432\u0435\u0442 \u043E\u0431\u043B\u0430\u043A\u043E\u0432 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F HTML-\u043D\u043E\u0442\u0430\u0446\u0438\u044F (\u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0432 \u0432\u0438\u0434\u0435 #RRG [...]
 OptionPanel.standardcloudestyle=\u0422\u0438\u043F \u043E\u0431\u043B\u0430\u043A\u043E\u0432
 OptionPanel.standardcloudestyle.tooltip=<html>\u0421\u0442\u0438\u043B\u044C \u043E\u0431\u043B\u0430\u043A\u0430 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E. \u0421\u0435\u0439\u0447\u0430\u0441 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E "\u0411\u0435\u0437\u044C\u0435"</html>
@@ -1356,14 +1355,14 @@ OptionPanel.text.use_ctrl_key=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u
 OptionPanel.time_for_automatic_save=\u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432
 OptionPanel.time_for_automatic_save.tooltip=<html>\u043F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u043A \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u043C\u0435\u0436\u0434\u0443 \u0434\u0432\u0443\u043C\u044F \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u043C\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F\u043C\u0438 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u0432 (\u0432 \u043C\u0438\u043B\u043B\u0438\u0441\u0435\ [...]
 OptionPanel.time_for_delayed_selection=\u0412\u0440\u0435\u043C\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0438
-OptionPanel.time_for_delayed_selection.tooltip=<html>\u0412\u0440\u0435\u043C\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 \u0442\u0435\u043C, \u043A\u0430\u043A \u0443\u0437\u0435\u043B \u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0441\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u043C, \u043A\u043E\u0433\u0434\u0430 \u0443\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u044C \u043C\u044B\u0448\u0438 \u043F\u0435\u0440\u0435\u043C\u0435 [...]
+OptionPanel.time_for_delayed_selection.tooltip=<html>\u0412\u0440\u0435\u043C\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0438 \u043F\u0435\u0440\u0435\u0434 \u0442\u0435\u043C, \u043A\u0430\u043A \u0443\u0437\u0435\u043B \u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0441\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u043C, \u043A\u043E\u0433\u0434\u0430 \u0443\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u044C \u043C\u044B\u0448\u0438 \u043F\u0435\u0440\u0435\u043C\u0435 [...]
 OptionPanel.toolTipManager.dismissDelay=\u0414\u043B\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043F\u043E\u043A\u0430\u0437\u0430, \u043C\u0441
 OptionPanel.toolTipManager.initialDelay=\u041D\u0430\u0447\u0430\u043B\u044C\u043D\u0430\u044F \u0437\u0430\u0434\u0435\u0440\u0436\u043A\u0430, \u043C\u0441
 OptionPanel.toolTipManager.max_tooltip_width=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0448\u0438\u0440\u0438\u043D\u0430 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438
 OptionPanel.toolTipManager.max_tooltip_width.tooltip=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0438 \u0432 \u043F\u0438\u043A\u0441\u0435\u043B\u044F\u0445.
 OptionPanel.toolTipManager.reshowDelay=\u0417\u0430\u0434\u0435\u0440\u0436\u043A\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0430, \u043C\u0441
 OptionPanel.tr=\u0422\u0443\u0440\u0435\u0446\u043A\u0438\u0439
-OptionPanel.uk_UA=\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0439
+OptionPanel.uk_UA=\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0439 / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=\u041F\u043E\u0434\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u043E
 OptionPanel.undo_levels=\u0427\u0438\u0441\u043B\u043E \u043E\u0442\u043C\u0435\u043D\u044F\u0435\u043C\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0439
 OptionPanel.undo_levels.tooltip=<html>\u041E\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0435\u0442 \u0447\u0438\u0441\u043B\u043E \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0439, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C.</html>
@@ -1373,7 +1372,6 @@ OptionPanel.use_common_out_point_for_root_node=\u0412\u0435\u0442\u0432\u0438 \u
 OptionPanel.use_common_out_point_for_root_node.tooltip=<html>\u0412\u0435\u0442\u0432\u0438 \u043D\u0430\u0447\u0438\u043D\u0430\u044E\u0442\u0441\u044F \u043E\u0442 \u043E\u0434\u043D\u043E\u0439 \u0438\u0437 \u0442\u043E\u0447\u0435\u043A, \u043D\u0430\u0445\u043E\u0434\u044F\u0449\u0438\u0445\u0441\u044F \u043D\u0430 \u043B\u0435\u0432\u043E\u043C \u0438\u043B\u0438 \u043F\u0440\u0430\u0432\u043E\u043C \u043A\u0440\u0430\u044E \u044D\u043B\u043B\u0438\u043F\u0441\u0430, \u043E\u0431\u [...]
 OptionPanel.use_tabbed_pane=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432\u043A\u043B\u0430\u0434\u043A\u0438
 OptionPanel.use_tabbed_pane.tooltip=\u0415\u0441\u043B\u0438 \u043E\u043F\u0446\u0438\u044F \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430, \u043A\u0430\u0440\u0442\u044B \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u044E\u0442\u0441\u044F \u0432\u043E \u0432\u043A\u043B\u0430\u0434\u043A\u0430\u0445 (\u043A\u0430\u043A \u0432 FireFox).
-OptionPanel.user_defined_screen_resolution=\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u0434\u0438\u0441\u043F\u043B\u0435\u044F, \u0437\u0430\u0434\u0430\u043D\u043D\u043E\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C (dpi)
 OptionPanel.validate_classpath_needs_readaccess=\u0421\u043A\u0440\u0438\u043F\u0442\u044B: \u041F\u0440\u0438 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0435 \u043F\u0443\u0442\u0438 \u043A \u043A\u043B\u0430\u0441\u0441\u0430\u043C \u043D\u0443\u0436\u043D\u043E \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435 \u043D\u0430 \u0434\u043E\u0441\u0442\u0443\u043F \u043A \u0447\u0442\u0435\u043D\u0438\u044E \u0444\u0430\u0439\u043B\u043E\u0432!
 OptionPanel.validate_invalid_date_format=\u041D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B\u0439 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u044B
 OptionPanel.validate_invalid_datetime_format=\u041D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B\u0439 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u044B/\u0432\u0440\u0435\u043C\u0435\u043D\u0438
@@ -1381,12 +1379,12 @@ OptionPanel.validate_invalid_number_format=\u041D\u0435\u0434\u043E\u043F\u0443\
 OptionPanel.validate_write_without_read=\u0421\u043A\u0440\u0438\u043F\u0442\u044B: \u0440\u0430\u0441\u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0437\u0430\u043F\u0438\u0441\u044C \u0444\u0430\u0439\u043B\u0430 \u043A \u0447\u0442\u0435\u043D\u0438\u044E \u0444\u0430\u0439\u043B\u0430.
 OptionPanel.validation_error=<html><body>\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438(\u043E\u043A):<p><em>{0}</em><p>\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u043B\u044F \u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043E\u0448\u0438\u0431\u043A\u0438(\u043E\u043A).</body></html>
 OptionPanel.validation_warning=<html><body>\u041F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u044F \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438(\u043E\u043A):<p><em>{0}</em></body></html>
-OptionPanel.vi=\u0412\u044C\u0435\u0442\u043D\u0430\u043C\u0441\u043A\u0438\u0439
+OptionPanel.vi=\u0412\u044C\u0435\u0442\u043D\u0430\u043C\u0441\u043A\u0438\u0439 / Ti\u1EBFng Vi\u1EC7t
 OptionPanel.wheel_velocity=\u0421\u043A\u043E\u0440\u043E\u0441\u0442\u044C
 OptionPanel.wheel_velocity.tooltip=\u0411\u043E\u043B\u044C\u0448\u0435\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0431\u043E\u043B\u044C\u0448\u0435\u0439 \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u0438 \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0435\u043D\u0438\u044F \u043A\u0430\u0440\u0442\u044B \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u043A\u043E\u043B\u0435\u0441\u0438\u043A\u0430.
 OptionPanel.windows=Windows
-OptionPanel.zh_CN=\u0423\u043F\u0440\u043E\u0449\u0435\u043D\u043D\u044B\u0439 \u043A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0439
-OptionPanel.zh_TW=\u0422\u0440\u0430\u0434\u0438\u0446\u0438\u043E\u043D\u043D\u044B\u0439 \u043A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0439
+OptionPanel.zh_CN=\u0423\u043F\u0440\u043E\u0449\u0435\u043D\u043D\u044B\u0439 \u043A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0439 / \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=\u0422\u0440\u0430\u0434\u0438\u0446\u0438\u043E\u043D\u043D\u044B\u0439 \u043A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0439 / \u7E41\u9AD4\u5B57
 org.freeplane.plugin.bugreport.agree=\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C
 org.freeplane.plugin.bugreport.always_agree=\u041E\u0442\u043F\u0440\u0430\u0432\u043B\u044F\u0442\u044C \u0432\u0441\u0435\u0433\u0434\u0430
 org.freeplane.plugin.bugreport.always_deny=\u041D\u0438\u043A\u043E\u0433\u0434\u0430 \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u044F\u0442\u044C
@@ -1486,7 +1484,7 @@ QuickFindAllAction.text=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\
 QuickHighlightAction.text=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0432\u0441\u0435 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0449\u0438\u0435 \u0443\u0437\u043B\u044B
 QuitAction.text=\u0412&\u044B\u0445\u043E\u0434
 read_only=\u0422\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0447\u0442\u0435\u043D\u0438\u044F
-ReadScriptError.text=\u041E\u0448\u0438\u0431\u043A\u0430 \u0447\u0442\u0435\u043D\u0438\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0430.\n\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043B \u043B\u043E\u0433\u0430 \u0434\u043B\u044F \u0434\u0435\u0442\u0430\u043B\u0435\u0439.
+ReadScriptError.text=\u041E\u0448\u0438\u0431\u043A\u0430 \u0447\u0442\u0435\u043D\u0438\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0430
 really_convert_to_current_version=<html>\u042D\u0442\u0430 \u043A\u0430\u0440\u0442\u044B \u0431\u044B\u043B\u0430 \u0441\u043E\u0437\u0434\u0430\u043D\u0430 \u0441\u0442\u0430\u0440\u043E\u0439 \u0432\u0435\u0440\u0441\u0438\u0435\u0439 Freeplane. <br>\u041A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0435\u0435 (\u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F)? <br>(\u0418\u043D\u0430\u0447\u0435 \u043E\u043D\u0430 \u04 [...]
 really_cut_node=\u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0432\u044B\u0440\u0435\u0437\u0430\u0442\u044C \u0443\u0437\u0435\u043B(\u0443\u0437\u043B\u044B)?
 really_execute_script=\u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0441\u043A\u0440\u0438\u043F\u0442\u044B, \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u043D\u044B\u0435 \u0432 \u044D\u0442\u0443 \u043A\u0430\u0440\u0442\u0443? \u041E\u043D\u0438 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u043D\u0435\u0431\u0435\u0437\u043E\u043F\u0430 [...]
@@ -1581,7 +1579,6 @@ ShowAncestorsAction.text=\u0421 \u0440\u043E\u0434\u0438\u0442\u0435\u043B\u044C
 ShowAttributeDialogAction.text=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 &\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430\u043C\u0438...
 ShowDescendantsAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043F\u043E\u0434\u0447\u0438\u043D\u0451\u043D\u043D\u044B\u0435
 ShowFilterToolbarAction.text=\u041F\u0430\u043D\u0435\u043B\u044C \u0444\u0438\u043B\u044C\u0442\u0440\u0430\u0446\u0438\u0438
-ShowFormatPanel.text=\u041F\u0430\u043D\u0435\u043B\u044C \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F
 ShowFormatPanel.tooltip=\u041E\u0442\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043E\u043A\u043D\u043E, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u043C \u0443\u0437\u0435\u043B \u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044B \u043C\u043E\u0433\u0443\u0442 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u043E\u0434\u043D\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E.
 ShowHideNoteAction.text=\u041E\u043A\u043D\u043E \u043F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u0439
 ShowHideNoteAction.tooltip=\u042D\u0442\u043E \u0433\u043E\u0440\u044F\u0447\u0430\u044F \u043A\u043B\u0430\u0432\u0438\u0448\u0430 \u0434\u043B\u044F \u0441\u0442\u0440\u0435\u043B\u043E\u0447\u0435\u043A \u043D\u0430 \u0440\u0430\u0437\u0434\u0435\u043B\u044F\u044E\u0449\u0435\u0439 \u043B\u0438\u043D\u0438\u0438.
@@ -1589,7 +1586,7 @@ ShowNextChildAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441
 ShowNotesInMapAction.text=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0437\u0430\u043C\u0435\u0442\u043A\u0438 \u043D\u0430 \u043A\u0430\u0440\u0442\u0435
 ShowSelectedAttributesAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0438\u0437\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044B
 ShowSelectionAsRectangleAction.text=\u041F\u043E\u0434\u0441\u0432\u0435\u0447\u0438\u0432\u0430\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u043E\u0435 \u043F\u0440\u044F\u043C\u043E\u0443\u0433\u043E\u043B\u044C\u043D\u0438\u043A\u043E\u043C
-simplyhtml.aboutFrameTitle=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435...
+simplyhtml.aboutFrameTitle=\u041E\u0431 \u044D\u0442\u043E\u043C \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0438
 simplyhtml.aboutLabel=\u041E SimplyHTML...
 simplyhtml.alignCenter=\u043F\u043E \u0446\u0435\u043D\u0442\u0440\u0443
 simplyhtml.alignLabel=\u0412\u044B\u0440\u0430\u0432\u043D\u0438\u0432\u0430\u043D\u0438\u0435 \u0433\u043E\u0440.:
@@ -1825,7 +1822,6 @@ ToggleMenubarAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C/\u0441
 ToggleScrollbarsAction.text=\u041F\u043E\u043B\u043E\u0441\u044B \u043F\u0440\u043E\u043A\u0440\u0443\u0442\u043A\u0438
 ToggleStatusAction.text=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0442\u044C \u0441\u0442\u0440\u043E\u043A\u0443 \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u044F
 ToggleToolbarAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C/\u0441\u043F\u0440\u044F\u0442\u0430\u0442\u044C \u043F\u0430\u043D\u0435\u043B\u044C \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432
-toolbars=\u041F\u0430\u043D\u0435\u043B\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432
 uiTextChanger.replaceText=\u0417\u0430\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442
 undefined_error=\u041D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u0430\u044F \u043E\u0448\u0438\u0431\u043A\u0430. \u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0441\u043E\u043E\u0431\u0449\u0438\u0442\u0435 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0447\u0438\u043A\u0430\u043C \u0447\u0435\u0440\u0435\u0437 \u0444\u043E\u0440\u0443\u043C.
 underline=\u041F\u043E\u0434\u0447\u0451\u0440\u043A\u0438\u0432\u0430\u043D\u0438\u0435
diff --git a/freeplane/resources/translations/Resources_sk.properties b/freeplane/resources/translations/Resources_sk.properties
index 3ce48ef..abedd08 100644
--- a/freeplane/resources/translations/Resources_sk.properties
+++ b/freeplane/resources/translations/Resources_sk.properties
@@ -1,152 +1,370 @@
+about_text=Freeplane - slobodn\u00FD softv\u00E9r na tvorbu my\u0161lienkov\u00FDch m\u00E1p a datab\u00E1z znalost\u00ED
 AboutAction.text=O programe
-acceleratorPresets=Hot Key Presets[translate me]
-accessories/plugins/ApplyFormatPlugin.dialog.title=Zme\u0148 form\u00E1t uzlov
-accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Zme\u0148 vzor
-accessories/plugins/EncryptNode.properties_0=Nastav heslo pre za\u0161ifrovan\u00FD uzol
-accessories/plugins/EncryptNode.properties_1=Hesl\u00E1 sa nerovnaj\u00FA alebo s\u00FA pr\u00EDli\u0161 kr\u00E1tke.
+acceleratorPresets=Kl\u00E1vesov\u00E9 skratky
+accelerators_loading_error=Nedaj\u00FA sa na\u010D\u00EDta\u0165 skratky z {0}
+accessories/plugins/ApplyFormatPlugin.dialog.title=Zmeni\u0165 form\u00E1t uzlov
+accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Zmeni\u0165 vzor
+accessories/plugins/EncryptNode.properties_0=Zvo\u013Ete heslo pre chr\u00E1nen\u00FD (za\u0161ifrovan\u00FD) uzol
+accessories/plugins/EncryptNode.properties_1=Hesl\u00E1 sa nezhoduj\u00FA alebo s\u00FA pr\u00EDli\u0161 kr\u00E1tke.
 accessories/plugins/EncryptNode.properties_2=Zadajte heslo:
 accessories/plugins/EncryptNode.properties_3=Zopakujte heslo:
-accessories/plugins/EncryptNode.properties_4=Zadajte heslo.
-accessories/plugins/EncryptNode.properties_5=<html>Pam\u00E4tajte, \u017Ee sila \u0161ifry<br> z\u00E1vis\u00ED do zna\u010Dnej miery od kvality hesla.
+accessories/plugins/EncryptNode.properties_4=Zadajte svoje heslo.
+accessories/plugins/EncryptNode.properties_5=<html>Pam\u00E4tajte, \u017Ee sila za\u0161ifrovania<br> z\u00E1vis\u00ED takmer v\u00FDlu\u010Dne od kvality v\u00E1\u0161ho hesla.
 accessories/plugins/EncryptNode.properties_6=OK
-accessories/plugins/EncryptNode.properties_7=Storno
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Stav za\u0161ifrovania m\u00F4\u017Eete meni\u0165 iba na za\u0161ifrovanom uzle. Pros\u00EDm vlo\u017Ete tak\u00FDto uzol pomocou menu n\u00E1strojov.
-accessories/plugins/EncryptNode.properties_select_me=Vyber ma a pokra\u010Duj!
+accessories/plugins/EncryptNode.properties_7=Zru\u0161i\u0165
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Stav ochrany (za\u0161ifrovania) m\u00F4\u017Eete meni\u0165 iba na za\u0161ifrovanom uzle. Vlo\u017Ete pros\u00EDm tak\u00FDto uzol pomocou menu n\u00E1strojov.
+accessories/plugins/EncryptNode.properties_select_me=Pre pokra\u010Dovanie ma zvo\u013Ete!
 accessories/plugins/EncryptNode.properties_wrong_password=Heslo je nespr\u00E1vne.
-accessories/plugins/ExportWithXSLT.tooltip=Toto je jednotn\u00E1 met\u00F3da exportu pomocou skriptov XSLT.
-accessories/plugins/ExportWithXSLT_Applet.text=Ako Java Applet...
-accessories/plugins/ExportWithXSLT_Applet.tooltip=Vyexportuje mapu ako applet v jazyku Java.
-accessories/plugins/ExportWithXSLT_Flash.text=Ako Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Vyexportuje mapu ako aplik\u00E1ciu v jazyku Flash
-accessories/plugins/ExportWithXSLT_HTML.text=Ako XHTML (verzia s JavaScriptom)...
-accessories/plugins/ExportWithXSLT_HTML3.text=Ako XHTML (verzia s klikate\u013Enou mapou)...
-add=Pridaj
-AddLocalLinkAction.text=Pridaj lok\u00E1lnu hyperlinku
-antialias_all=Vyhla\u010F v\u0161etko
-antialias_edges=Vyhla\u010F hrany
-antialias_none=Nevyhladzuj ni\u010D
-apply=Pou\u017Ei
-ApplyAction.text=Pou\u017Ei
-ApplyFormatPlugin.text=Zme\u0148 form\u00E1t...
-ApplyFormatPlugin.tooltip=Zobraz\u00ED dial\u00F3g, v ktorom mo\u017Eno naraz zmeni\u0165 vlastnosti uzlov aj hr\u00E1n.
-ApplyNoFilteringAction.text=Bez filtra
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Exportuje mapu pre Java Web Start.
+accessories/plugins/ExportWithTWiki.text=TWiki...
+accessories/plugins/ExportWithTWiki.tooltip=Exportuje mapu ako TKWiki dokument.
+accessories/plugins/ExportWithXSLT.tooltip=Toto je jednotn\u00E1 met\u00F3da exportu.
+accessories/plugins/ExportWithXSLT_Applet.text=Java Applet...
+accessories/plugins/ExportWithXSLT_Applet.tooltip=Exportuje mapu ako applet prehliada\u010Da Java.
+accessories/plugins/ExportWithXSLT_HTML.text=XHTML (verzia s JavaScriptom)...
+accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (verzia s klikacou mapou obr\u00E1zku)...
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Zdroje z uzla RESOURCES do s\u00FAboru TaskJuggler...
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Exportuje zdroje z uzla RESOURCES do modulu Taskjuggler.</html>
+accessories/plugins/ExportWithXSLT_TASKSTJI.text=\u00DAlohy z uzla TASKS do s\u00FAboru TaskJuggler...
+accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Exportuje \u00FAlohy z uzla TASKS do modulu TaskJuggler.</html>
+action_keystroke_in_use_error=Kl\u00E1vesov\u00E1 skratka {0} po\u017Eadovan\u00E1 pre akciu {1} sa u\u017E pou\u017E\u00EDva pre akciu {2}
+active=Akt\u00EDvne
+actual_map_styles=Podmienen\u00E9 \u0161t\u00FDly mapy boli aplikovan\u00E9 na uzol
+actual_node_styles=Podmienen\u00E9 \u0161t\u00FDly uzla boli aplikovan\u00E9 na uzol
+add=Prid&a\u0165
+AddConnectorAction.text=Spoji\u0165
+AddElementaryConditionAction.text=Prida\u0165
+AddExecutionLinkAction.text=Prida\u0165 odkaz na spustenie pr\u00EDkazu OS...
+AddLocalLinkAction.text=Prida\u0165 miestny odkaz
+AddMenuItemLinkAction.text=Prida\u0165 odkaz na polo\u017Eku v menu...
+AddOnDetailsPanel.authored.by=Pod\u013Ea {0}
+AddOnDetailsPanel.header.function=Funkcia
+AddOnDetailsPanel.header.menu=Umiestnenie v ponuke
+AddOnDetailsPanel.header.shortcut=Kl\u00E1vesov\u00E1 skratka
+AddOnDetailsPanel.homepage=Domovsk\u00E1 str\u00E1nka:
+addons.installer.canceled=In\u0161tal\u00E1cia zru\u0161en\u00E1
+addons.installer.confirm.licence=<html><body><h1>Licencia</h1>{0}<p><p><em>S\u00FAhlas\u00EDte s touto licenciou?</em></p></body></html>
+addons.installer.failed=In\u0161tal\u00E1cia zlyhala: {0}
+addons.installer.freeplaneversion.format.error=Nespr\u00E1vny form\u00E1t v {0} (hodnota: {1})
+addons.installer.html.script=Telo skriptu nesmie by\u0165 form\u00E1tovan\u00E9 ako HTML
+addons.installer.install=In\u0161talova\u0165
+addons.installer.invalid.keyboard.shortcut=Neplatn\u00E1 skratka {0}.
+addons.installer.licence.unchanged=Licencia sa nezmenila
+addons.installer.map.structure=Chyba v \u0161trukt\u00FAre mapy: {0}
+addons.installer.missing.child.nodes=Ch\u00FDbaj\u00FAce poduzly: {0}
+addons.installer.missing.permission.attribute=Skript {0}: ch\u00FDbaj\u00FAce atrib\u00FAty opr\u00E1vnenia {1}
+addons.installer.missing.properties=Ch\u00FDbaj\u00FAce vlastnosti: {0}
+addons.installer.missing.translation=Ch\u00FDba preklad {0} pre lokaliz\u00E1ciu {1}
+addons.installer.no.scripts=Nen\u00E1jden\u00E9 \u017Eiadne skripty
+addons.installer.no.zipdata=Nen\u00E1jden\u00E9 \u017Eiadne zip \u00FAdaje
+addons.installer.nonstandard.permissions=Skript vy\u017Eaduje nasleduj\u00FAce opr\u00E1vnenia, ktor\u00E9 v s\u00FA\u010Dasnosti nem\u00E1: {0}.\nMali by by\u0165 pridan\u00E9 k \u0161tandardn\u00FDm opr\u00E1vneniam?
+addons.installer.one.child.expected=O\u010Dak\u00E1va sa pr\u00E1ve jeden potomok {0}, obdr\u017Ean\u00FDch je ale {1}.
+addons.installer.script.name.suffix=Skript s n\u00E1zvom {0} nem\u00E1 pr\u00EDponu typu ".groovy"
+addons.installer.script.no.execution_mode=Pre {0} nie s\u00FA zadan\u00E9 \u017Eiadne "execution_mode" atrib\u00FAty
+addons.installer.script.no.menulocation=Pre {0} ne s\u00FA zadan\u00E9 \u017Eiadne "menuLocation" atrib\u00FAty
+addons.installer.script.no.menutitle=Pre {0} nie s\u00FA zadan\u00E9 \u017Eiadne "menuTitleKey" atrib\u00FAty
+addons.installer.script.no.permissions=Pre {0} nie s\u00FA definovan\u00E9 \u017Eiadne opr\u00E1vnenia
+addons.installer.success=In\u0161tal\u00E1cia prebehla \u00FAspe\u0161ne.\nNov\u00FD doplnok bude k dispoz\u00EDcii po re\u0161tarte.
+addons.installer.success.update=Aktualiz\u00E1cia z {0} na {1} prebehla \u00FAspe\u0161ne.\nNiektor\u00E9 funkcie m\u00F4\u017Eu by\u0165 dostupn\u00E9 a\u017E po re\u0161tarte.
+addons.installer.title=In\u0161tal\u00E1tor doplnku
+addons.installer.too.new=Aktu\u00E1lna verzia Freeplane {0} je nov\u0161ia, ne\u017E ak\u00FA podporuje tento doplnok. Nepodporuje verziu vy\u0161\u0161iu ako {1}
+addons.installer.too.old=Aktu\u00E1lna verzia Freeplane {0} je zastaral\u00E1. Tento doplnok potrebuje aspo\u0148 verziu {1}
+addons.installer.unknown.deinstallation.rules=Nezn\u00E1me odin\u0161tala\u010D\u00E9 pravidlo/pravidl\u00E1 {0}
+addons.installer.update=Aktualiz\u00E1cia z verzie {0}
+addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Mali by ste in\u0161talova\u0165 len doplnky z d\u00F4veryhodn\u00FDch zdrojov. \u0160kodliv\u00FD softv\u00E9r m\u00F4\u017Ee sp\u00F4sobi\u0165 po\u0161kodenie va\u0161ich \u00FAdajov alebo naru\u0161enie v\u00E1\u0161ho s\u00FAkromia.</strong></body></html>
+addons.site=http://freeplane.sourceforge.net/addons/
+AddStyleAttributes.text=Atrib\u00FAty zo \u0161t\u00FDlu
+AddStyleAttributes.tooltip=Prida\u0165 atrib\u00FAty z uzlu \u0161t\u00FDlu
+AllMapsNodeListAction.text=N\u00E1js\u0165 a nahradi\u0165 vo v\u0161etk\u00FDch map\u00E1ch
+always=V\u017Edy
+AlwaysUnfoldedNodeAction.text=V\u017Edy rozbalen\u00FD uzol (nastavi\u0165/resetova\u0165)
+antialias_all=Vyhladzova\u0165 v\u0161etko
+antialias_edges=Vyhladzova\u0165 hrany
+antialias_none=Nevyhladzova\u0165 ni\u010D
+apply=Pou\u017Ei\u0165
+ApplyAction.text=Pou\u017Ei\u0165
+ApplyFormatPlugin.text=Zmeni\u0165 form\u00E1t ...
+ApplyFormatPlugin.tooltip=Zobrazuje dial\u00F3g, v ktorom mo\u017Eno naraz zmeni\u0165 vlastnosti uzlov aj hr\u00E1n.
+ApplyNoFilteringAction.text=Bez filtrovania
+ApplySelectedViewConditionAction.text=Filtrova\u0165 vybran\u00E9 uzly
+ApplyToVisibleAction.text=Pou\u017E\u00EDva sa na filtrovan\u00E9 uzly
 as_parent=Ako rodi\u010D
-AskForHelp.text=Ask for Help[translate me]
-AssignAttributesAction.text=Prira\u010F atrib\u00FAty...
-attribute_delete=Vyma\u017E v\u0161etky hodnoty
-attribute_delete_value=Vyma\u017E t\u00FAto hodnotu
+AskForHelp.text=Po\u017Eiada\u0165 o pomoc na diskusnom f\u00F3re
+AssignAttributesAction.text=N\u00E1js\u0165 a nahradi\u0165 atrib\u00FAty...
+attribute_delete=Zmaza\u0165 v\u0161etky hodnoty
+attribute_delete_value=Zmaza\u0165 t\u00FAto hodnotu
 attribute_font_size_tooltip=Ve\u013Ekos\u0165 p\u00EDsma atrib\u00FAtu
-attribute_list_box_label_text=Existuj\u00FAce hodnoty
-attribute_replace=Nahra\u010F
+attribute_list_box_label_text=Jestvuj\u00FAce hodnoty
+attribute_name=N\u00E1zov atrib\u00FAtu
+attribute_name_or_value=N\u00E1zov alebo hodnota atrib\u00FAtu
+attribute_replace=Nahradi\u0165 s
 attribute_top=V\u0161etky zn\u00E1me atrib\u00FAty na\u010D\u00EDtan\u00FDch m\u00E1p
-attributes_adding_empty_attribute_error=Nem\u00F4\u017Eem pou\u017Ei\u0165 pr\u00E1zdny text ako n\u00E1zov atrib\u00FAtu
+attribute_value=Hodnota atrib\u00FAtu
+attributes_AddAttributeAction.text=Prida\u0165 atrib\u00FAt v dial\u00F3gu...
+attributes_adding_empty_attribute_error=Ako n\u00E1zov atrib\u00FAtu nemo\u017Eno pou\u017Ei\u0165 pr\u00E1zdny re\u0165azac
 attributes_all=V\u0161etky atrib\u00FAty
+attributes_assign_dialog=Roz\u0161\u00EDren\u00FD editor atrib\u00FAtu
 attributes_attribute=Atrib\u00FAty
-attributes_close=Zavri
+attributes_close=Zavrie\u0165
 attributes_deselect_all=Ni\u010D
-attributes_edit=Edituj
-attributes_edit_tooltip=Edituj mno\u017Einu
+attributes_dialog_title=Spr\u00E1vca atrib\u00FAtov
+attributes_edit=Upravi\u0165
+attributes_edit_tooltip=Upravi\u0165 sadu
 attributes_for_selected=Vybran\u00E9 uzly
 attributes_for_visible=V\u0161etky vidite\u013En\u00E9 uzly
-attributes_import=Importuj
-attributes_import_tooltip=Importuj atrib\u00FAty z ostatn\u00FDch na\u010D\u00EDtan\u00FDch m\u00E1p
-attributes_popup_delete=Vyma\u017E
-attributes_popup_down=Dole
-attributes_popup_edit=Edituj
-attributes_popup_hide=Skry
+attributes_import=&Importova\u0165
+attributes_import_tooltip=Importova\u0165 atrib\u00FAty z in\u00FDch na\u010D\u00EDtan\u00FDch m\u00E1p
+attributes_no_import_candidates_found=Nen\u00E1jden\u00E9 \u017Eiadne nov\u00E9 atrib\u00FAty
+attributes_popup_delete=Zmaza\u0165
+attributes_popup_down=Dolu
+attributes_popup_edit=Upravi\u0165
+attributes_popup_hide=Skry\u0165
 attributes_popup_new=Nov\u00FD atrib\u00FAt
 attributes_popup_optimal_width=Optim\u00E1lna \u0161\u00EDrka
 attributes_popup_up=Hore
-attributes_refresh=Obnov
-attributes_restricted_attributes_tooltip=Obmedz mno\u017Einu atrib\u00FAtov
-attributes_restricted_values_tooltip=Obmedz mno\u017Einu hodn\u00F4t teraj\u0161ieho atrib\u00FAtu
+attributes_refresh=Obnovi\u0165
+attributes_RemoveAllAttributesAction.text=Odstr\u00E1ni\u0165 v\u0161etky atrib\u00FAty
+attributes_RemoveFirstAttributeAction.text=Odstr\u00E1ni\u0165 prv\u00FD atrib\u00FAt
+attributes_RemoveLastAttributeAction.text=Odstr\u00E1ni\u0165 posledn\u00FD atrib\u00FAt
+attributes_restricted_attributes_tooltip=Obmedzi\u0165 mno\u017Einu atrib\u00FAtov
+attributes_restricted_values_tooltip=Obmedzi\u0165 mno\u017Einu hodn\u00F4t pre aktu\u00E1lny atrib\u00FAt
 attributes_restriction=Obmedzen\u00E1 mno\u017Eina
 attributes_select_all=V\u0161etky
-attributes_select_all_tooltip=Ozna\u010D / Odzna\u010D v\u0161etky
-attributes_show=Uk\u00E1\u017E
-attributes_skip_root=Presko\u010D kore\u0148ov\u00FD uzol
+attributes_select_all_tooltip=Ozna\u010Di\u0165/odzna\u010Di\u0165 v\u0161etky
+attributes_show=Uk\u00E1za\u0165
+attributes_skip_root=Presko\u010Di\u0165 kore\u0148ov\u00FD uzol
 attributes_visible=Ozna\u010Den\u00E9 vidite\u013En\u00E9
 attributes_visible_tooltip=Ozna\u010Den\u00E9 vidite\u013En\u00E9
-automatically_save_message=Mapa bola automaticky ulo\u017Een\u00E1 (n\u00E1zov s\u00FAboru {0}) ...
-AutomaticLayoutAction.text=Automatick\u00E9 rozlo\u017Eenie
+automatic_layout=Automatick\u00E9 rozlo\u017Eenie
+automatic_layout_disabled=zak\u00E1zan\u00E9
+automatically_save_message=Mapa bola automaticky ulo\u017Een\u00E1 (pou\u017Eij\u00FAc n\u00E1zov s\u00FAboru {0}) ...
+AutomaticEdgeColor.FOR_BRANCHES=pre vetvy
+AutomaticEdgeColor.FOR_COLUMNS=pre st\u013Apce
+AutomaticEdgeColor.FOR_LEVELS=pre \u00FArovne
+AutomaticEdgeColor.ON_BRANCH_CREATION=pri vytv\u00E1ran\u00ED vetvy
+AutomaticEdgeColorHookAction.text=Automatick\u00E1 farba hrany
+AutomaticLayout.ALL=pre v\u0161etky uzly
+AutomaticLayout.HEADINGS=pre in\u00E9 ako koncov\u00E9 uzly
+AutomaticLayout.level=\u00DArove\u0148 {0}
+AutomaticLayout.level.root=Kore\u0148
+AutomaticLayoutAction.text=Pou\u017Ei\u0165 \u0161t\u00FDly \u00FArovne
 AutomaticLayoutAction.tooltip=<html>Oprav\u00ED rozlo\u017Eenie mapy. <br>Prv\u00E1 \u00FArove\u0148 je \u010Dierna, druh\u00E1 modr\u00E1, at\u010F.</html>
+AutomaticLayoutControllerAction.ALL.text=pre v\u0161etky uzly
+AutomaticLayoutControllerAction.COLUMNS.text=pre st\u013Apce
+AutomaticLayoutControllerAction.HEADINGS.text=pre in\u00E9 ako koncov\u00E9 uzly
+AutomaticLayoutControllerAction.null.text=zak\u00E1zan\u00E9
 BackAction.text=Nasp\u00E4\u0165
 background=Pozadie
+bitmaps=Bitmapy
+black=\u010Cierna
 BlinkingNodeHookAction.text=Blikaj\u00FAci uzol
-BlinkingNodeHookAction.tooltip=<html>Teraz bude uzol blika\u0165. Opatrne. Nenastavuje to pr\u00EDli\u0161 mnoh\u00FDm uzlom, a <strong> nie spolu s \u010Fal\u0161\u00EDmi automatick\u00FDmi form\u00E1tmi na rovnakom uzle</strong></html>
+BlinkingNodeHookAction.tooltip=<html>Toto sp\u00F4sob\u00ED blikanie uzla. Bu\u010Fte v\u0161ak opatrn\u00ED. Nenastavuje to pr\u00EDli\u0161 mnoh\u00FDm uzlom, a <strong> nie spolu s \u010Fal\u0161\u00EDmi automatick\u00FDmi form\u00E1tovaniami na tom istom uzle</strong></html>
+blue=Modr\u00E1
 BoldAction.text=Tu\u010Dn\u00E9
-boldify_branch=Zme\u0148 na tu\u010Dn\u00E9
+boldify_branch=Zmeni\u0165 na tu\u010Dn\u00E9
 branch=Vetva
+browse=Prech\u00E1dza\u0165...
+calendar_attributes_panel=Kalend\u00E1r a atrib\u00FAty
+calendar_panel=Kalend\u00E1r
+can_not_clone_encrypted_node=Za\u0161ifrovan\u00E9 uzly nemo\u017Eno klonova\u0165
+can_not_connect_to_info_server=Ned\u00E1 sa pripoji\u0165 k informa\u010Dn\u00E9mu serveru
+can_not_delete_predefined_style=Preddefinovan\u00FD \u0161t\u00FDl nemo\u017Eno zmaza\u0165
+can_not_delete_root_style=Kore\u0148ov\u00FD \u0161t\u00FDl nemo\u017Eno zmaza\u0165
+can_not_delete_style_group=Skupinu \u0161t\u00FDlov nemo\u017Eno zmaza\u0165
+can_not_encrypt_cloned_node=Klonovan\u00E9 uzly nemo\u017Eno za\u0161ifrova\u0165
+can_not_save_key_set=Sadu hor\u00FAcich kl\u00E1ves nemo\u017Eno ulo\u017Ei\u0165
 cancel=Storno
 CancelAction.text=Storno
-cannot_add_parent_diff_parents=V\u0161etky uzly musia ma\u0165 rovnak\u00E9ho rodi\u010Da, aby sa dala pou\u017Ei\u0165 t\u00E1to funkcia.
+cannot_add_parent_diff_parents=Pre pou\u017Eitie tejto funkcie musia ma\u0165 v\u0161etky uzly rovnak\u00E9ho rodi\u010Da, .
 cannot_add_parent_to_root=Kore\u0148ov\u00FD uzol nemo\u017Eno prida\u0165 pod nov\u00E9ho rodi\u010Da.
-cannot_join_nodes_with_children=Nem\u00F4\u017Eem spoji\u0165 uzly s de\u0165mi
-cannot_move_to_child=Nem\u00F4\u017Eem posun\u00FA\u0165 uzol do jedn\u00E9ho z jeho det\u00ED.
-CenterAction.text=Centruj
-ChangeConnectorArrowsAction.backward.text=Nasp\u00E4\u0165
-ChangeConnectorArrowsAction.forward.text=Dopredu
-ChangeNodeLevelLeftsAction.text=Uzol do\u013Eava
+cannot_delete_root=Kore\u0148ov\u00FD uzol nemo\u017Eno zmaza\u0165 ani vystrihn\u00FA\u0165.
+cannot_join_nodes_with_children=Nemo\u017Eno spoji\u0165 uzly s potomkami
+cannot_move_into_child_node=Nemo\u017Eno presun\u00FA\u0165 do podraden\u00E9ho uzla
+cannot_move_to_child=Nemo\u017Eno presun\u00FA\u0165 uzol do jedn\u00E9ho z jeho potomkov.
+CenterAction.text=Vycentrova\u0165
+ChangeConnectorArrowsAction.backward.text=Nakresli\u0165 \u0161\u00EDpku sp\u00E4\u0165
+ChangeConnectorArrowsAction.both.text=Nakresli\u0165 \u0161\u00EDpky \u010Falej a sp\u00E4\u0165
+ChangeConnectorArrowsAction.forward.text=Nakresli\u0165 \u0161\u00EDpku \u010Falej
+ChangeConnectorArrowsAction.none.text=\u017Diadne
+ChangeConnectorArrowsAction.text=Zmeni\u0165 \u0161\u00EDpky spojenia
+ChangeConnectorShapeAction.CUBIC_CURVE.text=Krivka
+ChangeConnectorShapeAction.EDGE_LIKE.text=Simulova\u0165 hranu
+ChangeConnectorShapeAction.LINE.text=\u010Ciara
+ChangeConnectorShapeAction.LINEAR_PATH.text=Priama cesta
+ChangeNodeLevelLeftsAction.text=Presun\u00FA\u0165 uzol (Rodi\u010Dovsk\u00FD sused)
 ChangeNodeLevelLeftsAction.tooltip=Uzly na\u013Eavo od kore\u0148a sa posun\u00FA nadol. Stan\u00FA sa poduzlami uzla, ktor\u00FD bol nad nimi. Uzly napravo od kore\u0148a sa posun\u00FA nahor. Priamo pri koreni uzly zmenia stranu.
-ChangeNodeLevelRightsAction.text=Uzol doprava
+ChangeNodeLevelRightsAction.text=Presun\u00FA\u0165 uzol (Susedov potomok)
 ChangeNodeLevelRightsAction.tooltip=Uzly napravo od kore\u0148a sa posun\u00FA nadol. Stan\u00FA sa poduzlami uzla, ktor\u00FD bol nad nimi. Uzly na\u013Eavo od kore\u0148a sa posun\u00FA nahor. Priamo pri koreni uzly zmenia stranu.
-choose_background_color=Vyber farbu pozadia
-choose_cloud_color=Vyber farbu oblaku:
-choose_edge_color=Vyber farbu hrany
-choose_node_background_color=Vyber farbu pozadia uzla:
-choose_node_color=Vyber farbu uzla:
-CloseAction.text=Zavri
-CloudAction.text=Oblak
+choose_cloud_color=Zvo\u013Ete farbu oblaku:
+choose_edge_color=Zvo\u013Ete farbu hrany
+choose_map_background_color=Zvo\u013Ete farbu pozadia mapy
+choose_node_background_color=Zvo\u013Ete farbu pozadia uzla:
+choose_node_color=Zvo\u013Ete farbu uzla:
+ClearLinkAnchorAction.text=Vymaza\u0165 kotvu odkazu
+ClearLinkAnchorAction.tooltip=<html>vymaza\u0165 predt\u00FDm nastaven\u00E9 ukotvenie uzla</html>
+CloneAction.text=Vl\u017Ei\u0165 klon
+close_btn=Zavrie\u0165
+CloseAction.text=Zavrie\u0165 aktu\u00E1lnu mapu
+CloseAllMapsAction.text=Zavrie\u0165 v\u0161etky mapy
+CloseAllOtherMapsAction.text=Zavrie\u0165 v\u0161etky ostatn\u00E9 mapy
+cloud_shapes=Tvary oblakov
+CloudAction.text=Prida\u0165 / odstr\u00E1ni\u0165 oblak (predvolen\u00E9)
 CloudColorAction.text=Farba oblaku...
-ColorProperty.ResetColor=Vr\u00E1\u0165 p\u00F4vodn\u00FA farbu
-combined=Kombinovan\u00E1
-CopyAction.text=Kop\u00EDruj
-CopySingleAction.text=Kop\u00EDruj jeden
-CreationModificationPluginAction.text=Zobraz \u010Das zmeny
-CreationModificationPluginAction.tooltip=<html>T\u00E1to funkcia zaznamen\u00E1va \u010Das vytvorenia a \u00FApravy uzla.</html>
-CutAction.text=Vystrihni
+CloudShapeAction.ARC.text=Obl\u00FAk
+CloudShapeAction.RECT.text=Obd\u013A\u017Enik
+CloudShapeAction.ROUND_RECT.text=Zaoblen\u00FD obd\u013A\u017Enik
+CloudShapeAction.STAR.text=Hviezda
+collection.copy.presentation=Kop\u00EDrova\u0165 prezent\u00E1ciu
+collection.copy.slide=Kop\u00EDrova\u0165 sn\u00EDmok
+collection.delete=Zmaza\u0165
+collection.down=Dolu
+collection.move=Presun\u00FA\u0165
+collection.moveTo=Presun\u00FA\u0165 na poz\u00EDciu
+collection.new.presentation=Nov\u00E1 prezent\u00E1cia
+collection.new.slide=Nov\u00FD sn\u00EDmok
+collection.up=Hore
+ColorProperty.ResetColor=Vr\u00E1ti\u0165 p\u00F4vodn\u00FA farbu
+combined=Kombinovan\u00E9
+condition=Podmienka
+confirmation=Potvrdenie
+connector=Spojenie
+connector_arrows=\u0160\u00EDpky spojenia
+connector_label=Popis spojenia
+connector_lines=Spojovacie \u010Diary
+connector_shapes=Tvary spojenia
+ConnectorColorAction.text=Farba spojenia...
+controls=Ovl\u00E1dacie prvky
+ConvertCloneToIndependentNodeAction.text=Zru\u0161i\u0165 klonovanie
+copy_name={0} (kop\u00EDrova\u0165)
+CopyAction.text=Kop\u00EDrova\u0165
+CopyAction.tooltip=Kop\u00EDrova\u0165 vybran\u00FA vetvu
+CopyAttributes.text=Kop\u00EDrova\u0165 atrib\u00FAty
+CopyIDAction.text=Kop\u00EDrova\u0165 ID uzla
+CopyMapStylesAction.text=Kop\u00EDrova\u0165 \u0161t\u00FDl mapy z...
+CopyNodeURIAction.text=Kop\u00EDrova\u0165 URI uzla
+copyright=Copyright \u00A9 2000-2017 Freeplane t\u00EDm a \u010Fal\u0161\u00ED
+CopySingleAction.text=Kop\u00EDrova\u0165 uzol (jednotliv\u00FD)
+CopySingleAction.tooltip=Kop\u00EDrova\u0165 len vybrat\u00FD uzol
+CopyStyleExtensionsAction.text=Kop\u00EDrova\u0165 roz\u0161\u00EDrenia z uzlu \u0161t\u00FDlu
+corrupt_map=Obsah mapy je po\u0161koden\u00FD
+CreateConjunctConditionAction.text=A
+CreateDisjunctConditionAction.text=Alebo
+CreateNotSatisfiedConditionAction.text=Nie
+CreationModificationPluginAction.text=Zobrazi\u0165 \u010Dasy zmien
+CreationModificationPluginAction.tooltip=<html>T\u00E1to funkcia zaznamen\u00E1va \u010Dasy vytvorenia a \u00FAprav uzla.</html>
+current_dir=Mapy
+CutAction.text=Vystrihn\u00FA\u0165
 decrease_branch_font_size=Men\u0161ie p\u00EDsmo
 DecreaseNodeFontAction.text=Men\u0161ie p\u00EDsmo
-delete=Vyma\u017E
-delete_child=Vyma\u017E uzol
-DeleteAction.text=Odstr\u00E1\u0148 uzol
-DeleteConditionAction.text=Vyma\u017E
+default=Predvolen\u00E9
+DefaultColorAction.text=Predvolen\u00E1 farba
+defaultstyle.attributes=Atrib\u00FAty
+defaultstyle.details=Podrobnosti
+defaultstyle.floating=Pl\u00E1vaj\u00FAci uzol
+defaultstyle.note=Pozn\u00E1mka
+delete=Zmaza\u0165
+delete_child=Zmaza\u0165 uzol
+DeleteAction.text=Odstr\u00E1ni\u0165 uzol
+DeleteConditionAction.text=Zmaza\u0165
+DeleteDetailsAction.text=Odstr\u00E1ni\u0165 podrobnosti uzla
+DeleteLevelStyleAction.text=Odstr\u00E1ni\u0165 \u0161t\u00FDl \u00FArovne
+DeleteStyleAction.text=Odstr\u00E1ni\u0165 \u0161t\u00FDl
+DeleteUserStyleAction.text=Odstr\u00E1ni\u0165 pou\u017E\u00EDvate\u013Eom definovan\u00FD \u0161t\u00FDl
+dialect_info.app=S\u00FAbor s my\u0161lienkovou mapou {0} bol vytvoren\u00FD programom {1}.
+dialect_info.later_version=S\u00FAbor s my\u0161lienkovou mapou {0} bol vytvoren\u00FD niektorou zo star\u0161\u00EDch verzi\u00ED tohoto programu.
+dialect_info.unknownApp=S\u00FAbor s my\u0161lienkovou mapou {0} bol vytvoren\u00FD nezn\u00E1mym programom.
+dialect_info.unknownURL=Webov\u00E1 str\u00E1nka je nezn\u00E1ma.
+dialect_info.url=Pre viac inform\u00E1ci\u00ED nav\u0161t\u00EDvte str\u00E1nku programu {0}.
+dialect_info.warning=Freeplane to nemus\u00ED otvori\u0165, zobrazi\u0165 alebo ulo\u017Ei\u0165 spr\u00E1vne.
+DirectHtmlFlavorHandler=HTML ako jednotliv\u00FD uzol
 DocumentationAction.text=Dokument\u00E1cia
+down=D&olu
+DownConditionAction.text=Dolu
+download=Stiahnu\u0165
+dropped_file_error=Nemo\u017Eno otvori\u0165 pretiahnut\u00FD s\u00FAbor(y). D\u00F4vod: {0}
 edge=Hrana
+edge_is_formatted_by_style=Form\u00E1t hr\u00E1n sa riadi pod\u013Ea \u0161t\u00FDlu. Ak je to potrebn\u00E9, upravte pr\u00EDslu\u0161n\u00FD \u0161t\u00FDl.
 edge_style=\u0160t\u00FDl hrany
 edge_width=Hr\u00FAbka hrany
+edge_widths=\u0160\u00EDrky hrany
 EdgeColorAction.text=Farba hrany...
-EdgeStyleAction.bezier.text=Bezier
+EdgeProperties=Vlastnosti hrany
+EdgeStyleAction.bezier.text=Hladko zakriven\u00E9 (b\u00E9zier)
+EdgeStyleAction.bezier.tooltip=<html>Zobrazi\u0165 hranu ako hladk\u00FA krivku.</html>
+EdgeStyleAction.hide_edge.text=Skry\u0165 hranu
+EdgeStyleAction.hide_edge.tooltip=<html>Pre vybran\u00E9 uzly zobrazi\u0165 hranu k rodi\u010Dovsk\u00E9mu uzlu ako<br>bodkovan\u00FA \u010Diaru. Inak hranu skry\u0165.</html>
+EdgeStyleAction.horizontal.text=Vodorovn\u00E9
+EdgeStyleAction.horizontal.tooltip=<html>Pre hrany pou\u017Ei\u0165 kolm\u00E9 priamky.</html>
 EdgeStyleAction.linear.text=Line\u00E1rne
-EdgeStyleAction.sharp_bezier.text=Ostr\u00E1 bezi\u00E9rova
-EdgeStyleAction.sharp_linear.text=Ostr\u00E1 line\u00E1rna
+EdgeStyleAction.linear.tooltip=<html>Hranu zobrazi\u0165 ako priamku.</html>
+EdgeStyleAction.sharp_bezier.text=Ostro zakriven\u00E9 (b\u00E9zier)
+EdgeStyleAction.sharp_bezier.tooltip=<html>Zobrazi\u0165 hrany ako hladk\u00E9 krivky so zaostren\u00FDmi koncami.</html>
+EdgeStyleAction.sharp_linear.text=Ostr\u00E9 line\u00E1rne
+EdgeStyleAction.sharp_linear.tooltip=<html>Zobrazi\u0165 hrany ako priamky so zaostren\u00FDmi koncami.</html>
 EdgeStyleAsParentAction.text=Ako rodi\u010D
+EdgeStyleAsParentAction.tooltip=<html>Pou\u017Ei\u0165 \u0161t\u00FDl hrany rodi\u010Dovsk\u00E9ho uzla.</html>[zastaral\u00E9]
 EdgeWidthAction_width_parent.text=Rodi\u010D
 EdgeWidthAction_width_thin.text=Tenk\u00E1
-edit=Edituj
-edit_link_manually=Edituj hyperlinku ru\u010Dne...
+edit=Upravi\u0165
+edit.decision=HTML Editor
+edit.edit_rich_text=Chcete pou\u017Ei\u0165 form\u00E1tovanie ako tu\u010Dn\u00E9 alebo kurz\u00EDva?
+edit_details=Upravi\u0165 podrobnosti uzla
+edit_end_label=<html>Popiska<br>spojenia
+edit_label_font_family=P\u00EDsmo
+edit_label_font_size=Ve\u013Ekos\u0165 p\u00EDsma
+edit_link_manually=Upravi\u0165 odkaz manu\u00E1lne...
+edit_long_node=Upravi\u0165 jadro uzla v dial\u00F3gu
 edit_middle_label=Edit Middle Label[translate me]
-EditAction.text=Edituj uzol
-EditAttributesAction.text=Edituj atrib\u00FAty
-EditFilterAction.text=Edituj
-EditLongAction.text=Edituj dlh\u00FD uzol...
-EncryptedMap.text=Vytvor za\u0161ifrovan\u00FA mapu...
-EncryptedMap.tooltip=Vytvor nov\u00FA za\u0161ifrovan\u00FA mapu.
-enter_base_url=Idem vlo\u017Ei\u0165 relat\u00EDvne linky. Pros\u00EDm zadajte z\u00E1kladn\u00E9 URL.
+edit_note=Upravi\u0165 pozn\u00E1mku
+edit_transparency_label=Prieh\u013Eadnos\u0165
+edit_width_label=\u0160\u00EDrka
+EditAction.text=Upravi\u0165 jadro uzla v riadku
+EditAttributesAction.text=Upravi\u0165 atrib\u00FAty v riadku
+EditDetailsAction.text=Upravi\u0165 podrobnosti uzla v riadku
+EditDetailsInDialogAction.text=Upravi\u0165 podrobnosti uzla v dial\u00F3gu
+editEdgeColors=Upravi\u0165 farby hr\u00E1n
+EditFilterAction.text=Vytvori\u0165 filter
+EditLongAction.text=Upravi\u0165 jadro uzla v dial\u00F3gu
+EditNoteInDialogAction.text=Upravi\u0165 pozn\u00E1mku v dial\u00F3gu
+EditScript=Upravi\u0165 skript...
+EditStylesAction.text=Upravi\u0165 \u0161t\u00FDly
+EncryptedMap.text=Nov\u00E1 chr\u00E1nen\u00E1 (za\u0161ifrovan\u00E1) mapa...
+EncryptedMap.tooltip=Nov\u00E1 chr\u00E1nen\u00E1 mapa
+encryption=\u0160ifrovanie
+enter_base_url=Id\u00FA sa vklada\u0165 relat\u00EDvne odkazy. Zadajte pros\u00EDm z\u00E1kladn\u00E9 URL.
+enter_command=Zada\u0165 pr\u00EDkaz
+enter_condition_name=Zada\u0165 nov\u00FD n\u00E1zov podmienky
 enter_confirms=Enter potvrdzuje
 EnterPassword.text=Zme\u0148 vidite\u013En\u00E9 / za\u0161ifrovan\u00E9
 error=Chyba
 error_applying_template=Chyba pri pou\u017Eit\u00ED \u0161abl\u00F3ny XSL
-error_creating_directory=Neviem vytvori\u0165 adres\u00E1r na export.
-export_pdf_text=Prenosn\u00FD form\u00E1t dokumentu (PDF)
-export_svg_text=\u0160k\u00E1lovate\u013En\u00E1 vektorov\u00E1 grafika (SVG)
-ExportAction.text=Exportuj
+error_creating_directory=Nemo\u017Eno vytvori\u0165 adres\u00E1r na export.
+error_in_template=Chyby v predvolenej \u0161abl\u00F3ne mapy {0}. Po\u00FAste sa tento s\u00FAbor odstr\u00E1ni\u0165.
+errornumber={0} ch\u00FDb
+ExecuteScript.available_modes_tooltip={0} je dostupn\u00E9 pre
+ExecuteScript.script=Skript
+ExecuteScriptError.text=Chyba pri vykon\u00E1van\u00ED skriptu:\n{0}
+ExecuteScriptForAllNodes.text=Spusti\u0165 v\u0161etky skripty
+ExecuteScriptForSelectionAction.text=Spusti\u0165 skripty vybran\u00E9ho uzla
+ExecuteScriptOnSelectedNode.text=Spusti\u0165 {0} na v\u0161etk\u00FDch vybran\u00FDch uzloch
+ExecuteScriptOnSelectedNodeRecursively.text=Spusti\u0165 {0} na vybran\u00FDch uzloch, rekurz\u00EDvne
+ExecuteScriptOnSingleNode.text=Spusti\u0165 {0} na jednom vybranom uzle
+ExecuteScripts.text=Skripty
+ExecuteScriptSecurityError.text=Pri vykon\u00E1van\u00ED skriptu sa vyskytla chyba: {0}
+export_failed=Exportovanie zlyhalo
+export_using_xslt=Exportovanie z Freeplane
+ExportAction.text=Exportova\u0165 mapu...
+ExportAllPresentationsAction.text=Exportova\u0165 v\u0161etky prezent\u00E1cie do PNG obr\u00E1zkov
+ExportBranchAction.text=Presun\u00FA\u0165 vetvu do novej mapy...
 ExportBranchToHTMLAction.text=Vetva ako HTML
-ExportPdf.text=Ako PDF...
-ExportSvg.text=Ako SVG...
-ExportToHTMLAction.text=Ako HTML
-ExportToImage.jpg.text=Ako JPEG...
-ExportToImage.png.text=Ako PNG...
+exported_file={0} s\u00FAbor
+ExportPdf.text=Ako PDF
+ExportPresentationAction.text=Exportova\u0165 aktu\u00E1lnu prezent\u00E1ciu do PNG obr\u00E1zkov
+ExportSvg.text=SVG
+ExportToHTMLAction.text=HTML
+ExportToImage.jpg.text=JPEG
+ExportToImage.png.text=PNG
 ExportToOoWriter.text=Ako dokument programu OpenOffice Writer...
 ExportToOoWriter.tooltip=Rozbalen\u00E9 uzly tvoria \u0161trukt\u00FAru, zbalen\u00E9 uzly tvoria obsah dokumentu.
 extension_menu=Fyzick\u00FD \u0161t\u00FDl
@@ -357,12 +575,18 @@ node=Uzol
 node_changed_discard_changes=Zmenili ste uzol. Chcete zru\u0161i\u0165 tieto zmeny?
 NodeBackgroundColorAction.text=Farba pozadia uzla...
 NodeColorAction.text=Farba uzla...
-NodeColorBlendAction.text=Zmie\u0161aj farbu
+NodeColorBlendAction.text=Namie\u0161a\u0165 farbu
 NodeDownAction.text=Uzol nadol
-NodeListAction.text=Uk\u00E1\u017E hist\u00F3riu mapy...
-NodeListAction.tooltip=Uk\u00E1\u017Ee v\u0161etky uzly s d\u00E1tumami vytvorenia/zmeny
+NodeExtensions.EditNodeExtensions=Upravi\u0165 roz\u0161\u00EDrenia uzla
+NodeExtensions.RemoveNodeExtensions=Odstr\u00E1ni\u0165 roz\u0161\u00EDrenia uzla
+NodeListAction.text=N\u00E1js\u0165 a nahradi\u0165...
+NodeListAction.tooltip=Zobraz\u00ED v\u0161etky uzly ako preh\u013Eadate\u013En\u00FD zoznam s filtrovac\u00EDmi vlastnos\u0165ami.
 NodeShapeAction.bubble.text=Bublina
 NodeShapeAction.fork.text=Vetva
+NodeShapeAction.narrow_hexagon.text=\u00DAzky \u0161es\u0165uholn\u00EDk
+NodeShapeAction.oval.text=Ov\u00E1l
+NodeShapeAction.rectangle.text=Obd\u013A\u017Enik
+NodeShapeAction.wide_hexagon.text=\u0160irok\u00FD \u0161es\u0165uholn\u00EDk
 NodeUpAction.text=Uzol nahor
 nonboldify_branch=Zru\u0161 tu\u010Dn\u00E9
 nonitalicise_branch=Zru\u0161 kurz\u00EDvu
@@ -695,12 +919,35 @@ UnfoldOneLevelAction.text=Rozba\u013E jednu \u00FArove\u0148
 UnfoldOneLevelAction.tooltip=<html>Rozbal\u00ED ozna\u010Den\u00E9 uzly o jednu \u00FArove\u0148.</html>
 url_error=Toto URL je nespr\u00E1vne zap\u00EDsan\u00E9!
 url_load_error=Neviem na\u010D\u00EDta\u0165 mapu z URL:
-UsePlainTextAction.text=Pou\u017Ei \u010Dist\u00FD text
-user_defined_zoom=Zadan\u00FD u\u017E\u00EDvate\u013Eom.
-user_defined_zoom_status_bar=Men\u00EDm zaostrenie na hodnotu zadan\u00FA u\u017E\u00EDvate\u013Eom: {0}%.
-user_zoom=Zadajte koeficient zaostrenia (0.0 - 2.0):
-view=Poh\u013Ead
+UsePlainTextAction.text=Pou\u017Ei\u0165 hol\u00FD text
+user_config_folder=Adres\u00E1r pre konfigur\u00E1ciu pou\u017E\u00EDvate\u013Ea: {0}
+user_defined_filters=Filtre definovan\u00E9 pou\u017E\u00EDvate\u013Eom
+user_defined_scale=Mierka definovan\u00E1 po&u\u017E\u00EDvate\u013Eom
+user_defined_zoom=Definovan\u00E9 pou\u017E\u00EDvate\u013Eom
+user_defined_zoom_status_bar=Men\u00ED sa pribl\u00ED\u017Eenie na hodnotu zadan\u00FA pou\u017E\u00EDvate\u013Eom: {0}%.
+user_icon=Ikona pou\u017E\u00EDvate\u013Ea "{0}"
+user_template_dir=\u0160abl\u00F3ny pou\u017E\u00EDvate\u013Ea
+user_zoom=Koeficient pribl\u00ED\u017Eenia pri tla\u010Di (0.0 - 2.0):
+userScripts=Skripty
+value_format=Form\u00E1t hodnoty
+version_up_to_date=U\u017E pou\u017E\u00EDvate najnov\u0161iu verziu programu
+view=Zobrazi\u0165
+ViewLayoutTypeAction.OUTLINE.text=Zobrazi\u0165 ako osnovu
+web_resources=Webov\u00E9 zdroje
+WebDocuAction.text=Webov\u00E1 dokument\u00E1cia
+WhatsNewAction.text=\u010Co je nov\u00E9 vo Freeplane 1.5.x
 width=\u0160\u00EDrka
+wrong_regexp=Nespr\u00E1vny regul\u00E1rny v\u00FDraz "{0}", chyba {1}
+xslt_export.html=HTML dokument
+xslt_export.latex=LaTeX dokument
+xslt_export.latexbook=LaTeX kniha
+xslt_export.mediawiki=Mediawiki
+xslt_export.ms_excel=Microsoft Excel 2003 XML
+xslt_export.ms_project=Microsoft Project 2003 XML
+xslt_export.ms_word=Microsoft Word 2003 XML
+xslt_export.text=Oby\u010Dajn\u00FD text
+xslt_export_not_possible=Export Freeplane XSLT nie je mo\u017En\u00FD
 yes=\u00C1no
-ZoomInAction.text=Zv\u00E4\u010D\u0161i zaostrenie
-ZoomOutAction.text=Zmen\u0161i zaostrenie
+zoom=Pribl\u00ED\u017Eenie
+ZoomInAction.text=Pribl\u00ED\u017Ei\u0165
+ZoomOutAction.text=Oddiali\u0165
diff --git a/freeplane/resources/translations/Resources_sl.properties b/freeplane/resources/translations/Resources_sl.properties
index c34b8b3..ddf3223 100644
--- a/freeplane/resources/translations/Resources_sl.properties
+++ b/freeplane/resources/translations/Resources_sl.properties
@@ -1,43 +1,62 @@
+about_text=Freeplane - program za ustvarjanje mentalnih zemljevidov in nadgradnjo znanja
 AboutAction.text=O programu
-acceleratorPresets=Hot Key Presets[translate me]
+acceleratorPresets=Prednastavitev tipk za bli\u017Enjico
+accelerators_loading_error=Ne morem nalo\u017Eiti bli\u017Enjice na tipkovnici iz {0}
 accessories/plugins/ApplyFormatPlugin.dialog.title=Spremeni obliko vozli\u0161\u010D
 accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Spremeni vzorec
-accessories/plugins/EncryptNode.properties_0=Izberite geslo za \u0161ifrirano vozli\u0161\u010De
+accessories/plugins/EncryptNode.properties_0=Izberi geslo za \u0161ifrirano vozli\u0161\u010De
 accessories/plugins/EncryptNode.properties_1=Gesli se ne ujemata ali pa sta prekratki.
-accessories/plugins/EncryptNode.properties_2=Vnesite geslo:
-accessories/plugins/EncryptNode.properties_3=Ponovno vnesite geslo:
-accessories/plugins/EncryptNode.properties_4=Vnesite svoje geslo.
-accessories/plugins/EncryptNode.properties_5=<html>Zapomnite si, da je mo\u010D \u0161ifriranja<br> odvisna skoraj povsem od kvalitete va\u0161ega gesla.
+accessories/plugins/EncryptNode.properties_2=Vnesi geslo:
+accessories/plugins/EncryptNode.properties_3=Ponovno vnesi geslo:
+accessories/plugins/EncryptNode.properties_4=Vnesi svoje geslo.
+accessories/plugins/EncryptNode.properties_5=<html>Zapomnite si, da je mo\u010D \u0161ifriranja<br> odvisna povsem od kvalitete va\u0161ega gesla.
 accessories/plugins/EncryptNode.properties_6=V redu
 accessories/plugins/EncryptNode.properties_7=Prekli\u010Di
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Preklapljate lahko le stanje \u0161ifriranja \u0161ifrirnega na\u010Dina. Prosimo vstavite tak\u0161no vozli\u0161\u010De s pomo\u010Djo menija orodja.
-accessories/plugins/EncryptNode.properties_select_me=Izberite za nadaljevanje!
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Preklapljate lahko le stanje \u0161ifriranja \u0161ifrirnega na\u010Dina. Prosim vstavite tak\u0161no vozli\u0161\u010De s pomo\u010Djo menija orodja.
+accessories/plugins/EncryptNode.properties_select_me=Izberi za nadaljevanje!
 accessories/plugins/EncryptNode.properties_wrong_password=Geslo ni pravilno.
-accessories/plugins/ExportWithTWiki.text=Kot TWiki ...
+accessories/plugins/Export_JavaWebStart.text=Java Web Start ...
+accessories/plugins/Export_JavaWebStart.tooltip=Izvozi miselni vzorec za java web start.
+accessories/plugins/ExportWithTWiki.text=TWiki ...
 accessories/plugins/ExportWithTWiki.tooltip=Izvozi miselni vzorec kot dokument TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=To je uniformna metoda izvoza z uporabo skript XSLT.
-accessories/plugins/ExportWithXSLT_Applet.text=Kot program\u010Dek v Javi ...
+accessories/plugins/ExportWithXSLT_Applet.text=Program\u010Dek v Javi ...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Izvozi miselni vzorec kot program\u010Dek za brskalnik v javi.
-accessories/plugins/ExportWithXSLT_Flash.text=Kot flash ...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Izvozi miselni vzorec kot aplikacijo v flashu.
-accessories/plugins/ExportWithXSLT_HTML.text=Kot XHTML (razli\u010Dica JavaScript) ...
-accessories/plugins/ExportWithXSLT_HTML3.text=Kot XHTML (razli\u010Dica klikalne slike vzorca) ...
+accessories/plugins/ExportWithXSLT_HTML.text=XHTML (razli\u010Dica JavaScript) ...
+accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (razli\u010Dica klikalne slike vzorca) ...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Viri iz vozli\u0161\u010Da RESOURCES v datoteko TaskJuggler ...
-accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Izvori vire iz vozli\u0161\u010Da RESOURCES v modul Taskjuggler. </html>
-accessories/plugins/ExportWithXSLT_TASKSTJI.text=Opravki iz vozli\u0161\u010Da TASKS v datoteko TaskJuggler ...
+accessories/plugins/ExportWithXSLT_RESOURCESTJI.tooltip=<html>Izvozi vire iz vozli\u0161\u010Da RESOURCES v modul Taskjuggler. </html>
+accessories/plugins/ExportWithXSLT_TASKSTJI.text=Opravilo iz vozli\u0161\u010Da TASKS v datoteko TaskJuggler ...
 accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html>Izvozi opravila iz vozli\u0161\u010Da TASKS v modul Taskjuggler. </html>
-add=dodaj
+active=Aktiven
+add=&Dodaj
+AddConnectorAction.text=Pove\u017Ei
 AddLocalLinkAction.text=Dodaj krajevno hiperpovezavo
+AddMenuItemLinkAction.text=Dodaj hiperpovezavo na to\u010Dko menija ...
+AddOnDetailsPanel.header.function=Funkcija
+AddOnDetailsPanel.header.menu=Lokacija menija
+AddOnDetailsPanel.header.shortcut=Bli\u017Enjica
+AddOnDetailsPanel.homepage=Doma\u010Da stran:
+addons.installer.canceled=Namestitev preklicana
+addons.installer.failed=Namestitev ni uspela: {0}
+addons.installer.freeplaneversion.format.error=Oblika napake v {0} (vrednost:{1})
+addons.installer.html.script=Telo skripta ne sme biti oblikovano kot HTML
+addons.installer.install=Namestitev
+addons.installer.invalid.keyboard.shortcut=Neveljavna bli\u017Enjica {0}.
+addons.installer.licence.unchanged=Licenca je nespremenjena
+addons.installer.map.structure=Napaka v strukturi mape: {0}
+addons.installer.no.scripts=Skript ni bilo mogo\u010De najti
+addons.installer.update=Nadgradnja na verzijo {0}
 antialias_all=Pogladi robove vsega
 antialias_edges=Pogladi le robove
 antialias_none=Ne gladi robov
-apply=Uporabi
+apply=&Uporabi
 ApplyAction.text=Uporabi
 ApplyFormatPlugin.text=Spremeni obliko ...
 ApplyFormatPlugin.tooltip=Predstavi pogovorno okno, v katerem lahko naenkrat spremenite atribute vozli\u0161\u010Da in robov.
 ApplyNoFilteringAction.text=Brez filtriranja
 as_parent=Kot star\u0161
-AssignAttributesAction.text=Dodeli atribute ...
+AssignAttributesAction.text=Najdi in zamenjaj atribute ...
 attribute_delete=Izbri\u0161i vse vrednosti
 attribute_delete_value=Izbri\u0161i to vrednost
 attribute_font_size_tooltip=Velikost pisave atributa
@@ -49,12 +68,12 @@ attributes_all=Vsi atributi
 attributes_attribute=Atributi
 attributes_close=Zapri
 attributes_deselect_all=ni\u010D
-attributes_dialog_title=Upravljalec atributov
+attributes_dialog_title=Upravljavec atributov
 attributes_edit=Uredi
 attributes_edit_tooltip=Uredi mno\u017Eico
 attributes_for_selected=izbrana vozli\u0161\u010Da
 attributes_for_visible=vsa vidna vozli\u0161\u010Da
-attributes_import=Uvozi
+attributes_import=&Uvozi
 attributes_import_tooltip=Uvozi atribute iz drugih nalo\u017Eenih miselnih vzorcev
 attributes_no_import_candidates_found=Ni najdenih novih atributov
 attributes_popup_delete=Izbri\u0161i
@@ -65,60 +84,69 @@ attributes_popup_new=Nov atribut
 attributes_popup_optimal_width=Optimalna \u0161irina
 attributes_popup_up=Navzgor
 attributes_refresh=osve\u017Ei
+attributes_RemoveAllAttributesAction.text=Odstrani vse atribute
+attributes_RemoveFirstAttributeAction.text=Odstrani prvi atribut
+attributes_RemoveLastAttributeAction.text=Odstrani zadnji atribut
 attributes_restricted_attributes_tooltip=Omeji mno\u017Eico atributov
 attributes_restricted_values_tooltip=Omeji mno\u017Eico vrednosti za trenutne atribute
 attributes_restriction=omejena mno\u017Eica
 attributes_select_all=vse
-attributes_select_all_tooltip=Izberi / razberi vse
+attributes_select_all_tooltip=Izberi/odzna\u010Di vse
 attributes_show=Poka\u017Ei
 attributes_skip_root=Presko\u010Di korensko vozli\u0161\u010De
 attributes_visible=Vidno
 attributes_visible_tooltip=Vidno
 automatically_save_message=Miselni vzorec je bil samodejno shranjen (z uporabo imena datoteke {0}) ...
+AutomaticLayout.level.root=Koren
 AutomaticLayoutAction.text=Samodejna postavitev
 AutomaticLayoutAction.tooltip=<html>Popravi izgled miselnega vzorca. <br>Prva stopnja je \u010Drna, druga modra itn.</html>
 BackAction.text=Nazaj
 BackAction.tooltip=Sko\u010Di nazaj v izbrani verigi
 background=Ozadje
+bitmaps=Bitne slike
 BlinkingNodeHookAction.text=Utripajo\u010Di na\u010Din
-BlinkingNodeHookAction.tooltip=<html>S tem pri\u010Dne vozli\u0161\u010De utripati. Vendar bodite pozorni. Me povezujte ga s preve\u010D vozli\u0161\u010Di in <strong> ne z drugimi samodejnimi oblikovanji k istemu vozli\u0161\u010Du</strong></html>
+BlinkingNodeHookAction.tooltip=<html>S tem pri\u010Dne vozli\u0161\u010De utripati. Vendar bodite pozorni. Ne povezujte ga s preve\u010D vozli\u0161\u010Di in <strong> ne z drugimi samodejnimi oblikovanji k istemu vozli\u0161\u010Du</strong></html>
 BoldAction.text=Krepko
 boldify_branch=Okrepi
 branch=Veja
+browse=Brskanje ...
+calendar_attributes_panel=Koledar in atributi
+calendar_panel=Koledar
 cancel=Razveljavi
 CancelAction.text=Razveljavi
-cannot_add_parent_diff_parents=Vsa vozli\u0161\u010Da morajo imeti istega star\u0161a za uporabo te funkcije.
-cannot_add_parent_to_root=Korenskega vozli\u0161\u010Da ni mo\u017Eno dodati k novemu star\u0161u.
+cannot_add_parent_diff_parents=Vsa vozli\u0161\u010Da morajo imeti istega nadrejenega za uporabo te funkcije.
+cannot_add_parent_to_root=Korenskega vozli\u0161\u010Da ni mo\u017Eno dodati k novemu nadrejenemu.
 cannot_delete_root=Korenskega vozli\u0161\u010Da ni mo\u017Eno izbrisati ali izrezati.
 cannot_join_nodes_with_children=Vozli\u0161\u010D ni mogo\u010De zdru\u017Eiti z otroci
 cannot_move_to_child=Vozli\u0161\u010Da ni mo\u017Eno premakniti k enemu njegovih otrok.
 CenterAction.text=Sredinski
 ChangeConnectorArrowsAction.backward.text=Nazaj
 ChangeConnectorArrowsAction.forward.text=Naprej
+ChangeConnectorShapeAction.CUBIC_CURVE.text=Krivulja
 ChangeNodeLevelLeftsAction.text=Vozli\u0161\u010De na levi
 ChangeNodeLevelLeftsAction.tooltip=Tisti levo od korenskega(ih) vozli\u0161\u010D(a) je/so zamaknjeni navzdol. Postane(jo) otroci svojega gornjega bratskega vozli\u0161\u010Da. Tisti desno od korenskega(ih) vozli\u0161\u010D(a) so zamaknjeni navzgor. Neposredno ob korenu vozli\u0161\u010Da zamenjajo strani.
 ChangeNodeLevelRightsAction.text=Vozli\u0161\u010De na desni
 ChangeNodeLevelRightsAction.tooltip=Tisti desno od korenskega(ih) vozli\u0161\u010D(a) je/so zamaknjeni navzdol. Postane(jo) otroci svojega gornjega bratskega vozli\u0161\u010Da. Tisti levo od korenskega(ih) vozli\u0161\u010D(a) so zamaknjeni navzgor. Neposredno ob korenu vozli\u0161\u010Da zamenjajo strani.
-choose_background_color=Izberite barvo ozadja:
-choose_cloud_color=Izberite barvo obla\u010Dka:
-choose_edge_color=Izberi barvo robu
-choose_node_background_color=Izberite barvo ozadja vozli\u0161\u010Da:
-choose_node_color=Izberite barvo vozli\u0161\u010Da:
-CloseAction.text=Zapri
+choose_cloud_color=Izberi barvo obla\u010Dka:
+choose_edge_color=Izberi barvo roba
+choose_node_background_color=Izberi barvo ozadja vozli\u0161\u010Da:
+choose_node_color=Izberi barvo vozli\u0161\u010Da:
+close_btn=&Zapri
 CloudAction.text=Obla\u010Dek
 CloudColorAction.text=Barva obla\u010Dka ...
+collection.new.presentation=Nova prezentacija
 ColorProperty.ResetColor=Ponastavi barvo
 combined=Zdru\u017Eeno
 confirmation=Potrditev
 connector=Connector[translate me]
 connector_label=Connector Label[translate me]
 CopyAction.text=Kopiraj
-CopySingleAction.text=Kopiraj posami\u010Dno
 CreationModificationPluginAction.text=Prika\u017Ei \u010Dase sprememb
 CreationModificationPluginAction.tooltip=<html>Ta funkcija bele\u017Ei nastanek vozli\u0161\u010Da in \u010Dase spreminjanja.</html>
 CutAction.text=Izre\u017Ei
 decrease_branch_font_size=Manj\u0161a pisava
 DecreaseNodeFontAction.text=Manj\u0161a pisava
+DefaultColorAction.text=Privzete barve
 delete=izbri\u0161i
 delete_child=Izbri\u0161i vozli\u0161\u010De
 DeleteAction.text=Odstrani vozli\u0161\u010De
@@ -134,9 +162,9 @@ EdgeStyleAction.linear.text=Linearno
 EdgeStyleAction.sharp_bezier.text=ostro Bezier
 EdgeStyleAction.sharp_linear.text=ostro linearno
 EdgeStyleAsParentAction.text=Kot star\u0161
-EdgeWidthAction_width_parent.text=Star\u0161a
+EdgeWidthAction_width_parent.text=Nadrejen
 EdgeWidthAction_width_thin.text=Tanek
-edit=Uredi
+edit=&Uredi
 edit.decision=Urejevalnik HTML
 edit.edit_rich_text=\u017Delite uporabiti oblikovanje, kot je krepko in le\u017Ee\u010De?
 edit_link_manually=Ro\u010Dno uredi hiperpovezavo ...
@@ -146,52 +174,52 @@ edit_target_label=Edit Target Label[translate me]
 EditAction.text=Uredi vozli\u0161\u010De
 EditAttributesAction.text=Uredi atribute
 EditFilterAction.text=Uredi
-EditLongAction.text=Uredi dolgo vozli\u0161\u010De ...
-EncryptedMap.text=Ustvari \u0161ifriran miselni vzorec ...
+EditLongAction.text=Uredi dolgo vozli\u0161\u010De
+EditStylesAction.text=Uredi stil
 EncryptedMap.tooltip=Ustvari nov \u0161ifriran miselni vzorec
-enter_base_url=Prilepljene bodo relativne povezave. Prosimo, vnesite osnovni URL.
-enter_confirms=Tipka Enter potrdi
+enter_base_url=Prilepljene bodo relativne povezave. Prosim, vnesite osnovni URL.
+enter_confirms=Tipka &Enter potrdi
 EnterPassword.text=Preklopi \u0161ifrirano / ne\u0161ifrirano
 error=Napaka
 error_applying_template=Napaka pri uveljavljanju predloge XSL.
 error_creating_directory=Imenika za izvoz ni mogo\u010De ustvariti.
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
-ExportAction.text=Izvozi
+ExecuteScript.script=Skript
+ExportAction.text=Izvozi miselni vzorec \u2026
 ExportBranchToHTMLAction.text=Razvejaj kot HTML
-ExportPdf.text=Kot PDF ...
+exported_file={0} datoteka
+ExportPdf.text=PDF ...
 ExportSvg.text=Kot SVG ...
 ExportToHTMLAction.text=Kot HTML
-ExportToImage.jpg.text=Kot JPEG ...
-ExportToImage.png.text=Kot PNG ...
-ExportToOoWriter.text=Kot dokument OpenOffice.org Writer ...
+ExportToImage.jpg.text=JPEG ...
+ExportToImage.png.text=PNG ...
+ExportToOoWriter.text=Dokument Open Office Writer ...
 ExportToOoWriter.tooltip=Neprepognjena vozli\u0161\u010Da oblikujejo strukturo, prepognjena vozli\u0161\u010Da pa vsebino dokumenta.
 extension_menu=Fizi\u010Dni slog
-extras=Orodja
+extras=&Orodja
 f_button_unassigned=<no action>[translate me]
 FaqOpenURLAction.text=Pogosto zastavljena vpra\u0161anja (FAQ)
-file=Datoteka
+file=&Datoteka
 file_already_exists=Datoteka {0} \u017Ee obstaja. Jo \u017Eelite prepisati?
 file_not_found=Datoteke {0} ni mo\u010D najti
-filter=Filter[translate me]
+filter=F&ilter
 filter_add=dodaj
-filter_and=in
+filter_and=&In
 filter_conditions=Filtri
-filter_contains=vsebuje
+filter_contains=Vsebuje
 filter_delete=izbri\u0161i
-filter_dialog=Sestavljalec filtrov
+filter_dialog=Sestavljavec filtrov
 filter_does_not_exist=ne obstaja
 filter_edit_description=Uredi seznam filtrov
-filter_enter_value=Vnesite vrednost
+filter_enter_value=Vnesi vrednost
 filter_exist=obstaja
 filter_icon=Ikona
 filter_is_equal_to=je enako
 filter_is_not_equal_to=ni enako
 filter_no_filtering=Brez filtriranja
 filter_node=besedilo vozli\u0161\u010Da
-filter_not=ne
-filter_or=ali
-filter_select=izberi
+filter_not=&Ne
+filter_or=&Ali
+filter_select=&Izberi
 filter_selected_node_view=Trenutno izbrana vozli\u0161\u010Da
 find_what=Najdi niz
 FindAction.text=Najdi ...
@@ -203,12 +231,12 @@ FoldAllAction.text=Prepogni vse
 FoldAllAction.tooltip=<html>Prepogne izbrana vozli\u0161\u010Da in vse njihove otroke.</html>
 FoldOneLevelAction.text=Prepogni eno stopnjo
 FoldOneLevelAction.tooltip=<html>Prepogne izbrana vozli\u0161\u010Da za eno stopnjo.</html>
-follow_graphical_link=Pojdi na:
+follow_graphical_link=Pojdi na ''{0}''
 FollowLinkAction.text=Follow Link[translate me]
 font=Pisava
 FontFamilyAction.text=dru\u017Eina pisav
 FontSizeAction.text=velikost pisave
-format=Oblika
+format=O&blika
 format_menu_edge_styles=Slogi robov
 format_menu_edge_widths=\u0160irine robov
 FormatCopy.text=Kopiraj obliko
@@ -225,7 +253,7 @@ Freeplane.progress.gettingPreferenceDirectories=Pridobivanje nastavitev miselnih
 Freeplane.progress.gettingPreferences=Pridobivanje nastavitev ...
 Freeplane.progress.loadMaps=Nalaganje miselnih vzorcev ...
 Freeplane.progress.propagateLookAndFeel=Uveljavljanje videza in ob\u010Dutka ...
-Freeplane.progress.settingPreferences=Nastavljanje ...
+Freeplane.progress.settingPreferences=Pridobivanje nastavitev ...
 Freeplane.progress.startCreateController=Za\u010Detek ustvarjanja kontrolnika ...
 Freeplane.progress.updateLookAndFeel=Posodabljanje videza in ob\u010Dutka ...
 freeplane_reverted=Freeplane_Preobrnjeno_
@@ -240,23 +268,23 @@ GrabKeyDialog.grab-key.clear=Po\u010Disti
 GrabKeyDialog.grab-key.remove=Odstrani
 GrabKeyDialog.grab-key.remove-ask=Ste prepri\u010Dani, da ho\u010Dete odstraniti to akcijo tipke?
 GrabKeyDialog.grab-key.title=Vnesi novo tipko
-help=Pomo\u010D
+help=&Pomo\u010D
 HideAllAttributesAction.text=Skrij vse atribute
 HierarchicalIconsAction.text=Prika\u017Ei ikone hierarhi\u010Dno
 HierarchicalIconsAction.tooltip=\u010Ce ima kateri od otrok/vnukov ikono, to ikono prika\u017Ee tudi v majhni obliki.
 HotKeyInfoAction.text=Key Reference[translate me]
-html_export_based_on_headings=Izvoz HTML - Glede na naslove
+html_export_based_on_headings=HTML izvoz - Glede na naslove
 html_export_fold_all=Izvoz HTML - Prepogni vse
 html_export_fold_currently_folded=Izvoz HTML - Prepogni trenutno prepognjene
 html_export_no_folding=Izvoz HTML - Brez prepogibanja
-icon_0%=0%[translate me]
-icon_100%=100%[translate me]
-icon_25%=25%[translate me]
-icon_50%=50%[translate me]
-icon_75%=75%[translate me]
-icon_attach=Poglej sem
+icon_0%=0%
+icon_100%=100%
+icon_25%=25%
+icon_50%=50%
+icon_75%=75%
+icon_attach=Poglej tukaj
 icon_back=Nazaj
-icon_bee=Freeplane[translate me]
+icon_bee=Freeplane
 icon_bell=Zapomni si
 icon_bookmark=Izvrstno
 icon_broken-line=Broken[translate me]
@@ -273,13 +301,16 @@ icon_fema=Females[translate me]
 icon_female1=Female1[translate me]
 icon_female2=Female2[translate me]
 icon_females=Females[translate me]
-icon_flag=Zastavica
-icon_flag-black=Black Flag[translate me]
-icon_flag-green=Green Flag[translate me]
-icon_flag-orange=Orange Flag[translate me]
-icon_flag-pink=Pink Flag[translate me]
-icon_flag-yellow=Yellow Flag[translate me]
+icon_flag=Rde\u010Da zastavica
+icon_flag-black=\u010Crna zastavica
+icon_flag-blue=Modra zastavica
+icon_flag-green=Zelena zastavica
+icon_flag-orange=Oran\u017Ena zastavica
+icon_flag-pink=Ro\u017Enata zastavica
+icon_flag-yellow=Rumena zastavica
 icon_forward=Naprej
+icon_freemind_butterfly=FreeMind
+icon_full-0=Brez prioritete
 icon_full-1=1. prioriteta
 icon_full-2=2. prioriteta
 icon_full-3=3. prioriteta
@@ -287,6 +318,8 @@ icon_full-4=4. prioriteta
 icon_full-5=5. prioriteta
 icon_full-6=6. prioriteta
 icon_full-7=7. prioriteta
+icon_full-8=8. prioriteta
+icon_full-9=9. prioriteta
 icon_go=Green Traffic Light[translate me]
 icon_gohome=Domov
 icon_help=Vpra\u0161anje
@@ -304,7 +337,7 @@ icon_Mail=Po\u0161ta
 icon_male1=Male1[translate me]
 icon_male2=Male2[translate me]
 icon_males=Males[translate me]
-icon_menu=Ikone
+icon_menu=&Ikona
 icon_messagebox_warning=Pomembno
 icon_password=Klju\u010D
 icon_pencil=Za izbolj\u0161ati
@@ -314,6 +347,7 @@ icon_smiley-neutral=No Mind[translate me]
 icon_smily_bad=Mi ni sme\u0161no
 icon_stop=Ustavi
 icon_up=Navzgor
+icon_video=Video
 icon_wizard=\u010Carovnija
 icon_xmag=Potrebna je razprava
 icon_yes=Pomembno
@@ -325,38 +359,45 @@ IconGroupPopupAction.signs.text=Signs[translate me]
 IconGroupPopupAction.smiley.text=Smiley[translate me]
 IconSelectionPlugin.text=Izberi ikono ...
 IconSelectionPlugin.tooltip=<html>Tukaj lahko izberete ikono z uporabo podokna.</html>
-import=Uvozi
+import=U&voz
 import_linked_branch_no_link=Izbrano vozli\u0161\u010De nima nobene povezave za uvoz.
-ImportAction.text=Uvozi
-ImportBranchAction.text=Veja ...
-ImportExplorerFavoritesAction.text=Priljubljeni ...
+ImportAction.text=Uvozi miselni vzorec
 ImportFolderStructureAction.text=Struktura map ...
-ImportLinkedBranchAction.text=Povezana veja
-ImportLinkedBranchWithoutRootAction.text=(Povezana veja) brez korenine ...
 ImportMindmanagerFiles.text=Miselni vzorec MindManager X5 ...
+ImportXmlFile.text=Uvoz xml datoteke
 increase_branch_font_size=Ve\u010Dja pisava
 IncreaseNodeFontAction.text=Ve\u010Dja pisava
 ItalicAction.text=Le\u017Ee\u010De
 italicise_branch=Zale\u017Ei
+java_version=Razli\u010Dica Jave: {0}
+LatexEditLatexAction.text=Uredi LaTeX formulo ...
+LatexInsertLatexAction.text=Dodaj LaTeX formulo ...
+LengthUnits.cm=cm
+LengthUnits.mm=mm
+LengthUnits.pt=pt
+LengthUnits.px=px
 less_than_two_selected_nodes=Izbrati morate vsaj dve vozli\u0161\u010Di, da bi dobili povezave.
 link_not_available_any_more=Povezava ni ve\u010D veljavna. Medtem je bilo vozli\u0161\u010De \u017Ee izbrisano.
 link_not_found=Povezave {0} ni mogo\u010De najti.
-load=Nalo\u017Ei
+load=&Nalo\u017Ei
 locking_failed_by_open=Zaklep miselnega vzorca {0} ni uspel. Odpiranje samo za branje.
-locking_failed_by_save_as=Zaklep miselnega vzorca {0} ni uspel. Dejanje shranjevanja kot je bilo prekinjeno.
+locking_failed_by_save_as=Zaklep miselnega vzorca {0} ni uspel. Dejanje shranjevanja je bilo prekinjeno.
 locking_old_lock_removed=Miselni vzorec {0} je zaklenil uporabnik {1}. Zaklep je bil odstranjen, saj je star.
 long_node_changed_cancel=Spremenili ste vozli\u0161\u010De. \u017Delite zavre\u010Di spremembe?
 long_node_changed_submit=Spremenili ste vozli\u0161\u010De. \u017Delite shraniti spremembe?
 lots_of_links_warning=Ustvarili boste veliko povezav z istim vozli\u0161\u010Dem. Resni\u010Dno \u017Eelite ustvariti te povezave?
-map_already_exists=;Miselni vzorec \u017Ee obstaja. Ga \u017Eelite prepisati?
+ManageAddOnsDialog.tab.manage.themes=Teme
+map_already_exists=Miselni vzorec \u017Ee obstaja. Ga \u017Eelite prepisati?
 map_corrupted=Miselni vzorec je okvarjen. Si \u017Eelite ogledati podrobnosti?
 map_locked_by_open=Miselni vzorec {0} je \u017Ee urejevan s strani uporabnika {1}. Odpiranje samo za branje.
 map_locked_by_save_as=Miselni vzorec {0} je \u017Ee urejevan s strani uporabnika {1}. Akcija Shrani kot je prekinjena.
 map_not_saved=Miselni vzorec prej ni bil shranjen.
-menu_attributes=Atributi
-menu_insert=Vstavi
+menu_attributes=&Atributi
+menu_insert=Vs&tavi
+menu_latex_formula=LaTeX formula
+menu_nodes=&Vozli\u0161\u010Da
 mindmap=Miselni vzorec
-mindmaps=Miselni vzorci
+mindmaps=&Miselni vzorci
 mindmaps_desc=Miselni vzorci (*.mm)
 mindmaps_filter_desc=Filtri (*.mmfilter)
 mode_Browse=Browse Mode[translate me]
@@ -364,7 +405,7 @@ mode_File=File Mode[translate me]
 mode_MindMap=MindMap Mode[translate me]
 mode_na=Na\u010Din ni na voljo
 mode_status=Na\u010Din spremenjen v na\u010Din {0}
-mode_title=Freeplane - Na\u010Din {0}
+mode_title=Freeplane - {0}
 modes=Na\u010Dini
 ModesMenuAction.Browse.text=Map Browser[translate me]
 ModesMenuAction.File.text=File Explorer[translate me]
@@ -374,19 +415,20 @@ MoveToRootAction.text=Premakni k korenskemu vozli\u0161\u010Du
 navigate=Krmar
 NavigationNextMapAction.text=Naslednji vzorec
 NavigationPreviousMapAction.text=Prej\u0161nji vzorec
+new=&Novo
 new_mindmap=Nov miselni vzorec
 new_node=Novo vomgpidpipidzli\u0161\u010De
 new_node_as_sibling_not_possible_for_the_root=Novo vozli\u0161\u010De kot bratsko ni mo\u017Eno kot korensko vozli\u0161\u010De
 NewChildAction.text=Novo otro\u0161ko vozli\u0161\u010De
-NewMapAction.text=Nova
-NewParentNode.text=Novo star\u0161evsko vozli\u0161\u010De
-NewParentNode.tooltip=<html>Vsi izbrani so poslani k novemu star\u0161u.</html>
+NewerFileRevisionsFoundDialog.cancel=&Presko\u010Di
+NewMapAction.text=Nov miselni vzorec
+NewParentNode.text=Novo nadrejeno vozli\u0161\u010De
+NewParentNode.tooltip=<html>Vsi izbrani bodo poslani k novemu nadrejenemu.</html>
 NewPreviousSiblingAction.text=Novo predhodno bratsko vozli\u0161\u010De
 NewSiblingAction.text=Novo bratsko vozli\u0161\u010De
 no=Ne
 no_format_copy_before_format_paste=Oblike ne morete prilepiti, \u010De je niste prej kje kopirali.
 no_found_from=<html>"{0}" ni mogo\u010De najti v "{1}".</html>
-no_more_found_from=Nobenih "{0}" ve\u010D ni bilo najdenih v "{1}".
 no_previous_find=Ni bilo zadetkov od prej.
 node=Vozli\u0161\u010De
 node_changed_discard_changes=Spremenili ste vozli\u0161\u010De. \u017Delite zavre\u010Di spremembe?
@@ -398,15 +440,14 @@ NodeDownAction.text=Vozli\u0161\u010De navzdol
 NodeListAction.text=Najdi in zamenjaj ...
 NodeListAction.tooltip=Poka\u017Ei vsa vozli\u0161\u010Da kot iskalni seznam s filtrom lastnosti.
 NodeShapeAction.bubble.text=Mehur\u010Dek
-NodeShapeAction.fork.text=Razvejaj
 NodeUpAction.text=Vozli\u0161\u010De navzgor
 nonboldify_branch=Razveljavi krepko
 nonitalicise_branch=Razveljavi le\u017Ee\u010De
 normal=Obi\u010Dajno
 not_saved_for_link_error=Miselni vzorec mora biti shranjen, preden lahko nastavite povezavo z izbirnikom datotek
-ok=V redu
+ok=&V redu
 OKAction.text=V redu
-OpenAction.text=Odpri ...
+OpenAction.text=Odpri shranjen miselni vzorec ...
 OpenPathAction.text=Open File[translate me]
 option_changes_may_require_restart=Da bi videli u\u010Dinek spremenjenih nastavitev, morate najverjetneje ponovno zagnati Freeplane.
 OptionalDontShowMeAgainDialog.cancel=&Ne
@@ -420,8 +461,8 @@ OptionPanel.antialias.tooltip=<html>Dolo\u010Da kvaliteto vzorca. Ve\u010D glaje
 OptionPanel.antialias_all=Pogladi robove vsega
 OptionPanel.antialias_edges=Pogladi le robove
 OptionPanel.antialias_none=brez glajenja
-OptionPanel.Appearance=Izgled
-OptionPanel.ar=arabski
+OptionPanel.Appearance=Videz
+OptionPanel.ar=Arab\u0161\u010Dina / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
 OptionPanel.as_parent=kot star\u0161
 OptionPanel.ask=Vpra\u0161aj
 OptionPanel.automatic=samodejno
@@ -440,19 +481,19 @@ OptionPanel.cloud=Cloud[translate me]
 OptionPanel.combined=Zdru\u017Eeno
 OptionPanel.convert_to_current_version=<html>Samodejno pretvori miselne vzorce iz starej\u0161ih razli\u010Dic Freeplane <br>v trenutno razli\u010Dico?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Samo zelo obse\u017Ene miselne vzorce, ki ne potrebujejo pretvorbe <br>(to je izvedensko mnenje), lahko odprete brez pretvorbe.</html>
-OptionPanel.cs=\u010De\u0161ki
+OptionPanel.cs=\u010Ce\u0161\u010Dina / \u010Desky
 OptionPanel.cut_nodes_without_question=\u017Delite izrezati vozli\u0161\u010Da brez potrditve?
-OptionPanel.cut_nodes_without_question.tooltip=\u010Ce je to polje potrjeno, bodo vozli\u0161\u010Da izrezana brez potrditve. \u010Ce gumb pritisnete nenamerno, lahko povzro\u010Dite izgubo informacij.
-OptionPanel.da=danski
-OptionPanel.de=nem\u0161ki
+OptionPanel.cut_nodes_without_question.tooltip=\u010Ce je to polje potrjeno, bodo vozli\u0161\u010Da izrezana brez potrditve. \u010Ce pritisnete gumb nenamerno, lahko povzro\u010Dite izgubo informacij.
+OptionPanel.da=Dan\u0161\u010Dina / dansk
+OptionPanel.de=Nem\u0161\u010Dina / Deutsch
 OptionPanel.default=privzeto
-OptionPanel.default_browser_command_mac=Privzeti ukaz brskalnika - Mac
+OptionPanel.default_browser_command_mac=Privzeti ukaz brskalnika za Mac
 OptionPanel.default_browser_command_mac.tooltip=<html> in MAC: (hvala, Nick!)</html>
-OptionPanel.default_browser_command_other_os=Privzeti ukaz brskalnika - drugi OS
-OptionPanel.default_browser_command_other_os.tooltip=<html> To je tipi\u010Dno Linux:</html>
-OptionPanel.default_browser_command_windows_9x=Privzeti ukaz brskalnika - Windows 9x
+OptionPanel.default_browser_command_other_os=Privzeti ukaz brskalnika za druge OS
+OptionPanel.default_browser_command_other_os.tooltip=<html> To je tipi\u010Dno za Linux:</html>
+OptionPanel.default_browser_command_windows_9x=Privzeti ukaz brskalnika za Windows 9x
 OptionPanel.default_browser_command_windows_9x.tooltip=<html>Za Windows (znaki "" so obvezni zaradi povezav, ki vsebujejo "=" v svojem naslovu URL).</html>
-OptionPanel.default_browser_command_windows_nt=Privzeti ukaz brskalnika - Windows NT
+OptionPanel.default_browser_command_windows_nt=Privzeti ukaz brskalnika za Windows NT
 OptionPanel.default_browser_command_windows_nt.tooltip=<html>Za Windows (znaki "" so obvezni zaradi povezav, ki vsebujejo "=" v svojem naslovu URL).</html>
 OptionPanel.Defaults=Privzeto
 OptionPanel.delete_automatic_saves_at_exit=Ob izhodu izbri\u0161i samodejno shranjeno
@@ -468,19 +509,18 @@ OptionPanel.edgestyle=Slog robov
 OptionPanel.edgestyle.tooltip=Lastnost roba star\u0161evskega vozli\u0161\u010Da (velja tudi za vsa otro\u0161ka vozli\u0161\u010Da)
 OptionPanel.edgewidth=\u0160irina robov
 OptionPanel.edgewidth.tooltip=Lastnost roba star\u0161evskega vozli\u0161\u010Da (velja tudi za vsa otro\u0161ka vozli\u0161\u010Da)
-OptionPanel.el=El[translate me]
 OptionPanel.el__enter_confirms_by_default=Tipka Enter potrdi izbiro
 OptionPanel.el__max_default_window_height=Privzeta maksimalna vi\u0161ina okna
 OptionPanel.el__max_default_window_width=Privzeta maksimalna \u0161irina okna
 OptionPanel.el__min_default_window_height=Privzeta minimalna vi\u0161ina okna
 OptionPanel.el__min_default_window_width=Privzeta minimalna \u0161irina okna
 OptionPanel.el__position_window_below_node=Postavi okno pod vozli\u0161\u010De
-OptionPanel.en=angle\u0161ki
+OptionPanel.en=Angle\u0161\u010Dina / English
 OptionPanel.Environment=Okolje
-OptionPanel.es=\u0161panski
-OptionPanel.et=Et[translate me]
-OptionPanel.execute_scripts_without_asking=Skripti naj bodo izvedeni brez potrditve?
-OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripti Freeplane so ve\u010Dinoma sposobni izvesti poljubno dejanje na va\u0161em ra\u010Dunalniku. <br>Zato ni pametno izvajati skriptov, katerih varnosti ne morete oceniti.</html>
+OptionPanel.es=\u0160pan\u0161\u010Dina, Kastilj\u0161\u010Dina / espa\u00F1ol, castellano
+OptionPanel.et=Eston\u0161\u010Dina / eesti, eesti keel
+OptionPanel.execute_scripts_without_asking=Skripti naj bodo izvedeni brez potrditve
+OptionPanel.execute_scripts_without_asking.tooltip=<html>Skripti Freeplane so sposobni izvesti poljubno dejanje na va\u0161em ra\u010Dunalniku. <br>Zato ni pametno izvajati skript, katerih varnosti ne morete oceniti.</html>
 OptionPanel.experimental_file_locking_on=Poskusno zaklepanje datotek
 OptionPanel.experimental_file_locking_on.tooltip=<html> Eksperimentalne mo\u017Enosti</html>
 OptionPanel.export_icons_in_html=Izvozi ikone v HTML
@@ -490,24 +530,25 @@ OptionPanel.first=kot prve
 OptionPanel.foldingsymbolwidth=\u0160irina simbola prepogibanja
 OptionPanel.foldingsymbolwidth.tooltip=<html>\u0160irina krogca, ki ozna\u010Duje prepognjenost drevesa.</html>
 OptionPanel.fork=Fork[translate me]
-OptionPanel.fr=francoski
-OptionPanel.gl=galicijski
+OptionPanel.fr=Franco\u0161\u010Dina / Fran\u00E7ais
+OptionPanel.gl=Galicij\u0161\u010Dina / Galego
 OptionPanel.gtk=Gtk
-OptionPanel.hr=hrva\u0161ki
+OptionPanel.hr=Hrva\u0161\u010Dina / hrvatski
 OptionPanel.HTML=HTML
 OptionPanel.html_export_based_on_headings=glede na naslove
 OptionPanel.html_export_fold_all=Prepogni vse
 OptionPanel.html_export_fold_currently_folded=prepogni trenutno prepognjene
 OptionPanel.html_export_folding=Prepogibanje pri izvozu v HTML
 OptionPanel.html_export_no_folding=brez prepogibanja
-OptionPanel.hu=mad\u017Earski
+OptionPanel.hu=Mad\u017Ear\u0161\u010Dina / Magyar
 OptionPanel.icon=Ikona
 OptionPanel.icon.tooltip=\u010Ce je polje ozna\u010Deno, bo imelo vozli\u0161\u010De natanko to ikono.
+OptionPanel.icon_size=Velikost ikone
 OptionPanel.id=Id[translate me]
-OptionPanel.it=italijanski
-OptionPanel.ja=japonski
+OptionPanel.it=Italijan\u0161\u010Dina / Italiano
+OptionPanel.ja=Japon\u0161\u010Dina / \u65E5\u672C\u8A9E
 OptionPanel.Keystrokes=Bli\u017Enjice
-OptionPanel.ko=korejski
+OptionPanel.ko=Korej\u0161\u010Dina / \uD55C\uAD6D\uC5B4 (\u97D3\u570B\u8A9E), \uC870\uC120\uB9D0 (\u671D\u9BAE\u8A9E)
 OptionPanel.label_font_family=Font Family[translate me]
 OptionPanel.label_font_size=Velikost pisave
 OptionPanel.language=Jezik
@@ -522,39 +563,36 @@ OptionPanel.load_last_map=Samodejno odpri zadnji odprti miselni vzorec
 OptionPanel.load_last_map.tooltip=<html>Ko se Freeplane za\u017Eene, samodejno odpre nazadnje odprti miselni vzorec.</html>
 OptionPanel.lookandfeel=Izgled in ob\u010Dutek
 OptionPanel.lookandfeel.tooltip=<html>Izgled in ob\u010Dutek, ki naj bo uporabljen. 'meal','windows','motif', 'gtk' so podprti, 'mac' je na voljo le na MacOS. 'privzeto' pomeni, da je uporabljen privzeti izgled in ob\u010Dutek. \u010Ce \u017Eelite nastaviti svoj lasten L&F, prosimo vnesite ime razreda tukaj in zagotovite, da je/so ustrezna/e datoteka/e jar nalo\u017Eena/e. \u010Ce so z izgledom in ob\u010Dutkom problemi, potem tukaj izberite 'ni\u010D'. To deluje za program\u010Dke.</html>
-OptionPanel.lt=litovski
+OptionPanel.lt=Litov\u0161\u010Dina / kalba
 OptionPanel.max_node_width=Najve\u010Dja \u0161irina vozli\u0161\u010Da
 OptionPanel.max_node_width.tooltip=<html>Privzeta najve\u010Dja \u0161irina vozli\u0161\u010Da v pikslih.</html>
 OptionPanel.metal=Metal
 OptionPanel.motif=Motif
 OptionPanel.nb=Nb[translate me]
-OptionPanel.nl=nizozemski
+OptionPanel.nl=Nizozemski, Flamski / Nederlands, Vlaams
 OptionPanel.nn=norve\u0161ki Nynorsk
 OptionPanel.nodebackgroundcolor=Barva ozadja vozli\u0161\u010Da
-OptionPanel.nodebackgroundcolor.tooltip=nodebackgroundcolor.tooltip
 OptionPanel.nodecolor=Barva vozli\u0161\u010Da
-OptionPanel.nodecolor.tooltip=nodecolor.tooltip
 OptionPanel.nodefontbold=Krepka pisava
 OptionPanel.nodefontitalic=Le\u017Ee\u010Da pisava
 OptionPanel.nodefontname=Pisava vozli\u0161\u010Da
 OptionPanel.nodefontsize=Pisava vozli\u0161\u010Da
 OptionPanel.nodetext=Besedilo voli\u0161\u010Da
-OptionPanel.nodetext.tooltip=nodetext.tooltip
 OptionPanel.nothing=ni\u010D
 OptionPanel.number_of_different_files_for_automatic_save=\u0160tevilo datotek samodejnega shranjevanja
 OptionPanel.number_of_different_files_for_automatic_save.tooltip=<html> \u0161tevilo n razli\u010Dnih datotek, v katere se shranjujejo miselni vzorci.  Prvo samodejno shranjevanje se izvede v prvo datoteko itn. do n+1-shranjevanja, ki se spet izvede v prvo datoteko (cikli\u010Dno).</html>
 OptionPanel.OK=Shrani
 OptionPanel.patternname=Ime
 OptionPanel.patternname.tooltip=Unikatno ime vzorca
-OptionPanel.pl=poljski
+OptionPanel.pl=Polj\u0161\u010Dina / polski
 OptionPanel.placenewbranches=Postavi nove veje
 OptionPanel.placenewbranches.tooltip=<html>Kam naj bodo postavljene nove veje. Veljavne vrednosti so 'prve' in 'zadnje' </html>
 OptionPanel.printonwhitebackground=<html>Belo ozadje pri tiskanju</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Vedno uporabi belo ozadje za tiskanje</html>
-OptionPanel.pt_BR=portugalski BR
-OptionPanel.pt_PT=portugalski PT
+OptionPanel.pt_BR=Portugal\u0161\u010Dina (Brazilija) / Portugu\u00EAs (Brasil)
+OptionPanel.pt_PT=Portugal\u0161\u010Dina (Portugalska) / Portugu\u00EAs (Portugal)
 OptionPanel.relative=relativne
-OptionPanel.ru=ruski
+OptionPanel.ru=Ru\u0161\u010Dina / \u0420\u0443\u0441\u0441\u043A\u0438\u0439
 OptionPanel.scrollbar_increment=Speed[translate me]
 OptionPanel.selection_method=Metoda izbire
 OptionPanel.selection_method.tooltip=<html> z naslednjim preklopnikom lahko omogo\u010Dite/onemogo\u010Dite shemo zakasnjenega izbiranja. Samodejne mo\u017Enosti. Teh ne spreminjajte, saj bodo ne glede na to shranjene v auto.properties.</html>
@@ -576,8 +614,8 @@ OptionPanel.separator.EdgeControls=Robovi
 OptionPanel.separator.edit_long_node_window=Uredi dolgo okno vozli\u0161\u010Da
 OptionPanel.separator.files=Datoteke
 OptionPanel.separator.General=Splo\u0161no
-OptionPanel.separator.html_export=Izvoz HTML
-OptionPanel.separator.html_import=Html Import[translate me]
+OptionPanel.separator.html_export=HTML izvoz
+OptionPanel.separator.html_import=HTML uvoz
 OptionPanel.separator.hyperlink_types=Vrste hiperpovezav
 OptionPanel.separator.icon_properties=Ikone
 OptionPanel.separator.icons=Ikone v "Izberi ikono ..."
@@ -603,16 +641,14 @@ OptionPanel.separator.selection_method=Metoda izbire
 OptionPanel.separator.undo=Razveljavi
 OptionPanel.set_property_text=Spremeni
 OptionPanel.set_property_text.tooltip=Empty: Don't touch; Minus=Remove property (set default values); Plus=Spremeni lastnost
-OptionPanel.setscript=Spremeni?
-OptionPanel.setscript.tooltip=Skriptu lahko dodelite slog.
+OptionPanel.setscript=Spremenim?
+OptionPanel.setscript.tooltip=Skripti lahko dodelite slog.
 OptionPanel.sharp_bezier=ostro bezier
 OptionPanel.sharp_linear=ostro linearno
 OptionPanel.show_icon_for_attributes=Poka\u017Ei ikono za atribute
-OptionPanel.sk=Sk[translate me]
-OptionPanel.sl=slovenski
-OptionPanel.standardbackgroundcolor=Barva ozadja
+OptionPanel.sk=Slova\u0161\u010Dina / sloven\u010Dina
+OptionPanel.sl=Sloven\u0161\u010Dina / sloven\u0161\u010Dina
 OptionPanel.standardbackgroundcolor.tooltip=<html>Standardna barva ozadja v zapisu html </html>
-OptionPanel.standardcloudcolor=Barva obla\u010Dka
 OptionPanel.standardcloudcolor.tooltip=<html>Standardna barva obla\u010Dka v zapisu html </html>
 OptionPanel.standardcloudestyle=Slog obla\u010Dka
 OptionPanel.standardcloudestyle.tooltip=<html>Standardni slog obla\u010Dka. Trenutno je podprt le 'bezier'.</html>
@@ -626,30 +662,28 @@ OptionPanel.standardselectednodecolor=Barva izbranega vozli\u0161\u010Da
 OptionPanel.standardselectednodecolor.tooltip=<html>Standardna barva vozli\u0161\u010Da, \u010De je izbran. V zapisu HTML (#RRGGBB v \u0161estnajsti\u0161kih vrednostih) </html>
 OptionPanel.standardselectednoderectanglecolor=Barva izbranega obla\u010Dka vozli\u0161\u010Da
 OptionPanel.standardselectednoderectanglecolor.tooltip=<html>Barva obla\u010Dka, ki ozna\u010Duje izbrana vozli\u0161\u010Da. V zapisu html (#RRGGBB v \u0161estnajsti\u0161kih vrednostih) </html>
-OptionPanel.sv=\u0161vedski
+OptionPanel.sv=\u0160ved\u0161\u010Dina / svenska
 OptionPanel.time_for_automatic_save=Interval samodejnega shranjevanja
-OptionPanel.time_for_automatic_save.tooltip=<html> \u010Cas med dvema zaporednima samodejnima shranjevalnima akcijama (v ms): za onemogo\u017Eitev samodejnega shranjevanja to vrednost nastavite na 2000000000.</html>
+OptionPanel.time_for_automatic_save.tooltip=<html> \u010Cas med dvema zaporednima samodejnima shranjevalnima akcijama (v ms): za onemogo\u010Ditev samodejnega shranjevanja to vrednost nastavite na 2000000000.</html>
 OptionPanel.time_for_delayed_selection=\u010Cas za zakasnjeno izbiro
 OptionPanel.time_for_delayed_selection.tooltip=<html> \u010Casovna zakasnitev izbire vozli\u0161\u010D, ko je mi\u0161ka prek (v ms). Spremenite to vrednost na 1, \u010De \u017Eelite neposredno izbiro ob prekritju z mi\u0161ko.</html>
-OptionPanel.toolTipManager.max_tooltip_width=\u0160irina okenca nasveta
-OptionPanel.toolTipManager.max_tooltip_width.tooltip=<html>Privzeta \u0161irina okenca nasveta v slikovnih to\u010Dkah.</html>
-OptionPanel.tr=tur\u0161ki
-OptionPanel.uk_UA=Uk UA[translate me]
+OptionPanel.toolTipManager.max_tooltip_width.tooltip=Privzeta \u0161irina okenca nasveta v slikovnih to\u010Dkah.
+OptionPanel.tr=Tur\u0161\u010Dina / T\u00FCrk\u00E7e
+OptionPanel.uk_UA=Ukrajin\u0161\u010Dina / \u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430
 OptionPanel.undefined_font=Nedolo\u010Dena pisava
 OptionPanel.undo_levels=Ravni razveljavitve
-OptionPanel.undo_levels.tooltip=<html>Dolo\u010Da, koliko korakov je shranjenih, da jih lahko razveljavite z "Razveljavi".</html>
+OptionPanel.undo_levels.tooltip=<html>Dolo\u010Di, koliko korakov je shranjenih, da jih lahko razveljavite z "Razveljavi".</html>
 OptionPanel.unfold_on_paste=Razpostri vozli\u0161\u010De ob lepljenju
 OptionPanel.unfold_on_paste.tooltip=Razpostri vozli\u0161\u010De ob lepljenju ali povleci-in-spusti
 OptionPanel.use_common_out_point_for_root_node=Robovi se za\u010Dnejo v eni to\u010Dki v korenskem vozli\u0161\u010Du
 OptionPanel.use_common_out_point_for_root_node.tooltip=Robovi se za\u010Dnejo v eni to\u010Dki v korenskem vozli\u0161\u010Du
 OptionPanel.use_tabbed_pane=Uporabi zavihke
 OptionPanel.use_tabbed_pane.tooltip=Ob izboru naj bodo miselni vzorci prikazani v zavihkih (kot v Firefoxu :-) ).
-OptionPanel.vi=Vi[translate me]
 OptionPanel.wheel_velocity=Odzivnost
 OptionPanel.wheel_velocity.tooltip=Vi\u0161ja vrednost povzro\u010Di hitrej\u0161e premike mi\u0161kinega kole\u0161\u010Dcka po vzorcu.
 OptionPanel.windows=Windows
-OptionPanel.zh_CN=kitajski CN
-OptionPanel.zh_TW=kitajski
+OptionPanel.zh_CN=Kitaj\u0161\u010Dina, poenostavljena / \u7B80\u4F53\u5B57
+OptionPanel.zh_TW=Kitaj\u0161\u010Dina, tradicionalna / \u7E41\u9AD4\u5B57
 PageAction.text=Nastavitev strani ...
 PasteAction.text=Prilepi
 PatternNewNameProperty=Nov vzorec
@@ -664,13 +698,14 @@ PatternToString.FontItalic=Le\u017Ee\u010De
 PatternToString.FontName=Ime pisave
 PatternToString.Icon=Ikona
 PatternToString.NodeFontSize=Velikost pisave
+periodic_formula={0} * n + {1}
 plugins/ScriptEditor.cancel=&Prekli\u010Di
 plugins/ScriptEditor.exit=I&zhod
 plugins/ScriptEditor.menu_actions=&Dejanja
 plugins/ScriptEditor.new_script=Nov skript
-plugins/ScriptEditor.run=Za&\u017Eeni
+plugins/ScriptEditor.run=&Za\u017Eeni
 plugins/ScriptEditor/window.Result=Rezultat:
-plugins/ScriptEditor/window.title=Urejevalnik skriptov
+plugins/ScriptEditor/window.title=Urejevalnik skript
 plugins/TimeList.xml_Created=Ustvarjeno
 plugins/TimeList.xml_Date=Datum
 plugins/TimeList.xml_Icons=Ikone
@@ -698,20 +733,18 @@ plugins/TimeManagement.xml_Replace_All=Zamenjaj vse
 plugins/TimeManagement.xml_Replace_Selected=Zamenjaj izbrano
 plugins/TimeManagement.xml_Select=Izberi
 plugins/TimeManagement.xml_todayButton=Danes
-plugins/TimeManagement.xml_WindowTitle=\u010Casovni na\u010Drtovalec
-plugins/TimeManagement.xml_WindowTitle_All_Nodes=Najdi in zamenjaj
+plugins/TimeManagement.xml_WindowTitle_All_Nodes=Najdi & zamenjaj
 preferences=Nastavitve
 print_preview_title=Predogled tiskanja
-PrintDirectAction.text=Natisni ...
+PrintDirectAction.text=Natisni
 printing_settings=Umerjanje tiskanja
 PrintPreviewAction.text=Predogled tiskanja ...
 PropertyAction.dialog=Preferences[translate me]
-PropertyAction.text=Lastnosti ...
-QuitAction.text=Izhod
+PropertyAction.text=Nastavitve ...
 read_only=Samo za branje
 really_convert_to_current_version=<html>Ta miselni vzorec je nastal s staro razli\u010Dico programa Freeplane. <br>Ga \u017Eelite pretvoriti (priporo\u010Deno)? <br>(Sicer bo obravnavan tak, kakr\u0161en je, brez zagotovil.) </html>
 really_cut_node=Resni\u010Dno \u017Eelite izrezati vozli\u0161\u010Da?
-really_execute_script=Resni\u010Dno \u017Eelite izvesti skripte, vklju\u010Dene v ta miselni vzorec? Mogo\u010De je, da lahko \u0161kodijo va\u0161emu ra\u010Dunalniku.
+really_execute_script=Resni\u010Dno \u017Eelite izvesti skript, ki je vklju\u010Den v ta miselni vzorec? Mogo\u010De je, da bo \u0161kodil va\u0161emu ra\u010Dunalniku.
 really_remove_node=Resni\u010Dno \u017Eelite izbrisati vozli\u0161\u010Da?
 RedoAction.text=Ponovi
 RedoFilterAction.text=Ponovi
@@ -725,22 +758,18 @@ repair_link=Popravi povezavo
 repair_link_question=Povezanega miselnega vzorca ni mo\u017Eno nalo\u017Eiti. \u017Delite popraviti povezavo ro\u010Dno?
 replace=Zamenjaj
 reset_to_default=Use default[translate me]
-ResetNodeLocationAction.text=Ponastavi polo\u017Eaj
 save_failed=Poskus shranjevanja miselnega vzorca {0} ni uspel.
-save_unsaved=\u017Delite shraniti naslednji miselni vzorec? :
-SaveAction.text=Shrani
-SaveAll.text=Shrani vse
-SaveAll.tooltip=Shrani vse odprte miselne vzorce.
-SaveAsAction.text=Shrani kot ...
+save_unsaved=\u017Delite shraniti naslednji miselni vzorec?
+SaveAll.text=Shrani &vse miselne vzorce
+SaveAll.tooltip=Shrani vse odprte miselne vzorce
+SaveAsAction.text=Shrani miselni vzorec kot ...
 saved=Shranjeno
 scheme_evaluate=Ovrednoti!
-ScriptEditor.text=Urejevalnik skriptov ...
-ScriptEditor.tooltip=Omogo\u010Da pisanje ve\u010Djih skriptov v okviru Freeplane-a.
+ScriptEditor.text=Uredi skript ...
+ScriptEditor.tooltip=Omogo\u010Da pisanje ve\u010Djih skript v okviru Freeplane-a.
 ScriptEditorPanel.changed_cancel=Skripti so bili spremenjeni. Res \u017Eelite opustiti te spremembe?
-select_favorites_folder=Izberite mapo, v kateri se nahajajo va\u0161i priljubljeni
-select_folder_for_importing=Izberite mapo za uvoz
-SelectAllAction.text=Izberi vse vidne
-SelectBranchAction.text=Izberi vidno vejo
+select_favorites_folder=Izberi mapo, v kateri se nahajajo va\u0161i priljubljeni
+select_folder_for_importing=Izberi mapo za uvoz
 selection_method_by_click=Enkrat klikni za izbiro
 selection_method_delayed=Zakasnjena samodejna izbira
 selection_method_direct=Poka\u017Ei izbiro
@@ -751,13 +780,13 @@ SetLinkByFileChooserAction.text=Hiperpovezava (izbirnik datotek) ...
 SetLinkByTextFieldAction.text=Hiperpovezava (polje z besedilom) ...
 ShowAllAttributesAction.text=Poka\u017Ei vse atribute
 ShowAncestorsAction.text=poka\u017Ei prednike
-ShowAttributeDialogAction.text=Upravljalec atributov
+ShowAttributeDialogAction.text=Upravljavec atributov ...
 ShowFilterToolbarAction.text=Filter Toolbar[translate me]
 ShowHideNoteAction.text=Okno opombe
 ShowHideNoteAction.tooltip=Okno opomb se pojavi oz. izgine.
 ShowSelectedAttributesAction.text=Poka\u017Ei izbrane atribute
 ShowSelectionAsRectangleAction.text=Pravokotni izbor
-simplyhtml.aboutFrameTitle=O tej aplikaciji
+simplyhtml.aboutFrameTitle=O programu
 simplyhtml.aboutLabel=O programu SimplyHTML ...
 simplyhtml.alignCenter=sredinska
 simplyhtml.alignLabel=Poravnava:
@@ -835,7 +864,7 @@ simplyhtml.insertTableColLabel=Vstavi stolpec
 simplyhtml.insertTableLabel=Tabela ...
 simplyhtml.insertTableMsg=Koliko stolpcev?
 simplyhtml.insertTableRowLabel=Vstavi vrstico
-simplyhtml.insertTableTitle=vstaviTabelo
+simplyhtml.insertTableTitle=Vstavi tabelo
 simplyhtml.italicName=le\u017Ee\u010De
 simplyhtml.layoutTabTitle=Pogled postavitve
 simplyhtml.leftLabel=levo:
@@ -877,7 +906,7 @@ simplyhtml.previewLabel=Predogled
 simplyhtml.previewText=Predogled besedila
 simplyhtml.prevTableCellLabel=Prej\u0161nja celica
 simplyhtml.redoLabel=Ponovi
-simplyhtml.redoTip=Ponovi
+simplyhtml.redoTip=ponovi
 simplyhtml.replace=Zamenjaj ...
 simplyhtml.replaceAll=vse
 simplyhtml.replaceDone=Opravljeno
@@ -887,7 +916,7 @@ simplyhtml.replaceWith=Zamenjaj z:
 simplyhtml.replaceYes=Da
 simplyhtml.rightLabel=desno:
 simplyhtml.searchDown=I\u0161\u010Di proti koncu
-simplyhtml.searchFromStart=I\u0161\u010Di od zac\u010Detka
+simplyhtml.searchFromStart=I\u0161\u010Di od za\u010Detka
 simplyhtml.searchUp=I\u0161\u010Di proti zacetku
 simplyhtml.selectAllLabel=Izberi vse
 simplyhtml.sizeLabel=Velikost
@@ -919,11 +948,10 @@ simplyhtml.undoLabel=Razveljavi
 simplyhtml.undoTip=Razveljavi
 simplyhtml.valignBaseline=na osnovno \u010Drto
 simplyhtml.valignBottom=na dno
-simplyhtml.valignLabel=Navp. poravnava:
+simplyhtml.valignLabel=Navpi\u010Dna poravnava:
 simplyhtml.valignMiddle=sredinska
 simplyhtml.valignTop=na vrh
 simplyhtml.wholeWordsOnly=Samo cele besede
-SortNodes.text=Razvrsti otroke
 SortNodes.tooltip=Razvrsti vse otroke vozli\u0161\u010Da po abecedi.
 split=&Razdeli
 SplitNode.text=Razdeli vozli\u0161\u010De
@@ -934,6 +962,8 @@ TimeListAction.text=Prika\u017Ei seznam \u010Dasovnega na\u010Drtovalca ...
 TimeListAction.tooltip=Prika\u017Ee vse na\u010Drtovane \u010Dase in ustrezajo\u010Da vozli\u0161\u010Da.
 TimeManagementAction.text=Prika\u017Ei koledar ...
 TimeManagementAction.tooltip=<html>Prika\u017Ee koledarski modul, avtor Kai Toedter.</html>
+TimePeriodUnits.ms=ms
+TimePeriodUnits.seconds=sekunde
 ToggleChildrenFoldedAction.text=(Raz)postri otroke
 ToggleFBarAction.text=F-Bar[translate me]
 ToggleFoldedAction.text=Preklopi prepognjene
@@ -941,26 +971,35 @@ ToggleFullScreenAction.text=Full screen mode[translate me]
 ToggleLeftToolbarAction.text=Drugotna vrstica
 ToggleMenubarAction.text=Menijska vrstica
 ToggleToolbarAction.text=Orodna vrstica
-undefined_error=Pri\u0161lo je do nepri\u010Dakovane napake. Prosimo poskusite oddati poro\u010Dilo o hro\u0161\u010Du.
+undefined_error=Pri\u0161lo je do nepri\u010Dakovane napake. Prosim poskusite oddati poro\u010Dilo o hro\u0161\u010Du.
 underline=Pod\u010Drtano
 underlined=Pod\u010Drtano
 UndoAction.text=Razveljavi
 UndoFilterAction.text=Razveljavi
-unfold=Razpostri
+unfold=Razprostri
 UnfoldAllAction.text=Razpostri vse
 UnfoldAllAction.tooltip=<html>Razpostre izbrana vozli\u0161\u010Da in vse njihove otroke.</html>
-UnfoldOneLevelAction.text=Razpostri za eno stopnjo
-UnfoldOneLevelAction.tooltip=<html>Razpostre izbrana vozli\u0161\u010Da za eno stopnjo.</html>
+UnfoldOneLevelAction.text=Razprostri za eno stopnjo
+UnfoldOneLevelAction.tooltip=Razprostre izbrana vozli\u0161\u010Da za eno stopnjo.
 updatecheckdialog=Update Check Dialog[translate me]
 url_error=Ta URL je nepravilno oblikovan!
 url_load_error=Ni mogo\u010De nalo\u017Eiti miselnega vzorca z URL:
 UsePlainTextAction.text=Uporabi navadno besedilo
-user_defined_zoom=Uporabni\u0161ko dolo\u010Deno.
+user_defined_zoom=Uporabni\u0161ko dolo\u010Deno
 user_defined_zoom_status_bar=Spreminjanje pogleda na uporabni\u0161ko dolo\u010Deno vrednost {0}%.
 user_zoom=Faktor pove\u010Dave tiskanja (0.0 - 2.0):
-view=Pogled
+view=&Pogled
 WebDocuAction.text=Spletna dokumentacija
+WhatsNewAction.text=Kaj je novega v Freeplane 1.5.x
 width=\u0160irina
+xslt_export.html=HTML dokument
+xslt_export.latex=Latex dokument
+xslt_export.latexbook=Latex knjiga
+xslt_export.mediawiki=Mediawiki
+xslt_export.ms_excel=Microsoft Excel 2003 XML
+xslt_export.ms_project=Microsoft Project 2003 XML
+xslt_export.ms_word=Microsoft Word 2003 XML
+xslt_export.text=Golo besedilo
 yes=Da
 ZoomInAction.text=Pove\u010Daj
 ZoomOutAction.text=Pomanj\u0161aj
diff --git a/freeplane/resources/translations/Resources_sr.properties b/freeplane/resources/translations/Resources_sr.properties
index 72bb9e3..92f742a 100644
--- a/freeplane/resources/translations/Resources_sr.properties
+++ b/freeplane/resources/translations/Resources_sr.properties
@@ -21,8 +21,6 @@ accessories/plugins/ExportWithTWiki.tooltip=\u0418\u0437\u0432\u0435\u0437\u0438
 accessories/plugins/ExportWithXSLT.tooltip=\u041E\u0432\u043E \u0458\u0435 \u0458\u0435\u0434\u0438\u043D\u0441\u0442\u0432\u0435\u043D \u0438\u0437\u0432\u043E\u0437\u043D\u0438 \u043C\u0435\u0442\u043E\u0434.
 accessories/plugins/ExportWithXSLT_Applet.text=\u041A\u0430\u043E Java \u0430\u043F\u043B\u0435\u0442...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\u0418\u0437\u0432\u043E\u0437 \u043C\u0430\u043F\u0435 \u0443\u043C\u0430 \u043A\u0430\u043E Java \u0430\u043F\u043B\u0435\u0442 \u0443 \u043F\u0440\u0435\u0433\u043B\u0435\u0434\u0430\u0447\u0443 .
-accessories/plugins/ExportWithXSLT_Flash.text=\u041A\u0430\u043E \u0424\u043B\u0435\u0448...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\u0418\u0437\u0432\u043E\u0437 \u043C\u0430\u043F\u0435 \u043A\u0430\u043E \u0444\u043B\u0435\u0448 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0435.
 accessories/plugins/ExportWithXSLT_HTML.text=\u041A\u0430\u043E XHTML (JavaScript \u0438\u0437\u0434\u0430\u045A\u0435)...
 accessories/plugins/ExportWithXSLT_HTML3.text=\u041A\u0430\u043E XHTML (\u0438\u0437\u0434\u0430\u045A\u0435 \u043A\u043B\u0438\u043A\u0442\u0430\u0458\u0443\u045B\u0435 \u0441\u043B\u0438\u043A\u0435 \u043C\u0430\u043F\u0435)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u0421\u0440\u0435\u0434\u0441\u0442\u0432\u0430 \u0438\u0437 \u0421\u0420\u0415\u0414\u0421\u0422\u0410\u0412\u0410 \u0447\u0432\u043E\u0440\u0430 \u0443 TaskJuggler \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0443...
@@ -174,7 +172,6 @@ cannot_delete_root=\u041A\u043E\u0440\u0435\u043D\u0441\u043A\u0438 \u0447\u0432
 cannot_join_nodes_with_children=\u0427\u0432\u043E\u0440\u043E\u0432\u0435 \u043D\u0438\u0458\u0435 \u043C\u043E\u0433\u0443\u045B\u0435 \u043F\u043E\u0432\u0435\u0437\u0430\u0442\u0438 \u0441 \u043F\u043E\u0434\u0440\u0435\u0452\u0435\u043D\u0438\u043C
 cannot_move_to_child=\u0427\u0432\u043E\u0440 \u043D\u0438\u0458\u0435 \u043C\u043E\u0433\u0443\u045B\u0435 \u043F\u043E\u043C\u0435\u0440\u0438\u0442\u0438 \u043F\u0440\u0435\u043C\u0430 \u043F\u043E\u0434\u0440\u0435\u0452\u0435\u043D\u043E\u043C \u0447\u0432\u043E\u0440\u0443.
 CenterAction.text=\u0421\u0440\u0435\u0434\u0438\u043D\u0430
-CenterSelectedNodeAction.text=\u041E\u0434\u0430\u0431\u0440\u0430\u043D\u0438 \u0447\u0432\u043E\u0440 \u0443 \u0441\u0440\u0435\u0434\u0438\u043D\u0438
 ChangeConnectorArrowsAction.backward.text=\u041D\u0430\u0446\u0440\u0430\u0458 \u0441\u0442\u0440\u0435\u043B\u0438\u0446\u0443 \u0443\u043D\u0430\u0437\u0430\u0434
 ChangeConnectorArrowsAction.both.text=\u041D\u0430\u0446\u0440\u0442\u0430\u0458 \u0441\u0442\u0440\u0435\u043B\u0438\u0446\u0443 \u043D\u0430\u043F\u0440\u0435\u0434 \u0438 \u043D\u0430\u0437\u0430\u0434
 ChangeConnectorArrowsAction.forward.text=\u041D\u0430\u0446\u0440\u0442\u0430\u0458  \u0441\u0442\u0440\u0435\u043B\u0438\u0446\u0443 \u043D\u0430\u043F\u0440\u0435\u0434
@@ -188,7 +185,6 @@ ChangeNodeLevelLeftsAction.text=\u041F\u0440\u0435\u043C\u0435\u0448\u0442\u0430
 ChangeNodeLevelLeftsAction.tooltip=\u041B\u0435\u0432\u043E \u043E\u0434 \u043A\u043E\u0440\u0435\u043D\u0430 \u0447\u0432\u043E\u0440\u043E\u0432\u0438 \u0441\u0443 \u043F\u043E\u043C\u0435\u0440\u0435\u043D\u0438 \u043F\u0440\u0435\u043C\u0430 \u0434\u043E\u043B\u0435. \u0427\u0432\u043E\u0440\u043E\u0432\u0438 \u0441\u0443 \u043F\u043E\u0441\u0442\u0430\u043B\u0438 \u043F\u043E\u0434\u0440\u0435\u0452\u0435\u043D\u0438 \u043E\u0434 \u0440\u0430\u0432\u043D\u043E\u043F\u0440\u0430\u043 [...]
 ChangeNodeLevelRightsAction.text=\u041F\u0440\u0435\u043C\u0435\u0448\u0442\u0430\u045A\u0435 \u0447\u0432\u043E\u0440 (\u0420\u0430\u0432\u043D\u043E\u043F\u0440\u0430\u0432\u0430\u043D - \u043F\u043E\u0434\u0440\u0435\u0452\u0435\u043D)
 ChangeNodeLevelRightsAction.tooltip=\u0414\u0435\u0441\u043D\u043E \u043E\u0434 \u043A\u043E\u0440\u0435\u043D\u0430 \u0447\u0432\u043E\u0440\u043E\u0432\u0438 \u0441\u0443 \u043F\u043E\u043C\u0435\u0440\u0435\u043D\u0438 \u043F\u0440\u0435\u043C\u0430 \u0434\u043E\u043B\u0435. \u0427\u0432\u043E\u0440\u043E\u0432\u0438 \u0441\u0443 \u043F\u043E\u0441\u0442\u0430\u043B\u0438 \u043F\u043E\u0434\u0440\u0435\u0452\u0435\u043D\u0438 \u043E\u0434 \u0440\u0430\u0432\u043D\u043E\u043F\u0440\u04 [...]
-choose_background_color=\u0418\u0437\u0430\u0431\u0435\u0440\u0438\u0442\u0435 \u0431\u043E\u0458\u0443 \u043F\u043E\u0437\u0430\u0434\u0438\u043D\u0435 \u043C\u0430\u043F\u0435:
 choose_cloud_color=\u0418\u0437\u0430\u0431\u0435\u0440\u0438\u0442\u0435 \u0431\u043E\u0458\u0443 \u043E\u0431\u043B\u0430\u0447\u0438\u045B\u0430:
 choose_edge_color=\u041E\u0434\u0430\u0431\u0435\u0440\u0438 \u0431\u043E\u0458\u0443 \u0440\u0443\u0431\u0430
 choose_map_background_color=\u0418\u0437\u0430\u0431\u0435\u0440\u0438 \u043F\u043E\u0437\u0430\u0434\u0438\u043D\u0441\u043A\u0443 \u0431\u043E\u0458\u0443 \u043C\u0430\u043F\u0435
@@ -327,8 +323,6 @@ ExecuteScripts.noScriptsAvailable=\u041D\u0438\u0441\u0443 \u0434\u043E\u0441\u0
 ExecuteScripts.text=\u0421\u043A\u0440\u0438\u043F\u0442\u0435
 ExecuteScriptSecurityError.text=\u0414\u043E\u0448\u043B\u043E \u0458\u0435 \u0434\u043E \u0433\u0440\u0435\u0448\u043A\u0435 \u0442\u043E\u043A\u043E\u043C \u0438\u0437\u0432\u0440\u0448\u0435\u045A\u0430 \u0441\u043A\u0440\u0438\u043F\u0442\u0435: {0}
 export_failed=\u0418\u0437\u0432\u043E\u0437 \u043D\u0438\u0458\u0435 \u0443\u0441\u043F\u0435\u043E
-export_pdf_text=\u041F\u0440\u0435\u043D\u043E\u0441\u043D\u0438 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430 (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=\u0418\u0437\u0432\u043E\u0437 Freeplane-\u0430
 ExportAction.text=&\u0418\u0437\u0432\u043E\u0437 \u043C\u0430\u043F\u0435
 ExportBranchAction.text=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0438 \u0433\u0440\u0430\u043D\u0443 \u043D\u0430 \u043D\u043E\u0432\u0443 \u043C\u0430\u043F\u0443...
@@ -784,6 +778,7 @@ ModesMenuAction.Browse.text=\u041F\u0440\u0435\u0433\u043B\u0435\u0434\u043D\u04
 ModesMenuAction.File.text=\u0418\u0441\u0442\u0440\u0430\u0436\u0438\u0432\u0430\u0447 \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0430
 ModesMenuAction.MindMap.text=\u0423\u0440\u0435\u0452\u0438\u0432\u0430\u0447 \u043C\u0430\u043F\u0430 \u0443\u043C\u0430
 most_recent_files=\u041D\u0435&\u0434\u0430\u0432\u043D\u043E \u043E\u0442\u0432\u0430\u0440\u0430\u043D\u0435 \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0435
+MoveSelectedNodeAction.CENTER.text=\u041E\u0434\u0430\u0431\u0440\u0430\u043D\u0438 \u0447\u0432\u043E\u0440 \u0443 \u0441\u0440\u0435\u0434\u0438\u043D\u0438
 MoveToRootAction.text=\u0418\u0434\u0438 \u043D\u0430 \u0438\u0437\u0432\u043E\u0440\u043D\u0438 \u0447\u0432\u043E\u0440
 NameConditionAction.text=\u041F\u043E\u0441\u0442\u0430\u0432\u0438 \u043D\u0430\u0437\u0438\u0432
 navigate=&\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0458\u0430
@@ -822,7 +817,6 @@ NextNodeAction.BACK.text=\u041F\u0440\u0435\u0442\u0445\u043E\u0434\u043D\u0438
 NextNodeAction.BACK_N_FOLD.text=\u0418\u0434\u0438 \u043D\u0430 \u043F\u0440\u0435\u0442\u0445\u043E\u0434\u043D\u0438 \u0447\u0432\u043E\u0440 (\u0441\u043A\u043B\u043E\u043F\u0459\u0435\u043D\u043E)
 NextNodeAction.FORWARD.text=\u0418\u0434\u0438 \u043D\u0430 \u0441\u043B\u0435\u0434\u0435\u045B\u0438 \u0447\u0432\u043E\u0440
 NextNodeAction.FORWARD_N_FOLD.text=\u0418\u0434\u0438 \u043D\u0430 \u0441\u043B\u0435\u0434\u0435\u045B\u0438 \u0447\u0432\u043E\u0440 (\u0441\u043A\u043B\u043E\u043F\u0459\u0435\u043D\u043E)
-NextPresentationItemAction.text=\u0420\u0430\u0437\u0432\u0438\u0458 \u0441\u043B\u0435\u0434\u0435\u045B\u0443 \u0441\u0442\u0430\u0432\u043A\u0443 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0458\u0435
 no=\u041D\u0435
 no_copy_attributes_before_paste_attributes=\u041D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u043B\u0435\u043F\u0438\u0442\u0438 \u043E\u0431\u0435\u043B\u0435\u0436\u0458\u0435 \u0430\u043A\u043E \u0433\u0430 \u043F\u0440\u0435\u0442\u0445\u043E\u0434\u043D\u043E \u043D\u0438\u0441\u0442\u0435 \u0443\u043C\u043D\u043E\u0436\u0438\u043B\u0438.
 NO_FORMAT=\u0422\u0435\u043A\u0441\u0442
@@ -857,6 +851,7 @@ not_saved_for_image_error=\u041C\u0430\u043F\u0430 \u043C\u043E\u0440\u0430 \u04
 not_saved_for_link_error=\u041C\u0430\u043F\u0430 \u043C\u043E\u0440\u0430 \u0431\u0438\u0442\u0438 \u0441\u0430\u0447\u0443\u0432\u0430\u043D\u0430 \u043F\u0440\u0435 \u043F\u043E\u0432\u0435\u0437\u0438\u0432\u0430\u045A\u0430 \u0441 \u043F\u0440\u0435\u0442\u0440\u0430\u0436\u0438\u0432\u0430\u0447\u0435\u043C \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0430.
 note_window_location=\u041F\u043E\u0437\u0438\u0446\u0438\u0458\u0430 \u043E\u043A\u043D\u0430 \u0431\u0435\u043B\u0435\u0448\u043A\u0438
 notes=\u0411\u0435\u043B\u0435\u0448\u043A\u0430
+NotFoldingNextPresentationItemAction.text=\u0420\u0430\u0437\u0432\u0438\u0458 \u0441\u043B\u0435\u0434\u0435\u045B\u0443 \u0441\u0442\u0430\u0432\u043A\u0443 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0458\u0435
 ok=&\u0423 \u0440\u0435\u0434\u0443
 OKAction.text=&\u0423\u0440\u0435\u0434\u0443
 OnlineReference.text=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u0458\u0430 \u043C\u0430\u043F\u0430 \u043D\u0430 \u043C\u0440\u0435\u0436\u0438
@@ -1106,8 +1101,6 @@ OptionPanel.placenewbranches=\u041F\u043E\u0441\u0442\u0430\u0432\u0438 \u043D\u
 OptionPanel.placenewbranches.tooltip=<html>\u041E\u0434\u0440\u0435\u0452\u0443\u0458\u0435 \u043F\u043E\u043B\u043E\u0436\u0430\u0458 \u043D\u043E\u0432\u0435 \u0433\u0440\u0430\u043D\u0435. \u0412\u0430\u0459\u0430\u043D\u0435 \u0432\u0440\u0435\u0434\u043D\u043E\u0441\u0442\u0438 \u0441\u0443 '\u043F\u0440\u0432\u0430' \u0438 '\u043F\u043E\u0441\u043B\u0435\u0434\u045A\u0430' </html>
 OptionPanel.plugin.tooltip=\u041D\u0435\u043C\u0430 \u0443\u0433\u0440\u0430\u0452\u0435\u043D\u0438\u0445 \u0434\u043E\u0434\u0430\u0442\u0430\u043A\u0430.
 OptionPanel.plugins=\u0414\u043E\u0434\u0430\u0446\u0438
-OptionPanel.presentation_dimmer_transparency=\u041F\u0440\u043E\u0437\u0438\u0440\u043D\u043E\u0441\u0442 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0458\u0435
-OptionPanel.presentation_mode=\u0420\u0435\u0436\u0438\u043C \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0438\u0458\u0435
 OptionPanel.printonwhitebackground=<html>\u0411\u0435\u043B\u0430 \u043F\u043E\u0437\u0430\u0434\u0438\u043D\u0430 \u043A\u043E\u0434 \u0448\u0442\u0430\u043C\u043F\u0430\u045A\u0430</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u0423\u0432\u0435\u043A \u043A\u043E\u0440\u0438\u0441\u0442\u0438 \u0431\u0435\u043B\u0443 \u043F\u043E\u0437\u0430\u0434\u0438\u043D\u0443 \u043A\u043E\u0434 \u0448\u0442\u0430\u043C\u043F\u0430\u045A\u0430</html>
 OptionPanel.pt_BR=\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u0441\u043A\u0438 \u0411\u0420  / Portugu\u00EAs (Brasil)
@@ -1198,7 +1191,6 @@ OptionPanel.separator.single_instance_mode=\u041F\u0440\u0438\u043C\u0435\u0440
 OptionPanel.separator.size_limits=\u041E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u045A\u0430 \u0432\u0435\u043B\u0438\u0447\u0438\u043D\u0430
 OptionPanel.separator.spelling=\u041C\u043E\u0433\u0443\u045B\u043D\u043E\u0441\u0442\u0438 \u043F\u0440\u043E\u0432\u0435\u0440\u0435 \u043F\u0440\u0430\u0432\u043E\u043F\u0438\u0441\u0430
 OptionPanel.separator.status=\u0421\u0442\u0430\u0442\u0443\u0441\u043D\u0430 \u0442\u0440\u0430\u043A\u0430
-OptionPanel.separator.tooltip=\u0412\u0440\u0435\u043C\u0435 \u043F\u0440\u0438\u043A\u0430\u0437\u0430 \u0441\u0430\u0432\u0435\u0442\u0430
 OptionPanel.separator.undo=\u041E\u043F\u043E\u0437\u043E\u0432\u0438
 OptionPanel.separator.updates=\u0418\u0441\u043F\u0440\u0430\u0432\u043A\u0435 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0430
 OptionPanel.set_property_text=\u041F\u0440\u043E\u043C\u0435\u043D\u0438
@@ -1272,7 +1264,6 @@ OptionPanel.use_common_out_point_for_root_node=\u0420\u0443\u0431\u043E\u0432\u0
 OptionPanel.use_common_out_point_for_root_node.tooltip=\u0420\u0443\u0431\u043E\u0432\u0438 \u0437\u0430\u043F\u043E\u0447\u0438\u045A\u0443 \u0438\u0437 \u0458\u0435\u0434\u043D\u0435 \u0442\u0430\u0447\u043A\u0435 \u043D\u0430 \u0438\u0437\u0432\u043E\u0440\u043D\u043E\u043C \u0447\u0432\u043E\u0440\u0443
 OptionPanel.use_tabbed_pane=\u041A\u043E\u0440\u0438\u0441\u0442\u0438 \u043A\u0430\u0440\u0442\u0438\u0446\u0435
 OptionPanel.use_tabbed_pane.tooltip=\u0410\u043A\u043E \u0441\u0443 \u0430\u043A\u0442\u0438\u0432\u043D\u0435 \u043C\u0430\u043F\u0435 \u045B\u0435 \u0441\u0435 \u043F\u0440\u0438\u043A\u0430\u0437\u0438\u0432\u0430\u0442\u0438 \u0443 \u043A\u0430\u0440\u0442\u0438\u0446\u0430\u043C\u0430 (\u043A\u0430\u043E \u0443 FireFox-\u0443 :-) ).
-OptionPanel.user_defined_screen_resolution=\u041A\u043E\u0440\u0438\u0441\u043D\u0438\u0447\u043A\u0438 \u043E\u0434\u0440\u0435\u0452\u0435\u043D\u0430 \u0440\u0435\u0437\u043E\u043B\u0443\u0446\u0438\u0458\u0430 \u0435\u043A\u0440\u0430\u043D\u0430 (dpi)
 OptionPanel.validate_classpath_needs_readaccess=\u0418\u0437\u0432\u043E\u0452\u0435\u045A\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u0438: \u041A\u0430\u0434\u0430 \u0441\u0443 \u043F\u043E\u0441\u0442\u0430\u0432\u0459\u0435\u043D\u0435 \u043F\u0443\u0442\u0430\u045A\u0435 \u0447\u0438\u0442\u0430\u045A\u0430 JAR \u0438 .class \u0434\u0430\u0442\u043E\u0442\u0435\u043A\u0430 \u043C\u043E\u0440\u0430\u0442\u0435 \u043E\u043C\u043E\u0433\u0443\u045B\u0438\u0442\u0438 \u0447\u0438\u0442\ [...]
 OptionPanel.validate_invalid_date_format=\u041D\u0435\u0432\u0430\u0436\u0435\u045B\u0438 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0434\u043D\u0438 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u0443\u043C\u0430
 OptionPanel.validate_invalid_datetime_format=\u041D\u0435\u0432\u0430\u0436\u0435\u045B\u0438 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0434\u043D\u0438 \u0444\u043E\u0440\u043C\u0430\u0442 \u0432\u0440\u0435\u043C\u0435\u043D\u0430 \u0438 \u0434\u0430\u0442\u0443\u043C\u0430
@@ -1476,7 +1467,6 @@ ShowAncestorsAction.text=\u041F\u0440\u0438\u043A\u0430\u0436\u0438 \u043F\u0440
 ShowAttributeDialogAction.text=\u0423\u043F\u0440\u0430\u0432\u0459\u0430\u045A\u0435 \u0430&\u0442\u0440\u0438\u0431\u0443\u0442\u0438\u043C\u0430
 ShowDescendantsAction.text=\u041F\u0440\u0438\u043A\u0430\u0436\u0438 \u043F\u043E\u0442\u043E\u043C\u043A\u0435
 ShowFilterToolbarAction.text=\u0424\u0438\u043B\u0442\u0435\u0440 \u0442\u0440\u0430\u043A\u0435 \u0430\u043B\u0430\u0442\u0430
-ShowFormatPanel.text=\u0422\u0430\u0431\u043B\u0430 \u0441\u0432\u043E\u0458\u0441\u0442\u0430\u0432\u0430
 ShowFormatPanel.tooltip=\u041F\u0440\u0438\u043A\u0430\u0437\u0443\u0458\u0435 \u0434\u0438\u0458\u0430\u043B\u043E\u0433 \u0443 \u043A\u043E\u0458\u0435\u043C \u043E\u0431\u043B\u0438\u0446\u0438 \u0447\u0432\u043E\u0440\u043E\u0432\u0430 \u0438 \u0440\u0443\u0431\u043E\u0432\u0430 \u043C\u043E\u0433\u0443 \u0441\u0435 \u043C\u0435\u045A\u0430\u0442\u0438 \u043E\u0434\u0458\u0435\u0434\u043D\u043E\u043C.
 ShowHideNoteAction.text=\u041F\u0440\u0438\u043A\u0430\u0437 \u043E\u043A\u043D\u0430 \u0431\u0435\u043B\u0435\u0448\u043A\u0435
 ShowHideNoteAction.tooltip=\u0423\u043A\u0459\u0443\u0447\u0438\u0432\u0430\u045A\u0435 \u0438\u043B\u0438 \u0438\u0441\u043A\u0459\u0443\u0447\u0438\u0432\u0430\u045A\u0435 \u043F\u0440\u043E\u0437\u043E\u0440\u0430 \u0441 \u0431\u0435\u043B\u0435\u0448\u043A\u0430\u043C\u0430
@@ -1719,7 +1709,6 @@ ToggleLeftToolbarAction.text=&\u0418\u043A\u043E\u043D\u0435 \u0441\u0430 \u0430
 ToggleMenubarAction.text=&\u0418\u0437\u0431\u043E\u0440\u043D\u0430 \u0442\u0440\u0430\u043A\u0430
 ToggleStatusAction.text=\u041F\u0440\u0438\u043A\u0430\u0436\u0438 \u0441\u0442\u0430\u0442\u0443\u0441\u043D\u0443 \u0442\u0440\u0430\u043A\u0443
 ToggleToolbarAction.text=&\u0410\u043B\u0430\u0442\u043D\u0430 \u0442\u0440\u0430\u043A\u0430
-toolbars=\u0422\u0440\u0430\u043A\u0435 \u0441\u0430 \u0430\u043B\u0430\u0442\u043A\u0430\u043C\u0430
 undefined_error=\u0414\u043E\u0448\u043B\u043E \u0458\u0435 \u0434\u043E \u043D\u0435\u043E\u0447\u0435\u043A\u0438\u0432\u0430\u043D\u0435 \u0433\u0440\u0435\u0448\u043A\u0435. \u041C\u043E\u043B\u0438\u043C \u043F\u043E\u043A\u0443\u0448\u0430\u0458\u0442\u0435 \u043F\u043E\u0441\u043B\u0430\u0442\u0438 \u043F\u043E\u0440\u0443\u043A\u0443 \u043E \u0433\u0440\u0435\u0448\u0446\u0438.
 underline=\u041F\u043E\u0434\u0432\u0443\u045B\u0438
 UnderlineAction.text=\u041F\u043E\u0434\u0432\u0443\u045B\u0438
diff --git a/freeplane/resources/translations/Resources_sv.properties b/freeplane/resources/translations/Resources_sv.properties
index 3cd22a0..d1938e0 100644
--- a/freeplane/resources/translations/Resources_sv.properties
+++ b/freeplane/resources/translations/Resources_sv.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Avbryt
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=V\u00E4xling av krypteringsniv\u00E5 endast m\u00F6jlig p\u00E5 krypterad gren. Anv\u00E4nd verktygsmenyn f\u00F6r att infoga krypterad gren.
 accessories/plugins/EncryptNode.properties_select_me=V\u00E4lj mig f\u00F6r att forts\u00E4tta!
 accessories/plugins/EncryptNode.properties_wrong_password=L\u00F6senordet \u00E4r inte r\u00E4tt.
+accessories/plugins/Export_JavaWebStart.text=Webbstart f\u00F6r Java...
+accessories/plugins/Export_JavaWebStart.tooltip=Exporterar kartan f\u00F6r Java's webbstart.
 accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exportera kartan som ett TWiki-dokument.
 accessories/plugins/ExportWithXSLT.tooltip=Det h\u00E4r \u00E4r en enhetlig exportmetod.
 accessories/plugins/ExportWithXSLT_Applet.text=Java-applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exportera kartan som en Java-baserad webbl\u00E4sarapplet.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exportera kartan som en Flash-applikation.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript-version)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Klickbar bild-version f\u00F6r karta)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Resurser fr\u00E5n RESOURCES-nod till TaskJuggler-fil...
@@ -38,6 +38,28 @@ AddElementaryConditionAction.text=L\u00E4gg till
 AddExecutionLinkAction.text=Addera hyperl\u00E4nk f\u00F6r att exekvera ett OS kommando...
 AddLocalLinkAction.text=L\u00E4gg till lokal hyperl\u00E4nk
 AddMenuItemLinkAction.text=Hyperl?nk intern...
+AddOnDetailsPanel.authored.by=Av
+AddOnDetailsPanel.header.function=Funktion
+AddOnDetailsPanel.header.menu=Meny position
+AddOnDetailsPanel.header.shortcut=Genv\u00E4g
+AddOnDetailsPanel.homepage=Hemsida:
+addons.installer.canceled=Installation avbryten
+addons.installer.confirm.licence=<html><body><h1>Licens</h1>{0}<p><p><em>Accepterar du licensen?</em></p></body></html>
+addons.installer.failed=Installation misslyckades: {0}
+addons.installer.freeplaneversion.format.error=Format fel i {0} (v\u00E4rde: {1})
+addons.installer.html.script=Script f\u00E5r inte inneh\u00E5lla HTML kod
+addons.installer.install=Installera
+addons.installer.invalid.keyboard.shortcut=Ogiltig genv\u00E4g {0}.
+addons.installer.licence.unchanged=Licensen of\u00F6r\u00E4ndrad
+addons.installer.map.structure=Fel i mapp strukturen: {0}
+addons.installer.missing.child.nodes=Saknad subnoder: {0}
+addons.installer.missing.permission.attribute=Skript {0}: saknar r\u00E4ttigheter {1}
+addons.installer.missing.properties=Saknade egenskaper: {0}
+addons.installer.missing.translation=Saknad \u00F6vers\u00E4ttning f\u00F6r {0} f\u00F6r lokalt {1}
+addons.installer.no.scripts=Inget skript hittat
+addons.installer.no.zipdata=Ingen zip data hittad
+addons.installer.nonstandard.permissions=Skriptet fr\u00E5gar om de f\u00F6ljande beh\u00F6righeterna som f\u00F6r n\u00E4rvarande inte \u00E4r aktiverade: {0}.\nBorde de l\u00E4ggas till i standardbeh\u00F6righeterna?
+addons.installer.one.child.expected=Exakt ett barn av {0} f\u00F6rv\u00E4ntades, men fick {1}.
 AllMapsNodeListAction.text=S\u00F6k och Ers\u00E4tt i alla kartor
 antialias_all=J\u00E4mna ut alla
 antialias_edges=J\u00E4mna ut kanter
@@ -123,7 +145,6 @@ cannot_join_nodes_with_children=Kan inte f\u00F6rbinda gren med undergren
 cannot_move_into_child_node=Kan inte flytta till undergren
 cannot_move_to_child=Kan inte flytta gren till egen undergren.
 CenterAction.text=Centrera
-CenterSelectedNodeAction.text=Centrera vald gren
 ChangeConnectorArrowsAction.backward.text=Dra pekaren bak\u00E5t
 ChangeConnectorArrowsAction.both.text=Dra pekaren fram och tillbaka
 ChangeConnectorArrowsAction.forward.text=Dra pekaren fram\u00E5t
@@ -136,7 +157,6 @@ ChangeNodeLevelLeftsAction.text=Gren till v\u00E4nster
 ChangeNodeLevelLeftsAction.tooltip=P\u00E5 v\u00E4nster sida om rotgrenen flyttas grenar ned\u00E5t.<br> Blir undergren till ovanliggande syskongren. P\u00E5 h\u00F6ger sida om rotgrenen flyttas gren upp\u00E5t.<br> Direkt p\u00E5 rotgrenen byter grenarna sida.
 ChangeNodeLevelRightsAction.text=Gren till h\u00F6ger
 ChangeNodeLevelRightsAction.tooltip=P\u00E5 h\u00F6ger sida om rotgrenen flyttas grenar ned\u00E5t.<br> Blir undergren till ovanliggande syskongren.<br> P\u00E5 v\u00E4nster sida om rotgrenen flyttas grenar upp\u00E5t.<br> Direkt p\u00E5 rotgrenen byter grenarna sida.
-choose_background_color=V\u00E4lj bakgrundsf\u00E4rg:
 choose_cloud_color=V\u00E4lj molnf\u00E4rg:
 choose_edge_color=V\u00E4lj kantf\u00E4rg
 choose_map_background_color=V\u00E4lj kartans bakgrundsf\u00E4rg
@@ -234,8 +254,6 @@ ExecuteScriptOnSingleNode.text=K\u00F6r {0}\u00A0p\u00E5 vald gren
 ExecuteScripts.noScriptsAvailable=Inga
 ExecuteScripts.text=Skript
 export_failed=Exporten misslyckades
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Exportera med XSLT
 ExportAction.text=Exportera
 ExportBranchAction.text=Gren som ny karta...
@@ -532,6 +550,7 @@ ModesMenuAction.Browse.text=Kartbl\u00E4ddrare
 ModesMenuAction.File.text=Filbl\u00E4ddrare
 ModesMenuAction.MindMap.text=Redigeringsl\u00E4ge
 most_recent_files=Senast anv\u00E4nda filer
+MoveSelectedNodeAction.CENTER.text=Centrera vald gren
 MoveToRootAction.text=Hoppa till rotgren
 navigate=Navigera
 NavigationNextMapAction.text=N\u00E4sta karta
@@ -867,7 +886,6 @@ OptionPanel.separator.selection_method=Markering av grenar
 OptionPanel.separator.single_instance_mode=Endast en kopia av programmet startas
 OptionPanel.separator.size_limits=Storleksgr\u00E4ns
 OptionPanel.separator.spelling=Stavningskontroll
-OptionPanel.separator.tooltip=Tips-rutor
 OptionPanel.separator.undo=\u00C5ngra
 OptionPanel.separator.updates=Programuppdateringar
 OptionPanel.set_property_text=\u00C4ndra
@@ -1106,7 +1124,6 @@ ShowAncestorsAction.text=Visa f\u00F6r\u00E4ldragren
 ShowAttributeDialogAction.text=Egenskapshanterare
 ShowDescendantsAction.text=Visa undergren
 ShowFilterToolbarAction.text=Filter-verktygsf\u00E4lt
-ShowFormatPanel.text=Format f\u00F6nster
 ShowFormatPanel.tooltip=Presents a dialog in which node and edge attributes can be changed at once.
 ShowHideNoteAction.text=Anteckningsf\u00F6nster
 ShowHideNoteAction.tooltip=\u00C4r en menygenv\u00E4g f\u00F6r de sm\u00E5 pilarna p\u00E5 delningslinjen.
@@ -1365,9 +1382,19 @@ version_up_to_date=Senaste versionen redan installerad
 view=Visa
 ViewLayoutTypeAction.OUTLINE.text=\u00D6versiktsvy
 WebDocuAction.text=Webbdokumentation
+WhatsNewAction.text=Vad \u00E4r nytt i Freeplane 1.5.x
 width=Bredd
 wrong_regexp=Wrong regular expression "{0}", error {1}
-xslt_export_not_possible=Freeplane XSLT export not possible
+xslt_export.html=HTML dokument
+xslt_export.latex=Latex dokument
+xslt_export.latexbook=Latex book
+xslt_export.mediawiki=Mediawiki
+xslt_export.ms_excel=Microsoft Excel 2003 XML
+xslt_export.ms_project=Microsoft Project 2003 XML
+xslt_export.ms_word=Microsoft Word 2003 XML
+xslt_export.text=Ren text
+xslt_export_not_possible=Freeplane XSLT export g\u00E5r inte
 yes=Ja
+zoom=Zoom
 ZoomInAction.text=Zooma in
 ZoomOutAction.text=Zooma ut
diff --git a/freeplane/resources/translations/Resources_tr.properties b/freeplane/resources/translations/Resources_tr.properties
index 2fa4dd5..a3f40e0 100644
--- a/freeplane/resources/translations/Resources_tr.properties
+++ b/freeplane/resources/translations/Resources_tr.properties
@@ -1,28 +1,155 @@
+about_text=Freeplane - \u00FCcretsiz zihin haritas\u0131 ve bilgi olu\u015Fturma yaz\u0131l\u0131m\u0131
 AboutAction.text=Hakk\u0131nda
-acceleratorPresets=Hot Key Presets[translate me]
-accessories/plugins/EncryptNode.properties_0=\u015Eifreli d\u00FC\u011F\u00FCm i\u00E7in bir \u015Fifre belirleyin
+acceleratorPresets=K\u0131sayol tu\u015F ayarlar\u0131
+accelerators_loading_error={0}'dan h\u0131zland\u0131r\u0131c\u0131lar y\u00FCklenemedi
+accessories/plugins/ApplyFormatPlugin.dialog.title=D\u00FC\u011F\u00FCmlerin bi\u00E7imlerini de\u011Fi\u015Ftir
+accessories/plugins/AutomaticLayout.properties_StyleDialogTitle=Desen de\u011Fi\u015Ftir
+accessories/plugins/EncryptNode.properties_0=Korunmu\u015F (\u015Fifrelenmi\u015F) d\u00FC\u011F\u00FCm i\u00E7in bir \u015Fifre belirleyin
 accessories/plugins/EncryptNode.properties_1=\u015Eifreler uyu\u015Fmuyor ya da \u00E7ok k\u0131sa.
 accessories/plugins/EncryptNode.properties_2=\u015Eifre Gir:
-accessories/plugins/EncryptNode.properties_3=Yeniden Gir:
+accessories/plugins/EncryptNode.properties_3=\u015Eifreyi tekrar Gir:
 accessories/plugins/EncryptNode.properties_4=\u015Eifrenizi girin.
-accessories/plugins/EncryptNode.properties_5=<html>Unutmay\u0131n ki \u015Fifrelemenin g\u00FCc\u00FCn\u00FC neredeyse<br> tamamen \u015Fifrenizin kalitesine ba\u011Fl\u0131d\u0131r.
+accessories/plugins/EncryptNode.properties_5=<html>Unutmay\u0131n ki \u015Fifrelemenin g\u00FCc\u00FC neredeyse<br> tamamen \u015Fifrenizin kalitesine ba\u011Fl\u0131d\u0131r.
 accessories/plugins/EncryptNode.properties_6=Tamam
 accessories/plugins/EncryptNode.properties_7=\u0130ptal
-accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Yaln\u0131zca \u015Fifreli bir d\u00FC\u011F\u00FCm\u00FCn \u015Fifre durumunu de\u011Fi\u015Ftirebilirsiniz. L\u00FCtfen ara\u00E7lar men\u00FCs\u00FCn\u00FC kullanarak bu t\u00FCr bir d\u00FC\u011F\u00FCm olu\u015Fturun.
-accessories/plugins/EncryptNode.properties_select_me=Devam etmek i\u00E7in buray\u0131 se\u00E7in!
+accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=Yaln\u0131zca \u015Fifreli bir d\u00FC\u011F\u00FCm\u00FCn koruma (\u015Fifreleme) durumunu de\u011Fi\u015Ftirebilirsiniz. L\u00FCtfen ara\u00E7lar men\u00FCs\u00FCn\u00FC kullanarak bu t\u00FCr bir d\u00FC\u011F\u00FCm olu\u015Fturun.
+accessories/plugins/EncryptNode.properties_select_me=Devam etmek i\u00E7in beni se\u00E7!
 accessories/plugins/EncryptNode.properties_wrong_password=\u015Eifre yanl\u0131\u015F.
+accessories/plugins/Export_JavaWebStart.text=Java Web Ba\u015Flamas\u0131...
+accessories/plugins/Export_JavaWebStart.tooltip=java web ba\u015Flamas\u0131 i\u00E7in haritay\u0131 d\u0131\u015Fa aktar\u0131r.
+accessories/plugins/ExportWithTWiki.text=Twiki...
+accessories/plugins/ExportWithTWiki.tooltip=Haritay\u0131 TWiki belgesi olarak d\u0131\u015Fa aktar\u0131r.
 accessories/plugins/ExportWithXSLT.tooltip=Bu, XSLT betiklerini kullanan d\u00FCzenli bir d\u0131\u015Fa aktarma y\u00F6ntemidir.
+accessories/plugins/ExportWithXSLT_Applet.text=Java Uygulamas\u0131...
+accessories/plugins/ExportWithXSLT_Applet.tooltip=Haritay\u0131 java taray\u0131c\u0131 uygulamas\u0131 d\u0131\u015Fa aktar\u0131r.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML Olarak (JavaScript s\u00FCr\u00FCm\u00FC)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML Olarak (T\u0131klanabilir harita resmi s\u00FCr\u00FCm\u00FC)...
+accessories/plugins/ExportWithXSLT_TASKSTJI.text=G\u00F6revler G\u00D6REV d\u00FC\u011F\u00FCm\u00FCnden G\u00F6rev Y\u00F6neticisi dosyas\u0131na ...
+accessories/plugins/ExportWithXSLT_TASKSTJI.tooltip=<html> G\u00F6revleri G\u00F6rev Y\u00F6neticisi d\u00FC\u011F\u00FCm\u00FCnden G\u00F6rev Y\u00F6neticisi mod\u00FCl\u00FCne d\u0131\u015Fa aktar\u0131r.</html>
+action_keystroke_in_use_error={1} i\u015Flemi i\u00E7in {0} hareketi talep edildi, {2} eylemi i\u00E7in zaten kullan\u0131l\u0131yor
+active=Aktif
+actual_map_styles=Harita ko\u015Fullu stilleri d\u00FC\u011F\u00FCme uygulanan
+actual_node_styles=D\u00FC\u011F\u00FCme uygulanan ko\u015Fullu d\u00FC\u011F\u00FCmler stilleri
+add=&Ekle
+AddConnectorAction.text=Ba\u011Flan
+AddElementaryConditionAction.text=Ekle
+AddExecutionLinkAction.text=OS komutunu \u00E7al\u0131\u015Ft\u0131rmak i\u00E7in k\u00F6pr\u00FC ekleyin ...
 AddLocalLinkAction.text=Yerel Ba\u011Flant\u0131 Ekle
+AddMenuItemLinkAction.text=Men\u00FC \u00F6\u011Fesi i\u00E7in K\u00F6pr\u00FC Ekle...
+AddOnDetailsPanel.authored.by={0} taraf\u0131ndan
+AddOnDetailsPanel.header.function=Fonksiyon
+AddOnDetailsPanel.header.menu=Men\u00FC konumu
+AddOnDetailsPanel.header.shortcut=K\u0131sayol
+AddOnDetailsPanel.homepage=Ana sayfa:
+addons.installer.canceled=Kurulum iptal edildi
+addons.installer.confirm.licence=<html><body><h1>Lisans</h1>{0} <p><p><em>Bu lisans\u0131 kabul ediyor musun?</em></p></body></html>
+addons.installer.failed=Y\u00FCkleme ba\u015Far\u0131s\u0131z oldu: {0}
+addons.installer.freeplaneversion.format.error=Format hatas\u0131 {0} (de\u011Fer: {1})
+addons.installer.html.script=Komut dosyas\u0131 g\u00F6vdesi HTML olarak bi\u00E7imlendirilmemi\u015F olabilir
+addons.installer.install=Y\u00FCkle
+addons.installer.invalid.keyboard.shortcut=Ge\u00E7ersiz k\u0131sayol {0}.
+addons.installer.licence.unchanged=Lisans de\u011Fi\u015Fmedi
+addons.installer.map.structure=Harita yap\u0131s\u0131nda hata: {0}
+addons.installer.missing.child.nodes=kay\u0131p \u00E7ocuk d\u00FC\u011F\u00FCm:{0}
+addons.installer.missing.permission.attribute=Komut dosyas\u0131 {0}: izin \u00F6znitelikleri {1}
+addons.installer.missing.properties=Eksik \u00F6zellikler: {0}
+addons.installer.missing.translation={0}''\u0131n {1} dili i\u00E7in eksik \u00E7evirisi
+addons.installer.no.scripts=Hi\u00E7 Script bulunamad\u0131
+addons.installer.no.zipdata=Zip verisi bulunamad\u0131
+addons.installer.nonstandard.permissions=Script \u015Fu anda etkin de\u011Fil {0} a\u015Fa\u011F\u0131daki izinleri ister.\nStandart izinler eklenmelidir?
+addons.installer.one.child.expected=Tam {0} bir \u00E7ocu\u011Fu bekleniyordu, ancak {1} var.
+addons.installer.script.no.execution_mode=Hay\u0131r "execution_mode" \u00F6zniteli\u011Fi {0}i\u00E7in tan\u0131ml\u0131
+addons.installer.script.no.menulocation={0} i\u00E7in tan\u0131mlanan "menuLocation" \u00F6zniteli\u011Fi yok
+addons.installer.script.no.menutitle={0} i\u00E7in tan\u0131mlanan "menuTitleKey" \u00F6zniteli\u011Fi yok
+addons.installer.script.no.permissions={0} i\u00E7in tan\u0131mlanan izin yok
+addons.installer.success=Y\u00FCkleme ba\u015Far\u0131l\u0131.\nYeni eklenti yeniden ba\u015Flatmadan sonra kullan\u0131labilir hale gelir.
+addons.installer.success.update={0} {1} ba\u015Far\u0131l\u0131 g\u00FCncelle\u015Ftirin.\nBaz\u0131 i\u015Flevler yaln\u0131zca yeniden ba\u015Flatma sonras\u0131nda mevcut olabilir.
+addons.installer.title=Eklenti y\u00FCkleyicisi
+addons.installer.too.new=Mevcut Freeplane s\u00FCr\u00FCm\u00FC {0} \u00E7ok yeni
+addons.installer.too.old={0} ge\u00E7erli Freeplane s\u00FCr\u00FCm\u00FC \u00E7ok eski. Bu ihtiya\u00E7lar en az {1}
+addons.installer.update={0}s\u00FCr\u00FCm\u00FCnden g\u00FCncelleme
+addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">Yaln\u0131zca g\u00FCvendi\u011Finiz kaynaklardan eklentileri y\u00FCklemeniz gerekir</strong></body></html>
+addons.site=http://freeplane.sourceforge.net/addons/
+AddStyleAttributes.text=Stil \u00F6znitelikleri
+AddStyleAttributes.tooltip=Stili eklemek \u00F6znitelikleri d\u00FC\u011F\u00FCm
+AllMapsNodeListAction.text=T\u00FCm haritalarda Bul ve de\u011Fi\u015Ftir
+always=Her zaman
+AlwaysUnfoldedNodeAction.text=Her zaman a\u00E7\u0131lm\u0131\u015F d\u00FC\u011F\u00FCm (ayarla / s\u0131f\u0131rlama)
 antialias_all=Hepsini d\u00FCzg\u00FCnle\u015Ftir
 antialias_edges=S\u0131n\u0131rlar\u0131 d\u00FCzg\u00FCnle\u015Ftir
 antialias_none=Hi\u00E7 d\u00FCzg\u00FCnle\u015Ftirme
+apply=&Uygula
+ApplyAction.text=Uygula
+ApplyFormatPlugin.text=Format De\u011Fi\u015Ftir ...
+ApplyFormatPlugin.tooltip=D\u00FC\u011F\u00FCm ve kenar \u00F6znitelikleri hemen de\u011Fi\u015Ftirilebilir bir ileti\u015Fim kutusu sunar.
+ApplyNoFilteringAction.text=Filtreleme
+ApplySelectedViewConditionAction.text=Se\u00E7ilenleri Filtrele
+ApplyToVisibleAction.text=Filtre uygulanm\u0131\u015F d\u00FC\u011F\u00FCmlerine uygulan\u0131r
 as_parent=Ebeveyn Olarak
+AskForHelp.text=Forumda yard\u0131m isteyin
+AssignAttributesAction.text=Bul ve \u00F6znitelikleri de\u011Fi\u015Ftir...
+attribute_delete=T\u00FCm de\u011Ferleri sil
+attribute_delete_value=Bu de\u011Feri sil
+attribute_font_size_tooltip=Yaz\u0131 Tipi Boyutu
+attribute_list_box_label_text=Mevcut de\u011Ferler
+attribute_name=\u00D6znitelik Ad\u0131
+attribute_name_or_value=\u00D6znitelik ad\u0131n\u0131 veya de\u011Ferini
+attribute_replace=De\u011Fi\u015Ftir
+attribute_top=Y\u00FCklenen Haritalar i\u00E7in bilinen t\u00FCm \u00F6znitelikleri
+attribute_value=\u00D6znitelik De\u011Feri
+attributes_AddAttributeAction.text=\u00D6znitelik ileti\u015Fim kutusunda Ekle...
+attributes_adding_empty_attribute_error=Bo\u015F bir dize \u00F6zniteli\u011Fi ad\u0131 olarak kullanamazs\u0131n\u0131z
+attributes_all=T\u00FCm \u00F6znitelikleri
+attributes_assign_dialog=Geni\u015Fletilmi\u015F \u00F6znitelik D\u00FCzenleyicisi
+attributes_attribute=\u00D6znitelikleri
+attributes_close=Kapat
 attributes_deselect_all=Hi\u00E7bir \u015Fey
-attributes_refresh=Refresh[translate me]
+attributes_dialog_title=\u00D6znitelik Y\u00F6neticisi
+attributes_edit=D\u00FCzenle
+attributes_edit_tooltip=K\u00FCmesini D\u00FCzenle
+attributes_for_selected=Se\u00E7ili d\u00FC\u011F\u00FCmler
+attributes_for_visible=T\u00FCm g\u00F6r\u00FCn\u00FCr d\u00FC\u011F\u00FCmler
+attributes_import=&\u0130\u00E7eri Aktar
+attributes_import_tooltip=Y\u00FCklenmi\u015F di\u011Fer haritalardan \u00F6znitelikleri i\u00E7eri aktar
+attributes_no_import_candidates_found=Yeni \u00F6znitelikler bulunamad\u0131
+attributes_popup_delete=Sil
+attributes_popup_down=A\u015Fa\u011F\u0131
+attributes_popup_edit=D\u00FCzenle
+attributes_popup_hide=Gizle
+attributes_popup_new=Yeni \u00F6znitelik
+attributes_popup_optimal_width=En uygun geni\u015Flik
+attributes_popup_up=Yukar\u0131
+attributes_refresh=Tazele
+attributes_RemoveAllAttributesAction.text=T\u00FCm \u00F6znitelikleri kald\u0131r\u0131n
+attributes_RemoveFirstAttributeAction.text=\u0130lk \u00F6zniteli\u011Fi kald\u0131r\u0131n
+attributes_RemoveLastAttributeAction.text=Son \u00F6zniteli\u011Fi kald\u0131r\u0131n
+attributes_restricted_attributes_tooltip=\u00D6znitelikleri k\u00FCmesini k\u0131s\u0131tla
+attributes_restricted_values_tooltip=Ge\u00E7erli \u00F6zniteli\u011Fi i\u00E7in de\u011Ferler k\u00FCmesini s\u0131n\u0131rla
+attributes_restriction=S\u0131n\u0131rl\u0131 olarak ayarlay\u0131n
+attributes_select_all=Hepsi
+attributes_select_all_tooltip=Hepsini Se\u00E7/Kald\u0131r
+attributes_show=G\u00F6ster
+attributes_skip_root=K\u00F6k d\u00FC\u011F\u00FCm\u00FC atla
+attributes_visible=G\u00F6r\u00FCn\u00FCr se\u00E7ili
+attributes_visible_tooltip=G\u00F6r\u00FCn\u00FCr se\u00E7ili
+automatic_layout=Otomatik D\u00FCzen
+automatic_layout_disabled=devre d\u0131\u015F\u0131
+automatically_save_message=Harita otomatik olarak {0}) dosya ad\u0131yla kaydedilir (...
+AutomaticEdgeColor.FOR_BRANCHES=dallar\u0131 i\u00E7in
+AutomaticEdgeColor.FOR_COLUMNS=s\u00FCtunlar i\u00E7in
+AutomaticEdgeColor.FOR_LEVELS=d\u00FCzeyler i\u00E7in
+AutomaticEdgeColor.ON_BRANCH_CREATION=Dal olu\u015Fturma '
+AutomaticEdgeColorHookAction.text=Otomatik kenar rengi
+AutomaticLayout.ALL=t\u00FCm d\u00FC\u011F\u00FCmler i\u00E7in
+AutomaticLayout.HEADINGS=Ayr\u0131lmayan d\u00FC\u011F\u00FCmler i\u00E7in
+AutomaticLayout.level=D\u00FCzey {0}
+AutomaticLayout.level.root=K\u00F6k
 AutomaticLayoutAction.text=Otomatik Plan
 AutomaticLayoutAction.tooltip=<html> Haritan\u0131n plan\u0131n\u0131 tamir eder. <br>\u0130lk seviye siyah, ikincisi mavi, vb.</html>
+AutomaticLayoutControllerAction.ALL.text=t\u00FCm d\u00FC\u011F\u00FCmler i\u00E7in
+AutomaticLayoutControllerAction.COLUMNS.text=s\u00FCtunlar i\u00E7in
+AutomaticLayoutControllerAction.HEADINGS.text=Ayr\u0131lmayan d\u00FC\u011F\u00FCmler i\u00E7in
+AutomaticLayoutControllerAction.null.text=devre d\u0131\u015F\u0131
 BackAction.text=Geri
 background=Arkaplan
 BlinkingNodeHookAction.text=Yan\u0131p S\u00F6nen D\u00FC\u011F\u00FCm
@@ -39,14 +166,13 @@ cannot_move_to_child=D\u00FC\u011F\u00FCm \u00E7ocuklar\u0131ndan birine ta\u015
 CenterAction.text=Ortala
 ChangeConnectorArrowsAction.backward.text=Geri
 ChangeConnectorArrowsAction.forward.text=\u0130leri
-choose_background_color=Arkaplan Rengini De\u011Fi\u015Ftir
 choose_cloud_color=Bulut Rengini De\u011Fi\u015Ftir:
 choose_edge_color=S\u0131n\u0131r Rengi Se\u00E7
-choose_node_background_color=D\u00FC\u011F\u00FCm Arkaplan Rengini Se\u00E7
+choose_node_background_color=D\u00FC\u011F\u00FCm Arkaplan Rengini Se\u00E7:
 choose_node_color=D\u00FC\u011F\u00FCm Rengini Se\u00E7in:
 CloseAction.text=Kapat
 CloudAction.text=Bulut
-CloudColorAction.text=Bulut Rengi
+CloudColorAction.text=Bulut rengi...
 ColorProperty.ResetColor=Rengi S\u0131f\u0131rla
 combined=Birle\u015Fik
 CopyAction.text=Kopyala
@@ -62,7 +188,7 @@ DocumentationAction.text=Belgeler
 edge=S\u0131n\u0131r
 edge_style=S\u0131n\u0131r Bi\u00E7emi
 edge_width=S\u0131n\u0131r Geni\u015Fli\u011Fi
-EdgeColorAction.text=S\u0131n\u0131r Rengi
+EdgeColorAction.text=Kenar rengi...
 EdgeStyleAction.bezier.text=E\u011Fri
 EdgeStyleAction.linear.text=Do\u011Fru
 EdgeStyleAction.sharp_bezier.text=E\u011Friyi keskinle\u015Ftir
@@ -71,8 +197,12 @@ EdgeStyleAsParentAction.text=Ebeveyn Olarak
 EdgeWidthAction_width_parent.text=Ebeveyn
 EdgeWidthAction_width_thin.text=\u0130nce
 edit=D\u00FCzen
-edit.decision=HTML Editor[translate me]
-edit_link_manually=Ba\u011Flant\u0131y\u0131 elle d\u00FCzenle
+edit.decision=HTML Edit\u00F6r\u00FC
+edit_label_font_family=Yaz\u0131 tipi
+edit_label_font_size=Yaz\u0131 tipi boyutu
+edit_link_manually=Ba\u011Flant\u0131y\u0131 elle d\u00FCzenle...
+edit_note=Not d\u00FCzenle
+edit_width_label=Geni\u015Flik
 EditAction.text=D\u00FC\u011F\u00FCm\u00FC D\u00FCzenle
 EditLongAction.text=Uzun bir d\u00FC\u011F\u00FCm\u00FC d\u00FCzenle
 EncryptedMap.text=\u015Eifreli Harita Olu\u015Ftur ...
@@ -82,8 +212,6 @@ enter_confirms=Onaylar\u0131 girin
 EnterPassword.text=Ge\u00E7i\u015F yap \u015Eifrelenmi\u015F / \u015Eifrelenmemi\u015F
 error_creating_directory=D\u0131\u015Fa aktarmak i\u00E7in dizin olu\u015Fturulam\u0131yor.
 ExecuteScripts.text=Scripts[translate me]
-export_pdf_text=Ta\u015F\u0131nabilir Belge Bi\u00E7imi (PDF)
-export_svg_text=\u00D6l\u00E7eklenebilir Vekt\u00F6r Grafi\u011Fi (SVG)
 ExportAction.text=D\u0131\u015Fa Aktar
 ExportBranchToHTMLAction.text=Dal\u0131 HTML Olarak Aktar
 ExportPdf.text=PDF olarak...
@@ -100,6 +228,11 @@ FaqOpenURLAction.text=SSS
 file=Dosya
 file_already_exists={0} zaten var. \u00DCzerine yazmak ister misiniz?
 file_not_found={0} bulunamad\u0131
+filter=F&iltre
+filter_add=&Ekle
+filter_conditions=Filtreler
+filter_contains=\u0130\u00E7erir
+filter_delete=&Sil
 filter_does_not_exist=Not Exist[translate me]
 filter_icon=Icon[translate me]
 find_what=Neyi bul
@@ -113,7 +246,7 @@ FoldAllAction.tooltip=<html>Se\u00E7ili d\u00FC\u011F\u00FCmleri ve \u00E7ocukla
 FoldOneLevelAction.text=Bir Seviye Daralt
 FoldOneLevelAction.tooltip=<html>Se\u00E7ili d\u00FC\u011F\u00FCmleri bir seviye daralt\u0131r.</html>
 follow_graphical_link=Go to:[translate me]
-FollowLinkAction.text=Git:
+FollowLinkAction.text=Ba\u011Flant\u0131y\u0131 takip edin
 font=Yaz\u0131tipi
 FontFamilyAction.text=yaz\u0131tipi ailesi
 FontSizeAction.text=yaz\u0131tipi boyutu
@@ -248,12 +381,12 @@ NewSiblingAction.text=Yeni Karde\u015F D\u00FC\u011F\u00FCm
 no=Hay\u0131r
 no_format_copy_before_format_paste=\u00D6nce bir bi\u00E7im kopyalamal\u0131s\u0131n\u0131z.
 no_found_from=<html>"{1}"''de hi\u00E7 "{0}" bulunamad\u0131.</html>
-no_more_found_from="{1}"''de ba\u015Fka "{0}" bulunamad\u0131.
+no_more_found_from=<html>art\u0131k <u>{0}</u> {1} "bulundu".</html>
 no_previous_find=\u00D6nceki bulunamad\u0131.
 node=D\u00FC\u011F\u00FCm
 node_changed_discard_changes=D\u00FC\u011F\u00FCm\u00FC dei\u011Fi\u015Ftirdiniz. De\u011Fi\u015Fiklikleri silmek istedi\u011Finizden emin misiniz?
 NodeBackgroundColorAction.text=D\u00FC\u011F\u00FCm Arkaplan Rengi
-NodeColorAction.text=D\u00FC\u011F\u00FCm Rengi
+NodeColorAction.text=D\u00FC\u011F\u00FCm Rengi...
 NodeColorBlendAction.text=Rengi Kar\u0131\u015Ft\u0131r
 NodeDownAction.text=Alt D\u00FC\u011F\u00FCm
 NodeListAction.text=Harita Ge\u00E7mi\u015Fini G\u00F6ster ...
@@ -476,7 +609,7 @@ repair_link=Ba\u011Flant\u0131y\u0131 tamir et
 repair_link_question=Ba\u011Flant\u0131l\u0131 harita y\u00FCklenemedi. Ba\u011Flant\u0131 elle d\u00FCzenlensin mi?
 ResetNodeLocationAction.text=Durumu S\u0131f\u0131rla
 save_failed={0} kaydedilemedi.
-save_unsaved=Zihin haritas\u0131n\u0131 kaydet? :
+save_unsaved=Zihin haritas\u0131n\u0131 kaydet?
 SaveAction.text=Kaydet
 SaveAsAction.text=Farkl\u0131 Kaydet
 saved=Kaydedildi
@@ -488,12 +621,13 @@ SelectBranchAction.text=G\u00F6r\u00FCn\u00FCr Dal\u0131 Se\u00E7
 selection_method_by_click=Se\u00E7mek i\u00E7in t\u0131klay\u0131n
 selection_method_delayed=Gecikmeli Otomatik Se\u00E7im
 selection_method_direct=Se\u00E7ilecek nokta
-SetImageByFileChooserAction.text=Resmi Se\u00E7in (Dosya Se\u00E7ici veya Ba\u011Flant\u0131)
-SetLinkByFileChooserAction.text=Ba\u011F Olu\u015Ftur (Dosya se\u00E7ici)
-SetLinkByTextFieldAction.text=Ba\u011F Olu\u015Ftur (Metin alan\u0131)
-simplyhtml.alignLabel=Alignment:[translate me]
+SetImageByFileChooserAction.text=Resmi Se\u00E7in (Dosya Se\u00E7ici veya Ba\u011Flant\u0131)...
+SetLinkByFileChooserAction.text=Ba\u011F Olu\u015Ftur (Dosya se\u00E7ici)...
+SetLinkByTextFieldAction.text=Ba\u011F Olu\u015Ftur (Metin alan\u0131)...
+simplyhtml.alignCenter=merkez
+simplyhtml.alignLabel=Hizalama:
 simplyhtml.appendTableColLabel=Append col[translate me]
-simplyhtml.borderColorLabel=Color:[translate me]
+simplyhtml.borderColorLabel=Renk:
 simplyhtml.borderWidthLabel=Geni\u015Flik
 simplyhtml.cancelBtnName=\u0130ptal
 simplyhtml.cellMarginTabLabel=Margin[translate me]
@@ -505,10 +639,10 @@ simplyhtml.fontBoldLabel=Koyu
 simplyhtml.fontItalicLabel=Yat\u0131k
 simplyhtml.fontTabLabel=Yaz\u0131tipi
 simplyhtml.fontUnderlineLabel=Alt\u0131n\u0131 \u00C7iz
-simplyhtml.foregroundLabel=Foreground:[translate me]
+simplyhtml.foregroundLabel=\u00D6n plan:
 simplyhtml.formatLabel=Format[translate me]
 simplyhtml.helpLabel=Yard\u0131m
-simplyhtml.listIndentTitle=Indent:[translate me]
+simplyhtml.listIndentTitle=Girinti:
 simplyhtml.okBtnName=Tamam
 simplyhtml.pasteLabel=Yap\u0131\u015Ft\u0131r
 simplyhtml.redoLabel=Yinele
@@ -516,11 +650,11 @@ simplyhtml.redoTip=redo[translate me]
 simplyhtml.replaceNo=Hay\u0131r
 simplyhtml.replaceYes=Evet
 simplyhtml.styleLabel=Bi\u00E7em
-simplyhtml.textIndentLabel=Indent:[translate me]
+simplyhtml.textIndentLabel=Girinti:
 simplyhtml.uLineLabel=Alt\u0131n\u0131 \u00C7iz
 simplyhtml.undoLabel=Geri Al
 simplyhtml.valignBaseline=baseline[translate me]
-simplyhtml.valignLabel=Vert. Alignment:[translate me]
+simplyhtml.valignLabel=Dikey hizalama:
 split=&B\u00F6l
 style=Bi\u00E7em
 svg=SVG[translate me]
@@ -543,14 +677,21 @@ unfold=Geni\u015Flet
 UnfoldAllAction.text=T\u00FCm\u00FCn\u00FC Geni\u015Flet
 UnfoldAllAction.tooltip=<html>Se\u00E7ili d\u00FC\u011F\u00FCmleri ve \u00E7ocuklar\u0131n\u0131 geni\u015Fletir.</html>
 UnfoldOneLevelAction.text=Bir Seviye Geni\u015Flet
-UnfoldOneLevelAction.tooltip=<html>Se\u00E7ili d\u00FC\u011F\u00FCmleri bir seviye geni\u015Fletir.</html>
+UnfoldOneLevelAction.tooltip=Se\u00E7ili d\u00FC\u011F\u00FCmleri bir seviye geni\u015Fletir.
 url_error=Bozuk URL!
 url_load_error=Harita y\u00FCklenemedi URL:
-user_defined_zoom=Kullan\u0131c\u0131 tan\u0131ml\u0131.
+user_defined_zoom=Kullan\u0131c\u0131 tan\u0131ml\u0131
 user_defined_zoom_status_bar=Yak\u0131nla\u015Ft\u0131rma kullan\u0131c\u0131 tan\u0131ml\u0131 olarak de\u011Fi\u015Ftirildi {0}%.
 user_zoom=\u00D6l\u00E7ek \u00E7arpan\u0131n\u0131 yazd\u0131r (0.0 - 2.0):
-view=G\u00F6r\u00FCn\u00FCm
+userScripts=Betikler
+value_format=De\u011Fer bi\u00E7imi
+view=&G\u00F6r\u00FCn\u00FCm
+ViewLayoutTypeAction.OUTLINE.text=Anahat g\u00F6r\u00FCn\u00FCm\u00FC
+web_resources=Web kaynaklar\u0131
+WebDocuAction.text=Web Belgeleri
 width=Geni\u015Flik
+xslt_export.html=Html belgesi
 yes=Evet
+zoom=B\u00FCy\u00FCt
 ZoomInAction.text=Yakla\u015F
 ZoomOutAction.text=Uzakla\u015F
diff --git a/freeplane/resources/translations/Resources_uk_UA.properties b/freeplane/resources/translations/Resources_uk_UA.properties
index bf3b36a..52c95b9 100644
--- a/freeplane/resources/translations/Resources_uk_UA.properties
+++ b/freeplane/resources/translations/Resources_uk_UA.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=\u0421\u043A\u0430\u0441\u0443\u043
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=\u041F\u0435\u0440\u0435\u043C\u0438\u043A\u0430\u0442\u0438 \u0437\u0430\u0445\u0438\u0441\u0442 \u043F\u0430\u0440\u043E\u043B\u0435\u043C (\u0448\u0438\u0444\u0440\u0443\u0432\u0430\u043D\u043D\u044F) \u043C\u043E\u0436\u043D\u0430 \u0442\u0456\u043B\u044C\u043A\u0438 \u0434\u043B\u044F \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430. \u0421\u0442\u0432\ [...]
 accessories/plugins/EncryptNode.properties_select_me=\u0412\u0438\u0431\u0435\u0440\u0438 \u043C\u0435\u043D\u0435 \u0434\u043B\u044F \u043F\u0440\u043E\u0434\u043E\u0432\u0436\u0435\u043D\u043D\u044F!
 accessories/plugins/EncryptNode.properties_wrong_password=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0438\u0439 \u043F\u0430\u0440\u043E\u043B\u044C.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0443 \u0434\u043B\u044F Java Web Start.
 accessories/plugins/ExportWithTWiki.text=\u042F\u043A TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0443 \u044F\u043A \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442 TWiki.
 accessories/plugins/ExportWithXSLT.tooltip=\u0426\u0435 \u043E\u0434\u043D\u043E\u0440\u0456\u0434\u043D\u0438\u0439 \u043C\u0435\u0442\u043E\u0434 \u0435\u043A\u0441\u043F\u043E\u0440\u0442\u0443.
 accessories/plugins/ExportWithXSLT_Applet.text=\u042F\u043A java-\u0430\u043F\u043B\u0435\u0442...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0443 \u044F\u043A java-\u0430\u043F\u043B\u0435\u0442 \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u0433\u043B\u044F\u0434\u0443 \u0443 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0456.
-accessories/plugins/ExportWithXSLT_Flash.text=\u042F\u043A Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u044F\u043A \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0443 flash.
 accessories/plugins/ExportWithXSLT_HTML.text=\u042F\u043A XHTML (\u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0432\u0430\u0442\u0438 Javascript)...
 accessories/plugins/ExportWithXSLT_HTML3.text=\u042F\u043A XHTML (\u0437 \u043D\u0430\u0432\u0456\u0433\u0430\u0446\u0456\u0439\u043D\u043E\u044E \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u043E\u044E)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u0420\u0435\u0441\u0443\u0440\u0441\u0438 \u0437 \u0432\u0443\u0437\u043B\u0430 RESOURCES \u0443 \u0444\u0430\u0439\u043B \u0434\u043B\u044F TaskJuggler...
@@ -109,7 +109,7 @@ attributes_attribute=\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u0438
 attributes_close=\u0417\u0430\u043A\u0440\u0438\u0442\u0438
 attributes_deselect_all=\u041D\u0456\u0447\u043E\u0433\u043E
 attributes_dialog_title=\u041A\u0435\u0440\u0443\u0432\u0430\u043D\u043D\u044F \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430\u043C\u0438
-attributes_edit=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
+attributes_edit=\u0417\u043C\u0456\u043D\u0438\u0442\u0438
 attributes_edit_tooltip=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043C\u043D\u043E\u0436\u0438\u043D\u0443
 attributes_for_selected=\u0412\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438
 attributes_for_visible=\u0412\u0441\u0456 \u0432\u0438\u0434\u0438\u043C\u0456 \u0432\u0443\u0437\u043B\u0438
@@ -118,7 +118,7 @@ attributes_import_tooltip=\u0406\u043C\u043F\u043E\u0440\u0442\u0443\u0432\u0430
 attributes_no_import_candidates_found=\u041D\u043E\u0432\u0438\u0445 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0456\u0432 \u043D\u0435 \u0437\u043D\u0430\u0439\u0434\u0435\u043D\u043E
 attributes_popup_delete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
 attributes_popup_down=\u0414\u043E\u043D\u0438\u0437\u0443
-attributes_popup_edit=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
+attributes_popup_edit=\u0417\u043C\u0456\u043D\u0438\u0442\u0438
 attributes_popup_hide=\u0421\u0445\u043E\u0432\u0430\u0442\u0438
 attributes_popup_new=\u041D\u043E\u0432\u0438\u0439 \u0430\u0442\u0440\u0438\u0431\u0443\u0442
 attributes_popup_optimal_width=\u041E\u043F\u0442\u0438\u043C\u0430\u043B\u044C\u043D\u0430 \u0448\u0438\u0440\u0438\u043D\u0430
@@ -186,7 +186,6 @@ cannot_join_nodes_with_children=\u041D\u0435\u043C\u043E\u0436\u043B\u0438\u0432
 cannot_move_into_child_node=\u041D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u043F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438\u0441\u044F \u0432 \u0434\u043E\u0447\u0456\u0440\u043D\u0456\u0439 \u0432\u0443\u0437\u043E\u043B
 cannot_move_to_child=\u041D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u043F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438 \u0432\u0443\u0437\u043E\u043B \u0434\u043E \u043E\u0434\u043D\u043E\u0433\u043E \u0437 \u0439\u043E\u0433\u043E \u043D\u0430\u0449\u0430\u0434\u043A\u0456\u0432.
 CenterAction.text=\u0426\u0435\u043D\u0442\u0440\u0443\u0432\u0430\u0442\u0438
-CenterSelectedNodeAction.text=\u0426\u0435\u043D\u0442\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B
 ChangeConnectorArrowsAction.backward.text=\u041D\u0430\u0437\u0430\u0434
 ChangeConnectorArrowsAction.both.text=\u041C\u0430\u043B\u044E\u0432\u0430\u0442\u0438 \u0441\u0442\u0440\u0456\u043B\u043A\u0438 \u043D\u0430 \u043E\u0431\u043E\u0445 \u043A\u0456\u043D\u0446\u044F\u0445
 ChangeConnectorArrowsAction.forward.text=\u0412\u043F\u0435\u0440\u0435\u0434
@@ -200,7 +199,6 @@ ChangeNodeLevelLeftsAction.text=\u041F\u0456\u0434\u0432\u0438\u0449\u0438\u0442
 ChangeNodeLevelLeftsAction.tooltip=\u041B\u0456\u0432\u043E\u0440\u0443\u0447 \u0432\u0456\u0434 \u043A\u043E\u0440\u0435\u043D\u044F \u0432\u0443\u0437\u043B\u0438 \u0437\u043C\u0456\u0449\u0443\u044E\u0442\u044C\u0441\u044F \u0434\u043E\u043D\u0438\u0437\u0443 \u0456 \u0441\u0442\u0430\u044E\u0442\u044C \u043D\u0430\u0449\u0430\u0434\u043A\u0430\u043C\u0438 \u0432\u0443\u0437\u043B\u0430 \u0432\u0438\u0449\u043E\u0433\u043E \u0440\u0456\u0432\u043D\u044F. \u041F\u0440\u0430\u0432\u043E [...]
 ChangeNodeLevelRightsAction.text=\u041F\u043E\u043D\u0438\u0437\u0438\u0442\u0438 \u0440\u0456\u0432\u0435\u043D\u044C (\u043D\u0430\u0449\u0430\u0434\u043E\u043A \u0441\u0443\u0441\u0456\u0434\u0430)
 ChangeNodeLevelRightsAction.tooltip=\u041F\u0440\u0430\u0432\u043E\u0440\u0443\u0447 \u0432\u0456\u0434 \u043A\u043E\u0440\u0435\u043D\u044F \u0432\u0443\u0437\u043B\u0438 \u0437\u043C\u0456\u0449\u0443\u044E\u0442\u044C\u0441\u044F \u0434\u043E\u043D\u0438\u0437\u0443. \u0412\u043E\u043D\u0438 \u0441\u0442\u0430\u044E\u0442\u044C \u043D\u0430\u0449\u0430\u0434\u043A\u0430\u043C\u0438 \u0432\u0443\u0437\u043B\u0430, \u0449\u043E \u043B\u0435\u0436\u0438\u0442\u044C \u0432\u0438\u0449\u04 [...]
-choose_background_color=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043A\u043E\u043B\u0456\u0440 \u0442\u043B\u0430:
 choose_cloud_color=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043A\u043E\u043B\u0456\u0440 \u0445\u043C\u0430\u0440\u0438:
 choose_edge_color=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043A\u043E\u043B\u0456\u0440 \u043B\u0456\u043D\u0456\u0457
 choose_map_background_color=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 \u043A\u043E\u043B\u0456\u0440 \u0444\u043E\u043D\u0443 \u0434\u043B\u044F \u043A\u0430\u0440\u0442\u0438
@@ -218,6 +216,13 @@ CloudShapeAction.ARC.text=\u0414\u0443\u0433\u0430
 CloudShapeAction.RECT.text=\u041F\u0440\u044F\u043C\u043E\u043A\u0443\u0442\u043D\u0438\u043A
 CloudShapeAction.ROUND_RECT.text=\u0417\u0430\u043E\u043A\u0440\u0443\u0433\u043B\u0435\u043D\u0438\u0439 \u043F\u0440\u044F\u043C\u043E\u043A\u0443\u0442\u043D\u0438\u043A
 CloudShapeAction.STAR.text=\u0417\u0456\u0440\u043A\u0430
+collection.delete=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
+collection.down=\u0412\u043D\u0438\u0437
+collection.move=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438
+collection.moveTo=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438 \u0432 \u043F\u043E\u0437\u0438\u0446\u0456\u044E
+collection.new.presentation=\u041D\u043E\u0432\u0430 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044F
+collection.new.slide=\u041D\u043E\u0432\u0438\u0439 \u0441\u043B\u0430\u0439\u0434
+collection.up=\u0412\u0433\u043E\u0440\u0443
 ColorProperty.ResetColor=\u0412\u0456\u0434\u043D\u043E\u0432\u0438\u0442\u0438 \u043F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0438\u0439 \u043A\u043E\u043B\u0456\u0440
 combined=\u041A\u043E\u043C\u0431\u0456\u043D\u043E\u0432\u0430\u043D\u043E
 condition=\u0423\u043C\u043E\u0432\u0430
@@ -228,6 +233,7 @@ connector_label=\u041F\u0456\u0434\u043F\u0438\u0441 \u0437'\u0454\u0434\u043D\u
 connector_lines=\u041B\u0456\u043D\u0456\u0457 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0430
 connector_shapes=\u0424\u043E\u0440\u043C\u0438 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0430
 ConnectorColorAction.text=\u041A\u043E\u043B\u0456\u0440 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0430...
+controls=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043A\u0435\u0440\u0443\u0432\u0430\u043D\u043D\u044F
 ConvertCloneToIndependentNodeAction.text=\u0412\u0456\u0434'\u0454\u0434\u043D\u0430\u0442\u0438 \u043A\u043B\u043E\u043D
 CopyAction.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438
 CopyAction.tooltip=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0443 \u0433\u0456\u043B\u043A\u0443
@@ -235,7 +241,7 @@ CopyAttributes.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u043
 CopyIDAction.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 ID \u0432\u0443\u0437\u043B\u0430
 CopyMapStylesAction.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0441\u0442\u0438\u043B\u044C \u043A\u0430\u0440\u0442\u0438 \u0437...
 CopyNodeURIAction.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 URI \u0432\u0443\u0437\u043B\u0430
-copyright=Copyright \u00A9 2000-2016 \u041A\u043E\u043C\u0430\u043D\u0434\u0430 Freeplane \u0442\u0430 \u0456\u043D\u0448\u0456
+copyright=Copyright \u00A9 2000-2017 \u041A\u043E\u043C\u0430\u043D\u0434\u0430 Freeplane \u0442\u0430 \u0456\u043D\u0448\u0456
 CopySingleAction.text=\u0421\u043A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u043E\u0434\u0438\u043D \u0432\u0443\u0437\u043E\u043B
 CopySingleAction.tooltip=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u043B\u0438\u0448\u0435 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B
 CopyStyleExtensionsAction.text=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0440\u043E\u0437\u0448\u0438\u0440\u0435\u043D\u043D\u044F \u0437\u0456 \u0441\u0442\u0438\u043B\u044C\u043E\u0432\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
@@ -250,6 +256,7 @@ CutAction.text=\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438
 decrease_branch_font_size=\u0417\u043C\u0435\u043D\u0448\u0438\u0442\u0438 \u0448\u0440\u0438\u0444\u0442 \u0432\u0441\u0456\u0454\u0457 \u0433\u0456\u043B\u043A\u0438
 DecreaseNodeFontAction.text=\u0417\u043C\u0435\u043D\u0448\u0438\u0442\u0438 \u0448\u0440\u0438\u0444\u0442 \u0432\u0441\u0456\u0454\u0457 \u0433\u0456\u043B\u043A\u0438
 default=\u0422\u0438\u043F\u043E\u0432\u043E
+defaultAuxiliaryWordList=a, the, of
 DefaultColorAction.text=\u0422\u0438\u043F\u043E\u0432\u0438\u0439 \u043A\u043E\u043B\u0456\u0440
 defaultstyle.attributes=\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u0438
 defaultstyle.details=\u041F\u043E\u0434\u0440\u043E\u0431\u0438\u0446\u0456
@@ -317,6 +324,7 @@ EditAction.text=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
 EditAttributesAction.text=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438
 EditDetailsAction.text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u043E\u0434\u0440\u043E\u0431\u0438\u0446\u0456 \u0432\u0443\u0437\u043B\u0430 \u0432 \u0440\u044F\u0434\u043A\u0443
 EditDetailsInDialogAction.text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u043E\u0434\u0440\u043E\u0431\u0438\u0446\u0456 \u0432\u0443\u0437\u043B\u0430 \u0432 \u0432\u0456\u043A\u043D\u0456
+editEdgeColors=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u043A\u043E\u043B\u044C\u043E\u0440\u0438 \u0440\u0435\u0431\u0435\u0440
 EditFilterAction.text=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0444\u0456\u043B\u044C\u0442\u0440
 EditLongAction.text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u043E\u0441\u043D\u043E\u0432\u043D\u0438\u0439 \u0442\u0435\u043A\u0441\u0442 \u0443 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0456
 EditNoteInDialogAction.text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u043F\u0440\u0438\u043C\u0456\u0442\u043A\u0443 \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0456
@@ -352,14 +360,14 @@ ExecuteScripts.noScriptsAvailable=\u041D\u0435 \u0434\u043E\u0441\u0442\u0443\u0
 ExecuteScripts.text=\u0421\u043A\u0440\u0438\u043F\u0442\u0438
 ExecuteScriptSecurityError.text=\u041F\u0456\u0434 \u0447\u0430\u0441 \u0432\u0438\u043A\u043E\u043D\u0430\u043D\u043D\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0443 \u0432\u0438\u043D\u0438\u043A\u043B\u0430 \u043F\u043E\u043C\u0438\u043B\u043A\u0430: {0}
 export_failed=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u043D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044C
-export_pdf_text=\u0424\u043E\u0440\u043C\u0430\u0442 PDF
-export_svg_text=\u041C\u0430\u0441\u0448\u0442\u0430\u0431\u043E\u0432\u0430\u043D\u0430 \u0412\u0435\u043A\u0442\u043E\u0440\u043D\u0430 \u0413\u0440\u0430\u0444\u0456\u043A\u0430 (SVG)
 export_using_xslt=Freeplane \u0435\u043A\u0441\u043F\u043E\u0440\u0442
 ExportAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0443...
+ExportAllPresentationsAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0456 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457 \u0432 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0444\u043E\u0440\u043C\u0430\u0442\u0443 PNG
 ExportBranchAction.text=\u0413\u0456\u043B\u043A\u0443 \u044F\u043A \u043D\u043E\u0432\u0443 \u043A\u0430\u0440\u0442\u0443 ...
 ExportBranchToHTMLAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u0433\u0456\u043B\u043A\u0443 \u0434\u043E HTML
 exported_file={0} \u0444\u0430\u0439\u043B
 ExportPdf.text=PDF
+ExportPresentationAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u043F\u043E\u0442\u043E\u0447\u043D\u0443 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E \u0432 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0444\u043E\u0440\u043C\u0430\u0442\u0443 PNG
 ExportSvg.text=\u042F\u043A SVG...
 ExportToHTMLAction.text=\u0415\u043A\u0441\u043F\u043E\u0440\u0442\u0443\u0432\u0430\u0442\u0438 \u0434\u043E HTML
 ExportToImage.jpg.text=\u042F\u043A JPEG...
@@ -381,6 +389,7 @@ f_button_unassigned=<\u043D\u0435 \u043F\u0440\u0438\u0437\u043D\u0430\u0447\u04
 FaqOpenURLAction.text=\u041F\u0438\u0442\u0430\u043D\u043D\u044F, \u0449\u043E \u0447\u0430\u0441\u0442\u043E \u0441\u0442\u0430\u0432\u043B\u044F\u0442\u044C\u0441\u044F
 file=\u0424\u0430\u0439\u043B
 file_already_exists=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442 {0} \u0432\u0436\u0435 \u0456\u0441\u043D\u0443\u0454. \u041F\u0435\u0440\u0435\u043F\u0438\u0441\u0430\u0442\u0438?
+file_not_accessible=\u0424\u0430\u0439\u043B {0} \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0438\u0439
 file_not_found=\u0424\u0430\u0439\u043B {0} \u043D\u0435 \u0437\u043D\u0430\u0439\u0434\u0435\u043D\u043E
 FileListFlavorHandler=\u041F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F \u043D\u0430 \u0444\u0430\u0439\u043B\u0438
 FileProperties_BranchLeafCount=\u0427\u0438\u0441\u043B\u043E \u043A\u0456\u043D\u0446\u0435\u0432\u0438\u0445 \u0432\u0443\u0437\u043B\u0456\u0432 \u0443 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0445 \u0433\u0456\u043B\u043A\u0430\u0445:
@@ -474,7 +483,7 @@ fit_map_to_page_height=\u041F\u0456\u0434\u0456\u0433\u043D\u0430\u0442\u0438 &\
 fit_map_to_page_width=\u041F\u0456\u0434\u0456\u0433\u043D\u0430\u0442\u0438 &\u0448\u0438\u0440\u0438\u043D\u0443 \u0434\u043E \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0438
 FitToPage.text=\u041C\u0430\u0441\u0448\u0442\u0430\u0431\u0443\u0432\u0430\u0442\u0438 \u0437\u0430 \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u043E\u044E
 FitToPage.tooltip=\u041F\u0456\u0434\u0431\u0438\u0440\u0430\u0454  \u043C\u0430\u0441\u0448\u0442\u0430\u0431, \u0449\u043E\u0431 \u043F\u043E\u043C\u0456\u0441\u0442\u0438\u0442\u0438 \u0432\u0441\u044E \u043A\u0430\u0440\u0442\u0443 \u0443 \u0432\u0456\u043A\u043D\u0456.
-fold=\u0417\u0433\u043E\u0440\u043D\u0443\u0442\u0438
+fold=\u0417\u0433\u043E\u0440\u0442\u0430\u043D\u043D\u044F
 FoldAllAction.text=\u0417\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u0432\u0441\u0435
 FoldAllAction.tooltip=<html>\u0417\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438 \u0442\u0430 \u0432\u0441\u0456\u0445 \u0457\u0445\u043D\u0456\u0445 \u043D\u0430\u0449\u0430\u0434\u043A\u0456\u0432.</html>
 FoldOneLevelAction.text=\u0417\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u0440\u0456\u0432\u0435\u043D\u044C
@@ -636,6 +645,9 @@ icon_penguin=Linux
 icon_positive=\u041F\u043E\u0437\u0438\u0442\u0438\u0432\u043D\u043E
 icon_prepare=\u0416\u043E\u0432\u0442\u0435 \u0441\u0432\u0456\u0442\u043B\u043E \u0441\u0432\u0456\u0442\u043B\u043E\u0444\u043E\u0440\u0430
 icon_revision=\u0412\u0435\u0440\u0441\u0456\u044F
+icon_revision-green=\u0412\u0438\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044F \u0437\u0435\u043B\u0435\u043D\u0435
+icon_revision-pink=\u0412\u0438\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044F \u0440\u043E\u0436\u0435\u0432\u0435
+icon_revision-red=\u0412\u0438\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044F \u0447\u0435\u0440\u0432\u043E\u043D\u0435
 icon_smiley-angry=\u0421\u0435\u0440\u0434\u0438\u0442\u0438\u0439
 icon_smiley-neutral=\u0411\u0430\u0439\u0434\u0443\u0436\u0435
 icon_smiley-oh=\u0417\u0434\u0438\u0432\u043E\u0432\u0430\u043D\u0438\u0439
@@ -710,7 +722,7 @@ latex_editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0444
 LatexDeleteLatexAction.text=\u0412\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTeX
 LatexEditLatexAction.text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTeX...
 LatexInsertLatexAction.msg1=<html>\u0412\u0438 \u043D\u0430\u043C\u0430\u0433\u0430\u0454\u0442\u0435\u0441\u044C \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u0438 <i>\u0437\u0430\u0441\u0442\u0430\u0440\u0456\u043B\u0443</i> \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTeX.<br/>\u041D\u043E\u0432\u0438\u0439 \u0441\u043F\u043E\u0441\u0456\u0431 \u0441\u0442\u0432\u043E\u0440\u0435\u043D\u043D\u044F \u0442\u0435\u043A\u0441\u0442\u0443/\u0444\u043E\u0440\u043C\u0443\u043B LaTeX \u043E\u04 [...]
-LatexInsertLatexAction.msg2=<html>\u041A\u043E\u0440\u043E\u0442\u043A\u043E: <ul><li>\u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0439\u0442\u0435 \u043F\u0440\u0435\u0444\u0456\u043A\u0441 "\\latex " \u0443 \u0442\u0435\u043A\u0441\u0442\u0456 \u0432\u0443\u0437\u043B\u0430 \u0430\u0431\u043E</li><li><i>\u0412\u0438\u0433\u043B\u044F\u0434 -> \u041F\u0430\u043D\u0435\u043B\u044C \u0444\u043E\u0440\u043C\u0430\u0442\u0443\u0432\u0430\u043D\u043D\u044F </i>, \u043F [...]
+LatexInsertLatexAction.msg2=<html>\u041A\u043E\u0440\u043E\u0442\u043A\u043E: <ul><li>\u043D\u0430 \u043F\u043E\u0447\u0430\u0442\u043A\u0443 \u0442\u0435\u043A\u0441\u0442\u0443 \u0432\u0443\u0437\u043B\u0430 \u043D\u0430\u043F\u0438\u0448\u0456\u0442\u044C "\\latex " \u0430\u0431\u043E</li><li><i>\u041F\u0435\u0440\u0435\u0433\u043B\u044F\u0434->\u041F\u0430\u043D\u0435\u043B\u044C \u0437\u0430\u0441\u043E\u0431\u0456\u0432</i>, \u0430 \u043F\u043E\u0442\u0456\u043C <i>\u0422\u0435\u04 [...]
 LatexInsertLatexAction.text=\u0414\u043E\u0434\u0430\u0442\u0438 \u0444\u043E\u0440\u043C\u0443\u043B\u0443 LaTeX...
 latexPatternFormat=LaTeX
 LengthUnits.cm=\u0441\u043C
@@ -841,6 +853,7 @@ ModesMenuAction.File.text=\u041E\u0433\u043B\u044F\u0434\u0430\u0447 \u0444\u043
 ModesMenuAction.MindMap.text=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0430\u0441\u043E\u0446\u0456\u0430\u0442\u0438\u0432\u043D\u0438\u0445 \u043A\u0430\u0440\u0442
 most_recent_files=\u041D\u0435\u0434\u0430\u0432\u043D\u0456 \u0444\u0430\u0439\u043B\u0438
 MoveAction.text=\u041F\u0435\u0440\u0435\u043C\u0456\u0441\u0442\u0438\u0442\u0438
+MoveSelectedNodeAction.CENTER.text=\u0426\u0435\u043D\u0442\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B
 MoveToRootAction.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E \u043A\u043E\u0440\u0435\u043D\u044F
 NameConditionAction.text=\u0417\u0430\u0434\u0430\u0442\u0438 \u043D\u0430\u0437\u0432\u0443
 navigate=\u041F\u0435\u0440\u0435\u043C\u0456\u0449\u0435\u043D\u043D\u044F
@@ -880,7 +893,7 @@ NextNodeAction.BACK.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E
 NextNodeAction.BACK_N_FOLD.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E \u043F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u044C\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430 (\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438)
 NextNodeAction.FORWARD.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
 NextNodeAction.FORWARD_N_FOLD.text=\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430 (\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438)
-NextPresentationItemAction.text=\u0420\u043E\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u0438\u0439 \u0435\u043B\u0435\u043C\u0435\u043D\u0442 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
+NextPresentationItemAction.text=\u0420\u043E\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u0438\u0439 \u0435\u043B\u0435\u043C\u0435\u043D\u0442 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457 (\u0437\u0433\u043E\u0440\u0442\u043E\u043A)
 no=\u041D\u0456
 no_copy_attributes_before_paste_attributes=\u041D\u0435\u043C\u043E\u0436\u043B\u0438\u0432\u043E \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438, \u0434\u043E\u043A\u0438 \u043D\u0435 \u0441\u043A\u043E\u043F\u0456\u044E\u0454\u0442\u0435 \u044F\u043A\u0456-\u043D\u0435\u0431\u0443\u0434\u044C.
 NO_FORMAT=\u0422\u0435\u043A\u0441\u0442
@@ -921,6 +934,7 @@ not_saved_for_image_error=\u041F\u0435\u0440\u0448 \u043D\u0456\u0436 \u0437\u04
 not_saved_for_link_error=\u041A\u0430\u0440\u0442\u0430 \u043F\u043E\u0432\u0438\u043D\u043D\u0430 \u0431\u0443\u0442\u0438 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u0430 \u043F\u0435\u0440\u0435\u0434 \u0432\u0438\u0431\u043E\u0440\u043E\u043C \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F
 note_window_location=\u0420\u043E\u0437\u0442\u0430\u0448\u0443\u0432\u0430\u043D\u043D\u044F \u043F\u0430\u043D\u0435\u043B\u0456 \u043F\u0440\u0438\u043C\u0456\u0442\u043E\u043A
 notes=\u041F\u0440\u0438\u043C\u0456\u0442\u043A\u0430
+NotFoldingNextPresentationItemAction.text=\u0420\u043E\u0437\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u0438\u0439 \u0435\u043B\u0435\u043C\u0435\u043D\u0442 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
 NotificationOptions.CLOSE=\u0417\u0430\u043A\u0440\u0438\u0442\u0438
 NotificationOptions.REMIND_ME_LATER=\u041D\u0430\u0433\u0430\u0434\u0430\u0442\u0438 \u043F\u0456\u0437\u043D\u0456\u0448\u0435
 NotificationOptions.REMOVE_REMINDER=\u0412\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u043D\u0430\u0433\u0430\u0434\u0443\u0432\u0430\u043D\u043D\u044F
@@ -947,6 +961,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=\u0428
 OptionPanel.ADD_CHILD=\u0414\u043E\u0434\u0430\u0442\u0438 \u0434\u043E\u0447\u0456\u0440\u043D\u0456\u0439 \u0432\u0443\u0437\u043E\u043B
 OptionPanel.ADD_SIBLING=\u0414\u043E\u0434\u0430\u0442\u0438 \u0432\u0443\u0437\u043E\u043B-\u0431\u0440\u0430\u0442
 OptionPanel.addons=\u0414\u043E\u0434\u0430\u0442\u043A\u0438
+OptionPanel.af=\u0410\u0444\u0440\u0438\u043A\u0430\u0430\u043D\u0441
 OptionPanel.always_fold_all_after_load=\u0417\u0433\u043E\u0440\u043D\u0443\u0442\u0438 \u0432\u0441\u0456
 OptionPanel.always_load_last_maps=\u0417\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0438\u0442\u0438 \u043E\u0441\u0442\u0430\u043D\u043D\u0456 \u0456 \u043D\u043E\u0432\u0443 \u043A\u0430\u0440\u0442\u0443
 OptionPanel.always_load_last_maps.tooltip=\u042F\u043A\u0449\u043E \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E, \u0442\u043E \u043E\u0441\u0442\u0430\u043D\u043D\u0456 \u043A\u0430\u0440\u0442\u0438 \u0432\u0456\u0434\u043A\u0440\u0438\u0432\u0430\u0442\u0438\u043C\u0443\u0442\u044C\u0441\u044F \u043D\u0430\u0432\u0456\u0442\u044C \u043F\u0440\u0438 \u0432\u0456\u0434\u043A\u0440\u0438\u0432\u0430\u043D\u043D\u0456 \u043A\u0430\u0440\u0442\u0438 \u0437 \u0432\u0438 [...]
@@ -960,7 +975,9 @@ OptionPanel.antialias.tooltip=<html> \u0412\u0438\u0437\u043D\u0430\u0447\u0430\
 OptionPanel.antialias_all=\u0417\u0433\u043B\u0430\u0434\u0436\u0443\u0432\u0430\u0442\u0438 \u0443\u0441\u0435
 OptionPanel.antialias_edges=\u0417\u0433\u043B\u0430\u0434\u0436\u0443\u0432\u0430\u0442\u0438 \u043B\u0456\u043D\u0456\u0457
 OptionPanel.antialias_none=\u041D\u0435 \u0437\u0433\u043B\u0430\u0434\u0436\u0443\u0432\u0430\u0442\u0438
-OptionPanel.Appearance=\u0417\u043E\u0432\u043D\u0456\u0448\u043D\u0456\u0439 \u0432\u0438\u0433\u043B\u044F\u0434
+OptionPanel.antialias_svg=\u0417\u0433\u043B\u0430\u0434\u0436\u0443\u0432\u0430\u043D\u043D\u044F SVG
+OptionPanel.antialias_svg.tooltip=<html>\u0412\u0438\u0437\u043D\u0430\u0447\u0430\u0454 \u044F\u043A\u0456\u0441\u0442\u044C \u0432\u0438\u043C\u0430\u043B\u044C\u043E\u0432\u0443\u0432\u0430\u043D\u043D\u044F SVG. \u0411\u0456\u043B\u044C\u0448\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044F \u043F\u043E\u0442\u0440\u0435\u0431\u0443\u0454 \u0431\u0456\u043B\u044C\u0448\u0435 \u0447\u0430\u0441\u0443.</html>
+OptionPanel.Appearance=\u0412\u0438\u0433\u043B\u044F\u0434
 OptionPanel.approximate_search_threshold=\u041F\u043E\u0440\u0456\u0433 \u0434\u043B\u044F \u043D\u0430\u0431\u043B\u0438\u0436\u0435\u043D\u043E\u0457 \u0432\u0456\u0434\u043F\u043E\u0432\u0456\u0434\u043D\u043E\u0441\u0442\u0456
 OptionPanel.approximate_search_threshold.tooltip=<html>\u041F\u043E\u0440\u0456\u0433 \u0434\u043B\u044F \u043D\u0430\u0431\u043B\u0438\u0436\u0435\u043D\u043E\u0457 \u0432\u0456\u0434\u043F\u043E\u0432\u0456\u0434\u043D\u043E\u0441\u0442\u0456<br/><font size="2">\u0434\u0438\u0432. http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(\u0431\u0456\u043B\u044C\u0448\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044F - \u0431\u0456\u043B\u044C\u0448 \u0432\u0456\u0434\ [...]
 OptionPanel.ar=\u0410\u0440\u0430\u0431\u0441\u044C\u043A\u0430 / \u0627\u0644\u0639\u0631\u0628\u064A\u0629
@@ -976,6 +993,8 @@ OptionPanel.Behaviour=\u041F\u043E\u0432\u0435\u0434\u0456\u043D\u043A\u0430
 OptionPanel.bezier=\u041A\u0440\u0438\u0432\u0430
 OptionPanel.border_color=\u041A\u043E\u043B\u0456\u0440
 OptionPanel.border_color_matches_edge_color=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442\u0438 \u043A\u043E\u043B\u0456\u0440 \u0440\u0435\u0431\u0440\u0430
+OptionPanel.border_dash=\u0422\u0438\u043F \u043B\u0456\u043D\u0456\u0457 \u043C\u0435\u0436\u0456
+OptionPanel.border_dash_matches_edge_dash=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442\u0438 \u0442\u0438\u043F \u043B\u0456\u043D\u0456\u0457 \u0440\u0435\u0431\u0440\u0430
 OptionPanel.border_width=\u0428\u0438\u0440\u0438\u043D\u0430 \u043B\u0456\u043D\u0456\u0457
 OptionPanel.border_width_matches_edge_width=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442\u0438 \u0448\u0438\u0440\u0438\u043D\u0443 \u0440\u0435\u0431\u0440\u0430
 OptionPanel.bubble=\u0411\u0443\u043B\u044C\u0431\u0430\u0448\u043A\u0430
@@ -992,6 +1011,8 @@ OptionPanel.cloudcolor=\u041A\u043E\u043B\u0456\u0440 \u0445\u043C\u0430\u0440\u
 OptionPanel.cloudshape=\u0424\u043E\u0440\u043C\u0430 \u0445\u043C\u0430\u0440\u043A\u0438
 OptionPanel.combined=\u041A\u043E\u043C\u0431\u0456\u043D\u043E\u0432\u0430\u043D\u043E
 OptionPanel.compare_as_number=\u041F\u043E\u0440\u0456\u0432\u043D\u044E\u0432\u0430\u0442\u0438 \u044F\u043A \u0447\u0438\u0441\u043B\u0430
+OptionPanel.connector_arrows=\u0421\u0442\u0440\u0456\u043B\u043A\u0438 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0456\u0432
+OptionPanel.connector_dash=\u0422\u0438\u043F \u043B\u0456\u043D\u0456\u0457
 OptionPanel.convert_to_current_version=<html>\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u043F\u0435\u0440\u0435\u0442\u0432\u043E\u0440\u044E\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0438 \u0437\u0456 \u0441\u0442\u0430\u0440\u043E\u044E \u0432\u0435\u0440\u0441\u0456\u0457 Freeplane <br>\u0434\u043E \u043F\u043E\u0442\u043E\u0447\u043D\u043E\u0457 \u0432\u0435\u0440\u0441\u0456\u0457?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>\u041B\u0438\u0448\u0435 \u0434\u043B\u044F \u0434\u0443\u0436\u0435 \u0432\u0435\u043B\u0438\u043A\u0438\u0445 \u043A\u0430\u0440\u0442, \u044F\u043A\u0456 \u043D\u0435 \u043F\u043E\u0442\u0440\u0456\u0431\u043D\u043E \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0443\u0432\u0430\u0442\u0438 <br>(\u0434\u043B\u044F \u0434\u043E\u0441\u0432\u0456\u0434\u0447\u0435\u043D\u0438\u0445 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u [...]
 OptionPanel.copyFormatToNewSibling=\u041A\u043E\u043F\u0456\u044E\u0432\u0430\u0442\u0438 \u0444\u043E\u0440\u043C\u0430\u0442 \u043D\u0430 \u043D\u043E\u0432\u0456 \u0432\u0443\u0437\u043B\u0438 \u0446\u044C\u043E\u0433\u043E \u0436 \u0440\u0456\u0432\u043D\u044F
@@ -999,6 +1020,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=\u041A\u043E\u043F\u0456\u044E\u
 OptionPanel.cs=\u0427\u0435\u0441\u044C\u043A\u0430 / \u010Desky
 OptionPanel.cut_nodes_without_question=\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0432\u0443\u0437\u043B\u0438 \u0431\u0435\u0437 \u043F\u043E\u043F\u0435\u0440\u0435\u0434\u0436\u0435\u043D\u043D\u044F?
 OptionPanel.cut_nodes_without_question.tooltip=\u042F\u043A\u0449\u043E \u043F\u043E\u0437\u043D\u0430\u0447\u0435\u043D\u043E, \u0432\u0443\u0437\u043B\u0438 \u0432\u0438\u0440\u0456\u0437\u0430\u0442\u0438\u043C\u0443\u0442\u044C\u0441\u044F \u0431\u0435\u0437 \u043F\u043E\u043F\u0435\u0440\u0435\u0434\u0436\u0435\u043D\u043D\u044F. \u041C\u043E\u0436\u043D\u0430 \u0432\u0442\u0440\u0430\u0442\u0438\u0442\u0438 \u0456\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0456\u044E, \u044F\u043A\ [...]
+OptionPanel.cut_out_pictures_when_pasting_html=\u0412\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0437 HTML
 OptionPanel.da=\u0414\u0430\u043D\u0441\u044C\u043A\u0430 / dansk
 OptionPanel.date_format=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u0438
 OptionPanel.date_format.tooltip=SHORT, MEDIUM, LONG, FULL \u0430\u0431\u043E \u0448\u0430\u0431\u043B\u043E\u043D \u043D\u0430 \u0437\u0440\u0430\u0437\u043E\u043A "MM/dd/yyyy"
@@ -1029,6 +1051,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=\u041F\u043E\u043A\u0430\u04
 OptionPanel.display_node_id=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 ID \u0432\u0443\u0437\u043B\u0430
 OptionPanel.edgecolor=\u041A\u043E\u043B\u0456\u0440 \u0440\u0435\u0431\u0440\u0430
 OptionPanel.edgecolor.tooltip=\u041A\u043E\u043B\u0456\u0440 \u0440\u0435\u0431\u0440\u0430 \u0434\u043E \u0431\u0430\u0442\u044C\u043A\u0456\u0432\u0441\u044C\u043A\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430 (\u0442\u0430\u043A\u043E\u0436 \u0437\u0430\u0441\u0442\u043E\u0441\u043E\u0432\u0443\u0454\u0442\u044C\u0441\u044F \u0434\u043E \u0432\u0441\u0456\u0445 \u0434\u043E\u0447\u0456\u0440\u043D\u0456\u0445 \u0432\u0443\u0437\u043B\u0456\u0432)
+OptionPanel.edgedash=\u0422\u0438\u043F \u043B\u0456\u043D\u0456\u0457 \u0440\u0435\u0431\u0440\u0430
 OptionPanel.edgestyle=\u0421\u0442\u0438\u043B\u044C \u0440\u0435\u0431\u0440\u0430
 OptionPanel.edgestyle.tooltip=\u0421\u0442\u0438\u043B\u044C \u0440\u0435\u0431\u0440\u0430 \u0434\u043E \u0431\u0430\u0442\u044C\u043A\u0456\u0432\u0441\u044C\u043A\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430 (\u0442\u0430\u043A\u043E\u0436 \u0437\u0430\u0441\u0442\u043E\u0441\u043E\u0432\u0443\u0454\u0442\u044C\u0441\u044F \u0434\u043E \u0432\u0441\u0456\u0445 \u0434\u043E\u0447\u0456\u0440\u043D\u0456\u0445 \u0432\u0443\u0437\u043B\u0456\u0432)
 OptionPanel.edgewidth=\u0422\u043E\u0432\u0449\u0438\u043D\u0430 \u0440\u0435\u0431\u0440\u0430
@@ -1085,6 +1108,7 @@ OptionPanel.groovy_editor_font.tooltip=\u0412\u0438\u043A\u043E\u0440\u0438\u044
 OptionPanel.groovy_editor_font_size=\u0420\u043E\u0437\u043C\u0456\u0440 \u0441\u0438\u043C\u0432\u043E\u043B\u0456\u0432 \u0434\u043B\u044F Groovy-\u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430 \u0437 \u043F\u0456\u0434\u0441\u0432\u0456\u0447\u0435\u043D\u043D\u044F\u043C \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441\u0443
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=\u0421\u0445\u043E\u0432\u0430\u0442\u0438 \u0440\u0435\u0431\u0440\u043E
+OptionPanel.hide_single_end_connectors=\u041F\u0440\u0438\u0445\u043E\u0432\u0430\u0442\u0438 \u0437'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0456 \u0437 \u043E\u0434\u043D\u0438\u043C \u043A\u0456\u043D\u0446\u0435\u043C
 OptionPanel.highlight_formulas=\u041F\u0456\u0434\u0441\u0432\u0456\u0447\u0443\u0432\u0430\u0442\u0438 \u0444\u043E\u0440\u043C\u0443\u043B\u0438
 OptionPanel.horizontal=\u0413\u043E\u0440\u0438\u0437\u043E\u043D\u0442\u0430\u043B\u044C\u043D\u043E
 OptionPanel.hr=\u0425\u043E\u0440\u0432\u0430\u0442\u044C\u0441\u044C\u043A\u0430 / hrvatski
@@ -1100,6 +1124,7 @@ OptionPanel.ic_file=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432
 OptionPanel.ic_ram=\u0412 \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0456\u0439 \u043F\u0430\u043C'\u044F\u0442\u0456
 OptionPanel.icon=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0430
 OptionPanel.icon.tooltip=\u042F\u043A\u0449\u043E \u043F\u0440\u0438\u0439\u043D\u044F\u0442\u0438, \u0432\u0443\u0437\u043E\u043B \u043C\u0430\u0442\u0438\u043C\u0435 \u0441\u0430\u043C\u0435 \u0442\u0430\u043A\u0443 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0443.
+OptionPanel.icon_size=\u0420\u043E\u0437\u043C\u0456\u0440 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.icons.list=\u0421\u043F\u0438\u0441\u043E\u043A \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u0438\u0445 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0445 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C
 OptionPanel.icons.list.tooltip=\u0422\u0443\u0442 \u043C\u043E\u0436\u043D\u0430 \u0443\u043F\u043E\u0440\u044F\u0434\u043A\u0443\u0432\u0430\u0442\u0438 \u0430\u0431\u043E \u0432\u0438\u043C\u043A\u043D\u0443\u0442\u0438 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0456 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438. \u0412\u043E\u043D\u0438 \u0431\u0443\u0434\u0443\u0442\u044C \u0440\u043E\u0437\u0434\u0456\u043B\u0435\u043D\u0456 ';'.
 OptionPanel.id=\u0406\u043D\u0434\u043E\u043D\u0435\u0437\u0456\u0439\u0441\u044C\u043A\u0430 / Bahasa Indonesia
@@ -1141,6 +1166,8 @@ OptionPanel.lookandfeel.scaleuifonts=\u041C\u0430\u0441\u0448\u0442\u0430\u0431
 OptionPanel.lookandfeel.scaleuifonts.tooltip=\u0417\u0440\u0443\u0447\u043D\u043E \u0434\u043B\u044F \u043C\u043E\u043D\u0456\u0442\u043E\u0440\u0456\u0432 \u0437 \u0432\u0438\u0441\u043E\u043A\u043E\u044E \u0440\u043E\u0437\u0434\u0456\u043B\u044C\u043D\u0456\u0441\u0442\u044E
 OptionPanel.lookandfeel.tooltip=<html> \u041F\u0440\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 \u0432\u0438\u0431\u0438\u0440\u0430\u0439\u0442\u0435  '\u043D\u0456\u0447\u043E\u0433\u043E' ('nothing'). </html>
 OptionPanel.lt=\u041B\u0438\u0442\u043E\u0432\u0441\u044C\u043A\u0430 / kalba
+OptionPanel.markClones=\u041F\u043E\u0437\u043D\u0430\u0447\u0430\u0442\u0438 \u043A\u043B\u043E\u043D\u0438
+OptionPanel.markSelectedClones=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0443 \u0432\u0438\u0431\u0440\u0430\u043D\u043E\u0433\u043E \u043F\u043E\u0437\u043D\u0430\u0447\u043A\u0438 \u043A\u043B\u043E\u043D\u0456\u0432
 OptionPanel.max_displayed_node_count=\u041D\u0430\u0439\u0431\u0456\u043B\u044C\u0448\u0430 \u043A\u0456\u043B\u044C\u043A\u0456\u0441\u0442\u044C \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u0438\u0445 \u0432\u0443\u0437\u043B\u0456\u0432
 OptionPanel.max_image_width=\u041D\u0430\u0439\u0431\u0456\u043B\u044C\u0448\u0430 \u043F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0430 \u0448\u0438\u0440\u0438\u043D\u0430 \u043C\u0430\u043B\u044E\u043D\u043A\u0430
 OptionPanel.max_image_width.tooltip=\u041D\u043E\u0432\u0456 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0437\u043C\u0435\u043D\u0448\u0443\u0432\u0430\u0442\u0438\u043C\u0443\u0442\u044C\u0441\u044F \u0434\u043E \u0446\u0456\u0454\u0457 \u0448\u0438\u0440\u0438\u043D\u0438
@@ -1149,8 +1176,10 @@ OptionPanel.max_menu_item_count.tooltip=\u041E\u0431\u043C\u0435\u0436\u0443\u04
 OptionPanel.max_node_width=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430 \u0448\u0438\u0440\u0438\u043D\u0430 \u0432\u0443\u0437\u043B\u0456\u0432
 OptionPanel.max_node_width.tooltip=<html> \u0443 \u043F\u0456\u043A\u0441\u0435\u043B\u044F\u0445 </html>
 OptionPanel.max_shortened_text_length=\u041D\u0430\u0439\u0431\u0456\u043B\u044C\u0448\u0430 \u0448\u0438\u0440\u0438\u043D\u0430 \u0441\u043A\u043E\u0440\u043E\u0447\u0435\u043D\u043E\u0433\u043E \u0442\u0435\u043A\u0441\u0442\u0443
+OptionPanel.menuItemFontSize=\u0420\u043E\u0437\u043C\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0443 \u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0430 \u043C\u0435\u043D\u044E
 OptionPanel.metal=\u041C\u0435\u0442\u0430\u043B
 OptionPanel.min_node_width=\u041D\u0430\u0439\u043C\u0435\u043D\u0448\u0430 \u0448\u0438\u0440\u0438\u043D\u0430 \u0432\u0443\u0437\u043B\u0430
+OptionPanel.monitor_size_inches=\u0420\u043E\u0437\u043C\u0456\u0440 \u043C\u043E\u043D\u0456\u0442\u043E\u0440\u0430 (\u0432 \u0434\u044E\u0439\u043C\u0430\u0445)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=\u0412\u0443\u0437\u044C\u043A\u0438\u0439 \u0448\u0435\u0441\u0442\u0438\u043A\u0443\u0442\u043D\u0438\u043A
 OptionPanel.nb=\u041D\u043E\u0440\u0432\u0435\u0437\u044C\u043A\u0430 \u0431\u0443\u043A\u043C\u043E\u043B / Norsk bokm\u00E5l
@@ -1197,6 +1226,8 @@ OptionPanel.parse_latex=\u0420\u043E\u0437\u043F\u0456\u0437\u043D\u0430\u0432\u
 OptionPanel.parse_latex.tooltip=\u0420\u043E\u0437\u043F\u0456\u0437\u043D\u0430\u0432\u0430\u0442\u0438 \u0444\u043E\u0440\u043C\u0443\u043B\u0438 LaTeX \u0437\u0430 \u0444\u043E\u0440\u043C\u0430\u0442\u043E\u043C \u0430\u0431\u043E \u043F\u0440\u0435\u0444\u0456\u043A\u0441\u043E\u043C. \u0414\u0438\u0432. http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044F\u043A HTML
 OptionPanel.PASTE_PLAIN_TEXT=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044F\u043A \u043F\u0440\u043E\u0441\u0442\u0438\u0439 \u0442\u0435\u043A\u0441\u0442
+OptionPanel.pasteImagesFromFiles=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F \u0437 \u0444\u0430\u0439\u043B\u0456\u0432
+OptionPanel.pasteImagesFromFiles.tooltip=\u0412\u0441\u0442\u0430\u0432\u043B\u044F\u0442\u0438 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F, \u044F\u043A\u0449\u043E \u0444\u0430\u0439\u043B \u0437 \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F\u043C \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u043D\u0443\u0442\u043E \u043D\u0430 \u043A\u0430\u0440\u0442\u0443
 OptionPanel.path_property_may_not_be_empty=\u0412\u043B\u0430\u0441\u0442\u0438\u0432\u0456\u0441\u0442\u044C \u0428\u043B\u044F\u0445 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0431\u0443\u0442\u0438 \u043F\u043E\u0440\u043E\u0436\u043D\u044C\u043E\u044E! \u0417\u043C\u0456\u043D\u0438 \u0431\u0443\u0434\u0435 \u0441\u043A\u0430\u0441\u043E\u0432\u0430\u043D\u043E.
 OptionPanel.patternname=\u041D\u0430\u0437\u0432\u0430
 OptionPanel.patternname.tooltip=\u0423\u043D\u0456\u043A\u0430\u043B\u044C\u043D\u0430 \u043D\u0430\u0437\u0432\u0430 \u0448\u0430\u0431\u043B\u043E\u043D\u0443
@@ -1205,8 +1236,17 @@ OptionPanel.placenewbranches=\u0420\u043E\u0437\u0442\u0430\u0448\u0443\u0432\u0
 OptionPanel.placenewbranches.tooltip=<html>\u041C\u0456\u0441\u0446\u0435 \u0434\u043B\u044F \u043D\u043E\u0432\u0438\u0445 \u0433\u0456\u043B\u043E\u043A. \u0414\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u0456 \u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044F '\u041F\u0435\u0440\u0448\u0438\u0439' \u0430\u0431\u043E '\u041E\u0441\u0442\u0430\u043D\u043D\u0456\u0439' </html>
 OptionPanel.plugin.tooltip=\u0414\u043E\u0434\u0430\u0442\u043A\u0438, \u044F\u043A\u0456 \u043D\u0435 \u0432\u0431\u0443\u0434\u043E\u0432\u0430\u043D\u0456.
 OptionPanel.plugins=\u0414\u043E\u0434\u0430\u0442\u043A\u0438
-OptionPanel.presentation_dimmer_transparency=\u041F\u0440\u043E\u0437\u043E\u0440\u0456\u0441\u0442\u044C \u0437\u0430\u0442\u0456\u043D\u0435\u043D\u043D\u044F \u0432 \u0440\u0435\u0436\u0438\u043C\u0456 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
-OptionPanel.presentation_mode=\u0420\u0435\u0436\u0438\u043C \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
+OptionPanel.Presentation=\u041F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044F
+OptionPanel.presentation.combineAll=\u041A\u043E\u043C\u0431\u0456\u043D\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0456 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
+OptionPanel.presentation.exportDirectory=\u043D\u0430\u0437\u0432\u0430 \u0442\u0435\u043A\u0438 \u0435\u043A\u0441\u043F\u043E\u0440\u0442\u043E\u0432\u0430\u043D\u043E\u0457 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
+OptionPanel.presentation.maxDropBoxRowCount=\u041D\u0430\u0439\u0431\u0456\u043B\u044C\u0448\u0435 \u0447\u0438\u0441\u043B\u043E \u0440\u044F\u0434\u043A\u0456\u0432 \u0443 \u0440\u043E\u0437\u043A\u0440\u0438\u0432\u043D\u043E\u043C\u0443 \u0441\u043F\u0438\u0441\u043A\u0443
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=\u0417\u0430\u0441\u0442\u043E\u0441\u043E\u0432\u0443\u0454 \u0434\u043E \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457 \u0456 \u0441\u0435\u043B\u0435\u043A\u0442\u043E\u0440\u0456\u0432 \u0441\u043B\u0430\u0439\u0434\u0456\u0432
+OptionPanel.presentation.processesEscapeKey=\u041A\u043B\u0430\u0432\u0456\u0448\u0430 ESCAPE \u0437\u0443\u043F\u0438\u043D\u044F\u0454 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E
+OptionPanel.presentation.processesNavigationKeys=\u041A\u0435\u0440\u0443\u0432\u0430\u0442\u0438 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0454\u044E \u043D\u0430\u0432\u0456\u0433\u0430\u0446\u0456\u0439\u043D\u0438\u043C\u0438 \u043A\u043B\u0430\u0432\u0456\u0448\u0430\u043C\u0438
+OptionPanel.presentation.slideDisplaysAllNodes=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0440\u043E\u0437\u0433\u043E\u0440\u0442\u0430\u0442\u0438 \u0432\u0441\u0456 \u0432\u0443\u0437\u043B\u0438 \u0441\u043B\u0430\u0439\u0434\u0430
+OptionPanel.presentation.slowMotion=\u041F\u043E\u0432\u0456\u043B\u044C\u043D\u0438\u0439 \u0440\u0443\u0445
+OptionPanel.presentation.switchToFullScreen=\u0410\u043A\u0442\u0438\u0432\u0443\u0432\u0430\u0442\u0438 \u043F\u043E\u0432\u043D\u043E\u0435\u043A\u0440\u0430\u043D\u043D\u0438\u0439 \u0440\u0435\u0436\u0438\u043C
+OptionPanel.presentation.zoom=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442\u0438 \u043C\u0430\u0441\u0448\u0442\u0430\u0431 \u043A\u0430\u0440\u0442\u0438
 OptionPanel.printonwhitebackground=<html>\u0411\u0456\u043B\u0435 \u0442\u043B\u043E \u0434\u043B\u044F \u0434\u0440\u0443\u043A\u0443</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u0417\u0430\u0432\u0436\u0434\u0438 \u0432\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0432\u0430\u0442\u0438 \u0431\u0456\u043B\u0435 \u0442\u043B\u043E \u043F\u0456\u0434 \u0447\u0430\u0441 \u0434\u0440\u0443\u043A\u0443</html>
 OptionPanel.pt_BR=\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u044C\u0441\u044C\u043A\u0430 (\u0411\u0440\u0430\u0437\u0438\u043B\u0456\u044F) / Portugu\u00EAs (Brasil)
@@ -1254,6 +1294,8 @@ OptionPanel.separator.automatic_save=\u0410\u0432\u0442\u043E\u0437\u0431\u0435\
 OptionPanel.separator.behaviour=\u041F\u043E\u0432\u0435\u0434\u0456\u043D\u043A\u0430
 OptionPanel.separator.browser=\u041D\u0430\u0432\u0456\u0433\u0430\u0442\u043E\u0440
 OptionPanel.separator.cache=\u041A\u0435\u0448
+OptionPanel.separator.clones=\u041A\u043B\u043E\u043D\u0438
+OptionPanel.separator.cloud=\u0425\u043C\u0430\u0440\u0430
 OptionPanel.separator.CloudControls=\u0425\u043C\u0430\u0440\u0438
 OptionPanel.separator.commands_for_the_program=\u0423\u043F\u0440\u0430\u0432\u043B\u0456\u043D\u043D\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043E\u044E
 OptionPanel.separator.connectors=\u0417'\u0454\u0434\u043D\u0443\u0432\u0430\u0447\u0456
@@ -1272,7 +1314,9 @@ OptionPanel.separator.html_export=\u0415\u043A\u0441\u043F\u043E\u0440\u0442 \u0
 OptionPanel.separator.html_import=\u0406\u043C\u043F\u043E\u0440\u0442 HTML
 OptionPanel.separator.hyperlink_types=\u0422\u0438\u043F \u0433\u0456\u043F\u0435\u0440\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u0438\u0445 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u044C
 OptionPanel.separator.icon_properties=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438
+OptionPanel.separator.IconControls=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.separator.icons=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 \u0443 "\u0412\u0438\u0431\u0456\u0440 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438..."
+OptionPanel.separator.Icons=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.separator.initial_map_size=\u041F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0438\u0439 \u0440\u043E\u0437\u043C\u0456\u0440 \u043A\u0430\u0440\u0442\u0438
 OptionPanel.separator.inline_editor=\u041F\u0440\u043E\u0441\u0442\u0438\u0439 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0432\u0443\u0437\u043B\u0430
 OptionPanel.separator.JoinNodesAction=\u041E\u0431'\u0454\u0434\u043D\u0430\u043D\u043D\u044F \u0432\u0443\u0437\u043B\u0456\u0432
@@ -1297,6 +1341,7 @@ OptionPanel.separator.other_defaults=\u0406\u043D\u0448\u0456 \u0441\u0442\u0430
 OptionPanel.separator.others=\u0406\u043D\u0448\u0456 \u043F\u0440\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u043D\u044F \u043A\u043B\u0430\u0432\u0456\u0448
 OptionPanel.separator.outline_view=\u041F\u0435\u0440\u0435\u0433\u043B\u044F\u0434 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438
 OptionPanel.separator.patterns=\u0417\u0440\u0430\u0437\u043E\u043A
+OptionPanel.separator.presentation=\u041F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044F
 OptionPanel.separator.reminderOptions=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043D\u0430\u0433\u0430\u0434\u0443\u0432\u0430\u043D\u044C
 OptionPanel.separator.RichTextEditor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0437 \u0444\u043E\u0440\u043C\u0430\u0442\u0443\u0432\u0430\u043D\u043D\u044F\u043C
 OptionPanel.separator.root_node_appearance=\u0412\u0438\u0433\u043B\u044F\u0434 \u043A\u043E\u0440\u0435\u043D\u0435\u0432\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
@@ -1309,10 +1354,10 @@ OptionPanel.separator.selection_method=\u041C\u0435\u0442\u043E\u0434 \u0432\u04
 OptionPanel.separator.single_instance_mode=\u041E\u0434\u0438\u043D \u043F\u0440\u0438\u043C\u0456\u0440\u043D\u0438\u043A \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.separator.size_limits=\u041C\u0435\u0436\u0456 \u0440\u043E\u0437\u043C\u0456\u0440\u0456\u0432
 OptionPanel.separator.spelling=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043F\u0435\u0440\u0435\u0432\u0456\u0440\u043A\u0438 \u043F\u0440\u0430\u0432\u043E\u043F\u0438\u0441\u0443
-OptionPanel.separator.SplitToWordsAction=\u041F\u043E\u0434\u0456\u043B\u0438\u0442\u0438 \u0432\u0443\u0437\u043E\u043B \u043D\u0430 \u0441\u043B\u043E\u0432\u0430
+OptionPanel.separator.SplitToWordsAction=\u041F\u043E\u0434\u0456\u043B \u0432\u0443\u0437\u043B\u0430 \u043D\u0430 \u0441\u043B\u043E\u0432\u0430
 OptionPanel.separator.status=\u0420\u044F\u0434\u043E\u043A \u0441\u0442\u0430\u043D\u0443
 OptionPanel.separator.surveys=\u041E\u0433\u043B\u044F\u0434\u0438
-OptionPanel.separator.tooltip=\u0427\u0430\u0441\u043E\u0432\u0456 \u0456\u043D\u0442\u0435\u0440\u0432\u0430\u043B\u0438 \u043F\u0456\u0434\u043A\u0430\u0437\u043E\u043A
+OptionPanel.separator.svg_icons=\u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 SVG
 OptionPanel.separator.undo=\u0421\u043A\u0430\u0441\u0443\u0432\u0430\u0442\u0438
 OptionPanel.separator.updates=\u041E\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0438
 OptionPanel.set_property_text=\u0417\u043C\u0456\u043D\u0438\u0442\u0438
@@ -1358,12 +1403,13 @@ OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u0447\u0438\u0441\u043B\u043E
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=\u0437\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u043F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0438\u0439 \u0442\u0435\u043A\u0441\u0442 \u044F\u043A \u043F\u043E\u0434\u0440\u043E\u0431\u0438\u0446\u0456
 OptionPanel.sr=\u0421\u0435\u0440\u0431\u0441\u044C\u043A\u0430 / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0444\u0430\u0439\u043B \u0448\u0430\u0431\u043B\u043E\u043D\u0443
-OptionPanel.standardbackgroundcolor=\u041A\u043E\u043B\u0456\u0440 \u0444\u043E\u043D\u0443
+OptionPanel.standardbackgroundcolor=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u043A\u043E\u043B\u0456\u0440 \u0442\u043B\u0430
 OptionPanel.standardbackgroundcolor.tooltip=<html>\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u043A\u043E\u043B\u0456\u0440 \u0442\u043B\u0430 \u0432 \u043D\u043E\u0442\u0430\u0446\u0456\u0457 HTML </html>
-OptionPanel.standardcloudcolor=\u041A\u043E\u043B\u0456\u0440 \u0445\u043C\u0430\u0440
+OptionPanel.standardcloudcolor=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u043A\u043E\u043B\u0456\u0440 \u0445\u043C\u0430\u0440
 OptionPanel.standardcloudcolor.tooltip=<html>\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u043A\u043E\u043B\u0456\u0440 \u0445\u043C\u0430\u0440\u0438 \u0432 \u043D\u043E\u0442\u0430\u0446\u0456\u0457 HTML </html>
 OptionPanel.standardcloudestyle=\u0422\u0438\u043F \u0445\u043C\u0430\u0440
 OptionPanel.standardcloudestyle.tooltip=<html>\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0441\u0442\u0438\u043B\u044C \u0445\u043C\u0430\u0440\u0438. </html>
+OptionPanel.standardcloudshape=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0430 \u0444\u043E\u0440\u043C\u0430 \u0445\u043C\u0430\u0440
 OptionPanel.standarddrawrectangleforselection=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438 \u0432 \u0431\u0443\u043B\u044C\u0431\u0430\u0448\u043A\u0430\u0445
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>\u041F\u043E\u0437\u043D\u0430\u0447\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438, \u043F\u043E\u043C\u0456\u0441\u0442\u0438\u0432\u0448\u0438 \u0432 \u0431\u0443\u043B\u044C\u0431\u0430\u0448\u043A\u0438.</html>
 OptionPanel.standardlinkcolor=\u041A\u043E\u043B\u0456\u0440 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u044C
@@ -1385,6 +1431,7 @@ OptionPanel.time_for_automatic_save=\u0406\u043D\u0442\u0435\u0440\u0432\u0430\u
 OptionPanel.time_for_automatic_save.tooltip=<html> \u041F\u0440\u043E\u043C\u0456\u0436\u043E\u043A \u0447\u0430\u0441\u0443 \u043C\u0456\u0436 \u0434\u0432\u043E\u043C\u0430 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u0438\u043C\u0438 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u043D\u044F\u043C\u0438 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0456\u0432 \u0432 \u043C\u0456\u043B\u0456\u0441\u0435\u043A\u0443\u043D\u0434\u0430\u0445. \u0414\u0443\u0436\u043 [...]
 OptionPanel.time_for_delayed_selection=\u0427\u0430\u0441 \u0437\u0430\u0442\u0440\u0438\u043C\u043A\u0438 \u0432\u0438\u0431\u043E\u0440\u0443
 OptionPanel.time_for_delayed_selection.tooltip=<html>  \u0417\u0430\u0442\u0440\u0438\u043C\u043A\u0430 \u043F\u0435\u0440\u0435\u0434 \u0442\u0438\u043C, \u044F\u043A \u0432\u0443\u0437\u043E\u043B \u0441\u0442\u0430\u0454 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u043C \u043F\u0440\u0438 \u043D\u0430\u0432\u0435\u0434\u0435\u043D\u043D\u0456 \u0432\u043A\u0430\u0437\u0456\u0432\u043D\u0438\u043A\u0430 (\u0443 \u043C\u0456\u043B\u0456\u0441\u0435\u043A\u0443\u043D\u0434\u0430\u0445). 1 [...]
+OptionPanel.toolbar_icon_height=\u0412\u0438\u0441\u043E\u0442\u0430 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C \u043F\u0430\u043D\u0435\u043B\u0456 \u0456\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0456\u0432
 OptionPanel.toolTipManager.dismissDelay=\u0422\u0440\u0438\u0432\u0430\u043B\u0456\u0441\u0442\u044C \u043F\u043E\u043A\u0430\u0437\u0443, \u043C\u0441
 OptionPanel.toolTipManager.initialDelay=\u041F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0430 \u0437\u0430\u0442\u0440\u0438\u043C\u043A\u0430, \u043C\u0441
 OptionPanel.toolTipManager.max_tooltip_height=\u041D\u0430\u0439\u0431\u0456\u043B\u044C\u0448\u0430 \u0432\u0438\u0441\u043E\u0442\u0430 \u043F\u0456\u0434\u043A\u0430\u0437\u043A\u0438 \u0432\u0443\u0437\u043B\u0430
@@ -1401,9 +1448,10 @@ OptionPanel.unfold_on_paste=\u0420\u043E\u0437\u0433\u043E\u0440\u0442\u0430\u04
 OptionPanel.unfold_on_paste.tooltip=\u0420\u043E\u0437\u0433\u043E\u0440\u0442\u0430\u0442\u0438 \u0432\u0443\u0437\u043E\u043B \u043F\u0440\u0438 \u0432\u0441\u0442\u0430\u0432\u043B\u044F\u043D\u043D\u0456 \u0430\u0431\u043E \u043F\u0435\u0440\u0435\u0442\u044F\u0433\u0443\u0432\u0430\u043D\u043D\u0456
 OptionPanel.use_common_out_point_for_root_node=\u0420\u0435\u0431\u0440\u0430 \u043F\u043E\u0447\u0438\u043D\u0430\u044E\u0442\u044C\u0441\u044F \u0437 \u043E\u0434\u043D\u0456\u0454\u0457 \u0442\u043E\u0447\u043A\u0438 \u043A\u043E\u0440\u0435\u043D\u0435\u0432\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
 OptionPanel.use_common_out_point_for_root_node.tooltip=\u0420\u0435\u0431\u0440\u0430 \u043F\u043E\u0447\u0438\u043D\u0430\u044E\u0442\u044C\u0441\u044F \u0437 \u043E\u0434\u043D\u0456\u0454\u0457 \u0442\u043E\u0447\u043A\u0438 \u043A\u043E\u0440\u0435\u043D\u0435\u0432\u043E\u0433\u043E \u0432\u0443\u0437\u043B\u0430
+OptionPanel.use_svg_icons=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442\u0438 \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 SVG
+OptionPanel.use_svg_icons.tooltip=<html>\u0412\u0438\u0437\u043D\u0430\u0447\u0430\u0454 \u044F\u043A\u0456\u0441\u0442\u044C \u0432\u0438\u043C\u0430\u043B\u044C\u043E\u0432\u0443\u0432\u0430\u043D\u043D\u044F \u043F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C. \u041F\u0456\u043A\u0442\u043E\u0433\u0440\u0430\u043C\u0438 SVG \u043F\u043E\u0442\u0440\u0435\u0431\u0443\u044E\u0442\u044C \u0431\u0456\u043B\u044C\u0448\u0435 \u0447\u0430\u0441\u0443.</html>
 OptionPanel.use_tabbed_pane=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0432\u0430\u0442\u0438 \u0432\u043A\u043B\u0430\u0434\u043A\u0438
 OptionPanel.use_tabbed_pane.tooltip=\u042F\u043A\u0449\u043E \u0432\u0438\u0431\u0440\u0430\u043D\u043E, \u043A\u0430\u0440\u0442\u0438 \u0431\u0443\u0434\u0443\u0442\u044C \u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0456 \u043D\u0430 \u0432\u043A\u043B\u0430\u0434\u043A\u0430\u0445  (\u044F\u043A \u0443 FireFox :-) ).
-OptionPanel.user_defined_screen_resolution=\u0420\u043E\u0437\u0434\u0456\u043B\u044C\u043D\u0456\u0441\u0442\u044C \u0435\u043A\u0440\u0430\u043D\u0443, \u0437\u0430\u0434\u0430\u043D\u0430 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0435\u043C (dpi)
 OptionPanel.validate_classpath_needs_readaccess=\u0421\u043A\u0440\u0438\u043F\u0442\u0438: \u043F\u0440\u0438 \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u0456 \u0448\u043B\u044F\u0445\u0443 \u0434\u043E \u043A\u043B\u0430\u0441\u0456\u0432 \u043F\u043E\u0442\u0440\u0456\u0431\u0435\u043D \u0434\u043E\u0437\u0432\u0456\u043B \u043D\u0430 \u0434\u043E\u0441\u0442\u0443\u043F \u0434\u043B\u044F \u0447\u0438\u0442\u0430\u043D\u043D\u044F \u0444\u0430\u0439\u043B\u045 [...]
 OptionPanel.validate_invalid_date_format=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0438\u0439 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u0438
 OptionPanel.validate_invalid_datetime_format=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0438\u0439 \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u0438-\u0447\u0430\u0441\u0443
@@ -1504,6 +1552,8 @@ plugins/TimeManagement.xml_todayButton=\u0421\u044C\u043E\u0433\u043E\u0434\u043
 plugins/TimeManagement.xml_WindowTitle=\u0427\u0430\u0441
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=\u041F\u043E\u0448\u0443\u043A \u0456 \u0437\u0430\u043C\u0456\u043D\u0430
 preferences=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
+presentation=\u041F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044F
+presentation.combineAll=\u041E\u0431'\u0454\u0434\u043D\u0430\u0442\u0438 \u0432\u0441\u0456 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
 print_preview_title=\u041F\u0435\u0440\u0435\u0433\u043B\u044F\u0434 \u0434\u0440\u0443\u043A\u0443
 PrintAction.text=\u041D\u0430\u0434\u0440\u0443\u043A\u0443\u0432\u0430\u0442\u0438 \u043A\u0430\u0440\u0442\u0443...
 PrintDirectAction.text=\u041D\u0430\u0434\u0440\u0443\u043A\u0443\u0432\u0430\u0442\u0438
@@ -1628,12 +1678,17 @@ ShowAncestorsAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F
 ShowAttributeDialogAction.text=\u041A\u0435\u0440\u0443\u0432\u0430\u043D\u043D\u044F \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430\u043C\u0438...
 ShowDescendantsAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043D\u0430\u0449\u0430\u0434\u043A\u0456\u0432
 ShowFilterToolbarAction.text=\u041F\u0430\u043D\u0435\u043B\u044C \u0444\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u043D\u043D\u044F
-ShowFormatPanel.text=\u041F\u0430\u043D\u0435\u043B\u044C \u0432\u043B\u0430\u0441\u0442\u0438\u0432\u043E\u0441\u0442\u0435\u0439
+ShowFirstSlideAction.text=\u041F\u0435\u0440\u0448\u0438\u0439 \u0441\u043B\u0430\u0439\u0434
+ShowFirstSlideAndStartPresentationAction.text=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0438 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E \u0437 \u043F\u043E\u0447\u0430\u0442\u043A\u0443
+ShowFormatPanel.text=\u041F\u0430\u043D\u0435\u043B\u044C \u0456\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0456\u0432
 ShowFormatPanel.tooltip=\u0412\u0456\u0434\u043A\u0440\u0438\u0432\u0430\u0454 \u0432\u0456\u043A\u043D\u043E, \u0432 \u044F\u043A\u043E\u043C\u0443 \u0432\u0443\u0437\u043E\u043B \u0456 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438 \u0437\u0432'\u044F\u0437\u043A\u0456\u0432 \u043C\u043E\u0436\u0443\u0442\u044C \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438\u0441\u044F \u043E\u0434\u043D\u043E\u0447\u0430\u0441\u043D\u043E.
 ShowHideNoteAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F\u0430\u043D\u0435\u043B\u044C \u043F\u0440\u0438\u043C\u0456\u0442\u043E\u043A
 ShowHideNoteAction.tooltip=\u0412\u043C\u0438\u043A\u0430\u0454 \u0430\u0431\u043E \u0432\u0438\u043C\u0438\u043A\u0430\u0454 \u043F\u0430\u043D\u0435\u043B\u044C \u043F\u0440\u0438\u043C\u0456\u0442\u043E\u043A.
+ShowLastSlideAction.text=\u041E\u0441\u0442\u0430\u043D\u043D\u0456\u0439 \u0441\u043B\u0430\u0439\u0434
 ShowNextChildAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u043E\u0433\u043E \u043D\u0430\u0449\u0430\u0434\u043A\u0430
+ShowNextSlideAction.text=\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0438\u0439 \u0441\u043B\u0430\u0439\u0434
 ShowNotesInMapAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F\u0440\u0438\u043C\u0456\u0442\u043A\u0438 \u043D\u0430 \u043A\u0430\u0440\u0442\u0456
+ShowPreviousSlideAction.text=\u041F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u0456\u0439 \u0441\u043B\u0430\u0439\u0434
 ShowSelectedAttributesAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0438
 ShowSelectionAsRectangleAction.text=\u0412\u0438\u0431\u0456\u0440 \u043F\u0440\u044F\u043C\u043E\u043A\u0443\u0442\u043D\u0438\u043A\u043E\u043C
 simplyhtml.aboutFrameTitle=\u041F\u0440\u043E \u0446\u044E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0443
@@ -1685,7 +1740,7 @@ simplyhtml.deleteTableColLabel=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
 simplyhtml.deleteTableRowLabel=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0440\u044F\u0434\u043E\u043A
 simplyhtml.docTitleQuery=\u0412\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0438 \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A:
 simplyhtml.docTitleTitle=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430
-simplyhtml.editLabel=\u0417\u043C\u0456\u043D\u0438\u0442\u0438
+simplyhtml.editLabel=\u0417\u043C\u0456\u043D\u0438
 simplyhtml.effectLabel=\u0415\u0444\u0435\u043A\u0442
 simplyhtml.familyLabel=\u0421\u0456\u043C'\u044F
 simplyhtml.findNext=\u0417\u043D\u0430\u0439\u0442\u0438 \u043D\u0430\u0441\u0442\u0443\u043F\u043D\u0435...
@@ -1822,6 +1877,42 @@ simplyhtml.valignMiddle=\u043F\u043E\u0441\u0435\u0440\u0435\u0434\u0438\u043D\u
 simplyhtml.valignTop=\u0437\u0432\u0435\u0440\u0445\u0443
 simplyhtml.wholeWordsOnly=\u041B\u0438\u0448\u0435 \u0446\u0456\u043B\u0456 \u0441\u043B\u043E\u0432\u0430
 simplyhtml.wholeWordsOnly.tooltip=\u041E\u0431\u043C\u0435\u0436\u0438\u0442\u0438 \u043F\u043E\u0448\u0443\u043A \u0446\u0456\u043B\u0438\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438.
+slide.add=\u0414\u043E\u0434\u0430\u0442\u0438
+slide.add.tooltip=\u0414\u043E\u0434\u0430\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438 \u0434\u043E \u0441\u043B\u0430\u0439\u0434\u0430
+slide.at_center.tooltip=\u0443 \u0446\u0435\u043D\u0442\u0440\u0456
+slide.content=\u0412\u043C\u0456\u0441\u0442 \u0441\u043B\u0430\u0439\u0434\u0430
+slide.descendants=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043D\u0430\u0449\u0430\u0434\u043A\u0456\u0432
+slide.edge=\u043D\u0430 \u043C\u0435\u0436\u0456
+slide.filter=\u0424\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u0442\u0438
+slide.first=\u041F\u0435\u0440\u0448\u0438\u0439
+slide.last=\u041E\u0441\u0442\u0430\u043D\u043D\u0456\u0439
+slide.next=\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0438\u0439
+slide.nofilter=\u041D\u0435 \u0444\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u0442\u0438
+slide.on_the_left.tooltip=\u043B\u0456\u0432\u043E\u0440\u0443\u0447
+slide.on_the_right.tooltip=\u043B\u0456\u0432\u043E\u0440\u0443\u0447
+slide.placenode=\u0420\u043E\u0437\u043C\u0456\u0441\u0442\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0439 \u0432\u0443\u0437\u043E\u043B
+slide.placenode.tooltip=\u043F\u0456\u0434 \u0447\u0430\u0441 \u0434\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0443\u0432\u0430\u043D\u043D\u044F \u0441\u043B\u0430\u0439\u0434\u0430
+slide.present=\u041F\u043E\u0442\u043E\u0447\u043D\u0438\u0439
+slide.presentation=\u041F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044F
+slide.presentations=\u041F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u0457
+slide.previous=\u041F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u0456\u0439
+slide.remove=\u0412\u0438\u043B\u0443\u0447\u0438\u0442\u0438
+slide.remove.tooltip=\u0412\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438 \u0437\u0456 \u0441\u043B\u0430\u0439\u0434\u0430
+slide.select=\u0412\u0438\u0431\u0440\u0430\u0442\u0438
+slide.select.tooltip=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 \u0432\u0443\u0437\u043B\u0438 \u0441\u043B\u0430\u0439\u0434\u0430 \u043D\u0430 \u043A\u0430\u0440\u0442\u0456
+slide.set=\u0417\u0430\u0434\u0430\u0442\u0438
+slide.set.tooltip=\u0417\u0440\u043E\u0431\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438 \u0432\u043C\u0456\u0441\u0442\u043E\u043C \u0441\u043B\u0430\u0439\u0434\u0430
+slide.setfilter=\u0417\u0430\u0434\u0430\u0442\u0438 \u0444\u0456\u043B\u044C\u0442\u0440
+slide.setfilter.tooltip=\u0417\u0430\u0434\u0430\u0442\u0438 \u0430\u0431\u043E \u0432\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u0444\u0456\u043B\u044C\u0442\u0440, \u0449\u043E \u0431\u0443\u0434\u0435 \u0437\u0430\u0441\u0442\u043E\u0441\u043E\u0432\u0430\u043D\u0438\u0439 \u043F\u0440\u0438 \u043F\u043E\u043A\u0430\u0437\u0456 \u0441\u043B\u0430\u0439\u0434\u0430
+slide.setfoldingstate=\u0417\u0430\u0434\u0430\u0442\u0438 \u0437\u0433\u043E\u0440\u0442\u0430\u043D\u043D\u044F
+slide.setfoldingstate.tooltip=\u041F\u0440\u0438 \u043F\u043E\u043A\u0430\u0437\u0456 \u0441\u043B\u0430\u0439\u0434\u0430 \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0438 \u043F\u043E\u0442\u043E\u0447\u043D\u0435 \u0437\u0433\u043E\u0440\u0442\u0430\u043D\u043D\u044F
+slide.setzoom=\u0417\u0430\u0434\u0430\u0442\u0438 \u043C\u0430\u0441\u0448\u0442\u0430\u0431
+slide.setzoom.tooltip=\u0417\u0430\u0434\u0430\u0442\u0438 \u0430\u0431\u043E \u0432\u0438\u043B\u0443\u0447\u0438\u0442\u0438 \u043C\u0430\u0441\u0448\u0442\u0430\u0431 \u043A\u0430\u0440\u0442\u0438, \u0434\u043B\u044F \u0437\u0430\u0441\u0442\u043E\u0441\u0443\u0432\u0430\u043D\u043D\u044F \u043F\u0440\u0438 \u043F\u043E\u043A\u0430\u0437\u0456 \u0441\u043B\u0430\u0439\u0434\u0430
+slide.showancestors=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F\u0440\u0435\u0434\u043A\u0456\u0432
+slide.showonlyselected=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043B\u0438\u0448\u0435 \u0432\u0438\u0431\u0440\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438
+slide.showonlyselected.tooltip=\u041F\u0440\u0438 \u043F\u043E\u043A\u0430\u0437\u0456 \u0441\u043B\u0430\u0439\u0434\u0430 \u043F\u0440\u0438\u0445\u043E\u0432\u0430\u0442\u0438 \u0456\u043D\u0448\u0456 \u0432\u0443\u0437\u043B\u0438
+slide.slides=\u0421\u043B\u0430\u0439\u0434\u0438
+slide.stop=\u0417\u0443\u043F\u0438\u043D\u0438\u0442\u0438
 SortNodes.text=\u0423\u043F\u043E\u0440\u044F\u0434\u043A\u0443\u0432\u0430\u0442\u0438 \u043D\u0430\u0449\u0430\u0434\u043A\u0456\u0432
 SortNodes.tooltip=\u0423\u043F\u043E\u0440\u044F\u0434\u043A\u0443\u0432\u0430\u0442\u0438 \u043D\u0430\u0449\u0430\u0434\u043A\u0456\u0432 \u0432\u0443\u0437\u043B\u0430 \u0437\u0430 \u0430\u043B\u0444\u0430\u0432\u0456\u0442\u043E\u043C.
 split=(&S)\u0420\u043E\u0437\u0434\u0456\u043B\u0438\u0442\u0438
@@ -1830,7 +1921,10 @@ SplitNode.text=\u0420\u043E\u0437\u0434\u0456\u043B\u0438\u0442\u0438 \u0432\u04
 SplitNode.tooltip=<html>\u0412\u0443\u0437\u043E\u043B \u0440\u043E\u0437\u0434\u0456\u043B\u0435\u043D\u043E</html>
 SplitToWordsAction.text=\u0420\u043E\u0437\u0431\u0438\u0442\u0438 \u043F\u043E {0} \u0441\u043B\u0456\u0432 \u0443 \u0440\u044F\u0434\u043A\u0443
 STANDARD_FORMAT=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439
+StartPresentationAction.text=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0438 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E
+StartPresentationOrShowNextSlideAction.text=\u0417\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0438 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E/\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0438\u0439 \u0441\u043B\u0430\u0439\u0434
 stop_processing=\u0421\u0442\u043E\u043F
+StopPresentationAction.text=\u0417\u0443\u043F\u0438\u043D\u0438\u0442\u0438 \u043F\u0440\u0435\u0437\u0435\u043D\u0442\u0430\u0446\u0456\u044E
 StringFlavorHandler=\u0422\u0435\u043A\u0441\u0442 \u044F\u043A \u0434\u0435\u0440\u0435\u0432\u043E \u0432\u0443\u0437\u043B\u0456\u0432
 StructuredHtmlFlavorHandler=HTML \u044F\u043A \u0434\u0435\u0440\u0435\u0432\u043E \u0432\u0443\u0437\u043B\u0456\u0432
 style=\u0421\u0442\u0438\u043B\u044C
@@ -1873,6 +1967,7 @@ TextAlignAction.DEFAULT.text=\u0422\u0438\u043F\u043E\u0432\u043E
 TextAlignAction.LEFT.text=\u0422\u0435\u043A\u0441\u0442, \u0432\u0438\u0440\u0456\u0432\u043D\u044F\u043D\u0438\u0439 \u0432\u043B\u0456\u0432\u043E
 TextAlignAction.RIGHT.text=\u0422\u0435\u043A\u0441\u0442, \u0432\u0438\u0440\u0456\u0432\u043D\u044F\u043D\u0438\u0439 \u0432\u043F\u0440\u0430\u0432\u043E
 textalignment=\u0412\u0438\u0440\u0456\u0432\u043D\u044E\u0432\u0430\u043D\u043D\u044F \u0442\u0435\u043A\u0441\u0442\u0443
+TextChangeHotKeyAction.text=\u0417\u0430\u0434\u0430\u0442\u0438 \u0433\u0430\u0440\u044F\u0447\u0443 \u043A\u043B\u0430\u0432\u0456\u0448\u0443 \u0437\u043C\u0456\u043D\u0438 \u0442\u0435\u043A\u0441\u0442\u0443
 TimeListAction.text=\u0420\u043E\u0437\u043A\u043B\u0430\u0434...
 TimeListAction.tooltip=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0432\u0441\u0456 \u0447\u0430\u0441\u0438 \u043D\u0430\u0433\u0430\u0434\u0443\u0432\u0430\u043D\u044C \u0456 \u043F\u043E\u0432'\u044F\u0437\u0430\u043D\u0456 \u0432\u0443\u0437\u043B\u0438.
 TimeManagementAction.text=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043A\u0430\u043B\u0435\u043D\u0434\u0430\u0440...
@@ -1893,7 +1988,7 @@ ToggleMenubarAction.text=\u0420\u044F\u0434\u043E\u043A \u043C\u0435\u043D\u044E
 ToggleScrollbarsAction.text=\u0421\u043C\u0443\u0433\u0438 \u043F\u0440\u043E\u043A\u0440\u0443\u0442\u043A\u0438
 ToggleStatusAction.text=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0440\u044F\u0434\u043E\u043A \u0441\u0442\u0430\u043D\u0443
 ToggleToolbarAction.text=\u041F\u0430\u043D\u0435\u043B\u044C \u0437\u0430\u0441\u043E\u0431\u0456\u0432
-toolbars=\u041F\u0430\u043D\u0435\u043B\u0456 \u0456\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0456\u0432
+TranslatedElement.BORDER=\u0422\u0435\u043A\u0441\u0442 \u043C\u0435\u0436\u0456
 TranslatedElement.TEXT=\u0422\u0435\u043A\u0441\u0442
 TranslatedElement.TOOLTIP=\u041F\u0456\u0434\u043A\u0430\u0437\u043A\u0430
 uiTextChanger.originalTextIsNotDefined=\u041F\u043E\u0447\u0430\u0442\u043A\u043E\u0432\u0438\u0439 \u0442\u0435\u043A\u0441\u0442 \u043D\u0435 \u0432\u0438\u0437\u043D\u0430\u0447\u0435\u043D\u043E
diff --git a/freeplane/resources/translations/Resources_zh_CN.properties b/freeplane/resources/translations/Resources_zh_CN.properties
index b4c7de1..0a9234d 100644
--- a/freeplane/resources/translations/Resources_zh_CN.properties
+++ b/freeplane/resources/translations/Resources_zh_CN.properties
@@ -13,15 +13,15 @@ accessories/plugins/EncryptNode.properties_5=<html>\u8C28\u8BB0, \u52A0\u5BC6\u7
 accessories/plugins/EncryptNode.properties_6=\u786E\u5B9A
 accessories/plugins/EncryptNode.properties_7=\u53D6\u6D88
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=\u53EA\u80FD\u5207\u6362\u52A0\u5BC6\u8282\u70B9\u7684\u52A0\u5BC6\u72B6\u6001. \u4F7F\u7528\u5DE5\u5177\u83DC\u5355\u63D2\u5165\u52A0\u5BC6\u8282\u70B9.
-accessories/plugins/EncryptNode.properties_select_me=\u9009\u4E2D\u4EE5\u7EE7\u7EED!
+accessories/plugins/EncryptNode.properties_select_me=\u9009\u5B9A\u4EE5\u7EE7\u7EED!
 accessories/plugins/EncryptNode.properties_wrong_password=\u5BC6\u7801\u9519\u8BEF.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=\u4E3A Java Web Start \u5BFC\u51FA\u601D\u7EF4\u5BFC\u56FE.
 accessories/plugins/ExportWithTWiki.text=\u5BFC\u51FA\u4E3ATWiki...
 accessories/plugins/ExportWithTWiki.tooltip=\u5C06\u601D\u7EF4\u5BFC\u56FE\u5BFC\u51FA\u6210 TWiki \u6587\u6863.
 accessories/plugins/ExportWithXSLT.tooltip=\u8FD9\u662F\u4E00\u79CD\u4F7F\u7528XSLT\u811A\u672C\u7684\u7EDF\u4E00\u5BFC\u51FA\u65B9\u6CD5\u3002
 accessories/plugins/ExportWithXSLT_Applet.text=\u5BFC\u51FA\u4E3A Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\u5BFC\u51FA\u56FE\u4E3Ajava\u6D4F\u89C8\u5668applet\u3002
-accessories/plugins/ExportWithXSLT_Flash.text=\u5BFC\u51FA\u4E3AFlash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\u5BFC\u51FA\u56FE\u4E3A flash \u5E94\u7528.
 accessories/plugins/ExportWithXSLT_HTML.text=\u5BFC\u51FA\u4E3AXHTML(JavaScript\u7248)...
 accessories/plugins/ExportWithXSLT_HTML3.text=\u5BFC\u51FA\u4E3AXHTML(\u53EF\u70B9\u51FB\u7684\u6620\u5C04\u56FE\u50CF\u7248)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u4ECE RESOURCES \u8282\u70B9\u5230 TaskJuggler \u6587\u4EF6\u7684\u8D44\u6E90...
@@ -36,8 +36,8 @@ add=\u6DFB\u52A0(&A)
 AddConnectorAction.text=\u6DFB\u52A0\u8FDE\u63A5
 AddElementaryConditionAction.text=\u6DFB\u52A0
 AddExecutionLinkAction.text=\u6DFB\u52A0\u8D85\u94FE\u63A5\u6267\u884C\u64CD\u4F5C\u7CFB\u7EDF\u547D\u4EE4...
-AddLocalLinkAction.text=\u6DFB\u52A0\u672C\u5730\u8D85\u94FE\u63A5
-AddMenuItemLinkAction.text=\u6DFB\u52A0\u8D85\u94FE\u63A5\u2026
+AddLocalLinkAction.text=\u6DFB\u52A0\u8282\u70B9\u8D85\u94FE\u63A5
+AddMenuItemLinkAction.text=\u6DFB\u52A0\u83DC\u5355\u8D85\u94FE\u63A5...
 AddOnDetailsPanel.authored.by=\u4F5C\u8005{0}
 AddOnDetailsPanel.header.function=\u51FD\u6570
 AddOnDetailsPanel.header.menu=\u83DC\u5355\u4F4D\u7F6E
@@ -73,25 +73,25 @@ addons.installer.too.old=\u5F53\u524D\u7684Freeplane\u7248\u672C {0} \u592A\u4F4
 addons.installer.unknown.deinstallation.rules=\u672A\u77E5\u7684\u5378\u8F7D\u89C4\u5219 {0}
 addons.installer.update=\u4ECE\u7248\u672C{0}\u66F4\u65B0
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">\u4F60\u5E94\u8BE5\u53EA\u4ECE\u4FE1\u4EFB\u7684\u5730\u5740\u5B89\u88C5\u63D2\u4EF6\u3002\u6076\u610F\u7684\u63D2\u4EF6\u53EF\u80FD\u635F\u574F\u4F60\u7684\u6570\u636E\u6216\u8005\u4FB5\u72AF\u4F60\u7684\u9690\u79C1</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=\u6837\u5F0F\u4E2D\u7684\u5C5E\u6027
 AddStyleAttributes.tooltip=\u6DFB\u52A0\u6837\u5F0F\u8282\u70B9\u4E2D\u7684\u5C5E\u6027
-AllMapsNodeListAction.text=\u5728\u6240\u6709\u5BFC\u56FE\u4E2D\u67E5\u627E\u548C\u66FF\u6362
+AllMapsNodeListAction.text=\u5728\u6240\u6709\u5BFC\u56FE\u4E2D\u67E5\u627E\u5E76\u66FF\u6362
 always=\u603B\u662F
 AlwaysUnfoldedNodeAction.text=\u603B\u662F\u5C55\u5F00\u8282\u70B9(\u5F00\u542F/\u5173\u95ED)
 antialias_all=\u5E73\u6ED1\u5168\u90E8
-antialias_edges=\u5E73\u6ED1\u8FDE\u7EBF
+antialias_edges=\u5E73\u6ED1\u5206\u679D\u7EBF
 antialias_none=\u4E0D\u5E73\u6ED1
 apply=\u5E94\u7528(&A)
 ApplyAction.text=\u5E94\u7528(A)
 ApplyFormatPlugin.text=\u6539\u53D8\u683C\u5F0F(C)...
-ApplyFormatPlugin.tooltip=\u663E\u793A\u8282\u70B9\u53CA\u8FDE\u7EBF\u5C5E\u6027\u8BBE\u5B9A\u5BF9\u8BDD\u6846.
+ApplyFormatPlugin.tooltip=\u663E\u793A\u4E00\u4E2A\u5BF9\u8BDD\u6846, \u5176\u4E2D\u8282\u70B9\u548C\u5206\u679D\u7EBF\u7684\u5C5E\u6027\u53EF\u4EE5\u4E00\u540C\u4FEE\u6539.
 ApplyNoFilteringAction.text=\u4E0D\u8FC7\u6EE4
-ApplySelectedViewConditionAction.text=\u8FC7\u6EE4\u9009\u4E2D\u7684\u8282\u70B9
+ApplySelectedViewConditionAction.text=\u8FC7\u6EE4\u9009\u5B9A\u7684\u8282\u70B9
 ApplyToVisibleAction.text=\u5E94\u7528\u5230\u8FC7\u6EE4\u7684\u8282\u70B9
 as_parent=\u540C\u7236\u8282\u70B9
 AskForHelp.text=\u8BF7\u6C42\u5E2E\u52A9
-AssignAttributesAction.text=\u6307\u5B9A\u5C5E\u6027(G)...
+AssignAttributesAction.text=\u6307\u5B9A\u5C5E\u6027...
 attribute_delete=\u5220\u9664\u6240\u6709\u503C
 attribute_delete_value=\u5220\u9664\u6B64\u503C
 attribute_font_size_tooltip=\u5C5E\u6027\u5B57\u4F53\u5927\u5C0F
@@ -111,10 +111,10 @@ attributes_deselect_all=\u5168\u90E8\u4E0D\u9009
 attributes_dialog_title=\u5C5E\u6027\u7BA1\u7406\u5668
 attributes_edit=\u7F16\u8F91
 attributes_edit_tooltip=\u7F16\u8F91\u8BBE\u5B9A
-attributes_for_selected=\u9009\u62E9\u7684\u8282\u70B9
+attributes_for_selected=\u9009\u5B9A\u7684\u8282\u70B9
 attributes_for_visible=\u6240\u6709\u53EF\u89C1\u7684\u8282\u70B9
-attributes_import=\u5BFC\u5165(&I)
-attributes_import_tooltip=\u4ECE\u52A0\u8F7D\u7684\u5176\u4ED6\u5BFC\u56FE\u4E2D\u5BFC\u5165\u5C5E\u6027
+attributes_import=\u5BFC\u5165
+attributes_import_tooltip=\u4ECE\u52A0\u8F7D\u7684\u5176\u5B83\u5BFC\u56FE\u4E2D\u5BFC\u5165\u5C5E\u6027
 attributes_no_import_candidates_found=\u672A\u53D1\u73B0\u65B0\u5C5E\u6027
 attributes_popup_delete=\u5220\u9664
 attributes_popup_down=\u4E0B
@@ -131,31 +131,31 @@ attributes_restricted_attributes_tooltip=\u5C5E\u6027\u7684\u53D7\u9650\u8BBE\u7
 attributes_restricted_values_tooltip=\u5F53\u524D\u5C5E\u6027\u7684\u53D7\u9650\u8BBE\u7F6E\u503C
 attributes_restriction=\u53D7\u9650\u7684\u8BBE\u7F6E
 attributes_select_all=\u5168\u9009
-attributes_select_all_tooltip=\u9009\u62E9 / \u53D6\u6D88\u9009\u62E9\u6240\u6709
+attributes_select_all_tooltip=\u9009\u62E9 / \u53D6\u6D88\u6240\u6709\u9009\u62E9
 attributes_show=\u663E\u793A
 attributes_skip_root=\u8DF3\u8FC7\u6839\u8282\u70B9
 attributes_visible=\u9009\u5B9A\u53EF\u89C1
 attributes_visible_tooltip=\u9009\u5B9A\u53EF\u89C1
 automatic_layout=\u81EA\u52A8\u5E03\u5C40
-automatic_layout_disabled=\u7981\u7528
+automatic_layout_disabled=\u7981\u7528\u81EA\u52A8\u5E03\u5C40
 automatically_save_message=\u81EA\u52A8\u4FDD\u5B58\u5BFC\u56FE (\u4F7F\u7528\u6587\u4EF6\u540D {0}) ...
-AutomaticEdgeColor.FOR_BRANCHES=\u7ED9\u5206\u652F
-AutomaticEdgeColor.FOR_COLUMNS=\u7ED9\u5217
-AutomaticEdgeColor.FOR_LEVELS=\u7ED9\u7EA7\u522B
-AutomaticEdgeColor.ON_BRANCH_CREATION=\u5728\u5206\u652F\u521B\u5EFA
-AutomaticEdgeColorHookAction.text=\u81EA\u52A8\u53D8\u59D0\u989C\u8272
-AutomaticLayout.ALL=\u6240\u6709\u8282\u70B9
-AutomaticLayout.HEADINGS=\u975E\u53F6\u8282\u70B9
+AutomaticEdgeColor.FOR_BRANCHES=\u4E3A\u5206\u679D
+AutomaticEdgeColor.FOR_COLUMNS=\u4E3A\u5217
+AutomaticEdgeColor.FOR_LEVELS=\u4E3A\u7EA7\u522B
+AutomaticEdgeColor.ON_BRANCH_CREATION=\u5728\u521B\u5EFA\u5206\u679D\u65F6
+AutomaticEdgeColorHookAction.text=\u81EA\u52A8\u7BA1\u7406\u5206\u679D\u7EBF\u989C\u8272
+AutomaticLayout.ALL=\u81EA\u52A8\u5E03\u5C40\u6240\u6709\u8282\u70B9
+AutomaticLayout.HEADINGS=\u81EA\u52A8\u5E03\u5C40\u975E\u53F6\u8282\u70B9
 AutomaticLayout.level=\u5C42\u6B21{0}
 AutomaticLayout.level.root=\u6839
-AutomaticLayoutAction.text=\u5E94\u7528\u5C42\u6B21\u6837\u5F0F
-AutomaticLayoutAction.tooltip=<html>\u8C03\u6574\u5BFC\u56FE\u7684\u5E03\u5C40\u3002<br>\u7B2C\u4E00\u7EA7\u4E3A\u9ED1\u8272\uFF0C\u7B2C\u4E8C\u7EA7\u4E3A\u84DD\u8272\uFF0C\u7B49\u7B49\u3002</html>
-AutomaticLayoutControllerAction.ALL.text=\u6240\u6709\u8282\u70B9
-AutomaticLayoutControllerAction.COLUMNS.text=\u7ED9\u5217
-AutomaticLayoutControllerAction.HEADINGS.text=\u975E\u53F6\u8282\u70B9
-AutomaticLayoutControllerAction.null.text=\u7981\u7528
+AutomaticLayoutAction.text=\u81EA\u52A8\u5E03\u5C40
+AutomaticLayoutAction.tooltip=<html>\u8C03\u6574\u5BFC\u56FE\u7684\u5E03\u5C40. <br>\u7B2C\u4E00\u7EA7\u4E3A\u9ED1\u8272, \u7B2C\u4E8C\u7EA7\u4E3A\u84DD\u8272, \u7B49\u7B49.</html>
+AutomaticLayoutControllerAction.ALL.text=\u81EA\u52A8\u5E03\u5C40\u6240\u6709\u8282\u70B9
+AutomaticLayoutControllerAction.COLUMNS.text=\u4E3A\u5217
+AutomaticLayoutControllerAction.HEADINGS.text=\u81EA\u52A8\u5E03\u5C40\u975E\u53F6\u8282\u70B9
+AutomaticLayoutControllerAction.null.text=\u7981\u7528\u81EA\u52A8\u5E03\u5C40
 BackAction.text=\u540E\u9000
-BackAction.tooltip=\u5728\u9009\u4E2D\u7684\u94FE\u4E2D\u540E\u8DF3
+BackAction.tooltip=\u5728\u9009\u5B9A\u7684\u94FE\u4E2D\u540E\u8DF3
 background=\u80CC\u666F
 bitmaps=\u4F4D\u56FE
 black=\u9ED1\u8272
@@ -177,38 +177,38 @@ can_not_encrypt_cloned_node=\u65E0\u6CD5\u52A0\u5BC6\u514B\u9686\u8282\u70B9
 can_not_save_key_set=\u65E0\u6CD5\u4FDD\u5B58\u70ED\u952E\u96C6
 cancel=\u53D6\u6D88(&C)
 CancelAction.text=\u53D6\u6D88(C)
-cannot_add_parent_diff_parents=\u6240\u6709\u8282\u70B9\u5FC5\u987B\u6709\u76F8\u540C\u7684\u7236\u8282\u70B9\u624D\u80FD\u5E94\u7528\u6B64\u529F\u80FD\u3002
+cannot_add_parent_diff_parents=\u6240\u6709\u8282\u70B9\u5FC5\u987B\u6709\u76F8\u540C\u7684\u7236\u8282\u70B9\u624D\u80FD\u4F7F\u7528\u6B64\u529F\u80FD.
 cannot_add_parent_to_root=\u6839\u8282\u70B9\u4E0D\u80FD\u6DFB\u52A0\u65B0\u7684\u7236\u8282\u70B9\u3002
 cannot_delete_root=\u6839\u8282\u70B9\u4E0D\u80FD\u5220\u9664\u6216\u526A\u5207.
 cannot_join_nodes_with_children=\u6709\u5B50\u8282\u70B9\u7684\u8282\u70B9\u4E0D\u80FD\u5408\u5E76
 cannot_move_into_child_node=\u65E0\u6CD5\u79FB\u52A8\u5230\u5B50\u8282\u70B9
 cannot_move_to_child=\u4E0D\u80FD\u5C06\u8282\u70B9\u79FB\u5411\u5B83\u7684\u5B50\u8282\u70B9.
 CenterAction.text=\u5C45\u4E2D
-CenterSelectedNodeAction.text=\u5C06\u9009\u4E2D\u7684\u8282\u70B9\u5C45\u4E2D
 ChangeConnectorArrowsAction.backward.text=\u540E\u9000
 ChangeConnectorArrowsAction.both.text=\u53CC\u5411
 ChangeConnectorArrowsAction.forward.text=\u524D\u8FDB
 ChangeConnectorArrowsAction.none.text=\u65E0
 ChangeConnectorArrowsAction.text=\u6539\u53D8\u8FDE\u63A5\u7BAD\u5934
 ChangeConnectorShapeAction.CUBIC_CURVE.text=\u66F2\u7EBF
-ChangeConnectorShapeAction.EDGE_LIKE.text=\u6A21\u62DF\u8FB9\u7F18
+ChangeConnectorShapeAction.EDGE_LIKE.text=\u6A21\u62DF\u5206\u679D\u7EBF
 ChangeConnectorShapeAction.LINE.text=\u76F4\u7EBF
 ChangeConnectorShapeAction.LINEAR_PATH.text=\u7EBF\u6027\u8DEF\u5F84
 ChangeNodeLevelLeftsAction.text=\u8282\u70B9\u5DE6\u79FB
 ChangeNodeLevelLeftsAction.tooltip=\u5728\u6839\u5DE6\u8FB9\u7684\u8282\u70B9\uFF0C\u964D\u7EA7\u53D8\u6210\u4E0A\u65B9\u540C\u7EA7\u8282\u70B9\u7684\u5B50\u8282\u70B9\u3002\u6839\u53F3\u8FB9\u7684\u8282\u70B9\uFF0C\u5347\u7EA7\u5230\u4E0A\u4E00\u7EA7\u8282\u70B9\uFF0C\u82E5\u4E0E\u6839\u76F4\u63A5\u76F8\u8FDE\uFF0C\u5219\u53D8\u5230\u5DE6\u4FA7.
 ChangeNodeLevelRightsAction.text=\u8282\u70B9\u53F3\u79FB
 ChangeNodeLevelRightsAction.tooltip=\u5728\u6839\u53F3\u8FB9\u7684\u8282\u70B9\uFF0C\u964D\u7EA7\u53D8\u6210\u4E0A\u65B9\u540C\u7EA7\u8282\u70B9\u7684\u5B50\u8282\u70B9\u3002\u5728\u6839\u5DE6\u8FB9\u8282\u70B9\u5347\u7EA7\u5230\u4E0A\u4E00\u7EA7\u8282\u70B9\uFF0C\u82E5\u4E0E\u6839\u76F4\u63A5\u76F8\u8FDE\uFF0C\u5219\u53D8\u5230\u53F3\u4FA7.
-choose_background_color=\u9009\u62E9\u80CC\u666F\u989C\u8272\uFF1A
 choose_cloud_color=\u9009\u62E9\u4E91\u6846\u989C\u8272\uFF1A
-choose_edge_color=\u9009\u62E9\u8FDE\u7EBF\u989C\u8272
+choose_edge_color=\u9009\u62E9\u5206\u679D\u7EBF\u989C\u8272
 choose_map_background_color=\u9009\u62E9\u5BFC\u56FE\u80CC\u666F\u989C\u8272
 choose_node_background_color=\u9009\u62E9\u8282\u70B9\u80CC\u666F\u989C\u8272\uFF1A
-choose_node_color=\u9009\u62E9\u8282\u70B9\u989C\u8272\uFF1A
-ClearLinkAnchorAction.text=\u6E05\u9664\u94FE\u63A5\u951A(Anchor)
-ClearLinkAnchorAction.tooltip=<html>\u6E05\u9664\u5148\u524D\u8BBE\u7F6E\u7684\u8282\u70B9\u951A(Anchor)</html>
+choose_node_color=\u9009\u62E9\u8282\u70B9\u6587\u672C\u989C\u8272:
+ClearLinkAnchorAction.text=\u6E05\u9664\u94FE\u63A5\u951A
+ClearLinkAnchorAction.tooltip=<html>\u6E05\u9664\u5148\u524D\u8BBE\u7F6E\u7684\u8282\u70B9\u951A</html>
 CloneAction.text=\u7C98\u8D34\u514B\u9686
 close_btn=\u5173\u95ED(&C)
 CloseAction.text=\u5173\u95ED\u5F53\u524D\u5BFC\u56FE
+CloseAllMapsAction.text=\u5173\u95ED\u6240\u6709\u5BFC\u56FE
+CloseAllOtherMapsAction.text=\u5173\u95ED\u5176\u5B83\u5BFC\u56FE
 cloud_shapes=\u4E91\u5F62\u72B6
 CloudAction.text=\u4E91\u6846
 CloudColorAction.text=\u4E91\u6846\u989C\u8272...
@@ -216,7 +216,16 @@ CloudShapeAction.ARC.text=\u5F27\u5F62
 CloudShapeAction.RECT.text=\u77E9\u5F62
 CloudShapeAction.ROUND_RECT.text=\u5706\u8FB9\u77E9\u5F62
 CloudShapeAction.STAR.text=\u661F\u5F62
-ColorProperty.ResetColor=\u91CD\u8BBE\u989C\u8272
+collection.copy.presentation=\u590D\u5236\u6F14\u793A
+collection.copy.slide=\u590D\u5236\u5E7B\u706F\u7247
+collection.delete=\u5220\u9664
+collection.down=\u5411\u4E0B
+collection.move=\u79FB\u52A8
+collection.moveTo=\u79FB\u52A8\u5230\u4F4D\u7F6E
+collection.new.presentation=\u65B0\u5EFA\u6F14\u793A
+collection.new.slide=\u65B0\u5EFA\u5E7B\u706F\u7247
+collection.up=\u5411\u4E0A
+ColorProperty.ResetColor=\u91CD\u7F6E\u989C\u8272
 combined=\u7EC4\u5408
 condition=\u6761\u4EF6
 confirmation=\u786E\u8BA4
@@ -226,16 +235,18 @@ connector_label=\u8FDE\u63A5\u5668 \u6807\u7B7E
 connector_lines=\u8FDE\u63A5\u5668 \u76F4\u7EBF
 connector_shapes=\u8FDE\u63A5\u5668 \u5F62\u72B6
 ConnectorColorAction.text=\u8FDE\u63A5\u5668\u989C\u8272\u2026
+controls=\u63A7\u4EF6
 ConvertCloneToIndependentNodeAction.text=\u53D6\u6D88\u514B\u9686
-CopyAction.text=\u590D\u5236(C)
-CopyAction.tooltip=\u590D\u5236\u9009\u5B9A\u5206\u652F
-CopyAttributes.text=\u590D\u5236\u5C5E\u6027(a)
-CopyIDAction.text=\u590D\u5236\u8282\u70B9ID
+copy_name={0} (\u590D\u5236)
+CopyAction.text=\u590D\u5236
+CopyAction.tooltip=\u590D\u5236\u9009\u5B9A\u5206\u679D
+CopyAttributes.text=\u590D\u5236\u5C5E\u6027
+CopyIDAction.text=\u590D\u5236\u8282\u70B9 ID
 CopyMapStylesAction.text=\u4ECE\u5BFC\u56FE\u6837\u5F0F\u590D\u5236\u2026
-CopyNodeURIAction.text=\u590D\u5236\u8282\u70B9URI
-copyright=Copyright \u00A9 2000-2016 Freeplane \u56E2\u961F\u53CA\u5176\u4ED6\u4EBA
-CopySingleAction.text=\u590D\u5236\u8282\u70B9(\u5355\u4E00)
-CopySingleAction.tooltip=\u53EA\u590D\u5236\u9009\u4E2D\u8282\u70B9
+CopyNodeURIAction.text=\u590D\u5236\u8282\u70B9 URI
+copyright=Copyright \u00A9 2000-2017 Freeplane \u56E2\u961F\u53CA\u5176\u4ED6\u4EBA
+CopySingleAction.text=\u590D\u5236\u8282\u70B9 (\u5355\u4E00)
+CopySingleAction.tooltip=\u53EA\u590D\u5236\u9009\u5B9A\u8282\u70B9
 CopyStyleExtensionsAction.text=\u4ECE\u6837\u5F0F\u8282\u70B9\u590D\u5236\u6269\u5C55
 corrupt_map=\u5BFC\u56FE\u5185\u5BB9\u635F\u574F
 CreateConjunctConditionAction.text=\u4E0E
@@ -244,14 +255,14 @@ CreateNotSatisfiedConditionAction.text=\u975E
 CreationModificationPluginAction.text=\u663E\u793A\u4FEE\u6539\u65F6\u95F4
 CreationModificationPluginAction.tooltip=<html>\u8FD9\u4E2A\u529F\u80FD\u8DDF\u8E2A\u4FDD\u7559\u8282\u70B9\u7684\u521B\u5EFA\u66F4\u6539\u65F6\u95F4.</html>
 current_dir=\u5BFC\u56FE
-CutAction.text=\u526A\u5207(t)
+CutAction.text=\u526A\u5207
 decrease_branch_font_size=\u7F29\u5C0F\u5B57\u4F53
 DecreaseNodeFontAction.text=\u7F29\u5C0F\u5B57\u4F53
 default=\u9ED8\u8BA4
 defaultAuxiliaryWordList=\u4E00\u4E2A
 DefaultColorAction.text=\u9ED8\u8BA4\u989C\u8272
 defaultstyle.attributes=\u5C5E\u6027
-defaultstyle.details=\u8BE6\u7EC6
+defaultstyle.details=\u660E\u7EC6
 defaultstyle.floating=\u6D6E\u70B9\u6A21\u5F0F
 defaultstyle.note=\u6CE8\u89E3
 delete=\u5220\u9664(&D)
@@ -262,60 +273,61 @@ DeleteDetailsAction.text=\u5220\u9664\u8282\u70B9\u660E\u7EC6
 DeleteLevelStyleAction.text=\u5220\u9664\u5C42\u6B21\u6837\u5F0F
 DeleteStyleAction.text=\u5220\u9664\u6837\u5F0F
 DeleteUserStyleAction.text=\u5220\u9664\u7528\u6237\u5B9A\u4E49\u6837\u5F0F
-dialect_info.app=\u601D\u7EF4\u5BFC\u56FE\u6587\u4EF6{0}\u662F\u7531\u7A0B\u5E8F{1}\u521B\u5EFA\u3002
+dialect_info.app=\u601D\u7EF4\u5BFC\u56FE\u6587\u4EF6 {0} \u662F\u7531\u7A0B\u5E8F {1} \u521B\u5EFA\u7684.
 dialect_info.later_version=\u5BFC\u56FE\u6587\u4EF6 {0} \u662F\u7528\u672C\u7A0B\u5E8F\u7684\u66F4\u665A\u7248\u672C\u521B\u5EFA\u7684\u3002
-dialect_info.unknownApp=\u601D\u7EF4\u5BFC\u56FE\u6587\u4EF6{0}\u662F\u7531\u672A\u77E5\u7A0B\u5E8F\u521B\u5EFA\u3002
+dialect_info.unknownApp=\u601D\u7EF4\u5BFC\u56FE\u6587\u4EF6 {0} \u662F\u7531\u672A\u77E5\u7A0B\u5E8F\u521B\u5EFA\u7684.
 dialect_info.unknownURL=\u7F51\u7AD9\u672A\u77E5\u3002
 dialect_info.url=\u60F3\u8981\u4E86\u89E3\u66F4\u591A\u4FE1\u606F\uFF0C\u8BF7\u8BBF\u95EE\u7F51\u7AD9{0}\u3002
-dialect_info.warning=Freeplane\u53EF\u80FD\u9519\u8BEF\u5730\u6253\u5F00\u3001\u663E\u793A\u6216\u8005\u4FDD\u5B58\u5B83\u3002
+dialect_info.warning=Freeplane \u53EF\u80FD\u9519\u8BEF\u5730\u6253\u5F00, \u663E\u793A\u6216\u8005\u4FDD\u5B58\u5B83.
 DirectHtmlFlavorHandler=HTML\u4F5C\u4E3A\u5355\u4E2A\u8282\u70B9
 DocumentationAction.text=\u6587\u6863
 down=\u4E0B(&O)
 DownConditionAction.text=\u4E0B
 download=\u4E0B\u8F7D
 dropped_file_error=\u65E0\u6CD5\u6253\u5F00\u4E22\u5F03\u7684\u6587\u4EF6\u3002\u539F\u56E0\uFF1A{0}
-edge=\u8FDE\u7EBF
-edge_is_formatted_by_style=\u8FB9\u683C\u5F0F\u7531\u6837\u5F0F\u8868\u63A7\u5236\uFF0C\u5982\u679C\u60F3\u8981\u6539\u53D8\u8FB9\u683C\u5F0F\uFF0C\u8BF7\u7F16\u8F91\u76F8\u5173\u6837\u5F0F\u8868\u3002
-edge_style=\u8FDE\u7EBF\u98CE\u683C
-edge_width=\u8FDE\u7EBF\u5BBD\u5EA6
-edge_widths=\u5206\u652F\u7EBF\u5BBD\u5EA6
-EdgeColorAction.text=\u8FDE\u7EBF\u989C\u8272...
-EdgeProperties=\u5206\u652F\u7EBF\u5C5E\u6027
+edge=\u5206\u679D\u7EBF
+edge_is_formatted_by_style=\u5206\u679D\u7EBF\u683C\u5F0F\u7531\u6837\u5F0F\u8868\u63A7\u5236, \u5982\u679C\u60F3\u8981\u4FEE\u6539\u5206\u679D\u7EBF\u683C\u5F0F, \u8BF7\u7F16\u8F91\u76F8\u5173\u6837\u5F0F\u8868.
+edge_style=\u5206\u679D\u7EBF\u6837\u5F0F
+edge_width=\u5206\u679D\u7EBF\u5BBD\u5EA6
+edge_widths=\u5206\u679D\u7EBF\u5BBD\u5EA6
+EdgeColorAction.text=\u5206\u679D\u7EBF\u989C\u8272...
+EdgeProperties=\u5206\u679D\u7EBF\u5C5E\u6027
 EdgeStyleAction.bezier.text=\u8D1D\u585E\u5C14\u66F2\u7EBF
-EdgeStyleAction.bezier.tooltip=<html>\u663E\u793A\u5206\u652F\u7EBF\u4E3A\u5E73\u6ED1\u66F2\u7EBF\u3002</html>
-EdgeStyleAction.hide_edge.text=\u9690\u85CF\u8FDE\u7EBF
-EdgeStyleAction.hide_edge.tooltip=<html>For selected nodes display edge to parent as a<br>dotted line. Otherwise hide the edge.</html>
+EdgeStyleAction.bezier.tooltip=<html>\u663E\u793A\u5206\u679D\u7EBF\u4E3A\u5E73\u6ED1\u66F2\u7EBF.</html>
+EdgeStyleAction.hide_edge.text=\u9690\u85CF\u5206\u679D\u7EBF
+EdgeStyleAction.hide_edge.tooltip=<html>\u5BF9\u4E8E\u9009\u5B9A\u7684\u8282\u70B9\u4EE5\u865A\u7EBF\u65B9\u5F0F\u663E\u793A\u5206\u679D\u7EBF\u5230\u7236\u8282\u70B9, \u5426\u5219\u9690\u85CF\u5206\u679D\u7EBF.</html>
 EdgeStyleAction.horizontal.text=\u6C34\u5E73
-EdgeStyleAction.horizontal.tooltip=<html>Use perpendicular straight lines for edges.</html>
+EdgeStyleAction.horizontal.tooltip=<html>\u4E3A\u5206\u679D\u7EBF\u4F7F\u7528\u5782\u76F4\u7EBF.</html>
 EdgeStyleAction.linear.text=\u76F4\u7EBF
-EdgeStyleAction.linear.tooltip=<html>Display the edge as a straight line.</html>
+EdgeStyleAction.linear.tooltip=<html>\u5C06\u5206\u679D\u7EBF\u663E\u793A\u4E3A\u76F4\u7EBF.</html>
 EdgeStyleAction.sharp_bezier.text=\u6E10\u7A84\u8D1D\u585E\u5C14\u66F2\u7EBF
-EdgeStyleAction.sharp_bezier.tooltip=<html>Display the edge as a smooth curve with sharpened ends.</html>
+EdgeStyleAction.sharp_bezier.tooltip=<html>\u663E\u793A\u5206\u679D\u7EBF\u4E3A\u5E26\u5C16\u89D2\u672B\u7AEF\u7684\u5E73\u6ED1\u66F2\u7EBF.</html>
 EdgeStyleAction.sharp_linear.text=\u6E10\u7A84\u76F4\u7EBF
-EdgeStyleAction.sharp_linear.tooltip=<html>Display the edge as a straight line with sharpened ends.</html>
+EdgeStyleAction.sharp_linear.tooltip=<html>\u663E\u793A\u5206\u679D\u7EBF\u4E3A\u5E26\u5C16\u89D2\u672B\u7AEF\u7684\u76F4\u7EBF.</html>
 EdgeStyleAsParentAction.text=\u540C\u7236\u8282\u70B9
-EdgeStyleAsParentAction.tooltip=<html>Use edge style of parent node.</html>[obsolete]
+EdgeStyleAsParentAction.tooltip=<html>\u4F7F\u7528\u7236\u8282\u70B9\u7684\u5206\u679D\u7EBF\u6837\u5F0F.</html>[\u5DF2\u8FC7\u65F6]
 EdgeWidthAction_width_parent.text=\u540C\u7236\u8282\u70B9\u8FDE\u7EBF
 EdgeWidthAction_width_thin.text=\u7EC6\u8FDE\u7EBF
 edit=\u7F16\u8F91(&E)
 edit.decision=HTML \u7F16\u8F91\u5668
 edit.edit_rich_text=\u60A8\u5E0C\u671B\u4F7F\u7528\u7C7B\u4F3C\u4E8E\u7C97\u4F53\u659C\u4F53\u4E4B\u7C7B\u7684\u6837\u5F0F\u4E48?
 edit_details=\u7F16\u8F91\u8282\u70B9\u660E\u7EC6
-edit_end_label=<html>Connector<br>label
+edit_end_label=<html>\u8FDE\u63A5\u5668<br>\u6807\u7B7E
 edit_label_font_family=\u5B57\u4F53
 edit_label_font_size=\u5B57\u4F53\u5927\u5C0F
 edit_link_manually=\u624B\u52A8\u7F16\u8F91\u94FE\u63A5...
 edit_long_node=\u5728\u5BF9\u8BDD\u6846\u4E2D\u7F16\u8F91\u957F\u8282\u70B9
-edit_middle_label=<html>Middle<br>label
+edit_middle_label=<html>\u4E2D\u95F4<br>\u6807\u7B7E
 edit_note=\u7F16\u8F91\u6CE8\u89E3
 edit_source_label=<html>Source<br>label
-edit_target_label=<html>Target<br>label
+edit_target_label=<html>\u76EE\u6807<br>\u6807\u7B7E
 edit_transparency_label=\u4E0D\u900F\u660E\u6027
 edit_width_label=\u5BBD\u5EA6
 EditAction.text=\u7F16\u8F91\u8282\u70B9
 EditAttributesAction.text=\u7F16\u8F91\u5C5E\u6027
 EditDetailsAction.text=\u7F16\u8BD1\u8282\u70B9\u660E\u7EC6
 EditDetailsInDialogAction.text=\u5728\u5BF9\u8BDD\u6846\u4E2D\u7F16\u8F91\u8282\u70B9\u660E\u7EC6
+editEdgeColors=\u4FEE\u6539\u5206\u679D\u7EBF\u989C\u8272
 EditFilterAction.text=\u7F16\u8F91
 EditLongAction.text=\u7F16\u8F91\u957F\u8282\u70B9
 EditNoteInDialogAction.text=\u5728\u5BF9\u8BDD\u6846\u4E2D\u7F16\u8F91\u6CE8\u89E3
@@ -333,7 +345,7 @@ enter_map_url=\u8F93\u5165\u5BFC\u56FEURL
 enter_new_style_name=\u8F93\u5165\u65B0\u6837\u5F0F\u540D
 enter_node_id=\u8F93\u5165\u8282\u70B9ID
 enter_zoom=\u8F93\u5165\u7F29\u653E\u6BD4\u4F8B
-EnterPassword.text=\u89E3\u5F00\u6216\u5173\u95ED\u52A0\u5BC6\u8282\u70B9(&T)
+EnterPassword.text=\u6253\u5F00\u6216\u5173\u95ED\u52A0\u5BC6\u8282\u70B9
 error=\u9519\u8BEF
 error_applying_template=\u5E94\u7528 XSL \u6A21\u677F\u9519\u8BEF.
 error_creating_directory=\u65E0\u6CD5\u521B\u5EFA\u5BFC\u51FA\u76EE\u5F55\u3002
@@ -343,29 +355,29 @@ ExecuteScript.available_modes_tooltip={0} \u53EF\u7528\u4E8E
 ExecuteScript.script=\u811A\u672C
 ExecuteScriptError.text=\u6267\u884C\u811A\u672C\u65F6\u51FA\u9519\uFF1A\n{0}
 ExecuteScriptForAllNodes.text=\u6267\u884C\u6240\u6709\u811A\u672C
-ExecuteScriptForSelectionAction.text=\u6267\u884C\u9009\u4E2D\u8282\u70B9\u811A\u672C
-ExecuteScriptOnSelectedNode.text=\u5BF9\u6240\u6709\u9009\u4E2D\u7684\u8282\u70B9\u6267\u884C{0}
-ExecuteScriptOnSelectedNodeRecursively.text=\u5BF9\u9009\u4E2D\u7684\u8282\u70B9\u9012\u5F52\u6267\u884C{0}
-ExecuteScriptOnSingleNode.text=\u5BF9\u4E00\u4E2A\u9009\u4E2D\u7684\u8282\u70B9\u6267\u884C{0}
+ExecuteScriptForSelectionAction.text=\u6267\u884C\u9009\u5B9A\u8282\u70B9\u811A\u672C
+ExecuteScriptOnSelectedNode.text=\u5BF9\u6240\u6709\u9009\u5B9A\u7684\u8282\u70B9\u6267\u884C{0}
+ExecuteScriptOnSelectedNodeRecursively.text=\u5BF9\u9009\u5B9A\u7684\u8282\u70B9\u9012\u5F52\u6267\u884C{0}
+ExecuteScriptOnSingleNode.text=\u5BF9\u4E00\u4E2A\u9009\u5B9A\u7684\u8282\u70B9\u6267\u884C{0}
 ExecuteScripts.noScriptsAvailable=\u4E0D\u53EF\u7528
 ExecuteScripts.text=\u811A\u672C
 ExecuteScriptSecurityError.text=\u811A\u672C\u6267\u884C\u65F6\u51FA\u73B0\u9519\u8BEF\uFF1A{0}
 export_failed=\u5BFC\u51FA\u5931\u8D25
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Freeplane\u4F7F\u7528XSLT\u5BFC\u51FA
 ExportAction.text=\u5BFC\u51FA\u2026
-ExportBranchAction.text=\u5C06\u5206\u679D\u53E6\u5B58\u4E3A\u65B0\u7684\u601D\u7EF4\u5BFC\u56FE...
+ExportAllPresentationsAction.text=\u5C06\u6240\u6709\u6F14\u793A\u5BFC\u51FA\u4E3A PNG \u56FE\u7247
+ExportBranchAction.text=\u5C06\u5206\u679D\u53E6\u5B58\u4E3A\u65B0\u7684\u5BFC\u56FE...
 ExportBranchToHTMLAction.text=\u5BFC\u51FA\u5206\u679D\u4E3A HTML
 exported_file={0} \u6587\u4EF6
 ExportPdf.text=\u5BFC\u51FA\u4E3APDF...
+ExportPresentationAction.text=\u5C06\u5F53\u524D\u6F14\u793A\u5BFC\u51FA\u4E3A PNG \u56FE\u7247
 ExportSvg.text=\u5BFC\u51FA\u4E3ASVG...
 ExportToHTMLAction.text=\u5BFC\u51FA\u4E3AHTML
 ExportToImage.jpg.text=\u5BFC\u51FA\u4E3AJPEG...
 ExportToImage.png.text=\u5BFC\u51FA\u4E3APNG...
 ExportToOoWriter.text=\u5BFC\u51FA\u4E3A Open Office Writer \u6587\u6863...
 extension_menu=\u6837\u5F0F
-ExternalImage_popupMenu_Change=\u66F4\u6362\u56FE\u7247\u2026
+ExternalImage_popupMenu_Change=\u66F4\u6362\u56FE\u7247...
 ExternalImage_popupMenu_Open=\u5728\u67E5\u770B\u5668\u4E2D\u6253\u5F00
 ExternalImage_popupMenu_Remove=\u5220\u9664
 ExternalImage_popupMenu_ResetZoom=\u6062\u590D\u539F\u5927\u5C0F
@@ -379,18 +391,19 @@ f_button_unassigned=<\u65E0\u52A8\u4F5C>
 FaqOpenURLAction.text=FAQ
 file=\u6587\u4EF6(&F)
 file_already_exists=\u6587\u4EF6 {0} \u5DF2\u5B58\u5728. \u786E\u5B9A\u8981\u8986\u76D6\u5417?
+file_not_accessible=\u6587\u4EF6 {0} \u65E0\u6CD5\u8BBF\u95EE
 file_not_found=\u627E\u4E0D\u5230 {0} \u6587\u4EF6
 FileListFlavorHandler=\u5230\u6587\u4EF6\u7684\u8FDE\u63A5
-FileProperties_BranchLeafCount=\u9009\u53D6\u7684\u5206\u652F\u672B\u7AEF\u8282\u70B9\u6570\uFF1A
-FileProperties_BranchNodeCount=\u9009\u53D6\u7684\u5206\u652F\u7684\u8282\u70B9\u6570\uFF1A
-FileProperties_ChangesSinceLastSave=\u4E0A\u6B21\u4FDD\u5B58\u4E4B\u540E\u7684\u6539\u53D8\uFF1A
+FileProperties_BranchLeafCount=\u9009\u5B9A\u7684\u5206\u679D\u672B\u7AEF\u8282\u70B9\u6570:
+FileProperties_BranchNodeCount=\u9009\u5B9A\u7684\u5206\u679D\u7684\u8282\u70B9\u6570:
+FileProperties_ChangesSinceLastSave=\u4E0A\u6B21\u4FDD\u5B58\u4E4B\u540E\u7684\u6539\u53D8:
 FileProperties_FileName=\u6587\u4EF6\u540D:
 FileProperties_FileSaved=\u6587\u4EF6\u4FDD\u5B58\u5728:
 FileProperties_FileSize=\u6587\u4EF6\u5927\u5C0F:
-FileProperties_MainBranchCount=\u4E3B\u8981\u5206\u652F\u6570:
+FileProperties_MainBranchCount=\u4E3B\u8981\u5206\u679D\u6570:
 FileProperties_NeverSaved=\u4ECE\u672A\u4FDD\u5B58
-FileProperties_NodeChildCount=\u9009\u53D6\u5206\u652F\u7684\u5B50\u8282\u70B9\u6570\uFF1A
-FileProperties_NodeSelectionCount=\u9009\u53D6\u7684\u8282\u70B9\u6570\uFF1A
+FileProperties_NodeChildCount=\u9009\u5B9A\u5206\u679D\u7684\u5B50\u8282\u70B9\u6570:
+FileProperties_NodeSelectionCount=\u9009\u5B9A\u7684\u8282\u70B9\u6570:
 FileProperties_TotalFilteredCount=\u6EE1\u8DB3\u6761\u4EF6\u7684\u8282\u70B9\u6570\uFF1A
 FileProperties_TotalLeafCount=\u6240\u6709\u7684\u53F6\u8282\u70B9\u6570\uFF1A
 FileProperties_TotalNodeCount=\u6240\u6709\u7684\u8282\u70B9\u6570\uFF1A
@@ -408,15 +421,15 @@ FileRevisionsDialog.title=\u6587\u4EF6\u4FEE\u8BA2\u5217\u8868
 filter=\u8FC7\u6EE4\u5668(&I)
 filter_add=\u6DFB\u52A0(&A)
 filter_and=\u4E0E(&N)
-filter_any_text=\u8282\u70B9\u6838\u5FC3\uFF0C\u660E\u7EC6\u6216\u8005\u6CE8\u89E3
-filter_clone_snapshot=\u5DF2\u4FDD\u5B58\u9009\u4E2D\u7684\u514B\u9686
-filter_clones=\u9009\u4E2D\u7684\u514B\u9686
+filter_any_text=\u8282\u70B9\u6838\u5FC3, \u660E\u7EC6\u6216\u8005\u6CE8\u89E3
+filter_clone_snapshot=\u5DF2\u4FDD\u5B58\u9009\u5B9A\u7684\u514B\u9686
+filter_clones=\u9009\u5B9A\u7684\u514B\u9686
 filter_conditions=\u8FC7\u6EE4\u5668
 filter_contains=\u5305\u542B
 filter_created_after=\u4E4B\u540E\u521B\u5EFA
 filter_created_before=\u4E4B\u524D\u521B\u5EFA
 filter_delete=\u5220\u9664(&D)
-filter_details=\u8282\u70B9\u660E\u7EC6
+filter_details=\u660E\u7EC6
 filter_dialog=\u8FC7\u6EE4\u5668\u6784\u9020\u5668
 filter_does_not_exist=\u4E0D\u5B58\u5728
 filter_edit_description=\u7F16\u8F91\u8FC7\u6EE4\u5668\u5217\u8868
@@ -441,7 +454,7 @@ filter_not=\u975E
 filter_note=\u6CE8\u89E3
 filter_odd_level=\u5076\u6570\u5C42\u6B21\u8282\u70B9
 filter_or=\u6216
-filter_parent=\u7236\u8282\u70B9\u6587\u5B57
+filter_parent=\u7236\u8282\u70B9\u6587\u672C
 filter_periodic_level=\u5468\u671F\u6027
 filter_priority=\u4F18\u5148\u6743
 filter_regexp_matches=\u6B63\u5219\u8868\u8FBE\u5F0F\u5339\u914D
@@ -453,8 +466,8 @@ filter_reminder_later=\u7A0D\u540E\u5230\u671F
 filter_root=\u6839\u8282\u70B9
 filter_script=\u811A\u672C\u8FC7\u6EE4\u5668
 filter_select=\u9009\u62E9(&S)
-filter_selected_node_view=\u76EE\u524D\u9009\u62E9\u7684\u8282\u70B9
-filter_selected_node_view_snapshot=\u5DF2\u4FDD\u5B58\u9009\u9879
+filter_selected_node_view=\u76EE\u524D\u9009\u5B9A\u7684\u8282\u70B9
+filter_selected_node_view_snapshot=\u5DF2\u4FDD\u5B58\u7684\u9009\u5B9A\u9879
 filter_style=\u6837\u5F0F
 filter_time=\u65E5\u671F\u8FC7\u6EE4\u5668
 FilterCondition=\u8FC7\u6EE4\u6761\u4EF6
@@ -463,7 +476,7 @@ filterConditions.noActions=\u65E0\u5DF2\u547D\u540D\u8FC7\u6EE4\u5668
 filters_not_loaded=\u65E0\u6CD5\u52A0\u8F7D\u8FC7\u6EE4\u5668\uFF0C\u6587\u4EF6\u635F\u574F
 find=\u67E5\u627E
 find_what=\u67E5\u627E
-FindAction.text=\u67E5\u627E(&F)\u2026
+FindAction.text=\u67E5\u627E\u2026
 FindNextAction.text=\u67E5\u627E\u4E0B\u4E00\u4E2A
 FindPreviousAction.text=\u67E5\u627E\u4E0A\u4E00\u4E2A
 fit_background_to_page=\u80CC\u666F\u56FE\u7247\u9002\u5408\u4E00\u9875
@@ -474,9 +487,9 @@ FitToPage.text=\u7F29\u653E\u4EE5\u9002\u5408\u9875\u9762\u5927\u5C0F
 FitToPage.tooltip=\u8C03\u6574\u7F29\u653E\u4EE5\u4FBF\u6574\u4E2A\u5BFC\u56FE\u9002\u5408\u5F53\u524D\u7A97\u53E3\u5927\u5C0F\u3002
 fold=\u6298\u53E0
 FoldAllAction.text=\u6298\u53E0\u5168\u90E8
-FoldAllAction.tooltip=<html>\u6298\u53E0\u9009\u4E2D\u7684\u8282\u70B9\u4EE5\u53CA\u5B83\u4EEC\u6240\u6709\u7684\u5B50\u8282\u70B9\u3002</html>
+FoldAllAction.tooltip=<html>\u6298\u53E0\u9009\u5B9A\u7684\u8282\u70B9\u53CA\u5176\u6240\u6709\u5B50\u8282\u70B9.</html>
 FoldOneLevelAction.text=\u6298\u53E0\u4E00\u7EA7
-FoldOneLevelAction.tooltip=<html>\u4EC5\u6298\u53E0\u9009\u4E2D\u7684\u8282\u70B9\u4E00\u7EA7\u3002</html>
+FoldOneLevelAction.tooltip=<html>\u6298\u53E0\u9009\u5B9A\u8282\u70B9\u7684\u4E00\u7EA7.</html>
 follow_clone=\u5185\u5D4C\u4E8E ''{0}''
 follow_graphical_link=\u8F6C\u5230 ''{0}''
 FollowLinkAction.text=\u6253\u5F00\u8D85\u94FE\u63A5
@@ -486,11 +499,11 @@ FontSizeAction.text=\u5B57\u4F53\u5927\u5C0F
 format=\u683C\u5F0F(&O)
 format_invalid_pattern=\u4E0D\u662F\u6709\u6548\u7684\u6837\u5F0F
 format_menu_cloud_shapes=\u4E91\u72B6\u5305\u88F9(\u65B0\u589E\u6216\u53D8\u5F62)
-format_menu_edge_styles=\u8FDE\u7EBF\u98CE\u683C
-format_menu_edge_widths=\u8FDE\u7EBF\u5BBD\u5EA6
+format_menu_edge_styles=\u5206\u679D\u7EBF\u6837\u5F0F
+format_menu_edge_widths=\u5206\u679D\u7EBF\u5BBD\u5EA6
 format_panel=\u683C\u5F0F
 FormatCopy.text=\u590D\u5236\u683C\u5F0F
-FormatCopy.tooltip=<html>\u590D\u5236\u4E00\u4E2A\u8282\u70B9\u7684\u683C\u5F0F\u3002</html>
+FormatCopy.tooltip=<html>\u590D\u5236\u4E00\u4E2A\u8282\u70B9\u7684\u683C\u5F0F.</html>
 FormatPaste.text=\u7C98\u8D34\u683C\u5F0F
 FormatPaste.tooltip=<html>\u7C98\u8D34\u4E00\u4E2A\u8282\u70B9\u7684\u683C\u5F0F\u3002</html>
 formats_not_loaded=\u683C\u5F0F\u65E0\u6CD5\u8F7D\u5165\uFF0C\u6587\u4EF6\u635F\u6BC1
@@ -501,7 +514,7 @@ formula.EvaluateAllAction.tooltip=\u8BA1\u7B97\u5BFC\u56FE\u4E0A\u7684\u6240\u67
 formula.menuname=\u516C\u5F0F
 formula_editor=\u7F16\u8F91\u516C\u5F0F
 ForwardAction.text=\u524D\u8FDB
-ForwardAction.tooltip=\u5728\u9009\u4E2D\u7684\u94FE\u4E2D\u524D\u8DF3
+ForwardAction.tooltip=\u5728\u9009\u5B9A\u7684\u94FE\u4E2D\u524D\u8DF3
 FreeNodeAction.text=\u8BBE\u5B9A/\u53D6\u6D88 \u81EA\u7531\u5B9A\u4F4D\u8282\u70B9
 Freeplane.progress.buildScreen=\u6784\u9020\u5C4F\u5E55...
 Freeplane.progress.createController=\u521B\u5EFA\u63A7\u5236\u5668...
@@ -514,14 +527,14 @@ Freeplane.progress.propagateLookAndFeel=\u4F20\u64AD\u5916\u89C2...
 Freeplane.progress.settingPreferences=\u8BBE\u7F6E\u9996\u9009\u9879...
 Freeplane.progress.startCreateController=\u5F00\u59CB\u521B\u5EFA\u63A7\u5236\u5668...
 Freeplane.progress.updateLookAndFeel=\u66F4\u65B0\u5916\u89C2...
-freeplane_reverted=Freeplane_Reverted_
+freeplane_reverted=Freeplane_\u5DF2\u6062\u590D_
 FreeplaneHelpStarter.text=\u5E2E\u52A9...
 FreeplaneHelpStarter.tooltip=Freeplane\u6269\u5C55\u5E2E\u52A9
 GettingStartedAction.text=\u5FEB\u901F\u5165\u95E8
 goto=\u8F6C\u5230
 goto.noActions=\u65E0\u76EE\u6807\u8282\u70B9
 GotoLinkNodeAction.text=\u8F6C\u81F3\u8FDE\u63A5
-GotoNodeAction.text=\u5230\u6307\u5B9AID\u7684\u8282\u70B9...
+GotoNodeAction.text=\u8F6C\u5230\u6307\u5B9A ID \u7684\u8282\u70B9...
 GrabKeyDialog.common.cancel=\u53D6\u6D88
 GrabKeyDialog.common.ok=\u786E\u5B9A
 GrabKeyDialog.grab-key.assigned-to=\u6307\u5B9A
@@ -539,7 +552,7 @@ HierarchicalIconsAction.text=\u663E\u793A\u5206\u7EA7\u56FE\u6807
 HierarchicalIconsAction.tooltip=\u4E0D\u8BBA\u5B50\u3001\u4E3B\u8282\u70B9\u7684\u56FE\u6807\uFF0C\u90FD\u5C06\u7F29\u5C0F\u663E\u793A.
 hot_keys=\u5FEB\u6377\u952E
 hot_keys_table=\u5FEB\u6377\u952E\u5217\u8868
-HotKeyInfoAction.text=\u952E\u53C2\u8003
+HotKeyInfoAction.text=\u5FEB\u6377\u952E\u5217\u8868
 html_export_based_on_headings=\u5BFC\u51FA\u4E3A HTML - \u57FA\u4E8E\u65B9\u4F4D
 html_export_fold_all=\u5BFC\u51FA\u4E3A HTML - \u5168\u90E8\u6298\u53E0
 html_export_fold_currently_folded=\u5BFC\u51FA\u4E3A HTML - \u4FDD\u6301\u6298\u53E0
@@ -634,6 +647,9 @@ icon_penguin=Linux\u4F01\u9E45
 icon_positive=\u79EF\u6781\u7684
 icon_prepare=\u9EC4\u8272\u4EA4\u901A\u706F
 icon_revision=\u4FEE\u8BA2
+icon_revision-green=\u7EFF\u8272\u4FEE\u8BA2
+icon_revision-pink=\u7C89\u8272\u4FEE\u8BA2
+icon_revision-red=\u7EA2\u8272\u4FEE\u8BA2
 icon_smiley-angry=\u751F\u6C14
 icon_smiley-neutral=\u6CA1\u5174\u8DA3
 icon_smiley-oh=\u60CA\u8BB6
@@ -677,19 +693,19 @@ IconProgressRemoveAction.text=\u79FB\u9664\u8FDB\u5EA6
 IconProgressRemoveAction.tooltip=\u79FB\u9664\u8FDB\u5EA6\u56FE\u6807\u548C\u5EF6\u4F38\u8FDB\u5EA6\u56FE\u6807\u3002
 icons=\u56FE\u6807
 IconSelectionPlugin.text=\u9009\u62E9\u56FE\u6807...
-IconSelectionPlugin.tooltip=<html>\u5728\u6B64\u4F7F\u7528\u5B50\u7A97\u53E3\u9009\u62E9\u56FE\u6807\u3002</html>
+IconSelectionPlugin.tooltip=<html>\u5728\u6B64\u4F7F\u7528\u5B50\u7A97\u53E3\u9009\u62E9\u56FE\u6807.</html>
 image_covertLink=\u5C06\u94FE\u63A5\u8F6C\u5316\u6210\u56FE\u7247
 ImageFlavorHandler=\u56FE\u7247(\u4F7F\u7528\u4E0D\u540C\u7684\u6587\u4EF6)
-import=\u5BFC\u5165(&M)
-import_linked_branch_no_link=\u9009\u4E2D\u7684\u8282\u70B9\u6CA1\u6709\u8FDE\u63A5\u53EF\u4EE5\u5BFC\u5165\u3002
-ImportAction.text=\u5BFC\u5165(I)
-ImportBranchAction.text=\u5206\u652F...
+import=\u5BFC\u5165
+import_linked_branch_no_link=\u9009\u5B9A\u7684\u8282\u70B9\u6CA1\u6709\u8FDE\u63A5\u53EF\u4EE5\u5BFC\u5165.
+ImportAction.text=\u5BFC\u5165
+ImportBranchAction.text=\u5206\u679D...
 ImportExplorerFavoritesAction.text=\u6D4F\u89C8\u6536\u85CF\u5939...
 ImportFolderStructureAction.text=\u6587\u4EF6\u5939\u7ED3\u6784...
-ImportLinkedBranchAction.text=\u5DF2\u94FE\u63A5\u5206\u652F
-ImportLinkedBranchWithoutRootAction.text=\u5DF2\u94FE\u63A5\u5206\u652F(\u4E0D\u542B\u6839\u8282\u70B9)...
+ImportLinkedBranchAction.text=\u5DF2\u94FE\u63A5\u5206\u679D
+ImportLinkedBranchWithoutRootAction.text=\u5DF2\u94FE\u63A5\u5206\u679D(\u4E0D\u542B\u6839\u8282\u70B9)...
 ImportMindmanagerFiles.text=MindManager X5 \u5BFC\u56FE...
-ImportXmlFile.text=\u5BFC\u5165 xml \u6587\u4EF6
+ImportXmlFile.text=\u5BFC\u5165 XML \u6587\u4EF6
 increase_branch_font_size=\u52A0\u5927\u5B57\u4F53
 IncreaseNodeFontAction.text=\u52A0\u5927\u5B57\u4F53
 internal_error_tooltip=\u5185\u90E8\u9519\u8BEF\u53D1\u751F, \u70B9\u51FB\u6253\u5F00\u6700\u65B0\u7684log.0\u6587\u4EF6\u8FDB\u884C\u67E5\u8BE2\u3002
@@ -708,7 +724,7 @@ latex_editor=\u7F16\u8F91 LaTeX \u516C\u5F0F
 LatexDeleteLatexAction.text=\u79FB\u9664 LaTeX \u516C\u5F0F
 LatexEditLatexAction.text=\u7F16\u8F91 LaTeX \u516C\u5F0F...
 LatexInsertLatexAction.msg1=<html>\u60A8\u5C1D\u8BD5\u63D2\u5165\u4E00\u4E2A<i>\u65E7\u5F0F</i>\u7684 LaTeX \u516C\u5F0F\u3002<br/>\u521B\u5EFA LaTeX \u6587\u672C\u6216\u516C\u5F0F\u7684\u65B0\u65B9\u6CD5\u8BF7\u89C1\u9875\u9762\uFF1A</html>
-LatexInsertLatexAction.msg2=<html>In short: <ul><li>use a "\\latex " prefix in node text or</li><li><i>View->Properties panel</i>, then <i>Core text->Format->Latex</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html> 1\u7B80\u800C\u8A00\u4E4B: <ul> 2<li> 3\u5728\u6587\u672C\u8282\u70B9\u91CC\u4F7F\u7528 "\\latex " \u524D\u7F00\u6216\u8005 </li> 4<li> 5<i> 6\u89C6\u56FE->\u5DE5\u5177\u9762\u677F</i> 7, \u7136\u540E <i> 8\u6838\u5FC3\u5185\u5BB9->\u683C\u5F0F->LaTex</i> 9</li> 0</ul></html>
 LatexInsertLatexAction.text=\u6DFB\u52A0 LaTeX \u516C\u5F0F...
 latexPatternFormat=LaTeX
 LengthUnits.cm=\u5398\u7C73
@@ -716,7 +732,7 @@ LengthUnits.in=\u82F1\u5BF8
 LengthUnits.mm=\u6BEB\u7C73
 LengthUnits.pt=pt
 LengthUnits.px=px
-less_than_two_selected_nodes=\u81F3\u5C11\u5FC5\u987B\u9009\u62E9\u4E24\u4E2A\u8282\u70B9\u8FDB\u884C\u8FDE\u63A5\u3002
+less_than_two_selected_nodes=\u81F3\u5C11\u5FC5\u987B\u9009\u62E9\u4E24\u4E2A\u8282\u70B9\u8FDB\u884C\u8FDE\u63A5.
 license=\u8BB8\u53EF
 license_text=<html>This program is free software; you can redistribute it and/or<br>modify it under the terms of the GNU General Public License<br>as published by the Free Software Foundation; either version 2<br>of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful,<br>but WITHOUT ANY WARRANTY; without even the implied warranty of<br>MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>GNU General Public  [...]
 link_error=\u9519\u8BEF\u8FDE\u63A5\u2014{0}\u2014\u6CA1\u6709\u52A0\u8F7D
@@ -727,19 +743,19 @@ load=\u52A0\u8F7D(&L)
 load_accelerator_presets=\u52A0\u8F7D
 load_accelerator_presets.noActions=\u65E0\u9884\u8BBE
 LoadAcceleratorPresetsAction.textPatterns.text=\u6587\u672C\u6A21\u5F0F
-locking_failed_by_open=\u601D\u7EF4\u5BFC\u56FE {0} \u52A0\u9501\u5931\u8D25. \u4EE5\u53EA\u8BFB\u65B9\u5F0F\u6253\u5F00.
-locking_failed_by_save_as=\u601D\u7EF4\u5BFC\u56FE {0} \u52A0\u9501\u5931\u8D25. \u4FDD\u5B58\u52A8\u4F5C\u88AB\u4E2D\u6B62.
-locking_old_lock_removed=\u601D\u7EF4\u5BFC\u56FE {0} \u88AB\u7528\u6237 {1} \u52A0\u9501. \u65E7\u9501\u5DF2\u88AB\u79FB\u9664.
+locking_failed_by_open=\u601D\u7EF4\u5BFC\u56FE {0} \u52A0\u9501\u5931\u8D25, \u4EE5\u53EA\u8BFB\u65B9\u5F0F\u6253\u5F00.
+locking_failed_by_save_as=\u601D\u7EF4\u5BFC\u56FE {0} \u52A0\u9501\u5931\u8D25, \u4FDD\u5B58\u52A8\u4F5C\u88AB\u4E2D\u6B62.
+locking_old_lock_removed=\u601D\u7EF4\u5BFC\u56FE {0} \u88AB\u7528\u6237 {1} \u52A0\u9501, \u65E7\u9501\u5DF2\u88AB\u79FB\u9664.
 long_node_changed_cancel=\u60A8\u786E\u8BA4\u653E\u5F03\u5BF9\u8282\u70B9\u6240\u505A\u66F4\u6539?
 long_node_changed_submit=\u60A8\u786E\u8BA4\u4FDD\u5B58\u5BF9\u8282\u70B9\u6240\u505A\u66F4\u6539?
 lots_of_links_warning=\u60A8\u6B63\u8981\u5411\u540C\u4E00\u4E2A\u8282\u70B9\u6DFB\u52A0\u5927\u91CF\u94FE\u63A5. \u60A8\u771F\u7684\u60F3\u8981\u521B\u5EFA\u8FD9\u4E9B\u94FE\u63A5\u5417?
 main_menu=\u83DC\u5355
 main_resource_directory=\u5B89\u88C5\u8D44\u6E90\uFF1A{0}
-MainView.errorUpdateText=\u8F93\u5165\u7684 {0} \u9519\u8BEF\u5730\u8BBE\u5B9A\u6587\u5B57\u3002
+MainView.errorUpdateText=\u4E3A\u6240\u8F93\u5165\u7684 {0} \u8BBE\u5B9A\u6587\u672C\u65F6\u53D1\u751F\u9519\u8BEF.
 MakeLinkFromAnchorAction.text=\u4ECE\u951A\u70B9\u5EFA\u7ACB\u94FE\u63A5
-MakeLinkFromAnchorAction.tooltip=<html>create a local or global link from<br/>the anchor node to the selected node</html>
+MakeLinkFromAnchorAction.tooltip=<html>\u4ECE\u8282\u70B9\u951A\u521B\u5EFA\u4E00\u4E2A<br/>\u672C\u5730\u6216\u5168\u5C40\u94FE\u63A5\u5230\u9009\u5B9A\u8282\u70B9</html>
 MakeLinkToAnchorAction.text=\u5EFA\u7ACB\u94FE\u63A5\u5230\u951A\u70B9
-MakeLinkToAnchorAction.tooltip=<html>create a local or global link from<br/>the selected note to the anchor node</html>
+MakeLinkToAnchorAction.tooltip=<html>\u4ECE\u9009\u5B9A\u6CE8\u89E3\u521B\u5EFA\u4E00\u4E2A<br/>\u672C\u5730\u6216\u5168\u5C40\u94FE\u63A5\u5230\u8282\u70B9\u951A</html>
 ManageAddOnsAction.text=\u9644\u52A0\u7EC4\u4EF6
 ManageAddOnsDialog.activate=\u542F\u7528
 ManageAddOnsDialog.activation.success={0} \u4F1A\u5728\u91CD\u65B0\u542F\u52A8\u540E\u542F\u7528\u3002
@@ -757,7 +773,7 @@ ManageAddOnsDialog.error={0} \u5B89\u88C5\u9519\u8BEF\u3002
 ManageAddOnsDialog.install=\u5B89\u88DD
 ManageAddOnsDialog.install.from.known.location=\u4ECE\u79FB\u690D\u4F4D\u7F6E\u5B89\u88C5\u9644\u4EF6\u7EC4\u4EF6
 ManageAddOnsDialog.install.tooltip=\u5728\u8FD9\u91CC\u63D2\u5165\u9644\u52A0\u5143\u4EF6\u5B89\u88C5\u6587\u4EF6
-ManageAddOnsDialog.map.not.opened=\u601D\u7EF4\u5BFC\u56FE {0} \u672A\u6253\u5F00\u3002
+ManageAddOnsDialog.map.not.opened=\u601D\u7EF4\u5BFC\u56FE {0} \u4F3C\u4E4E\u672A\u88AB\u6253\u5F00.
 ManageAddOnsDialog.really.deinstall=\u79FB\u9664 {0}?
 ManageAddOnsDialog.search=\u641C\u7D22\u9644\u52A0\u7EC4\u4EF6
 ManageAddOnsDialog.search.file=\u641C\u7D22
@@ -774,13 +790,13 @@ ManageAddOnsDialog.tab.manage.tooltip=\u7BA1\u7406\u5DF2\u5B89\u88C5\u9644\u52A0
 ManageAddOnsDialog.visit.addon.page=\u8BBF\u95EE\u9644\u52A0\u7EC4\u4EF6\u9875\u2026
 ManageConditionalStylesAction.text=\u7BA1\u7406\u601D\u7EF4\u5BFC\u56FE\u7684\u6761\u4EF6\u6837\u5F0F
 ManageNodeConditionalStylesAction.text=\u7BA1\u7406\u8282\u70B9\u7684\u6761\u4EF6\u6837\u5F0F
-map_already_exists=\u601D\u7EF4\u5BFC\u56FE\u5DF2\u5B58\u5728\uFF0C\u8981\u8986\u76D6\u5417?
+map_already_exists=\u601D\u7EF4\u5BFC\u56FE\u5DF2\u5B58\u5728, \u8981\u8986\u76D6\u5417?
 map_background=\u5BFC\u56FE\u80CC\u666F
 map_background_image=\u80CC\u666F\u56FE\u7247
-map_corrupted=\u601D\u7EF4\u5BFC\u56FE\u5DF2\u635F\u574F. \u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F?
+map_corrupted=\u601D\u7EF4\u5BFC\u56FE\u5DF2\u635F\u574F, \u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F?
 map_load_error=\u4E0D\u80FD\u8F7D\u5165\u601D\u7EF4\u5BFC\u56FE {0}
-map_locked_by_open=\u601D\u7EF4\u5BFC\u56FE {0} \u5DF2\u88AB\u7528\u6237 {1} \u6253\u5F00. \u5C06\u4EE5\u53EA\u8BFB\u65B9\u5F0F\u6253\u5F00.
-map_locked_by_save_as=\u601D\u7EF4\u5BFC\u56FE {0} \u5DF2\u88AB\u7528\u6237 {1} \u6253\u5F00. \u4FDD\u5B58\u52A8\u4F5C\u88AB\u4E2D\u6B62.
+map_locked_by_open=\u601D\u7EF4\u5BFC\u56FE {0} \u6B63\u88AB\u7528\u6237 {1} \u7F16\u8F91, \u5C06\u4EE5\u53EA\u8BFB\u65B9\u5F0F\u6253\u5F00.
+map_locked_by_save_as=\u601D\u7EF4\u5BFC\u56FE {0} \u6B63\u88AB\u7528\u6237 {1} \u7F16\u8F91, \u4FDD\u5B58\u52A8\u4F5C\u88AB\u4E2D\u6B62.
 map_not_saved=\u8BE5\u5BFC\u56FE\u4ECE\u672A\u4FDD\u5B58\u8FC7.
 MapBackgroundClearAction.text=\u6E05\u9664
 MapBackgroundColorAction.text=\u80CC\u666F\u989C\u8272
@@ -839,6 +855,9 @@ ModesMenuAction.File.text=\u6587\u4EF6\u7BA1\u7406\u5668
 ModesMenuAction.MindMap.text=\u601D\u7EF4\u5BFC\u56FE\u7F16\u8F91\u5668
 most_recent_files=\u6700\u8FD1\u6587\u4EF6(&M)
 MoveAction.text=\u79FB\u52A8
+MoveSelectedNodeAction.CENTER.text=\u5C06\u9009\u5B9A\u7684\u8282\u70B9\u5C45\u4E2D
+MoveSelectedNodeAction.EAST.text=\u5C06\u9009\u5B9A\u7684\u8282\u70B9\u79FB\u52A8\u5230\u53F3\u8FB9
+MoveSelectedNodeAction.WEST.text=\u5C06\u9009\u5B9A\u7684\u8282\u70B9\u79FB\u52A8\u5230\u5DE6\u8FB9
 MoveToRootAction.text=\u8F6C\u5230\u6839\u8282\u70B9
 NameConditionAction.text=\u8BBE\u5B9A\u540D\u79F0
 navigate=\u5B9A\u4F4D(&N)
@@ -867,22 +886,22 @@ NewLevelStyleAction.text=\u65B0\u589E\u5C42\u6B21\u6837\u5F0F
 newmap.install.addon.question={0} \u662F\u4E00\u4E2A\u9644\u52A0\u7EC4\u4EF6\u5305\n\u4F60\u60F3\u5B89\u88C5\u5B83\u4E48?\n(\u9ED8\u8BA4\u9009\u62E9"\u5426".)
 newmap.install.addon.title=\u5B89\u88C5\u9644\u52A0\u7EC4\u4EF6\uFF1F
 NewMapAction.text=\u65B0\u5EFA\u5BFC\u56FE
-NewMapViewAction.text=\u65B0\u601D\u7EF4\u5BFC\u56FE
+NewMapViewAction.text=\u65B0\u5EFA\u601D\u7EF4\u5BFC\u56FE\u89C6\u56FE
 NewParentNode.text=\u65B0\u5EFA\u7236\u8282\u70B9
-NewParentNode.tooltip=<html>\u6240\u6709\u9009\u4E2D\u7684\u53D1\u9001\u5230\u4E00\u4E2A\u65B0\u7236\u8282\u70B9\u3002</html>
+NewParentNode.tooltip=<html>\u5C06\u6240\u6709\u9009\u5B9A\u7684\u53D1\u9001\u5230\u4E00\u4E2A\u65B0\u7236\u8282\u70B9.</html>
 NewPreviousSiblingAction.text=\u63D2\u5165\u5E73\u884C\u8282\u70B9(\u4E0A\u65B9)
 NewSiblingAction.text=\u63D2\u5165\u5E73\u884C\u8282\u70B9(\u4E0B\u65B9)
-NewSummaryAction.text=\u6DFB\u52A0\u603B\u7ED3\u8282\u70B9(\u9009\u53D6\u8282\u70B9)
-NewUserStyleAction.text=\u65B0\u81EA\u5B9A\u6837\u5F0F(\u4ECE\u9009\u53D6\u4E2D)
-NextNodeAction.BACK.text=\u524D\u4E00\u8282\u70B9
-NextNodeAction.BACK_N_FOLD.text=\u524D\u4E00\u8282\u70B9(\u6298\u53E0)
+NewSummaryAction.text=\u6DFB\u52A0\u603B\u7ED3\u8282\u70B9
+NewUserStyleAction.text=\u4ECE\u9009\u5B9A\u8282\u70B9\u521B\u5EFA\u65B0\u6837\u5F0F
+NextNodeAction.BACK.text=\u4E0A\u4E00\u8282\u70B9
+NextNodeAction.BACK_N_FOLD.text=\u4E0A\u4E00\u8282\u70B9 (\u6298\u53E0)
 NextNodeAction.FORWARD.text=\u4E0B\u4E00\u8282\u70B9
-NextNodeAction.FORWARD_N_FOLD.text=\u4E0B\u4E00\u8282\u70B9(\u6298\u53E0)
-NextPresentationItemAction.text=\u5C55\u5F00\u4E0B\u4E00\u4E2A\u6F14\u793A\u6761\u76EE
+NextNodeAction.FORWARD_N_FOLD.text=\u4E0B\u4E00\u8282\u70B9 (\u6298\u53E0)
+NextPresentationItemAction.text=\u5C55\u5F00\u4E0B\u4E00\u4E2A\u6F14\u793A\u9879\u76EE (\u6298\u53E0)
 no=\u5426
 no_copy_attributes_before_paste_attributes=\u4F60\u65E0\u6CD5\u5728\u590D\u5236\u5C5E\u6027\u524D\u5C31\u53BB\u8D34\u4E0A\u5C5E\u6027.
 NO_FORMAT=\u6587\u672C(\u65E0\u683C\u5F0F)
-no_format_copy_before_format_paste=\u7C98\u8D34\u683C\u5F0F\u524D\u5FC5\u987B\u5148\u8FDB\u884C\u590D\u5236\u3002
+no_format_copy_before_format_paste=\u7C98\u8D34\u683C\u5F0F\u524D\u5FC5\u987B\u5148\u8FDB\u884C\u590D\u5236.
 no_found_from=<html>\u672A\u627E\u5230 <u>"{0}"</u> \u5728 "{1}" \u4E2D\u3002</html>
 no_more_found_from=<html>\u6CA1\u6709\u627E\u5230\u66F4\u591A\u7684 <u>"{0}"</u> \u5728 "{1}" \u4E2D\u3002</html>
 no_previous_find=\u524D\u8FB9\u6CA1\u6709\u4E86.
@@ -893,11 +912,11 @@ node_changed_discard_changes=\u60A8\u786E\u8BA4\u653E\u5F03\u5BF9\u8282\u70B9\u6
 node_is_write_protected=\u76EE\u6807\u8282\u70B9\u5199\u4FDD\u62A4\u3002
 node_location_help=\u62D6\u62C9\u6539\u53D8\u8282\u70B9\u7684\u4F4D\u7F6E, ctrl+\u62D6\u62C9 \u6539\u53D8\u8DDD\u79BB, \u53CC\u51FB\u548C ctrl+\u53CC\u51FB \u91CD\u7F6E.
 node_popup_scripting=\u811A\u672C
-node_selector=\u8282\u70B9\u9009\u53D6
-node_selector_message=\u53CC\u51FB\u9009\u53D6\u8282\u70B9
+node_selector=\u8282\u70B9\u9009\u5B9A
+node_selector_message=\u53CC\u51FB\u9009\u5B9A\u8282\u70B9
 node_styles=\u8282\u70B9\u6837\u5F0F
 NodeBackgroundColorAction.text=\u8282\u70B9\u80CC\u666F\u989C\u8272...
-NodeColorAction.text=\u8282\u70B9\u989C\u8272 ...
+NodeColorAction.text=\u8282\u70B9\u6587\u672C\u989C\u8272...
 NodeColorBlendAction.text=\u8272\u5F69\u6DF7\u5408
 NodeDownAction.text=\u4E0B\u79FB
 NodeExtensions.EditNodeExtensions=\u7F16\u8F91\u8282\u70B9\u6269\u5C55\u6027\u8D28
@@ -917,8 +936,9 @@ nonitalicise_branch=\u53D6\u6D88\u659C\u4F53
 normal=\u5E38\u89C4
 not_saved_for_image_error=\u4F7F\u7528\u6587\u4EF6\u9009\u62E9\u5668\u8BBE\u7F6E\u56FE\u7247\u524D\u5FC5\u987B\u5148\u4FDD\u5B58\u5BFC\u56FE
 not_saved_for_link_error=\u7528\u6587\u4EF6\u9009\u62E9\u5668\u6DFB\u52A0\u6587\u4EF6\u94FE\u63A5\u524D\u5FC5\u987B\u5148\u4FDD\u5B58\u56FE
-note_window_location=\u6CE8\u89E3\u7A97\u53E3\u4F4D\u7F6E
+note_window_location=\u6CE8\u89E3\u9762\u677F\u4F4D\u7F6E
 notes=\u6CE8\u89E3
+NotFoldingNextPresentationItemAction.text=\u5C55\u5F00\u4E0B\u4E00\u4E2A\u6F14\u793A\u6761\u76EE
 NotificationOptions.CLOSE=\u5173\u95ED
 NotificationOptions.REMIND_ME_LATER=\u7A0D\u540E\u63D0\u9192\u6211
 NotificationOptions.REMOVE_REMINDER=\u79FB\u9664\u63D0\u9192
@@ -928,12 +948,12 @@ OKAction.text=\u786E\u5B9A (O)
 OnlineReference.text=\u601D\u7EF4\u5BFC\u56FE\u5728\u7EBF\u6587\u6863
 open_asMindMap=\u601D\u7EF4\u5BFC\u56FE
 OpenAction.text=\u6253\u5F00\u5DF2\u4FDD\u5B58\u5BFC\u56FE...
-OpenFreeplaneSiteAction.text=Freeplane\u7F51\u7AD9\u9996\u9875
+OpenFreeplaneSiteAction.text=Freeplane \u7F51\u7AD9\u4E3B\u9875
 OpenMapsAddLocation.text=\u6DFB\u52A0 OpenMaps \u4F4D\u7F6E...
 OpenMapsRemoveLocation.text=\u79FB\u9664 OpenMaps \u4F4D\u7F6E
 OpenMapsViewLocation.text=\u67E5\u770B OpenMaps \u4F4D\u7F6E...
 OpenPathAction.text=\u6253\u5F00\u6587\u4EF6
-OpenURLMapAction.text=\u4ECEURL\u6253\u5F00\u601D\u7EF4\u5BFC\u56FE\u2026
+OpenURLMapAction.text=\u4ECE URL \u6253\u5F00\u5BFC\u56FE\u2026
 OpenUserDirAction.text=\u6253\u5F00\u7528\u6237\u76EE\u5F55
 option_changes_may_require_restart=\u91CD\u65B0\u542F\u52A8Freeplane\u540E, \u624D\u53EF\u770B\u5230\u66F4\u6539\u8BBE\u7F6E\u7684\u6548\u679C.
 OptionalDontShowMeAgainDialog.cancel=\u5426(&N)
@@ -945,23 +965,26 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=\u81EA
 OptionPanel.ADD_CHILD=\u6DFB\u52A0\u5B50\u8282\u70B9
 OptionPanel.ADD_SIBLING=\u6DFB\u52A0\u5144\u5F1F\u8282\u70B9
 OptionPanel.addons=\u9644\u52A0\u7EC4\u4EF6
+OptionPanel.af=\u5357\u975E\u8BED
 OptionPanel.always_fold_all_after_load=\u5168\u90E8\u6298\u53E0
 OptionPanel.always_load_last_maps=\u52A0\u8F7D\u4E0A\u6B21\u5BFC\u56FE\u548C\u65B0\u5BFC\u56FE
-OptionPanel.always_load_last_maps.tooltip=\u901A\u8FC7\u4E0A\u9762\u7684\u9009\u9879\u6253\u5F00\u4E0A\u6B21\u6587\u4EF6\uFF0C\u751A\u81F3\u5728\u7528\u9009\u4E2D\u7684\u5BFC\u56FE\u6587\u4EF6\u542F\u52A8FreePlane\u65F6\u4E5F\u6709\u6548\u3002
+OptionPanel.always_load_last_maps.tooltip=\u5373\u4F7F\u4EE5\u67D0\u4E2A\u5BFC\u56FE\u6587\u4EF6\u542F\u52A8 Freeplane, \u4E5F\u7167\u6837\u6253\u5F00\u4E0A\u6B21\u7684\u6240\u6709\u6587\u4EF6.
 OptionPanel.always_save_folding=\u603B\u662F
 OptionPanel.always_save_folding_state=\u603B\u662F\u4FDD\u5B58\u6298\u53E0\u72B6\u6001\u7684\u6539\u53D8
-OptionPanel.always_save_folding_state.tooltip=\u5982\u679C\u9009\u4E2D\uFF0C\u6BCF\u6B21\u6298\u53E0\u52A8\u4F5C\u90FD\u4F1A\u5BFC\u81F4\u5BFC\u56FE\u6539\u53D8\u5E76\u63D0\u9192\u7528\u6237\u4FDD\u5B58\u3002
+OptionPanel.always_save_folding_state.tooltip=\u5982\u679C\u9009\u4E2D, \u6BCF\u6B21\u6298\u53E0\u52A8\u4F5C\u90FD\u4F1A\u5BFC\u81F4\u5BFC\u56FE\u6539\u53D8\u5E76\u63D0\u9192\u7528\u6237\u4FDD\u5B58.
 OptionPanel.always_show_less_than_N_nodes_after_load=\u5C55\u5F00\u4E00\u4E9B\u8282\u70B9
 OptionPanel.always_unfold_all_after_load=\u5C55\u5F00\u6240\u6709
 OptionPanel.antialias=\u5E73\u6ED1
 OptionPanel.antialias.tooltip=<html>\u786E\u5B9A\u56FE\u7684\u8D28\u91CF. \u8D8A\u5E73\u6ED1\u5904\u7406\u65F6\u95F4\u8D8A\u957F.</html>
 OptionPanel.antialias_all=\u5E73\u6ED1\u5168\u90E8
-OptionPanel.antialias_edges=\u5E73\u6ED1\u8FDE\u7EBF
+OptionPanel.antialias_edges=\u5E73\u6ED1\u5206\u679D\u7EBF
 OptionPanel.antialias_none=\u4E0D\u5E73\u6ED1
+OptionPanel.antialias_svg=\u5E73\u6ED1 SVG
+OptionPanel.antialias_svg.tooltip=<html>\u51B3\u5B9A SVG \u7684\u6E32\u67D3\u54C1\u8D28, \u8D8A\u5E73\u6ED1\u6E32\u67D3\u65F6\u95F4\u8D8A\u957F.</html>
 OptionPanel.Appearance=\u5916\u89C2
 OptionPanel.approximate_search_threshold=\u8FD1\u4F3C\u5339\u914D\u9608\u503C
 OptionPanel.approximate_search_threshold.tooltip=<html>\u8FD1\u4F3C\u5339\u914D\u9608\u503C<br/> <font size="2">\u8BE6\u60C5\u8BF7\u81F3 http://freeplane.sf.net/wiki/index.php/Approximate_search </font><br/>\uFF08\u8D8A\u9AD8\u4F1A\u53D1\u73B0\u8D8A\u5C11\u7684\u641C\u7D22\u7ED3\u679C<br/>\uFF09 </html>
-OptionPanel.ar=\u963F\u6839\u5EF7\u8BED
+OptionPanel.ar=\u963F\u62C9\u4F2F\u8BED
 OptionPanel.ARC=\u5F27\u5F62
 OptionPanel.as_parent=\u540C\u7236\u8282\u70B9
 OptionPanel.ask=\u8BE2\u95EE
@@ -973,13 +996,15 @@ OptionPanel.backup_file_number=\u4FDD\u5B58\u5907\u4EFD\u6587\u4EF6\u7684\u4E2A\
 OptionPanel.Behaviour=\u884C\u4E3A
 OptionPanel.bezier=\u8D1D\u585E\u5C14\u66F2\u7EBF
 OptionPanel.border_color=\u989C\u8272
-OptionPanel.border_color_matches_edge_color=\u4F7F\u7528\u8FB9\u7F18\u989C\u8272
+OptionPanel.border_color_matches_edge_color=\u4F7F\u7528\u5206\u679D\u7EBF\u989C\u8272
+OptionPanel.border_dash=\u8FB9\u6846\u7EBF\u6761\u7C7B\u578B
+OptionPanel.border_dash_matches_edge_dash=\u4F7F\u7528\u5206\u679D\u7EBF\u6761\u7C7B\u578B
 OptionPanel.border_width=\u7EBF\u5BBD
-OptionPanel.border_width_matches_edge_width=\u4F7F\u7528\u8FB9\u7F18\u5BBD\u5EA6
+OptionPanel.border_width_matches_edge_width=\u4F7F\u7528\u5206\u679D\u7EBF\u5BBD\u5EA6
 OptionPanel.bubble=\u6C14\u6CE1
 OptionPanel.ca=\u52A0\u6CF0\u7F57\u5C3C\u4E9A\u8BED
 OptionPanel.Cancel=\u53D6\u6D88
-OptionPanel.center_selected_node=\u5C06\u9009\u4E2D\u7684\u8282\u70B9\u5C45\u4E2D
+OptionPanel.center_selected_node=\u81EA\u52A8\u5C06\u9009\u5B9A\u7684\u8282\u70B9\u5C45\u4E2D
 OptionPanel.check_updates_automatically=\u7A0B\u5E8F\u542F\u52A8\u65F6\u68C0\u67E5\u66F4\u65B0
 OptionPanel.childpattern=\u5B50\u6A21\u5F0F
 OptionPanel.childpattern.tooltip=\u5BF9\u6240\u6709\u5B50\u8282\u70B9\u5E94\u7528\u6307\u5B9A\u7684\u6A21\u5F0F.
@@ -990,13 +1015,16 @@ OptionPanel.cloudcolor=\u4E91\u6846\u548C\u989C\u8272
 OptionPanel.cloudshape=\u4E91\u7684\u5F62\u72B6
 OptionPanel.combined=\u7EC4\u5408
 OptionPanel.compare_as_number=\u6570\u5B57\u6BD4\u5BF9
+OptionPanel.connector_arrows=\u8FDE\u63A5\u5668\u7BAD\u5934
+OptionPanel.connector_dash=\u7EBF\u6761\u7C7B\u578B
 OptionPanel.convert_to_current_version=<html>\u81EA\u52A8\u5C06\u65E7\u7248\u672C Freeplane \u5BFC\u56FE\u8F6C\u6362\u4E3A <br>\u5F53\u524D\u7684\u7248\u672C?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>\u53EA\u4E3A\u65E0\u9700\u8F6C\u6362\u7684\u975E\u5E38\u5927\u7684\u5BFC\u56FE <br>(\u8FD9\u662F\u4E13\u5BB6\u77E5\u8BC6\u5E93) \u4F60\u53EF\u4EE5\u65E0\u9700\u8F6C\u6362\u6253\u5F00\u5BFC\u56FE.</html>
 OptionPanel.copyFormatToNewSibling=\u590D\u5236\u683C\u5F0F\u5230\u65B0\u540C\u7EA7
 OptionPanel.copyFormatToNewSiblingIncludesIcons=\u590D\u5236\u683C\u5F0F(\u542B\u56FE\u6807)
 OptionPanel.cs=\u6377\u514B\u8BED
 OptionPanel.cut_nodes_without_question=\u65E0\u9700\u786E\u8BA4\u5373\u526A\u5207\u8282\u70B9?
-OptionPanel.cut_nodes_without_question.tooltip=\u5982\u679C\u52FE\u9009\u6B64\u590D\u9009\u6846\uFF0C\u5C06\u65E0\u9700\u786E\u8BA4\u5373\u526A\u5207\u8282\u70B9. \u8FD9\u53EF\u80FD\u5BFC\u81F4\u65E0\u610F\u4E2D\u4E22\u5931\u4FE1\u606F.
+OptionPanel.cut_nodes_without_question.tooltip=\u5982\u679C\u52FE\u9009\u6B64\u590D\u9009\u6846, \u5C06\u65E0\u9700\u786E\u8BA4\u5373\u53EF\u526A\u5207\u8282\u70B9, \u8FD9\u53EF\u80FD\u5BFC\u81F4\u65E0\u610F\u4E2D\u4E22\u5931\u4FE1\u606F.
+OptionPanel.cut_out_pictures_when_pasting_html=\u4ECE HTML \u79FB\u9664\u6240\u6709\u56FE\u7247
 OptionPanel.da=\u4E39\u9EA6\u8BED
 OptionPanel.date_format=\u6807\u51C6\u65E5\u671F\u683C\u5F0F
 OptionPanel.date_format.tooltip=SHORT, MEDIUM, LONG, FULL \u6216\u662F"MM/dd/yyyy" \u4E4B\u4EFB\u4E00\u4E2A
@@ -1025,16 +1053,17 @@ OptionPanel.disable_cursor_move_paper=\u62D6\u52A8\u65F6\u7981\u6B62\u6307\u9488
 OptionPanel.disable_cursor_move_paper.tooltip=<html>\u62D6\u52A8\u9875\u9762\u65F6\u4E0D\u663E\u793A\u9F20\u6807\u6307\u9488</html>
 OptionPanel.display_inline_editor_for_all_new_nodes=\u5BF9\u6240\u6709\u65B0\u8282\u70B9\u663E\u793A\u5185\u5D4C\u7F16\u8F91\u5217
 OptionPanel.display_node_id=\u663E\u793A\u8282\u70B9ID
-OptionPanel.edgecolor=\u8FDE\u7EBF\u989C\u8272
-OptionPanel.edgecolor.tooltip=\u7236\u8282\u70B9\u7684\u8FDE\u7EBF\u5C5E\u6027 (\u4E5F\u9002\u7528\u4E8E\u6240\u6709\u5B50\u8282\u70B9)
-OptionPanel.edgestyle=\u8FDE\u7EBF\u6837\u5F0F
-OptionPanel.edgestyle.tooltip=\u7236\u8282\u70B9\u7684\u8FDE\u7EBF\u5C5E\u6027 (\u4E5F\u9002\u7528\u4E8E\u6240\u6709\u5B50\u8282\u70B9)
-OptionPanel.edgewidth=\u8FDE\u7EBF\u5BBD\u5EA6
-OptionPanel.edgewidth.tooltip=\u7236\u8282\u70B9\u7684\u8FDE\u7EBF\u5C5E\u6027 (\u4E5F\u9002\u7528\u4E8E\u6240\u6709\u5B50\u8282\u70B9)
+OptionPanel.edgecolor=\u5206\u679D\u7EBF\u989C\u8272
+OptionPanel.edgecolor.tooltip=\u7236\u8282\u70B9\u7684\u5206\u679D\u7EBF\u5C5E\u6027 (\u4E5F\u9002\u7528\u4E8E\u6240\u6709\u5B50\u8282\u70B9)
+OptionPanel.edgedash=\u5206\u679D\u7EBF\u6761\u7C7B\u578B
+OptionPanel.edgestyle=\u5206\u679D\u7EBF\u6837\u5F0F
+OptionPanel.edgestyle.tooltip=\u7236\u8282\u70B9\u7684\u5206\u679D\u7EBF\u5C5E\u6027 (\u4E5F\u9002\u7528\u4E8E\u6240\u6709\u5B50\u8282\u70B9)
+OptionPanel.edgewidth=\u5206\u679D\u7EBF\u5BBD\u5EA6
+OptionPanel.edgewidth.tooltip=\u7236\u8282\u70B9\u7684\u5206\u679D\u7EBF\u5C5E\u6027 (\u4E5F\u9002\u7528\u4E8E\u6240\u6709\u5B50\u8282\u70B9)
 OptionPanel.EDIT_CURRENT=\u8986\u76D6\u5185\u5BB9
 OptionPanel.edit_on_double_click=\u53CC\u51FB\u65F6\u7F16\u8F91
 OptionPanel.editor_extra_width=\u989D\u5916\u5BBD\u5EA6\u8DDD\u79BB
-OptionPanel.editor_extra_width.tooltip=<html>\u5F53\u6587\u5B57\u8D85\u8FC7\u76EE\u524D\u5BBD\u5EA6\u65F6\uFF0C\u51B3\u5B9A\u8981\u589E\u52A0\u7684\u5BBD\u5EA6\u7684\u50CF\u7D20\u503C .</html>
+OptionPanel.editor_extra_width.tooltip=<html>\u5F53\u6587\u672C\u8D85\u8FC7\u76EE\u524D\u5BBD\u5EA6\u65F6, \u51B3\u5B9A\u8981\u589E\u52A0\u7684\u5BBD\u5EA6\u7684\u50CF\u7D20\u503C.</html>
 OptionPanel.el=\u5E0C\u814A\u8BED
 OptionPanel.el__buttons_above=\u9876\u7AEF\u6309\u94AE
 OptionPanel.el__enter_confirms_by_default=\u9ED8\u8BA4\u8FDB\u5165\u786E\u8BA4
@@ -1079,10 +1108,11 @@ OptionPanel.gl=\u683C\u9675\u5170\u8BED
 OptionPanel.goto_note_end_on_edit=\u79FB\u52A8\u6CE8\u89E3\u5149\u6807\u5230\u6700\u540E
 OptionPanel.grid_size=\u683C\u70B9\u95F4\u683C\u5927\u5C0F
 OptionPanel.groovy_editor_font=Groovy Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53
-OptionPanel.groovy_editor_font.tooltip=Use 'Dialog' or 'Monospaced' if you need unicode chars!
+OptionPanel.groovy_editor_font.tooltip=\u5982\u679C\u4F60\u9700\u8981 Unicode \u5B57\u7B26\u5219\u8BF7\u4F7F\u7528 '\u5BF9\u8BDD\u6846' \u6216 '\u5355\u7A7A\u683C'!
 OptionPanel.groovy_editor_font_size=Groovy Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53\u5927\u5C0F
 OptionPanel.gtk=Gtk
-OptionPanel.hide_edge=\u9690\u85CF\u8FDE\u7EBF
+OptionPanel.hide_edge=\u9690\u85CF\u5206\u679D\u7EBF
+OptionPanel.hide_single_end_connectors=\u9690\u85CF\u5355\u7AEF\u8FDE\u63A5\u5668
 OptionPanel.highlight_formulas=\u9AD8\u4EAE\u516C\u5F0F
 OptionPanel.horizontal=\u6C34\u5E73
 OptionPanel.hr=\u514B\u7F57\u5730\u4E9A\u8BED
@@ -1095,15 +1125,16 @@ OptionPanel.html_export_no_folding=\u4E0D\u6298\u53E0
 OptionPanel.hu=\u5308\u7259\u5229\u8BED
 OptionPanel.ic_disable=\u7981\u7528
 OptionPanel.ic_file=\u4F7F\u7528\u786C\u76D8
-OptionPanel.ic_ram=In RAM
+OptionPanel.ic_ram=\u4F7F\u7528\u5185\u5B58
 OptionPanel.icon=\u56FE\u6807
 OptionPanel.icon.tooltip=\u5982\u679C\u5E94\u7528,\u8282\u70B9\u56FE\u6807\u5C06\u88AB\u8BBE\u7F6E\u4E3A\u8FD9\u4E2A\u56FE\u6807.
+OptionPanel.icon_size=\u56FE\u6807\u5C3A\u5BF8
 OptionPanel.icons.list=\u53EF\u663E\u793A\u7684\u6807\u51C6\u56FE\u6807\u5217\u8868
-OptionPanel.icons.list.tooltip=\u5728\u6B64\u6392\u5E8F\u6216\u7981\u7528\u6807\u51C6\u56FE\u6807\u3002\u56FE\u6807\u5FC5\u987B\u4EE5\u5206\u53F7';'\u5206\u9694\u3002
+OptionPanel.icons.list.tooltip=\u5728\u6B64\u6392\u5E8F\u6216\u7981\u7528\u6807\u51C6\u56FE\u6807, \u56FE\u6807\u5FC5\u987B\u4EE5 ';' \u5206\u9694.
 OptionPanel.id=\u5370\u5EA6\u5C3C\u897F\u4E9A\u8BED
 OptionPanel.IGNORE=\u5FFD\u7565
 OptionPanel.il__enter_confirms_by_default=\u7F3A\u7701Enter\u786E\u8BA4
-OptionPanel.image_cache=for images
+OptionPanel.image_cache=\u4E3A\u4E86\u56FE\u7247
 OptionPanel.indentationUsesTabsInTextOutput=\u5728\u6587\u672C\u8F93\u51FA\u4E2D\u4F7F\u7528 tab
 OptionPanel.it=\u610F\u5927\u5229\u8BED
 OptionPanel.ja=\u65E5\u8BED
@@ -1120,7 +1151,7 @@ OptionPanel.last_opened_list_length=\u2014\u6700\u8FD1\u7684\u6587\u4EF6\u2014\u
 OptionPanel.latex_disable_editor=\u7981\u7528 LaTeX \u8BED\u6CD5\u9AD8\u4EAE\u7F16\u8F91\u5668
 OptionPanel.latex_disable_editor.tooltip=\u5982\u679C\u60A8\u9047\u5230 LaTeX \u7F16\u8F91\u5668\u7684\u95EE\u9898\uFF0C\u8BF7\u67E5\u770B\u8FD9\u4E2A
 OptionPanel.latex_editor_font=LaTeX Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53
-OptionPanel.latex_editor_font.tooltip=Use 'Dialog' or 'Monospaced' if you need unicode chars!
+OptionPanel.latex_editor_font.tooltip=\u5982\u679C\u4F60\u9700\u8981 Unicode \u5B57\u7B26\u5219\u8BF7\u4F7F\u7528 '\u5BF9\u8BDD\u6846' \u6216 '\u5355\u7A7A\u683C'!
 OptionPanel.latex_editor_font_size=LaTeX Syntax Highlighting Editor \u6240\u7528\u5B57\u4F53\u5927\u5C0F
 OptionPanel.latex_macros=\u5E38\u7528 LaTeX \u5B8F
 OptionPanel.layout_map_on_text_change=\u7F16\u8F91\u65F6\u66F4\u65B0\u601D\u7EF4\u5BFC\u56FE
@@ -1132,22 +1163,26 @@ OptionPanel.load_folding=\u52A0\u8F7D\u65F6
 OptionPanel.load_folding_from_map_default_fold_all=\u4ECE\u5BFC\u56FE\u52A0\u8F7D\u6216\u6298\u53E0\u5168\u90E8
 OptionPanel.load_folding_from_map_default_unfold_all=\u4ECE\u5BFC\u56FE\u52A0\u8F7D\u6216\u5C55\u5F00\u5168\u90E8
 OptionPanel.load_last_map=\u81EA\u52A8\u6253\u5F00\u6700\u540E\u7684\u5BFC\u56FE
-OptionPanel.load_last_map.tooltip=<html>\u5982\u679C\u9009\u4E2D\u7684\u8BDD\uFF0CFreeplane \u542F\u52A8\u65F6\u81EA\u52A8\u52A0\u8F7D\u4E0A\u6B21\u6253\u5F00\u7684\u601D\u7EF4\u5BFC\u56FE.</html>
+OptionPanel.load_last_map.tooltip=<html>\u5982\u679C\u9009\u4E2D\u7684\u8BDD, Freeplane \u542F\u52A8\u65F6\u4F1A\u81EA\u52A8\u52A0\u8F7D\u4E0A\u6B21\u6253\u5F00\u7684\u601D\u7EF4\u5BFC\u56FE.</html>
 OptionPanel.load_last_maps=\u52A0\u8F7D\u4E0A\u6B21\u6240\u6709\u7684\u5BFC\u56FE
 OptionPanel.lookandfeel=\u5916\u89C2\u611F\u89C9
 OptionPanel.lookandfeel.scaleuifonts=\u7F29\u653E UI \u5B57\u4F53
 OptionPanel.lookandfeel.scaleuifonts.tooltip=\u9002\u7528\u4E8E\u9AD8\u5206\u8FA8\u7387\u663E\u793A\u5668
 OptionPanel.lookandfeel.tooltip=<html>\u4F7F\u7528\u5916\u89C2\u611F\u89C9. \u652F\u6301 'metal','windows','motif', 'gtk', \u4F7F\u7528MacOS\u65F6 'mac' \u53EF\u7528. \u9ED8\u8BA4\u662F\u6307, \u91C7\u7528\u9ED8\u8BA4\u89C2\u611F. \u5982\u679C\u60F3\u4F7F\u7528\u81EA\u5DF1\u7684\u89C2\u611F, \u8F93\u5165class\u540D\u79F0, \u5E76\u4E14\u786E\u8BA4\u76F8\u5E94\u7684jar\u6587\u4EF6\u88AB\u52A0\u8F7D. \u5982\u679C\u89C2\u611F\u6709\u95EE\u9898, \u9009\u62E9 'nothing' . \u5BF9applet\u540C\u68 [...]
 OptionPanel.lt=\u7ACB\u9676\u5B9B\u8BED
+OptionPanel.markClones=\u4E3A\u514B\u9686\u6807\u8BB0\u4E0A\u8272
+OptionPanel.markSelectedClones=\u4E3A\u514B\u9686\u6807\u8BB0\u4E0A\u8272\u4EE5\u4F9B\u9009\u62E9
 OptionPanel.max_displayed_node_count=\u6700\u5927\u663E\u793A\u8282\u70B9\u6570
 OptionPanel.max_image_width=\u6700\u5927\u521D\u59CB\u56FE\u7247\u5BBD\u5EA6
 OptionPanel.max_image_width.tooltip=\u65B0\u7684\u56FE\u50CF\u7F29\u5C0F\u5230\u8FD9\u4E2A\u5BBD\u5EA6
 OptionPanel.max_menu_item_count=\u6700\u5927\u83DC\u5355\u9879\u6570\u76EE
 OptionPanel.max_menu_item_count.tooltip=\u5B50\u83DC\u5355\u6700\u5927\u5141\u8BB8\u7684\u9879\u76EE\u6570(\u6700\u5C11\u4E3A10)
 OptionPanel.max_node_width=\u8282\u70B9\u6700\u5927\u5BBD\u5EA6
-OptionPanel.max_shortened_text_length=\u6700\u5927\u6587\u5B57\u5BBD\u5EA6
+OptionPanel.max_shortened_text_length=\u6700\u5927\u6587\u672C\u5BBD\u5EA6
+OptionPanel.menuItemFontSize=\u83DC\u5355\u9879\u76EE\u5B57\u4F53\u5927\u5C0F
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=\u6700\u5C0F\u8282\u70B9\u5BBD\u5EA6
+OptionPanel.monitor_size_inches=\u663E\u793A\u5668\u5C3A\u5BF8 (\u82F1\u5BF8)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=\u72ED\u7A84\u516D\u89D2\u5F62
 OptionPanel.nb=\u632A\u5A01\u8BED(\u4F2F\u514B\u6885\u5C14)
@@ -1156,21 +1191,21 @@ OptionPanel.neverShowSurvey=\u6C38\u4E0D\u663E\u793A\u95EE\u9898\u3001\u8C03\u67
 OptionPanel.nl=\u5C3C\u52A0\u62C9\u74DC\u8BED
 OptionPanel.nn=\u632A\u5A01\u8BED(\u5C3C\u8BFA\u65AF\u514B)
 OptionPanel.nodebackgroundcolor=\u8282\u70B9\u80CC\u666F\u989C\u8272
-OptionPanel.nodebackgroundcolor.tooltip=\u672A\u9009\u4E2D\u8282\u70B9\u7684\u80CC\u666F\u989C\u8272\u3002
-OptionPanel.nodecolor=\u8282\u70B9\u989C\u8272
-OptionPanel.nodecolor.tooltip=\u672A\u9009\u4E2D\u8282\u70B9\u7684\u524D\u666F\u989C\u8272\u3002
+OptionPanel.nodebackgroundcolor.tooltip=\u672A\u9009\u5B9A\u8282\u70B9\u7684\u80CC\u666F\u989C\u8272.
+OptionPanel.nodecolor=\u8282\u70B9\u6587\u672C\u989C\u8272
+OptionPanel.nodecolor.tooltip=\u672A\u9009\u5B9A\u8282\u70B9\u7684\u6587\u672C\u989C\u8272.
 OptionPanel.nodefontbold=\u7C97\u4F53
 OptionPanel.nodefonthyperlink=\u8D85\u94FE\u63A5
 OptionPanel.nodefontitalic=\u659C\u4F53
 OptionPanel.nodefontname=\u8282\u70B9\u5B57\u4F53\u540D\u79F0
 OptionPanel.nodefontsize=\u8282\u70B9\u5B57\u4F53\u5927\u5C0F
 OptionPanel.nodeformat=\u683C\u5F0F
-OptionPanel.nodeformat.tooltip=<html>\u6587\u5B57\u66FF\u6362/ \u683C\u5F0F:<ul><li><em>\u6837\u5F0F\u6269\u5145</em> (<tt>%s</tt> \u662F\u539F\u59CB\u6587\u5B57), \u4F8B\u5982<tt>\u6CE8\u610F: %s</tt> <li><em>\u65E5\u671F\u548C\u6570\u5B57\u683C\u5F0F</em> - \u770B\u9009\u53D6\u65B9\u5757\u4E2D\u7684\u4F8B\u5B50</ul></html>
+OptionPanel.nodeformat.tooltip=<html>\u6587\u672C\u66FF\u6362/ \u683C\u5F0F:<ul><li><em>\u6837\u5F0F\u6269\u5145</em> (<tt>%s</tt> \u662F\u539F\u59CB\u6587\u672C), \u4F8B\u5982<tt>\u6CE8\u610F: %s</tt> <li><em>\u65E5\u671F\u548C\u6570\u5B57\u683C\u5F0F</em> - \u770B\u9009\u5B9A\u65B9\u5757\u4E2D\u7684\u4F8B\u5B50</ul></html>
 OptionPanel.nodenumbering=\u8282\u70B9\u7F16\u53F7
-OptionPanel.nodenumbering.tooltip=\u5728\u8282\u70B9\u6587\u5B57\u52A0\u4E0A\u6392\u5E8F\u7F16\u53F7 (\u4F8B\u5982 1.3.1)\u3002
+OptionPanel.nodenumbering.tooltip=\u5728\u8282\u70B9\u6587\u672C\u52A0\u4E0A\u6392\u5E8F\u7F16\u53F7 (\u4F8B\u5982 1.3.1).
 OptionPanel.nodeshape=\u8282\u70B9\u5F62\u72B6
 OptionPanel.nodetext=\u8282\u70B9\u6587\u672C
-OptionPanel.nodetext.tooltip=\u5728\u6B64\u5B9A\u4E49\u8282\u70B9\u6587\u672C\uFF0C\u5F53\u6B64\u6A21\u5F0F\u5E94\u7528\u65F6\uFF0C\u4EE5\u524D\u7684\u6587\u672C\u5C06\u88AB\u4E22\u5F03\u3002
+OptionPanel.nodetext.tooltip=\u5728\u6B64\u5B9A\u4E49\u8282\u70B9\u6587\u672C, \u5F53\u5E94\u7528\u6B64\u6A21\u5F0F\u65F6, \u4EE5\u524D\u7684\u6587\u672C\u5C06\u88AB\u4E22\u5F03.
 OptionPanel.nothing=\u5168\u90E8\u4E0D\u9009
 OptionPanel.number_format=\u6807\u51C6\u6570\u5B57\u683C\u5F0F
 OptionPanel.number_format.tooltip=\u6837\u5F0F\u53EF\u5305\u542B'#' \u6216'0' \u6765\u8BBE\u5B9A\u5F3A\u5236\u6570\u5B57\u683C\u5F0F, \u4F8B\u5982"0.00", "0.0%", "$#.00", "#0"
@@ -1189,11 +1224,13 @@ OptionPanel.paint_connectors_behind=\u8282\u70B9\u906E\u76D6\u8FDE\u7EBF
 OptionPanel.parse_data=\u8FA8\u8BA4\u8F93\u5165\u4E2D\u7684\u6570\u5B57\u548C\u65E5\u671F-\u65F6\u95F4
 OptionPanel.parse_data.tooltip=\u8BD5\u7740\u89E3\u6790\u65E5\u671F, \u65E5\u671F-\u65F6\u95F4\u548C\u6570\u5B57\u8F93\u5165\u5E76\u5957\u7528\u6807\u51C6\u683C\u5F0F. \u4F8B\u5982100,000.00, 12/31, 12/31/99, 1999-12-31 and 1999-12-31 23:59
 OptionPanel.parse_formulas=\u8BC6\u522B\u516C\u5F0F
-OptionPanel.parse_formulas.tooltip=Parse formulas on nodes starting with '=': See http://www.freeplane.org/wiki/index.php/Formulas.
+OptionPanel.parse_formulas.tooltip=\u89E3\u6790\u8282\u70B9\u4E0A\u7684\u516C\u5F0F, \u4EE5 '=' \u53F7\u5F00\u5934: \u53C2\u89C1 http://www.freeplane.org/wiki/index.php/Formulas.
 OptionPanel.parse_latex=\u8BC6\u522B LaTeX
 OptionPanel.parse_latex.tooltip=\u6309\u683C\u5F0F\u6216\u524D\u7F00\u8BC6\u522B LaTeX \u516C\u5F0F\uFF1A\u53C2\u89C1 http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane\u3002
 OptionPanel.PASTE_HTML=\u7C98\u8D34\u4E3AHTML
 OptionPanel.PASTE_PLAIN_TEXT=\u7C98\u8D34\u4E3A\u7EAF\u6587\u672C
+OptionPanel.pasteImagesFromFiles=\u4ECE\u6587\u4EF6\u7C98\u8D34\u56FE\u7247
+OptionPanel.pasteImagesFromFiles.tooltip=\u5982\u679C\u628A\u56FE\u7247\u6587\u4EF6\u62D6\u52A8\u5230\u601D\u7EF4\u5BFC\u56FE\u4E0A\u5219\u63D2\u5165\u8BE5\u56FE\u7247
 OptionPanel.path_property_may_not_be_empty=\u8DEF\u5F84\u5C5E\u6027\u4E0D\u4E3A\u7A7A\uFF01\u53D8\u66F4\u5DF2\u6062\u590D\u3002
 OptionPanel.patternname=\u540D\u79F0
 OptionPanel.patternname.tooltip=\u6A21\u5F0F\u540D\u79F0\u4E0D\u80FD\u91CD\u590D
@@ -1202,8 +1239,18 @@ OptionPanel.placenewbranches=\u653E\u7F6E\u65B0\u5206\u679D
 OptionPanel.placenewbranches.tooltip=<html>\u6307\u660E\u65B0\u5206\u679D\u7684\u4F4D\u7F6E. \u6709\u6548\u7684\u503C\u4E3A '\u5F00\u59CB' \u548C '\u6700\u540E' </html>
 OptionPanel.plugin.tooltip=\u975E\u6838\u5FC3\u63D2\u4EF6\u3002
 OptionPanel.plugins=\u63D2\u4EF6
-OptionPanel.presentation_dimmer_transparency=\u6F14\u793A\u8C03\u5149\u900F\u660E\u5EA6
-OptionPanel.presentation_mode=\u6F14\u793A\u6A21\u5F0F
+OptionPanel.Presentation=\u6F14\u793A
+OptionPanel.presentation.combineAll=\u5408\u5E76\u6240\u6709\u6F14\u793A
+OptionPanel.presentation.exportDirectory=\u5BFC\u51FA\u6F14\u793A\u6240\u5728\u7684\u76EE\u5F55\u540D\u79F0
+OptionPanel.presentation.maxDropBoxRowCount=\u6700\u5927\u5316\u4E0B\u62C9\u6846\u91CC\u7684\u9879\u76EE\u884C\u6570
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=\u5E94\u7528\u5230\u6F14\u793A\u548C\u5E7B\u706F\u7247\u9009\u62E9\u5668
+OptionPanel.presentation.processesEscapeKey=ESCAPE \u952E\u7ED3\u675F\u6F14\u793A
+OptionPanel.presentation.processesNavigationKeys=\u5BFC\u822A\u952E\u63A7\u5236\u6F14\u793A
+OptionPanel.presentation.slideDisplaysAllNodes=\u81EA\u52A8\u5C55\u5F00\u6240\u6709\u5E7B\u706F\u7247\u8282\u70B9
+OptionPanel.presentation.slowMotion=\u6162\u52A8\u4F5C
+OptionPanel.presentation.switchToFullScreen=\u5F00\u542F\u5168\u5C4F\u5E55
+OptionPanel.presentation.switchToSpotlight=\u5F00\u542F\u63A2\u7167\u706F
+OptionPanel.presentation.zoom=\u4F7F\u7528\u601D\u7EF4\u5BFC\u56FE\u7F29\u653E
 OptionPanel.printonwhitebackground=<html>\u6253\u5370\u65F6\u4F7F\u7528\u767D\u8272\u80CC\u666F</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u6253\u5370\u65F6\u603B\u662F\u4F7F\u7528\u767D\u8272\u80CC\u666F</html>
 OptionPanel.pt_BR=\u8461\u8404\u7259\u8BED\uFF08\u5DF4\u897F\uFF09
@@ -1211,13 +1258,13 @@ OptionPanel.pt_PT=\u8461\u8404\u7259\u8BED\uFF08\u8461\u8404\u7259\uFF09
 OptionPanel.RECT=\u77E9\u5F62
 OptionPanel.rectangle=\u77E9\u5F62
 OptionPanel.relative=\u76F8\u5BF9
-OptionPanel.remind_type_of_new_nodes.tooltip=<html>"Ask" will ask you (use in doubt).<br>"Yes" displays the rich text editor.<br>"No" displays the plain text editor.</html>
+OptionPanel.remind_type_of_new_nodes.tooltip=<html>"\u8BE2\u95EE" \u4F1A\u8BE2\u95EE\u4F60 (\u5B58\u5728\u7591\u95EE\u65F6\u4F7F\u7528).<br>"\u662F" \u663E\u793A\u5BCC\u6587\u672C\u7F16\u8F91\u5668.<br>"\u5426" \u663E\u793A\u666E\u901A\u6587\u672C\u7F16\u8F91\u5668.</html>
 OptionPanel.remind_use_rich_text_in_new_nodes=\u4F7F\u7528\u5BCC\u6587\u672C\u683C\u5F0F(RTF\uFF09\u7C98\u8D34
 OptionPanel.remindersBlink=\u7728\u773C\u63D0\u9192
 OptionPanel.remindersShowNotifications=\u63D0\u9192\u663E\u793A\u5F39\u51FA\u901A\u77E5
 OptionPanel.remindersStandardDelay=\u63D0\u9192\u5EF6\u65F6
-OptionPanel.remove_notes_without_question=\u4E0D\u63D0\u95EE\u5C31\u79FB\u9664\u6CE8\u89E3\u5417\uFF1F
-OptionPanel.remove_notes_without_question.tooltip=\u5982\u679C\u52FE\u9009\u6B64\u590D\u9009\u6846\uFF0C\u5C5E\u4E8E\u9009\u4E2D\u8282\u70B9\u7684\u6CE8\u89E3\u5C06\u4E0D\u8FDB\u884C\u786E\u8BA4\u5C31\u79FB\u9664\u6389\u3002\u8FD9\u53EF\u80FD\u5BFC\u81F4\u65E0\u610F\u4E2D\u4E22\u5931\u4FE1\u606F.
+OptionPanel.remove_notes_without_question=\u4E0D\u63D0\u95EE\u5C31\u79FB\u9664\u6CE8\u89E3\u5417?
+OptionPanel.remove_notes_without_question.tooltip=\u5982\u679C\u52FE\u9009\u6B64\u590D\u9009\u6846, \u5C5E\u4E8E\u9009\u5B9A\u8282\u70B9\u7684\u6CE8\u89E3\u5C06\u4E0D\u8FDB\u884C\u786E\u8BA4\u5C31\u79FB\u9664\u6389, \u8FD9\u53EF\u80FD\u5BFC\u81F4\u65E0\u610F\u4E2D\u4E22\u5931\u4FE1\u606F.
 OptionPanel.resources_use_default_font_for_notes_too=\u6CE8\u89E3\u4E5F\u4F7F\u7528\u7F3A\u7701\u5B57\u4F53
 OptionPanel.resources_use_margin_top_zero_for_notes=\u53BB\u9664\u6CE8\u89E3\u7684\u4E0A\u8FB9\u754C
 OptionPanel.revision_color=\u4FEE\u8BA2\u989C\u8272
@@ -1231,16 +1278,16 @@ OptionPanel.save_modification_times=\u4FDD\u5B58\u4FEE\u6539\u6B21\u6570
 OptionPanel.script_classpath=Script\u7C7B\u76EE\u5F55
 OptionPanel.script_classpath.tooltip=<html>\u7528\u6765\u52A0\u5165script \u548C\u516C\u5F0F\u7684\u7C7B\u522B\u8DEF\u5F84\u7684JAR \u548C\u76EE\u5F55\u5217\u8868\u3002<br>\u4F7F\u7528; (Windows) \u6216: (Linux, Mac) \u6765\u5206\u9694\u3002<br>\u76EE\u5F55\u4F1A\u88AB\u626B\u63CF\u627EJAR \u548C.class \u6863\u3002<br>\u8DEF\u5F84\u5982\u679C\u4E0D\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u5C06\u88AB\u89C6\u4E3A\u76F8\u5BF9\u4E8EFreeplane \u7684\u4F7F\u7528\u8005\u76EE\u5F55\u3002<br>\u5982\u [...]
 OptionPanel.script_compilation_disabled_extensions=\u6587\u4EF6\u6269\u5C55\u540D\u4E0D\u80FD\u88AB\u7F16\u8BD1\uFF08\u53C2\u89C1\u5DE5\u5177\u63D0\u793A\uFF09
-OptionPanel.script_compilation_disabled_extensions.tooltip=<html>If all scripts of an additionally installed language (except<br>Groovy and JavaScript) have a general compilation problem<br>try to add the file extension here (comma-separated list).</html>
+OptionPanel.script_compilation_disabled_extensions.tooltip=<html>\u5982\u679C\u989D\u5916\u5B89\u88C5\u7684\u8BED\u8A00\uFF08\u9664\u4E86<br>Groovy \u548C JavaScript\uFF09\u7684\u5168\u90E8\u811A\u672C\u5747\u6709\u7F16\u8BD1\u95EE\u9898\uFF0C<br>\u5C1D\u8BD5\u5728\u6B64\u6DFB\u52A0\u76F8\u5E94\u7684\u6587\u4EF6\u6269\u5C55\u540D\uFF08\u9017\u53F7\u5206\u9694\u7684\u5217\u8868\uFF09\u3002</html>
 OptionPanel.script_directories=\u811A\u672C\u641C\u7D22\u8DEF\u5F84(\u4F7F\u7528\u5206\u53F7;\u5206\u9694)
 OptionPanel.script_directories.tooltip=<html>\u76EE\u5F55\u5217\u8868.<br>\u4F7F\u7528; (Windows) \u6216: (Linux, Mac) \u6765\u5206\u9694.<br>\u8DEF\u5F84\u5982\u679C\u4E0D\u662F\u7EDD\u5BF9\u8DEF\u5F84, \u5C06\u88AB\u89C6\u4E3A\u76F8\u5BF9\u4E8EFreeplane \u7684\u7528\u6237\u76EE\u5F55.</html>
 OptionPanel.script_user_key_name_for_signing=\u811A\u672C\u7B7E\u540D\u7528\u7684\u53EF\u9009\u7528\u6237\u5BC6\u94A5\u522B\u540D
 OptionPanel.script_user_key_name_for_signing.tooltip=<html>\u5982\u679C\u60F3\u5BF9\u811A\u672C\u7B7E\u540D\uFF0C\u8BF7\u5728\u6B64\u8F93\u5165\u5BC6\u94A5\u7684\u522B\u540D. <br>\u5BC6\u94A5\u9884\u60F3\u5B58\u5728\u4E8E\u7F3A\u7701\u7684keystore\u4E2D. <br>\u5BC6\u94A5\u7684\u5BC6\u7801\u5FC5\u987B\u4E0Ekeystore\u7684\u5BC6\u7801\u4E00\u81F4(\u7F3A\u7701\u5982\u6B64).</html>
 OptionPanel.scrollbar_increment=\u5FEB\u901F
-OptionPanel.scrolling_speed=Automatic map scrolling speed
+OptionPanel.scrolling_speed=\u81EA\u52A8\u5316\u601D\u7EF4\u5BFC\u56FE\u6EDA\u52A8\u901F\u5EA6
 OptionPanel.scrollOnUnfold=\u5C55\u5F00\u4E00\u4E2A\u8282\u70B9\u540E\u6EDA\u52A8\u5BFC\u56FE
 OptionPanel.selection_method=\u9009\u53D6\u6A21\u5F0F
-OptionPanel.selection_method.tooltip=<html> \u4EE5\u4E0B\u9009\u9879\u53EF\u4F9B\u9009\u62E9\uFF1A\u5EF6\u8FDF.\u81EA\u52A8.\u5355\u51FB. \u4E0D\u8981\u66F4\u6539\u8FD9\u4E9B. \u4ED6\u4EEC\u5C06\u4FDD\u5B58\u5728 auto.properties.</html>
+OptionPanel.selection_method.tooltip=<html>\u4EE5\u4E0B\u9009\u9879\u53EF\u4F9B\u9009\u62E9: \u76F4\u63A5, \u5EF6\u8FDF, \u5355\u51FB.</html>
 OptionPanel.selection_method_by_click=\u5355\u51FB
 OptionPanel.selection_method_delayed=\u5EF6\u8FDF
 OptionPanel.selection_method_direct=\u76F4\u63A5
@@ -1251,14 +1298,16 @@ OptionPanel.separator.automatic_save=\u81EA\u52A8\u4FDD\u5B58
 OptionPanel.separator.behaviour=\u884C\u4E3A
 OptionPanel.separator.browser=\u6D4F\u89C8\u5668
 OptionPanel.separator.cache=\u7F13\u5B58
+OptionPanel.separator.clones=\u514B\u9686
+OptionPanel.separator.cloud=\u4E91\u6846
 OptionPanel.separator.CloudControls=\u4E91\u6846
 OptionPanel.separator.commands_for_the_program=\u7A0B\u5E8F\u547D\u4EE4
 OptionPanel.separator.connectors=\u8FDE\u63A5
 OptionPanel.separator.data_formats=\u6570\u636E\u683C\u5F0F\u5316\u548C\u89E3\u6790
 OptionPanel.separator.default_colors=\u9ED8\u8BA4\u989C\u8272
 OptionPanel.separator.default_fonts=\u9ED8\u8BA4\u5B57\u4F53
-OptionPanel.separator.default_styles=\u9ED8\u8BA4\u98CE\u683C
-OptionPanel.separator.EdgeControls=\u8FDE\u7EBF
+OptionPanel.separator.default_styles=\u9ED8\u8BA4\u6837\u5F0F
+OptionPanel.separator.EdgeControls=\u5206\u679D\u7EBF
 OptionPanel.separator.edit_long_node_window=\u7F16\u8F91\u957F\u8282\u70B9\u7A97\u53E3
 OptionPanel.separator.editing=\u7F16\u8F91\u5668\u8BBE\u7F6E
 OptionPanel.separator.export=\u5BFC\u51FA
@@ -1266,10 +1315,12 @@ OptionPanel.separator.files=\u6587\u4EF6
 OptionPanel.separator.formula=\u516C\u5F0F
 OptionPanel.separator.General=\u5E38\u89C4
 OptionPanel.separator.html_export=Html\u5BFC\u51FA
-OptionPanel.separator.html_import=Html\u5BFC\u5165
+OptionPanel.separator.html_import=HTML \u5BFC\u5165
 OptionPanel.separator.hyperlink_types=\u8D85\u94FE\u63A5\u7C7B\u578B
 OptionPanel.separator.icon_properties=\u56FE\u6807
+OptionPanel.separator.IconControls=\u56FE\u6807
 OptionPanel.separator.icons="\u9009\u62E9\u56FE\u6807..."\u4E2D\u7684\u56FE\u6807
+OptionPanel.separator.Icons=\u56FE\u6807
 OptionPanel.separator.initial_map_size=\u601D\u7EF4\u5BFC\u56FE\u521D\u59CB\u5C3A\u5BF8
 OptionPanel.separator.inline_editor=\u5185\u5D4C\u5F0F\u8282\u70B9\u7F16\u8F91\u5668
 OptionPanel.separator.JoinNodesAction=\u52A0\u5165\u8282\u70B9
@@ -1282,18 +1333,19 @@ OptionPanel.separator.mouse_wheel=\u9F20\u6807\u6EDA\u8F6E
 OptionPanel.separator.new_node_commands=\u65B0\u5EFA\u8282\u70B9\u547D\u4EE4
 OptionPanel.separator.node_editing_commands=\u8282\u70B9\u7F16\u8F91\u547D\u4EE4
 OptionPanel.separator.node_navigation_commands=\u8282\u70B9\u5BFC\u822A\u547D\u4EE4
-OptionPanel.separator.NodeBorder=\u8282\u70B9\u8FB9\u754C
+OptionPanel.separator.NodeBorder=\u8282\u70B9\u8FB9\u6846
 OptionPanel.separator.NodeColors=\u8282\u70B9\u989C\u8272
 OptionPanel.separator.NodeFont=\u8282\u70B9\u5B57\u4F53
 OptionPanel.separator.NodeShape=\u8282\u70B9\u5F62\u72B6
 OptionPanel.separator.NodeStyle=\u8282\u70B9\u6837\u5F0F
-OptionPanel.separator.NodeText=\u6838\u5FC3\u6587\u5B57
+OptionPanel.separator.NodeText=\u8282\u70B9\u6587\u672C
 OptionPanel.separator.notifications=\u786E\u8BA4
 OptionPanel.separator.org.freeplane.plugin.bugreport=\u81EA\u52A8\u9519\u8BEF\u62A5\u544A
 OptionPanel.separator.other_defaults=\u5176\u5B83\u9ED8\u8BA4\u8BBE\u5B9A
 OptionPanel.separator.others=\u5176\u5B83\u5173\u952E\u7684\u8FDE\u63A5
 OptionPanel.separator.outline_view=\u5927\u7EB2\u89C6\u56FE
 OptionPanel.separator.patterns=\u6A21\u5F0F
+OptionPanel.separator.presentation=\u6F14\u793A
 OptionPanel.separator.reminderOptions=\u63D0\u9192\u9009\u9879
 OptionPanel.separator.RichTextEditor=\u5BCC\u6587\u672C\u7F16\u8F91\u5668
 OptionPanel.separator.root_node_appearance=\u6839\u8282\u70B9\u5916\u89C2
@@ -1309,7 +1361,8 @@ OptionPanel.separator.spelling=\u62FC\u5199\u68C0\u67E5\u9009\u9879
 OptionPanel.separator.SplitToWordsAction=\u5206\u79BB\u8282\u70B9\u5230\u5355\u8BCD
 OptionPanel.separator.status=\u72B6\u6001\u884C
 OptionPanel.separator.surveys=\u8C03\u67E5
-OptionPanel.separator.tooltip=\u5DE5\u5177\u63D0\u793A\u65F6\u95F4
+OptionPanel.separator.svg_icons=SVG \u56FE\u6807
+OptionPanel.separator.tooltip=\u5DE5\u5177\u63D0\u793A
 OptionPanel.separator.undo=\u64A4\u9500
 OptionPanel.separator.updates=\u7A0B\u5E8F\u66F4\u65B0
 OptionPanel.set_property_text=\u66F4\u6539
@@ -1321,9 +1374,12 @@ OptionPanel.shape_vertical_margin=\u5782\u76F4\u8FB9\u8DDD
 OptionPanel.sharp_bezier=\u6E10\u7A84\u8D1D\u585E\u5C14\u66F2\u7EBF
 OptionPanel.sharp_linear=\u6E10\u7A84\u76F4\u7EBF
 OptionPanel.shouldCenterSmallMaps=\u4E2D\u5FC3\u5C0F\u5BFC\u56FE
+OptionPanel.show_connectors=\u663E\u793A\u8FDE\u63A5\u5668\u8FDE\u7EBF
 OptionPanel.show_icon_for_attributes=\u663E\u793A\u5C5E\u6027\u56FE\u6807
+OptionPanel.show_icons=\u663E\u793A\u56FE\u6807
 OptionPanel.show_less_than_N_nodes_by_default_after_load=\u8F7D\u5165\u5BFC\u56FE\u6216\u5C55\u5F00\u4E00\u4E9B\u8282\u70B9
 OptionPanel.show_node_tooltips=\u663E\u793A\u8282\u70B9\u7684\u5DE5\u5177\u63D0\u793A
+OptionPanel.show_note_icon_in_tooltip=\u5728\u5DE5\u5177\u63D0\u793A\u91CC\u663E\u793A\u6CE8\u89E3\u56FE\u6807
 OptionPanel.show_note_icons=\u663E\u793A\u6CE8\u89E3\u56FE\u6807
 OptionPanel.show_styles_in_tooltip=\u5728\u5DE5\u5177\u63D0\u793A\u4E2D\u663E\u793A\u8282\u70B9\u6837\u5F0F
 OptionPanel.signed_script_are_trusted=\u4FE1\u4EFB\u5DF2\u7B7E\u540D\u811A\u672C(\u63A8\u8350)\u3002
@@ -1338,8 +1394,8 @@ OptionPanel.single_instance_force=\u53EA\u8FD0\u884C\u4E00\u4E2A\u5B9E\u4F8B
 OptionPanel.single_instance_force.tooltip=\u5373\u662F\u6CA1\u6709\u6587\u4EF6\u88AB\u6253\u5F00\u4E5F\u907F\u514D\u8FD0\u884C\u7B2C\u4E8C\u4E2A\u5B9E\u4F8B
 OptionPanel.sk=\u65AF\u6D1B\u4F10\u514B\u8BED
 OptionPanel.skip_template_selection=\u8DF3\u8FC7\u6A21\u677F\u9009\u62E9\u5BF9\u8BDD
-OptionPanel.sl=\u585E\u62C9\u5229\u6602\u8BED
-OptionPanel.slow_scroll_selected_node=\u7F13\u6162\u6EDA\u52A8\u5230\u9009\u4E2D\u8282\u70B9
+OptionPanel.sl=\u65AF\u6D1B\u6587\u5C3C\u4E9A\u8BED
+OptionPanel.slow_scroll_selected_node=\u5E73\u6ED1\u6EDA\u52A8\u5230\u9009\u5B9A\u8282\u70B9
 OptionPanel.spelling_opt_case_sensitive=\u5927\u5C0F\u5199\u654F\u611F
 OptionPanel.spelling_opt_ignore_all_caps_words=\u5FFD\u7565\u5168\u90E8\u5927\u5199\u7684\u5355\u8BCD\u3002
 OptionPanel.spelling_opt_ignore_capitalization=\u5FFD\u7565\u5355\u8BCD\u7684\u5927\u5199\u9996\u5B57\u6BCD
@@ -1350,28 +1406,31 @@ OptionPanel.SplitToWordsAction.auxiliaryWordList=\u52A9\u8BCD\u540D\u5355
 OptionPanel.SplitToWordsAction.charactersAcceptedInWord=\u5355\u8BCD\u5B57\u7B26\u6570
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=\u4FDD\u6301\u539F\u8282\u70B9\u4E3A\u7A7A
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=\u884C\u4E2D\u8282\u70B9\u6570
-OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=\u4FDD\u5B58\u539F\u8282\u70B9\u6587\u672C\u4E3A\u8BE6\u7EC6\u4FE1\u606F
-OptionPanel.sr=\u0441\u0440\u043F\u0441\u043A\u0438 (\u585E\u5C14\u7EF4\u4E9A\u6587)
+OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=\u5C06\u539F\u6587\u672C\u4FDD\u5B58\u4E3A\u8282\u70B9\u660E\u7EC6
+OptionPanel.spotlight=\u63A2\u7167\u706F
+OptionPanel.spotlight_background_color=\u63A2\u7167\u706F\u80CC\u666F\u989C\u8272
+OptionPanel.sr=\u585E\u5C14\u7EF4\u4E9A\u8BED
 OptionPanel.standard_template=\u6807\u51C6\u6A21\u7248\u6587\u4EF6
 OptionPanel.standardbackgroundcolor=\u6807\u51C6\u80CC\u666F\u989C\u8272
 OptionPanel.standardbackgroundcolor.tooltip=<html>html \u7B26\u53F7\u8868\u793A\u6807\u51C6\u80CC\u666F\u989C\u8272 </html>
 OptionPanel.standardcloudcolor=\u6807\u51C6\u4E91\u6846\u989C\u8272
 OptionPanel.standardcloudcolor.tooltip=<html> html \u7B26\u53F7\u8868\u793A\u6807\u51C6\u4E91\u6846\u989C\u8272 </html>
-OptionPanel.standardcloudestyle=\u6807\u51C6\u4E91\u6846\u98CE\u683C
-OptionPanel.standardcloudestyle.tooltip=<html>\u6807\u51C6\u4E91\u6846\u98CE\u683C. \u5F53\u524D\u53EA\u652F\u6301 'bezier'</html>
-OptionPanel.standarddrawrectangleforselection=\u4E3A\u6240\u9009\u8282\u70B9\u8BBE\u7F6E\u6CE1\u6846
-OptionPanel.standarddrawrectangleforselection.tooltip=<html>\u7ED9\u6240\u9009\u8282\u70B9\u52A0\u4E0A\u6CE1\u6846.</html>
+OptionPanel.standardcloudestyle=\u6807\u51C6\u4E91\u6846\u6837\u5F0F
+OptionPanel.standardcloudestyle.tooltip=<html>\u6807\u51C6\u4E91\u6846\u6837\u5F0F.</html>
+OptionPanel.standardcloudshape=\u6807\u51C6\u4E91\u6846\u5F62\u72B6
+OptionPanel.standarddrawrectangleforselection=\u4E3A\u9009\u5B9A\u8282\u70B9\u8BBE\u7F6E\u6CE1\u6846
+OptionPanel.standarddrawrectangleforselection.tooltip=<html>\u7ED9\u9009\u5B9A\u8282\u70B9\u52A0\u4E0A\u6CE1\u6846.</html>
 OptionPanel.standardlinkcolor=\u6807\u51C6\u94FE\u63A5\u989C\u8272
 OptionPanel.standardlinkcolor.tooltip=<html>html \u7B26\u53F7\u8868\u793A\u6807\u51C6\u94FE\u63A5\u989C\u8272</html>
-OptionPanel.standardlinkestyle=\u6807\u51C6\u94FE\u63A5\u98CE\u683C
-OptionPanel.standardlinkestyle.tooltip=<html>\u6807\u51C6\u94FE\u63A5\u98CE\u683C. \u5F53\u524D\u53EA\u652F\u6301 'bezier'</html>
-OptionPanel.standardselectednodecolor=\u6807\u51C6\u8282\u70B9\u9009\u4E2D\u989C\u8272
-OptionPanel.standardselectednodecolor.tooltip=<html>\u8282\u70B9\u9009\u4E2D\u65F6\u7684\u6807\u51C6\u989C\u8272. html \u7B26\u53F7\u8868\u793A (#RRGGBB 16\u8FDB\u5236) </html>
-OptionPanel.standardselectednoderectanglecolor=\u9009\u4E2D\u8282\u70B9\u6CE1\u6846\u989C\u8272
-OptionPanel.standardselectednoderectanglecolor.tooltip=<html>\u8BBE\u7F6E\u6240\u9009\u8282\u70B9\u7684\u6CE1\u6846\u989C\u8272. \u91C7\u7528html\u6807\u8BB0 (#RRGGBB 16\u8FDB\u5236)</html>
+OptionPanel.standardlinkestyle=\u6807\u51C6\u94FE\u63A5\u6837\u5F0F
+OptionPanel.standardlinkestyle.tooltip=<html>\u6807\u51C6\u94FE\u63A5\u6837\u5F0F, \u5F53\u524D\u53EA\u652F\u6301 'bezier'</html>
+OptionPanel.standardselectednodecolor=\u6807\u51C6\u8282\u70B9\u9009\u5B9A\u989C\u8272
+OptionPanel.standardselectednodecolor.tooltip=<html>\u8282\u70B9\u9009\u5B9A\u65F6\u7684\u6807\u51C6\u989C\u8272. html \u7B26\u53F7\u8868\u793A (#RRGGBB 16\u8FDB\u5236) </html>
+OptionPanel.standardselectednoderectanglecolor=\u9009\u5B9A\u8282\u70B9\u6CE1\u6846\u989C\u8272
+OptionPanel.standardselectednoderectanglecolor.tooltip=<html>\u8BBE\u7F6E\u9009\u5B9A\u8282\u70B9\u7684\u6CE1\u6846\u989C\u8272. \u91C7\u7528 HTML \u6807\u8BB0 (#RRGGBB 16\u8FDB\u5236)</html>
 OptionPanel.STAR=\u661F\u72B6
 OptionPanel.statesymbolwidth=\u72B6\u6001\u7B26\u53F7\u5BBD\u5EA6
-OptionPanel.structured_html_import=\u5C06HTML\u5BFC\u5165\u4E3A\u8282\u70B9\u7ED3\u6784
+OptionPanel.structured_html_import=\u5C06 HTML \u5BFC\u5165\u4E3A\u8282\u70B9\u7ED3\u6784
 OptionPanel.structured_icon_toolbar=\u7ED3\u6784\u5316\u56FE\u6807\u5DE5\u5177\u6761
 OptionPanel.summary=\u6458\u8981
 OptionPanel.sv=\u745E\u5178\u8BED
@@ -1379,8 +1438,9 @@ OptionPanel.text.use_ctrl_key=\u4ECE\u5DE5\u5177\u83DC\u5355\u4E2D\u4F7F\u7528\u
 OptionPanel.textalignment=\u6587\u5B57\u5BF9\u9F50
 OptionPanel.time_for_automatic_save=\u81EA\u52A8\u4FDD\u5B58\u95F4\u9694
 OptionPanel.time_for_automatic_save.tooltip=<html> \u4E24\u6B21\u81EA\u52A8\u4FDD\u5B58\u76F4\u63A5\u7684\u65F6\u95F4 (\u6BEB\u79D2): \u8BBE\u7F6E 2000000000\u65F6\u81EA\u52A8\u4FDD\u5B58\u88AB\u7981\u6B62.</html>
-OptionPanel.time_for_delayed_selection=\u5EF6\u8FDF\u9009\u4E2D\u65F6\u95F4
-OptionPanel.time_for_delayed_selection.tooltip=<html>\u5EF6\u8FDF\u9009\u4E2D\u7684\u9F20\u6807\u505C\u7559\u65F6\u95F4 (\u6BEB\u79D2). \u5982\u679C\u60F3\u76F4\u63A5\u9009\u4E2D\u8BBE\u7F6E\u4E3A1.</html>
+OptionPanel.time_for_delayed_selection=\u5EF6\u8FDF\u9009\u5B9A\u65F6\u95F4
+OptionPanel.time_for_delayed_selection.tooltip=<html>\u5EF6\u8FDF\u9009\u5B9A\u7684\u9F20\u6807\u505C\u7559\u65F6\u95F4(\u6BEB\u79D2), \u5982\u679C\u60F3\u76F4\u63A5\u9009\u5B9A\u5219\u8BBE\u7F6E\u4E3A1.</html>
+OptionPanel.toolbar_icon_height=\u5DE5\u5177\u680F\u56FE\u6807\u9AD8\u5EA6
 OptionPanel.toolTipManager.dismissDelay=\u6D88\u5931\u5EF6\u65F6\uFF0C\u6BEB\u79D2
 OptionPanel.toolTipManager.initialDelay=\u521D\u59CB\u5EF6\u65F6\uFF0C\u6BEB\u79D2
 OptionPanel.toolTipManager.max_tooltip_height=\u8282\u70B9\u5DE5\u5177\u63D0\u793A\u6700\u5927\u9AD8\u5EA6
@@ -1396,11 +1456,12 @@ OptionPanel.undo_levels.tooltip=<html>\u51B3\u5B9A\u5B58\u50A8\u2014\u64A4\u9500
 OptionPanel.unfold_on_paste=\u7C98\u8D34\u65F6\u5C55\u5F00\u8282\u70B9
 OptionPanel.unfold_on_paste.tooltip=\u7C98\u8D34\u6216\u62D6\u653E\u65F6\u5C55\u5F00\u8282\u70B9
 OptionPanel.uniform_shape=\u4E00\u81F4
-OptionPanel.use_common_out_point_for_root_node=\u4ECE\u6839\u8282\u70B9\u5F00\u59CB\u8FDE\u7EBF
-OptionPanel.use_common_out_point_for_root_node.tooltip=\u4ECE\u6839\u8282\u70B9\u5F00\u59CB\u8FDE\u7EBF
+OptionPanel.use_common_out_point_for_root_node=\u5206\u679D\u7EBF\u4ECE\u6839\u8282\u70B9\u5F00\u59CB
+OptionPanel.use_common_out_point_for_root_node.tooltip=\u5206\u679D\u7EBF\u4ECE\u6839\u8282\u70B9\u5F00\u59CB
+OptionPanel.use_svg_icons=\u4F7F\u7528 SVG \u56FE\u6807
+OptionPanel.use_svg_icons.tooltip=<html>\u51B3\u5B9A\u56FE\u6807\u7684\u6E32\u67D3\u54C1\u8D28, SVG \u56FE\u6807\u7684\u6E32\u67D3\u9700\u8981\u82B1\u8D39\u66F4\u591A\u65F6\u95F4.</html>
 OptionPanel.use_tabbed_pane=\u4F7F\u7528\u6807\u7B7E\u9875
-OptionPanel.use_tabbed_pane.tooltip=\u5982\u679C\u9009\u4E2D\uFF0C\u5BFC\u56FE\u5C06\u663E\u793A\u5728\u6807\u7B7E\u9875\u4E2D (\u5C31\u50CF\u5728 FireFox :-) ).
-OptionPanel.user_defined_screen_resolution=\u7528\u6237\u5B9A\u4E49\u5C4F\u5E55\u5206\u8FA8\u7387(dpi)
+OptionPanel.use_tabbed_pane.tooltip=\u5982\u679C\u9009\u4E2D, \u5BFC\u56FE\u5C06\u663E\u793A\u5728\u6807\u7B7E\u9875\u4E2D (\u5C31\u50CF Firefox \u90A3\u6837 :-) ).
 OptionPanel.validate_classpath_needs_readaccess=\u811A\u672C\uFF1A\u8BBE\u5B9A\u7684\u7C7B\u8DEF\u5F84\u5FC5\u987B\u5141\u8BB8\u8BFB\u53D6\u90A3\u91CC\u7684\u6587\u4EF6\uFF01
 OptionPanel.validate_invalid_date_format=\u4E0D\u6B63\u786E\u7684\u65E5\u671F\u683C\u5F0F
 OptionPanel.validate_invalid_datetime_format=\u4E0D\u6B63\u786E\u7684\u65E5\u671F-\u65F6\u95F4\u683C\u5F0F
@@ -1439,9 +1500,9 @@ PatternNewNameProperty=\u65B0\u6A21\u5F0F
 PatternToString.backgroundColor=\u80CC\u666F\u989C\u8272
 PatternToString.Child=\u5B50\u8282\u70B9\u6837\u5F0F
 PatternToString.color=\u989C\u8272
-PatternToString.EdgeColor=\u8FDE\u7EBF\u989C\u8272
-PatternToString.EdgeStyle=\u8FDE\u7EBF\u98CE\u683C
-PatternToString.EdgeWidth=\u8FDE\u7EBF\u5BBD\u5EA6
+PatternToString.EdgeColor=\u5206\u679D\u7EBF\u989C\u8272
+PatternToString.EdgeStyle=\u5206\u679D\u7EBF\u6837\u5F0F
+PatternToString.EdgeWidth=\u5206\u679D\u7EBF\u5BBD\u5EA6
 PatternToString.FontBold=\u7C97\u4F53
 PatternToString.FontItalic=\u659C\u4F53
 PatternToString.FontName=\u5B57\u4F53\u540D\u79F0
@@ -1456,10 +1517,10 @@ PeriodUnit.WEEK=\u5468
 PeriodUnit.YEAR=\u5E74
 plugins/latex/LatexNodeHook.editorTitle=\u7F16\u8F91Latex
 plugins/script_filter=Script \u8FC7\u6EE4\u5668 {0}
-plugins/script_filter_error={0} had to return a boolean result on {1} but returned {2}
-plugins/script_filter_execute_error=Error executing {0}\nfor node {1}:\n{2}
+plugins/script_filter_error=\u5728 {1} \u4E0A {0} \u5FC5\u987B\u8FD4\u56DE\u4E00\u4E2A\u5E03\u5C14\u578B\u7ED3\u679C, \u5426\u5219\u8FD4\u56DE {2}
+plugins/script_filter_execute_error=\u6267\u884C\u9519\u8BEF {0}\n\u4E3A\u8282\u70B9 {1}:\n{2}
 plugins/ScriptEditor.cancel=\u653E\u5F03\u4FEE\u6539\u9000\u51FA(&D)
-plugins/ScriptEditor.exit=\u4FDD\u5B58\u9000\u51FA(&S)
+plugins/ScriptEditor.exit=\u4FDD\u5B58\u9000\u51FA
 plugins/ScriptEditor.FORBIDDEN_ACTION=Freeplane groovy\u811A\u672C\u53D7\u9650. \u4E0B\u9762\u7684 {0,choice,0#File|1#Network|2#Exec} \u64CD\u4F5C\u88AB\u7981\u6B62: {1,choice,0#Accept|1#Connect|2#Listen|3#Multicast|4#SetFactory|5#Exec|6#Link|7#Delete|8#Read|9#Write}. \u4F60\u53EF\u4EE5\u5728\u7A0B\u5E8F\u8BBE\u7F6E\u4E2D\u66F4\u6539\u6B64\u9009\u9879.
 plugins/ScriptEditor.menu_actions=\u52A8\u4F5C(&A)
 plugins/ScriptEditor.new_script=\u65B0\u811A\u672C
@@ -1470,16 +1531,16 @@ plugins/ScriptEditor/window.title=\u811A\u672C\u7F16\u8F91\u5668
 plugins/ScriptingEngine.illegalAccessToInternalAPI=\u975E\u6CD5\u8BBF\u95EE\u5185\u90E8API (package {0}). \u5982\u679CAPI \u4E0D\u7ED9\u529B\u8BF7\u8054\u7EDCFreeplane \u56E2\u961F.
 plugins/TimeList.xml_Created=\u521B\u5EFA
 plugins/TimeList.xml_Date=\u65E5\u671F
-plugins/TimeList.xml_Details=\u8BE6\u7EC6\u4FE1\u606F
+plugins/TimeList.xml_Details=\u660E\u7EC6
 plugins/TimeList.xml_Icons=\u56FE\u6807
 plugins/TimeList.xml_Modified=\u4FEE\u6539
 plugins/TimeList.xml_Notes=\u6CE8\u89E3
 plugins/TimeList.xml_Text=\u6587\u672C
-plugins/TimeManagement.xml_appendButton=\u5728\u6240\u9009\u8282\u70B9\u8FFD\u52A0\u65E5\u671F
+plugins/TimeManagement.xml_appendButton=\u5728\u9009\u5B9A\u8282\u70B9\u8FFD\u52A0\u65E5\u671F
 plugins/TimeManagement.xml_Cancel=\u53D6\u6D88
 plugins/TimeManagement.xml_cancelButton=\u53D6\u6D88
 plugins/TimeManagement.xml_closeButton=\u5173\u95ED
-plugins/TimeManagement.xml_Export=\u5BFC\u51FA\u9009\u4E2D\u7684\u8282\u70B9
+plugins/TimeManagement.xml_Export=\u5BFC\u51FA\u9009\u5B9A\u7684\u8282\u70B9
 plugins/TimeManagement.xml_Find=\u67E5\u627E
 plugins/TimeManagement.xml_Goto=\u8F6C\u5230
 plugins/TimeManagement.xml_hour=\u65F6:
@@ -1492,36 +1553,39 @@ plugins/TimeManagement.xml_reminderNode_tooltip=\u9884\u8BBE\u63D0\u9192 {0,date
 plugins/TimeManagement.xml_remindLaterButton=\u7A0D\u540E\u63D0\u9192
 plugins/TimeManagement.xml_remindLaterButton_tooltip=\u7A0D\u540E\u63D0\u9192
 plugins/TimeManagement.xml_removeReminderButton=\u5220\u9664\u63D0\u9192
-plugins/TimeManagement.xml_removeReminderButton_tooltip=\u5220\u9664\u6240\u9009\u8282\u70B9\u7684\u6240\u6709\u76F8\u5173\u63D0\u9192.
+plugins/TimeManagement.xml_removeReminderButton_tooltip=\u5220\u9664\u9009\u5B9A\u8282\u70B9\u7684\u6240\u6709\u76F8\u5173\u63D0\u9192.
 plugins/TimeManagement.xml_Replace=\u66FF\u6362
 plugins/TimeManagement.xml_Replace_All=\u5168\u90E8\u66FF\u6362
 plugins/TimeManagement.xml_Replace_Selected=\u66FF\u6362\u9009\u5B9A
 plugins/TimeManagement.xml_Select=\u9009\u62E9
-plugins/TimeManagement.xml_todayButton=\u4ECA\u5929
+plugins/TimeManagement.xml_todayButton=\u91CD\u7F6E\u65E5\u5386
 plugins/TimeManagement.xml_WindowTitle=\u7BA1\u7406\u65F6\u95F4
-plugins/TimeManagement.xml_WindowTitle_All_Nodes=\u67E5\u627E\u66FF\u6362
+plugins/TimeManagement.xml_WindowTitle_All_Nodes=\u67E5\u627E\u5E76\u66FF\u6362
 preferences=\u9996\u9009\u9879
+presentation=\u6F14\u793A
+presentation.combineAll=\u5408\u5E76\u6240\u6709\u6F14\u793A
 print_preview_title=\u6253\u5370\u9884\u89C8
 PrintAction.text=\u6253\u5370\u5BFC\u56FE...
 PrintDirectAction.text=\u6253\u5370
 printing_settings=\u6253\u5370\u6BD4\u4F8B
 PrintPreviewAction.text=\u6253\u5370\u9884\u89C8...
+program_terminates=\u5185\u90E8\u9519\u8BEF, \u7A0B\u5E8F\u7EC8\u6B62.
 progress=\u8FDB\u5EA6\u56FE\u6807(%)
 PropertyAction.dialog=\u9996\u9009\u9879
-PropertyAction.text=\u9996\u9009\u9879 ...
+PropertyAction.text=\u9996\u9009\u9879...
 QuickFilterAction.text=\u5FEB\u901F\u8FC7\u6EE4
 QuickFindAction.BACK.text=\u67E5\u627E\u4E0A\u4E00\u4E2A
 QuickFindAction.FORWARD.text=\u67E5\u627E\u4E0B\u4E00\u4E2A
-QuickFindAllAction.text=\u9009\u53D6\u6240\u6709\u5339\u914D\u8282\u70B9
+QuickFindAllAction.text=\u9009\u5B9A\u6240\u6709\u5339\u914D\u8282\u70B9
 QuickHighlightAction.text=\u9AD8\u70B9\u6240\u6709\u5339\u914D\u8282\u70B9
 QuitAction.text=\u9000\u51FA Freeplane
 read_only=\u53EA\u8BFB
 ReadScriptError.text=\u8BFB\u53D6\u811A\u672C\u9519\u8BEF\n\u8BE6\u60C5\u8BF7\u67E5\u770Blog\u6587\u4EF6
 really_convert_to_current_version=<html>\u8BE5\u5BFC\u56FE\u662F\u7528\u65E7\u7248\u672C\u7684 Freeplane\u521B\u5EFA\u7684. <br>\u8F6C\u6362\u5B83 (\u5EFA\u8BAE)? <br>(\u5426\u5219\u4F5C\u4E3A\u672A\u786E\u8BA4\u5904\u7406.) </html>
-really_cut_node=\u771F\u7684\u526A\u5207\u8282\u70B9?
+really_cut_node=\u786E\u8BA4\u526A\u5207\u8282\u70B9?
 really_execute_script=\u4F60\u771F\u7684\u60F3\u6267\u884C\u8BE5\u5BFC\u56FE\u4E2D\u5305\u542B\u7684\u811A\u672C? \u8FD9\u4E9B\u811A\u672C\u53EF\u80FD\u635F\u5BB3\u4F60\u7684\u7535\u8111.
 really_remove_node=\u771F\u7684\u8981\u5220\u9664\u8282\u70B9?
-really_remove_notes=\u771F\u7684\u8981\u79FB\u9664\u6CE8\u89E3\u5417\uFF1F
+really_remove_notes=\u771F\u7684\u8981\u79FB\u9664\u6CE8\u89E3\u5417?
 ReapplyFilterAction.text=\u91CD\u65B0\u5E94\u7528
 red=\u7EA2\u8272
 RedefineStyleAction.text=\u91CD\u5B9A\u4E49\u6837\u5F0F
@@ -1553,43 +1617,43 @@ replace_shortcut_title=\u66FF\u6362\u5FEB\u6377\u952E\uFF1F
 ReportBugAction.text=\u62A5\u544A\u9519\u8BEF
 RequestFeatureAction.text=\u8BF7\u6C42\u589E\u52A0\u4E00\u4E2A\u529F\u80FD
 reset_to_default=\u4F7F\u7528\u7F3A\u7701
-ResetNodeLocationAction.text=\u91CD\u8BBE\u8282\u70B9\u4F4D\u7F6E
+ResetNodeLocationAction.text=\u91CD\u7F6E\u8282\u70B9\u4F4D\u7F6E
 ResetStyleAction.text=\u91CD\u7F6E\u8282\u70B9\u6837\u5F0F
 RevertAction.text=\u8FD8\u539F\u81F3\u4E0A\u6B21\u4FDD\u5B58\u72B6\u6001
 RevisionPluginAction.text=\u6539\u53D8\u4FEE\u8BA2\u90E8\u5206\u7684\u80CC\u666F\u989C\u8272
-save=\u4FDD\u5B58(&S)
+save=\u4FDD\u5B58
 save_failed=\u56FE {0} \u5B58\u50A8\u5931\u8D25.
-save_unsaved=\u4FDD\u5B58\u4E0B\u5217\u601D\u7EF4\u5BFC\u56FE\uFF1F
-save_unsaved_styles=\u4FDD\u5B58\u6837\u5F0F\uFF1F
+save_unsaved=\u4FDD\u5B58\u4E0B\u5217\u601D\u7EF4\u5BFC\u56FE?
+save_unsaved_styles=\u4FDD\u5B58\u6837\u5F0F?
 SaveAcceleratorPresetsAction.text=\u4FDD\u5B58\u70ED\u952E\u96C6\u2026
-SaveAction.text=\u4FDD\u5B58(&S)
-SaveAction_readonlyMsg=This map is read-only. Please use 'File->Save map as...' to save this map.
+SaveAction.text=\u4FDD\u5B58
+SaveAction_readonlyMsg=\u8FD9\u4E2A\u601D\u7EF4\u5BFC\u56FE\u662F\u53EA\u8BFB\u7684, \u8BF7\u4F7F\u7528 '\u6587\u4EF6->\u53E6\u5B58\u4E3A...' \u6765\u4FDD\u5B58\u8FD9\u4E2A\u5BFC\u56FE.
 SaveAction_readonlyTitle=\u5C1D\u8BD5\u4FDD\u5B58\u53EA\u8BFB\u5BFC\u56FE
-SaveAll.text=\u4FDD\u5B58\u6240\u6709(A)
+SaveAll.text=\u4FDD\u5B58\u6240\u6709\u601D\u7EF4\u5BFC\u56FE
 SaveAll.tooltip=\u4FDD\u5B58\u6240\u6709\u6253\u5F00\u7684\u5BFC\u56FE
-SaveAs_toReadonlyMsg={0} \u662F\u53EA\u8BFB\u72B6\u6001\u3002\u8BF7\u5C1D\u8BD5\u4FDD\u5B58\u4E3A\u53E6\u4E00\u4E2A\u6587\u4EF6\u3002
+SaveAs_toReadonlyMsg={0} \u662F\u53EA\u8BFB\u72B6\u6001, \u8BF7\u5C1D\u8BD5\u4FDD\u5B58\u4E3A\u53E6\u4E00\u4E2A\u6587\u4EF6.
 SaveAs_toReadonlyTitle=\u5C1D\u8BD5\u4FDD\u5B58\u5230\u53EA\u8BFB\u6587\u4EF6
 SaveAsAction.text=\u53E6\u5B58\u4E3A...
 saved=\u4FDD\u5B58\u5B8C\u6BD5
 saving_canceled=\u5DF2\u53D6\u6D88\u4FDD\u5B58
 scanners_not_loaded=\u626B\u63CF\u5668\u65E0\u6CD5\u8F7D\u5165\uFF0C\u6587\u4EF6\u5DF2\u635F\u6BC1
 scheme_evaluate=\u8BC4\u4F30!
-script_execution_disabled=\u811A\u672C\u88AB\u7981\u7528\uFF0C\u8BF7\u67E5\u770B \u5DE5\u5177/\u9996\u9009\u9879/\u63D2\u4EF6
+script_execution_disabled=\u811A\u672C\u88AB\u7981\u7528, \u8BF7\u67E5\u770B \u5DE5\u5177/\u9996\u9009\u9879/\u63D2\u4EF6
 ScriptEditor.text=\u811A\u672C\u7F16\u8F91\u5668...
-ScriptEditor.tooltip=\u5141\u8BB8\u5728Freeplane\u4E2D\u7F16\u5199\u8F83\u957F\u811A\u672C.
+ScriptEditor.tooltip=\u5141\u8BB8\u5728 Freeplane \u4E2D\u7F16\u5199\u8F83\u957F\u811A\u672C.
 ScriptEditorPanel.changed_cancel=\u811A\u672C\u5DF2\u4FEE\u6539. \u4F60\u771F\u7684\u60F3\u653E\u5F03\u8FD9\u4E9B\u4FEE\u6539\u5417?
 scripting=\u811A\u672C
-scripting_api_generator_legend=Legend
-scripting_api_generator_proxy=Proxy
-scripting_api_generator_title=Scripting API
-scripting_api_generator_utilities=Utilities
-scripting_api_generator_web=Web Resources
-ScriptsRunToggleAction.ON_SELECTED_NODE.text=\u5728\u6240\u6709\u9009\u4E2D\u7684\u8282\u70B9\u4E0A\u6267\u884C\u811A\u672C
-ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=\u5728\u9009\u4E2D\u7684\u8282\u70B9\u4E0A\u9012\u5F52\u6267\u884C\u811A\u672C
-ScriptsRunToggleAction.ON_SINGLE_NODE.text=\u5728\u9009\u4E2D\u7684\u8282\u70B9\u4E0A\u6267\u884C\u811A\u672C
-select_favorites_folder=\u9009\u62E9\u2014\u6536\u85CF\u5939\u2014\u6240\u5728\u7684\u76EE\u5F55
+scripting_api_generator_legend=\u56FE\u4F8B
+scripting_api_generator_proxy=\u4EE3\u7406
+scripting_api_generator_title=\u811A\u672C API
+scripting_api_generator_utilities=\u5B9E\u7528\u5DE5\u5177
+scripting_api_generator_web=\u7F51\u7EDC\u8D44\u6E90
+ScriptsRunToggleAction.ON_SELECTED_NODE.text=\u5728\u6240\u6709\u9009\u5B9A\u7684\u8282\u70B9\u4E0A\u6267\u884C\u811A\u672C
+ScriptsRunToggleAction.ON_SELECTED_NODE_RECURSIVELY.text=\u5728\u9009\u5B9A\u7684\u8282\u70B9\u4E0A\u9012\u5F52\u6267\u884C\u811A\u672C
+ScriptsRunToggleAction.ON_SINGLE_NODE.text=\u5728\u9009\u5B9A\u7684\u8282\u70B9\u4E0A\u6267\u884C\u811A\u672C
+select_favorites_folder=\u9009\u62E9\u6536\u85CF\u5939\u6240\u5728\u7684\u76EE\u5F55
 select_file_export_to=\u9009\u62E9\u8981\u5BFC\u51FA\u5230\u7684\u6587\u4EF6
-select_folder_for_importing=\u9009\u62E9\u5BFC\u5165\u7684\u76EE\u5F55
+select_folder_for_importing=\u9009\u62E9\u8981\u5BFC\u5165\u7684\u76EE\u5F55
 select_icon=\u9009\u62E9\u56FE\u6807
 select_menu_item_dialog=\u9009\u62E9\u83DC\u5355\u9879
 select_menu_item_root_node=\u83DC\u5355
@@ -1598,21 +1662,22 @@ SelectAllAction.text=\u9009\u62E9\u6240\u6709\u53EF\u89C1\u9879
 SelectBranchAction.text=\u9009\u62E9\u53EF\u89C1\u5206\u679D
 SelectedPasteAction.text=\u7C98\u8D34\u4E3A...
 selection_method_by_click=\u5355\u51FB\u65F6\u9009\u5B9A
-selection_method_delayed=\u5EF6\u8FDF\u81EA\u52A8\u9009\u5B9A\u6A21\u5F0F\uFF08\u6307\u5411\u5E76\u5EF6\u8FDF\u4E00\u6BB5\u540E\u9009\u5B9A\uFF09
+selection_method_delayed=\u5EF6\u8FDF\u81EA\u52A8\u9009\u5B9A\u6A21\u5F0F (\u6307\u5411\u5E76\u5EF6\u8FDF\u4E00\u6BB5\u65F6\u95F4\u540E\u9009\u5B9A)
 selection_method_direct=\u6307\u5411\u65F6\u9009\u5B9A
 SelectNoteAction.text=\u6CE8\u89E3\u7F16\u8F91\u5207\u6362
-SelectNoteAction.tooltip=\u5207\u6362\u6CE8\u89E3\u7A97\u53E3\u4E0E\u5BFC\u56FE\u7A97\u53E3\u7126\u70B9
+SelectNoteAction.tooltip=\u5207\u6362\u6CE8\u89E3\u9762\u677F\u4E0E\u5BFC\u56FE\u7A97\u53E3\u7126\u70B9
+set_accelerator_on_next_click_helpmessage=\u5728\u83DC\u5355\u91CC\u70B9\u51FB\u4E00\u4E2A\u547D\u4EE4\u6765\u4E3A\u5176\u521B\u5EFA\u5FEB\u6377\u952E.
 SetAccelerator.dialogTitle=\u5206\u914D\u5FEB\u6377\u952E
 SetAccelerator.keystrokeDetected=\u6309\u952E ''{0}'' \u5C1A\u672A\u6307\u5B9A\u7ED9\u4EFB\u4F55\u83DC\u5355\u9879\u3002
 SetAcceleratorOnNextClickAction.text=\u6307\u5B9A\u5FEB\u6377\u65B9\u5F0F\u2026
 SetAlwaysUnfoldedNodeFlagsAction.text=\u4FDD\u6301\u5C55\u5F00\u8282\u70B9
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=\u907F\u514D\u6298\u53E0\u5F53\u524D\u5C55\u5F00\u7684\u8282\u70B9
 SetImageByFileChooserAction.text=\u52A0\u5165\u56FE\u50CF(\u6587\u4EF6\u6216\u94FE\u63A5)...
-SetLinkAnchorAction.text=\u8BBE\u5B9A\u8282\u70B9\u8DF3\u8F6C(anchor)
-SetLinkAnchorAction.tooltip=<html>set selected node as anchor for future<br/>creation of local or global links.
-SetLinkAnchorAction.tooltip_anchored=<html>set selected node as anchor for future<br/>creation of local or global links. Current anchor:<br/>{0}
-SetLinkByFileChooserAction.text=\u52A0\u5165\u8D85\u94FE\u63A5(\u6587\u4EF6)...
-SetLinkByTextFieldAction.text=\u52A0\u5165\u8D85\u94FE\u63A5(\u6587\u5B57)...
+SetLinkAnchorAction.text=\u8BBE\u5B9A\u94FE\u63A5\u951A
+SetLinkAnchorAction.tooltip=<html>\u5C06\u9009\u5B9A\u8282\u70B9\u8BBE\u4E3A\u8282\u70B9\u951A<br/>\u4EE5\u4F9B\u5C06\u6765\u521B\u5EFA\u672C\u5730\u6216\u5168\u5C40\u94FE\u63A5.
+SetLinkAnchorAction.tooltip_anchored=<html>\u5C06\u9009\u5B9A\u8282\u70B9\u8BBE\u4E3A\u8282\u70B9\u951A<br/>\u4EE5\u4F9B\u5C06\u6765\u521B\u5EFA\u672C\u5730\u6216\u5168\u5C40\u94FE\u63A5. \u5F53\u524D\u8282\u70B9\u951A:<br/>{0}
+SetLinkByFileChooserAction.text=\u6DFB\u52A0\u8D85\u94FE\u63A5(\u6587\u4EF6)...
+SetLinkByTextFieldAction.text=\u6DFB\u52A0\u8D85\u94FE\u63A5(\u6587\u672C)...
 SetNodeLink.text=\u8BBE\u5B9A\u59D0\u5F1F\u554A\u94FE\u63A5...
 SetNoteWindowPosition.bottom.text=\u5E95\u90E8
 SetNoteWindowPosition.left.text=\u5DE6\u8FB9
@@ -1624,21 +1689,26 @@ ShowAllAttributesAction.text=\u663E\u793A\u6240\u6709\u5C5E\u6027
 ShowAncestorsAction.text=\u663E\u793A\u4E0A\u4EE3
 ShowAttributeDialogAction.text=\u5C5E\u6027\u7BA1\u7406\u5668...
 ShowDescendantsAction.text=\u663E\u793A\u540E\u4EE3
-ShowFilterToolbarAction.text=\u8FC7\u6EE4\u5668\u5DE5\u5177\u6761
-ShowFormatPanel.text=\u5C5E\u6027\u9762\u677F
-ShowFormatPanel.tooltip=\u5448\u73B0\u4E00\u4E2A\u5BF9\u8BDD\u6846, \u5176\u4E2D\u8282\u70B9\u548C\u5206\u652F\u7EBF\u7684\u5C5E\u6027\u53EF\u4EE5\u540C\u65F6\u4FEE\u6539.
-ShowHideNoteAction.text=\u6CE8\u89E3\u7A97\u53E3
-ShowHideNoteAction.tooltip=\u8BA9\u6CE8\u89E3\u7A97\u53E3\u51FA\u73B0\u6216\u6D88\u5931.
-ShowNextChildAction.text=\u663E\u793A\u4E0B\u4E00\u4E2A\u513F\u5B50
-ShowNotesInMapAction.text=\u5728\u601D\u7EF4\u5BFC\u56FE\u4E0A\u663E\u793A\u6CE8\u89E3
-ShowSelectedAttributesAction.text=\u663E\u793A\u9009\u62E9\u7684\u5C5E\u6027
+ShowFilterToolbarAction.text=\u8FC7\u6EE4\u680F
+ShowFirstSlideAction.text=\u7B2C\u4E00\u5F20\u5E7B\u706F\u7247
+ShowFirstSlideAndStartPresentationAction.text=\u4ECE\u5934\u5F00\u59CB\u6F14\u793A
+ShowFormatPanel.text=\u5DE5\u5177\u9762\u677F
+ShowFormatPanel.tooltip=\u663E\u793A\u4E00\u4E2A\u5BF9\u8BDD\u6846, \u5176\u4E2D\u8282\u70B9\u548C\u5206\u679D\u7EBF\u7684\u5C5E\u6027\u53EF\u4EE5\u4E00\u540C\u4FEE\u6539.
+ShowHideNoteAction.text=\u663E\u793A\u6CE8\u89E3\u9762\u677F
+ShowHideNoteAction.tooltip=\u8BA9\u6CE8\u89E3\u9762\u677F\u51FA\u73B0\u6216\u6D88\u5931.
+ShowLastSlideAction.text=\u6700\u540E\u4E00\u5F20\u5E7B\u706F\u7247
+ShowNextChildAction.text=\u663E\u793A\u4E0B\u4E00\u4E2A\u5B50\u9879
+ShowNextSlideAction.text=\u4E0B\u4E00\u5F20\u5E7B\u706F\u7247
+ShowNotesInMapAction.text=\u5728\u5BFC\u56FE\u4E0A\u663E\u793A\u6CE8\u89E3
+ShowPreviousSlideAction.text=\u4E0A\u4E00\u5F20\u5E7B\u706F\u7247
+ShowSelectedAttributesAction.text=\u663E\u793A\u9009\u5B9A\u7684\u5C5E\u6027
 ShowSelectionAsRectangleAction.text=\u77E9\u5F62\u9009\u62E9
 simplyhtml.aboutFrameTitle=\u5173\u4E8E\u672C\u7A0B\u5E8F
 simplyhtml.aboutLabel=\u5173\u4E8E SimplyHTML...
-simplyhtml.alignCenter=\u4E2D
+simplyhtml.alignCenter=\u5C45\u4E2D
 simplyhtml.alignLabel=\u5BF9\u9F50:
-simplyhtml.alignLeft=\u5DE6
-simplyhtml.alignRight=\u53F3
+simplyhtml.alignLeft=\u5DE6\u5BF9\u9F50
+simplyhtml.alignRight=\u53F3\u5BF9\u9F50
 simplyhtml.allCellsRangeLabel=\u6240\u6709\u5355\u5143\u683C
 simplyhtml.allOccurrencesReplaced=\u5DF2\u5168\u90E8\u66FF\u6362
 simplyhtml.appendTableColLabel=\u9644\u52A0\u5217
@@ -1686,9 +1756,9 @@ simplyhtml.editLabel=\u7F16\u8F91
 simplyhtml.effectLabel=\u6548\u679C
 simplyhtml.familyLabel=\u5B57\u4F53
 simplyhtml.findNext=\u67E5\u627E\u4E0B\u4E00\u4E2A...
-simplyhtml.findReplaceDialogTitle=\u67E5\u627E\u66FF\u6362
-simplyhtml.findReplaceLabel=\u67E5\u627E\u66FF\u6362
-simplyhtml.findReplaceTip=\u67E5\u627E\u66FF\u6362
+simplyhtml.findReplaceDialogTitle=\u67E5\u627E\u5E76\u66FF\u6362
+simplyhtml.findReplaceLabel=\u67E5\u627E\u5E76\u66FF\u6362
+simplyhtml.findReplaceTip=\u67E5\u627E\u5E76\u66FF\u6362
 simplyhtml.fontBoldLabel=\u7C97\u4F53
 simplyhtml.fontBoldTip=\u5207\u6362\u7C97\u4F53 \u5F00/\u5173
 simplyhtml.fontColorLabel=\u6587\u672C\u989C\u8272
@@ -1741,7 +1811,7 @@ simplyhtml.marginLabel=\u9875\u8FB9\u8DDD(\u5916)
 simplyhtml.matchApproximately=\u8FD1\u4F3C\u5339\u914D
 simplyhtml.matchApproximately.tooltip=<html>\u662F\u5426\u5141\u8BB8\u8FD1\u4F3C\u5339\u914D,<br/>i.e. searching for 'files' will find 'flies'.</html>
 simplyhtml.matchCase=\u533A\u5206\u5927\u5C0F\u5199
-simplyhtml.matchCase.tooltip=\u67E5\u627E\u65F6\u662F\u5426\u533A\u5206\u5927\u5C0F\u5199\u3002
+simplyhtml.matchCase.tooltip=\u67E5\u627E\u65F6\u662F\u5426\u533A\u5206\u5927\u5C0F\u5199.
 simplyhtml.newStyleDefaultName=\u65B0\u6837\u5F0F
 simplyhtml.nextTableCellLabel=\u4E0B\u4E00\u4E2A\u5355\u5143\u683C
 simplyhtml.noLineLabel=\u65E0
@@ -1778,11 +1848,11 @@ simplyhtml.replaceWith=\u66FF\u6362\u4E3A:
 simplyhtml.replaceYes=\u662F
 simplyhtml.rightLabel=\u53F3:
 simplyhtml.searchDown=\u5411\u4E0B\u67E5\u627E
-simplyhtml.searchDown.tooltip=\u4ECE\u6700\u4E0A\u4E00\u884C\u5F00\u59CB\u67E5\u627E\u3002
-simplyhtml.searchFromStart=\u4ECE\u5F00\u59CB\u67E5\u627E
-simplyhtml.searchFromStart.tooltip=\u4ECE\u6700\u4E0A\u4E00\u884C\u5F00\u59CB\u67E5\u627E\uFF0C\u800C\u4E0D\u662F\u4ECE\u5149\u6807\u6240\u5728\u4F4D\u7F6E\u3002
+simplyhtml.searchDown.tooltip=\u4ECE\u6700\u4E0A\u4E00\u884C\u5F80\u4E0B\u67E5\u627E.
+simplyhtml.searchFromStart=\u91CD\u5934\u67E5\u627E
+simplyhtml.searchFromStart.tooltip=\u4ECE\u6700\u4E0A\u4E00\u884C\u5F00\u59CB\u67E5\u627E, \u800C\u4E0D\u662F\u4ECE\u5149\u6807\u6240\u5728\u4F4D\u7F6E.
 simplyhtml.searchUp=\u5411\u4E0A\u67E5\u627E
-simplyhtml.searchUp.tooltip=\u4ECE\u6700\u672B\u4E00\u884C\u5F80\u4E0A\u67E5\u627E\u3002
+simplyhtml.searchUp.tooltip=\u4ECE\u6700\u672B\u4E00\u884C\u5F80\u4E0A\u67E5\u627E.
 simplyhtml.selectAllLabel=\u5168\u9009
 simplyhtml.selectedFontColorLabel=\u9009\u62E9\u5B57\u4F53\u989C\u8272
 simplyhtml.sizeLabel=\u5B57\u53F7
@@ -1797,7 +1867,7 @@ simplyhtml.tableLabel=\u8868\u683C
 simplyhtml.tablePanelTitle=\u8868\u683C\u5F0F
 simplyhtml.tableWidthLabel=\u5BBD\u5EA6:
 simplyhtml.textIndentLabel=\u7F29\u8FDB:
-simplyhtml.textToFind=\u67E5\u627E\u7684\u6587\u672C:
+simplyhtml.textToFind=\u67E5\u627E\u6587\u672C:
 simplyhtml.thisCellRangeLabel=\u6B64\u5355\u5143\u683C
 simplyhtml.thisColRangeLabel=\u6B64\u5217
 simplyhtml.thisRowRangeLabel=\u6B64\u884C
@@ -1818,16 +1888,55 @@ simplyhtml.valignLabel=\u5782\u76F4\u5BF9\u9F50:
 simplyhtml.valignMiddle=\u4E2D\u95F4
 simplyhtml.valignTop=\u9876\u90E8
 simplyhtml.wholeWordsOnly=\u5168\u5B57\u5339\u914D
-simplyhtml.wholeWordsOnly.tooltip=\u4E25\u683C\u5339\u914D\u5168\u5B57\u3002
+simplyhtml.wholeWordsOnly.tooltip=\u4E25\u683C\u5339\u914D\u5168\u5B57.
+slide.add=\u6DFB\u52A0
+slide.add.tooltip=\u5C06\u5F53\u524D\u9009\u5B9A\u7684\u8282\u70B9\u6DFB\u52A0\u5230\u5E7B\u706F\u7247
+slide.at_center.tooltip=\u5728\u4E2D\u95F4
+slide.content=\u5E7B\u706F\u7247\u5185\u5BB9
+slide.descendants=\u663E\u793A\u5B50\u96C6
+slide.edge=\u5728\u8FB9\u7F18
+slide.filter=\u8FC7\u6EE4
+slide.first=\u7B2C\u4E00\u4E2A
+slide.last=\u6700\u540E\u4E00\u4E2A
+slide.next=\u4E0B\u4E00\u4E2A
+slide.nofilter=\u4E0D\u8FC7\u6EE4
+slide.on_the_left.tooltip=\u5728\u5DE6\u8FB9
+slide.on_the_right.tooltip=\u5728\u5DE6\u8FB9
+slide.placenode=\u653E\u7F6E\u9009\u5B9A\u7684\u8282\u70B9
+slide.placenode.tooltip=\u5F53\u5E7B\u706F\u7247\u88AB\u663E\u793A\u65F6
+slide.present=\u8FD0\u884C
+slide.presentation=\u6F14\u793A
+slide.presentations=\u6240\u6709\u6F14\u793A
+slide.previous=\u4E0A\u4E00\u4E2A
+slide.remove=\u79FB\u9664
+slide.remove.tooltip=\u4ECE\u5E7B\u706F\u7247\u79FB\u9664\u5F53\u524D\u9009\u5B9A\u7684\u8282\u70B9
+slide.select=\u9009\u62E9
+slide.select.tooltip=\u5728\u601D\u7EF4\u5BFC\u56FE\u4E0A\u9009\u62E9\u5E7B\u706F\u7247\u8282\u70B9
+slide.set=\u8BBE\u7F6E
+slide.set.tooltip=\u5C06\u5F53\u524D\u9009\u5B9A\u7684\u8282\u70B9\u4F5C\u4E3A\u5E7B\u706F\u7247\u5185\u5BB9
+slide.setfilter=\u8BBE\u7F6E\u8FC7\u6EE4
+slide.setfilter.tooltip=\u5F53\u5E7B\u706F\u7247\u88AB\u663E\u793A\u65F6\u8BBE\u7F6E\u6216\u79FB\u9664\u8FC7\u6EE4\u5668
+slide.setfoldingstate=\u8BBE\u7F6E\u6298\u53E0
+slide.setfoldingstate.tooltip=\u5F53\u5E7B\u706F\u7247\u88AB\u663E\u793A\u65F6\u8FD8\u539F\u5F53\u524D\u6298\u53E0
+slide.setzoom=\u8BBE\u7F6E\u7F29\u653E
+slide.setzoom.tooltip=\u5F53\u5E7B\u706F\u7247\u88AB\u663E\u793A\u65F6\u8BBE\u7F6E\u6216\u79FB\u9664\u601D\u7EF4\u5BFC\u56FE\u7F29\u653E
+slide.showancestors=\u663E\u793A\u7236\u96C6
+slide.showonlyselected=\u4EC5\u663E\u793A\u9009\u5B9A\u7684\u8282\u70B9
+slide.showonlyselected.tooltip=\u5F53\u524D\u5E7B\u706F\u7247\u88AB\u663E\u793A\u65F6\u9690\u85CF\u5176\u5B83\u8282\u70B9
+slide.slides=\u5E7B\u706F\u7247
+slide.stop=\u505C\u6B62
 SortNodes.text=\u6392\u5E8F\u5B50\u8282\u70B9
 SortNodes.tooltip=\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5E8F\u6240\u6709\u5B50\u8282\u70B9.
 split=(&S)\u62C6\u5206
 SplitConditionAction.text=\u62C6\u5206
-SplitNode.text=\u62C6\u5206\u8282\u70B9(S)
+SplitNode.text=\u62C6\u5206\u8282\u70B9
 SplitNode.tooltip=<html>\u8282\u70B9\u62C6\u5206</html>
-SplitToWordsAction.text=Split with {0} words in line
+SplitToWordsAction.text=\u6BCF {0} \u5B57\u4E3A\u4E00\u884C
 STANDARD_FORMAT=\u6807\u51C6
+StartPresentationAction.text=\u8FD0\u884C\u6F14\u793A
+StartPresentationOrShowNextSlideAction.text=\u8FD0\u884C\u6F14\u793A/\u4E0B\u4E00\u5F20\u5E7B\u706F\u7247
 stop_processing=\u505C\u6B62
+StopPresentationAction.text=\u505C\u6B62\u6F14\u793A
 StringFlavorHandler=\u7EAF\u6587\u672C\u4F5C\u4E3A\u8282\u70B9\u5C42\u6B21\u7ED3\u6784
 StructuredHtmlFlavorHandler=HTML\u4F5C\u4E3A\u8282\u70B9\u5C42\u6B21\u7ED3\u6784
 style=\u6837\u5F0F
@@ -1835,7 +1944,7 @@ style_already_exists=\u6837\u5F0F\u5DF2\u7ECF\u5B58\u5728\u3002
 styledialog.cancel.text=\u53D6\u6D88
 styledialog.ok.text=\u786E\u5B9A
 styles=\u6837\u5F0F
-styles.AutomaticLayout=\u5E94\u7528\u5C42\u6B21\u6837\u5F0F
+styles.AutomaticLayout=\u81EA\u52A8\u5E03\u5C40
 styles.connection=\u8FDE\u63A5\u70B9
 styles.date=\u65E5\u671F
 styles.definition=\u5B9A\u4E49
@@ -1853,16 +1962,16 @@ styles.predefined=\u9884\u5B9A\u4E49\u6837\u5F0F
 styles.question=\u95EE\u9898
 styles.quotation=\u5F15\u8FF0
 styles.root_node=\u6837\u5F0F
-styles.subsubtopic=\u6B21\u5B50\u6807\u9898
-styles.subtopic=\u5B50\u6807\u9898
-styles.topic=\u6807\u9898
+styles.subsubtopic=\u5B50\u6807\u9898
+styles.subtopic=\u526F\u6807\u9898
+styles.topic=\u4E3B\u6807\u9898
 styles.user-defined=\u7528\u6237\u81EA\u5B9A\u4E49\u6837\u5F0F
 styles.website=\u7F51\u7AD9
-styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\n About this style set\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n This standard was developed after 11 years pedagogy research about how to make the process o [...]
+styles_background_html=\n <html>\n <head>\n </head>\n <body>\n <table width="800" style="text-align: left; vertical-align: top">\n <tr valign="top">\n <th>\n <div style="margin-top: 0pt; margin-right: 0pt; margin-bottom: 0pt; margin-left: 0pt; text-align: center; font-weight: bold">\n \u5173\u4E8E\u672C\u98CE\u683C\u96C6\n </div>\n <div style="text-align: left; font-weight: normal">\n <div style="margin: 3pt">\n \u5BF9\u5982\u4F55\u4F7F\u5904\u7406\u77E5\u8BC6\u66F4\u7B80\u4FBF\u548C\u66 [...]
 styles_menu=\u53EF\u7528\u7684\u6837\u5F0F
 submenu_keystroke_in_use_error=\u5B50\u83DC\u5355{1}\u4E0D\u80FD\u4F7F\u7528\u6309\u952E{0}\u3002\u6309\u952E\u5DF2\u5220\u9664\u3002
 summary_nodes=\u603B\u7ED3\u8282\u70B9
-summary_not_possible=\u65E0\u6CD5\u5BF9\u76EE\u524D\u9009\u53D6\u7684\u5EFA\u7ACB\u603B\u7ED3\u8282\u70B9
+summary_not_possible=\u65E0\u6CD5\u4E3A\u5F53\u524D\u9009\u5B9A\u7684\u8282\u70B9\u6DFB\u52A0\u603B\u7ED3\u8282\u70B9
 svg=SVG
 template_dir=\u6807\u51C6\u6A21\u7248
 TextAlignAction.CENTER.text=\u6587\u5B57\u5C45\u4E2D
@@ -1871,7 +1980,7 @@ TextAlignAction.LEFT.text=\u6587\u5B57\u5DE6\u5BF9\u9F50
 TextAlignAction.RIGHT.text=\u6587\u5B57\u53F3\u5BF9\u9F50
 textalignment=\u6587\u5B57\u5BF9\u9F50
 TextChangeHotKeyAction.text=\u8BBE\u5B9A\u6539\u53D8\u6587\u672C\u7684\u70ED\u952E
-TimeListAction.text=\u663E\u793A\u65E5\u7A0B\u5B89\u6392 ...
+TimeListAction.text=\u663E\u793A\u65E5\u7A0B\u5B89\u6392...
 TimeListAction.tooltip=\u663E\u793A\u6240\u6709\u65E5\u7A0B\u53CA\u76F8\u5E94\u8282\u70B9.
 TimeManagementAction.text=\u663E\u793A\u65E5\u5386...
 TimeManagementAction.tooltip=<html>\u663E\u793A\u65E5\u5386\u6A21\u5757 by Kai Toedter.</html>
@@ -1883,7 +1992,7 @@ TimePeriodUnits.seconds=\u79D2
 TimePeriodUnits.weeks=\u5468
 ToggleChildrenFoldedAction.text=\u5C55\u5F00/\u6298\u53E0\u5B50\u8282\u70B9
 ToggleDetailsAction.text=\u9690\u85CF\u8282\u70B9\u7EC6\u8282
-ToggleFBarAction.text=F-Bar
+ToggleFBarAction.text=\u5FEB\u6377\u529F\u80FD\u680F
 ToggleFoldedAction.text=\u5C55\u5F00/\u6298\u53E0\u8282\u70B9
 ToggleFullScreenAction.text=\u5168\u5C4F\u6A21\u5F0F
 ToggleLeftToolbarAction.text=\u56FE\u6807\u5DE5\u5177\u680F
@@ -1891,8 +2000,7 @@ ToggleMenubarAction.text=\u83DC\u5355\u680F
 ToggleScrollbarsAction.text=\u6EDA\u52A8
 ToggleStatusAction.text=\u663E\u793A\u72B6\u6001\u5217
 ToggleToolbarAction.text=\u5DE5\u5177\u680F
-toolbars=\u5DE5\u5177\u680F
-TranslatedElement.BORDER=\u8FB9\u7F18\u6587\u672C
+TranslatedElement.BORDER=\u8FB9\u6846\u6587\u672C
 TranslatedElement.TEXT=\u6587\u672C
 TranslatedElement.TOOLTIP=\u63D0\u793A
 uiTextChanger.originalTextIsNotDefined=\u521D\u59CB\u6587\u672C\u672A\u5B9A\u4E49
@@ -1905,9 +2013,9 @@ UndoAction.text=\u64A4\u9500
 UndoFilterAction.text=\u64A4\u9500
 unfold=\u5C55\u5F00
 UnfoldAllAction.text=\u5C55\u5F00\u6240\u6709
-UnfoldAllAction.tooltip=<html>\u5C55\u5F00\u9009\u5B9A\u7684\u8282\u70B9\u53CA\u5176\u6240\u6709\u5B50\u8282\u70B9\u3002</html>
+UnfoldAllAction.tooltip=<html>\u5C55\u5F00\u9009\u5B9A\u7684\u8282\u70B9\u53CA\u5176\u6240\u6709\u5B50\u8282\u70B9.</html>
 UnfoldOneLevelAction.text=\u5C55\u5F00\u4E00\u7EA7
-UnfoldOneLevelAction.tooltip=\u5C55\u5F00\u9009\u5B9A\u8282\u70B9\u7684\u4E00\u7EA7\u3002
+UnfoldOneLevelAction.tooltip=\u5C55\u5F00\u9009\u5B9A\u8282\u70B9\u7684\u4E00\u7EA7.
 unparsedLatexPatternFormat=\u672A\u89E3\u6790\u7684 LaTeX
 up=\u5411\u4E0A
 UpConditionAction.text=\u4E0A
@@ -1941,7 +2049,7 @@ view=\u89C6\u56FE(&V)
 ViewLayoutTypeAction.OUTLINE.text=\u5927\u7EB2\u89C6\u56FE
 web_resources=\u7F51\u7EDC\u8D44\u6E90
 WebDocuAction.text=Web \u6587\u6863
-WhatsNewAction.text=What's new in Freeplane 1.5.x
+WhatsNewAction.text=Freeplane 1.5.x \u7684\u65B0\u529F\u80FD
 width=\u5BBD\u5EA6
 wrong_regexp=\u9519\u8BEF\u7684\u6B63\u5219\u8868\u8FBE\u5F0F"{0}"\uFF0C\u9519\u8BEF\uFF1A{1}
 xslt_export.html=HTML \u6587\u6863
@@ -1951,7 +2059,7 @@ xslt_export.mediawiki=Mediawiki
 xslt_export.ms_excel=Excel (2003 \u548C\u4E4B\u540E\u7248\u672C) XML \u683C\u5F0F
 xslt_export.ms_project=MS Project (2003 \u548C\u4E4B\u540E\u7248\u672C) XML \u683C\u5F0F
 xslt_export.ms_word=Word (2003 \u548C\u4E4B\u540E\u7248\u672C) XML \u683C\u5F0F
-xslt_export.text=\u7EAF\u6587\u5B57
+xslt_export.text=\u7EAF\u6587\u672C
 xslt_export_not_possible=\u4E0D\u5141\u8BB8Freeplane XSLT\u5BFC\u51FA
 yes=\u662F
 zoom=\u7F29\u653E
diff --git a/freeplane/resources/translations/Resources_zh_TW.properties b/freeplane/resources/translations/Resources_zh_TW.properties
index 0ce08a3..f34cff0 100644
--- a/freeplane/resources/translations/Resources_zh_TW.properties
+++ b/freeplane/resources/translations/Resources_zh_TW.properties
@@ -20,8 +20,6 @@ accessories/plugins/ExportWithTWiki.tooltip=\u5C07\u5FC3\u667A\u5716\u532F\u51FA
 accessories/plugins/ExportWithXSLT.tooltip=\u9019\u662F\u4F7F\u7528 XSLT \u7684\u5236\u5F0F\u8F38\u51FA\u65B9\u5F0F\u3002
 accessories/plugins/ExportWithXSLT_Applet.text=\u5B58\u6210 Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=\u532F\u51FA\u5FC3\u667A\u5716\u70BA java browser applet\u3002
-accessories/plugins/ExportWithXSLT_Flash.text=\u532F\u51FA\u6210 Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=\u532F\u51FA\u5FC3\u667A\u5716\u70BA Flash \u61C9\u7528\u7A0B\u5F0F\u3002
 accessories/plugins/ExportWithXSLT_HTML.text=\u532F\u51FA\u6210 XHTML (JavaScript \u7248)...
 accessories/plugins/ExportWithXSLT_HTML3.text=\u532F\u51FA\u6210 XHTML (\u53EF\u9EDE\u9078\u5716\u50CF\u7248)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=\u5C07\u8CC7\u6E90\u7BC0\u9EDE\u8F49\u6210 TaskJuggler \u6A94\u6848...
@@ -182,7 +180,6 @@ cannot_delete_root=\u4E3B\u7BC0\u9EDE\u4E0D\u53EF\u522A\u9664\u6216\u526A\u4E0B\
 cannot_join_nodes_with_children=\u6709\u5B50\u7BC0\u9EDE\u7684\u4E0D\u80FD\u5408\u4F75
 cannot_move_to_child=\u4E0D\u80FD\u628A\u7BC0\u9EDE\u79FB\u5230\u5B83\u7684\u5B50\u7BC0\u9EDE.
 CenterAction.text=\u79FB\u81F3\u4E2D\u9593
-CenterSelectedNodeAction.text=\u5C07\u9078\u53D6\u7684\u7BC0\u9EDE\u79FB\u5230\u4E2D\u5FC3
 ChangeConnectorArrowsAction.backward.text=\u5F80\u5F8C
 ChangeConnectorArrowsAction.both.text=\u96D9\u5411
 ChangeConnectorArrowsAction.forward.text=\u5F80\u524D
@@ -196,7 +193,6 @@ ChangeNodeLevelLeftsAction.text=\u5C07\u7BC0\u9EDE\u79FB\u5230\u5DE6\u908A
 ChangeNodeLevelLeftsAction.tooltip=\u4E3B\u7BC0\u9EDE\u5DE6\u908A\u7684\u7BC0\u9EDE\u6703\u964D\u4E00\u968E\u8B8A\u6210\u5B83\u4E0A\u65B9\u5144\u5F1F\u7BC0\u9EDE\u7684\u5B50\u7BC0\u9EDE\u3002\u4E3B\u7BC0\u9EDE\u53F3\u908A\u7684\u7BC0\u9EDE\u6703\u5347\u4E00\u968E\u8B8A\u6210\u5B83\u4E0A\u65B9\u5144\u5F1F\u7BC0\u9EDE\u7684\u7236\u7BC0\u9EDE\u3002
 ChangeNodeLevelRightsAction.text=\u5C07\u7BC0\u9EDE\u79FB\u5230\u53F3\u908A
 ChangeNodeLevelRightsAction.tooltip=\u4E3B\u7BC0\u9EDE\u53F3\u908A\u7684\u7BC0\u9EDE\u6703\u964D\u4E00\u968E\u8B8A\u6210\u5B83\u4E0A\u65B9\u5144\u5F1F\u7BC0\u9EDE\u7684\u5B50\u7BC0\u9EDE\u3002\u4E3B\u7BC0\u9EDE\u5DE6\u908A\u7684\u7BC0\u9EDE\u6703\u5347\u4E00\u968E\u8B8A\u6210\u5B83\u4E0A\u65B9\u5144\u5F1F\u7BC0\u9EDE\u7684\u7236\u7BC0\u9EDE\u3002
-choose_background_color=\u9078\u64C7\u80CC\u666F\u984F\u8272\uFF1A
 choose_cloud_color=\u9078\u64C7\u96F2\u7684\u984F\u8272\uFF1A
 choose_edge_color=\u9078\u64C7\u5206\u652F\u7DDA\u984F\u8272
 choose_map_background_color=\u9078\u64C7\u5FC3\u667A\u5716\u7684\u80CC\u666F\u984F\u8272
@@ -230,7 +226,7 @@ CopyAttributes.text=\u8907\u88FD\u5C6C\u6027
 CopyIDAction.text=\u8907\u88FD\u7BC0\u9EDE\u8EAB\u5206\u78BC (ID)
 CopyMapStylesAction.text=\u8907\u88FD\u5FC3\u667A\u5716\u6A23\u5F0F...
 CopyNodeURIAction.text=\u8907\u88FD\u7BC0\u9EDE\u9023\u7D50\u7DB2\u5740 (URI)
-copyright=\u7248\u6B0A\u6240\u6709 \u00A9 2000-2016 Freeplane \u5718\u968A\u548C\u5176\u4ED6\u4EBA
+copyright=\u7248\u6B0A\u6240\u6709 \u00A9 2000-2017 Freeplane \u5718\u968A\u548C\u5176\u4ED6\u4EBA
 CopySingleAction.text=\u8907\u88FD\u55AE\u4E00\u7BC0\u9EDE
 CopySingleAction.tooltip=\u50C5\u8907\u88FD\u9078\u53D6\u7684\u7BC0\u9EDE
 CopyStyleExtensionsAction.text=\u532F\u5165\u7BC0\u9EDE\u5EF6\u4F38\u6027\u8CEA\u7684\u6A23\u5F0F
@@ -346,8 +342,6 @@ ExecuteScripts.noScriptsAvailable=\u6C92\u6709\u53EF\u7528\u7684 scripts
 ExecuteScripts.text=\u57F7\u884C script \u6307\u4EE4
 ExecuteScriptSecurityError.text=Scripts \u57F7\u884C\u6642\u51FA\u73FE\u932F\u8AA4: {0}
 export_failed=\u532F\u51FA\u5931\u6557
-export_pdf_text=PDF\u6A94
-export_svg_text=SVG \u6A94 (\u53EF\u7E2E\u653E\u5411\u91CF\u5716\u5F62\u6A94)
 export_using_xslt=\u4F7F\u7528 XSLT \u532F\u51FA
 ExportAction.text=(E)\u532F\u51FA\u5FC3\u667A\u5716...
 ExportBranchAction.text=\u5C07\u5206\u652F\u79FB\u5230\u65B0\u7684\u5FC3\u667A\u5716...
@@ -688,7 +682,6 @@ latex_editor=\u7DE8\u8F2F LaTeX \u6578\u5B78\u5F0F
 LatexDeleteLatexAction.text=\u79FB\u9664 LaTeX \u6578\u5B78\u5F0F
 LatexEditLatexAction.text=(L)\u7DE8\u8F2F LaTeX \u6578\u5B78\u5F0F...
 LatexInsertLatexAction.msg1=<html>\u60A8\u5617\u8A66\u63D2\u5165\u4E00\u500B<i>\u820A\u5F0F</i>\u7684 LaTeX \u6578\u5B78\u5F0F\u3002<br/>\u65B0\u65B9\u6CD5\u5EFA\u7ACB LaTeX \u6587\u5B57/\u6578\u5B78\u5F0F\u63CF\u8FF0\u65BC\u6B64\u9801\u9762\u4E0A\uFF1A</html>
-LatexInsertLatexAction.msg2=<html>\u7E3D\u4E4B\uFF1A<ul><li>\u5728\u7BC0\u9EDE\u6587\u5B57\u4F7F\u7528 "\\latex" \u524D\u7DB4\u6216\u662F</li><li><i>\u6AA2\u8996 -> \u6027\u8CEA\u9762\u677F</i>\uFF0C\u7136\u5F8C<i>\u7BC0\u9EDE\u6838\u5FC3 -> \u683C\u5F0F -> Latex</i></li></ul></html>
 LatexInsertLatexAction.text=(L)\u65B0\u589E LaTeX \u6578\u5B78\u5F0F...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -810,6 +803,7 @@ ModesMenuAction.Browse.text=\u5FC3\u667A\u5716\u700F\u89BD\u5668
 ModesMenuAction.File.text=\u6A94\u6848\u7E3D\u7BA1
 ModesMenuAction.MindMap.text=\u5FC3\u667A\u5716\u7DE8\u8F2F\u5668
 most_recent_files=\u6700\u8FD1\u958B\u555F\u7684\u6A94\u6848
+MoveSelectedNodeAction.CENTER.text=\u5C07\u9078\u53D6\u7684\u7BC0\u9EDE\u79FB\u5230\u4E2D\u5FC3
 MoveToRootAction.text=\u79FB\u5230\u4E3B\u7BC0\u9EDE
 NameConditionAction.text=\u8A2D\u5B9A\u540D\u7A31
 navigate=(&N)\u5C0E\u89BD
@@ -848,7 +842,6 @@ NextNodeAction.BACK.text=\u5230\u524D\u4E00\u500B\u7BC0\u9EDE
 NextNodeAction.BACK_N_FOLD.text=\u5230\u524D\u4E00\u500B\u7BC0\u9EDE\u4E26\u647A\u758A\u8A72\u7BC0\u9EDE
 NextNodeAction.FORWARD.text=\u5230\u5F8C\u4E00\u500B\u7BC0\u9EDE
 NextNodeAction.FORWARD_N_FOLD.text=\u5230\u5F8C\u4E00\u500B\u7BC0\u9EDE\u4E26\u647A\u758A\u8A72\u7BC0\u9EDE
-NextPresentationItemAction.text=\u6253\u958B\u4E0B\u4E00\u500B\u7C21\u5831\u9805\u76EE
 no=\u5426
 no_copy_attributes_before_paste_attributes=\u60A8\u7121\u6CD5\u5728\u8907\u88FD\u5C6C\u6027\u524D\u5C31\u53BB\u8CBC\u4E0A\u5C6C\u6027\u3002
 NO_FORMAT=\u7D14\u6587\u5B57
@@ -888,6 +881,7 @@ not_saved_for_image_error=\u8A2D\u5B9A\u5716\u7247\u524D\u5FC5\u9808\u5148\u5132
 not_saved_for_link_error=\u8A2D\u5B9A\u9023\u7D50\u524D\u5FC5\u9808\u5148\u5132\u5B58\u5FC3\u667A\u5716
 note_window_location=\u8A3B\u89E3\u8996\u7A97\u4F4D\u7F6E
 notes=\u8A3B\u89E3
+NotFoldingNextPresentationItemAction.text=\u6253\u958B\u4E0B\u4E00\u500B\u7C21\u5831\u9805\u76EE
 ok=(&O)\u78BA\u5B9A
 OKAction.text=(O)\u78BA\u5B9A
 OnlineReference.text=\u53C3\u8003\u624B\u518A
@@ -1153,8 +1147,6 @@ OptionPanel.placenewbranches=\u65B0\u589E\u5B50\u7BC0\u9EDE\u4F4D\u7F6E
 OptionPanel.placenewbranches.tooltip=<html>\u7B2C\u4E00\u500B\u6216\u6700\u5F8C\u4E00\u500B</html>
 OptionPanel.plugin.tooltip=\u975E\u6838\u5FC3\u5916\u639B\u5143\u4EF6\u3002
 OptionPanel.plugins=\u5916\u639B\u5143\u4EF6
-OptionPanel.presentation_dimmer_transparency=\u7C21\u5831\u6697\u8655\u7684\u900F\u660E\u5EA6
-OptionPanel.presentation_mode=\u7C21\u5831\u6A21\u5F0F
 OptionPanel.printonwhitebackground=<html>\u5217\u5370\u6642\u4F7F\u7528\u767D\u8272\u5E95\u8272</html>
 OptionPanel.printonwhitebackground.tooltip=<html>\u5217\u5370\u6642\u7E3D\u662F\u4F7F\u7528\u767D\u5E95\u7576\u80CC\u666F</html>
 OptionPanel.pt_BR=Portugu\u00EAs- Brasil (\u5DF4\u897F\u8461\u8404\u7259\u6587)
@@ -1250,7 +1242,6 @@ OptionPanel.separator.single_instance_mode=\u55AE\u4E00\u7A0B\u5F0F\u57F7\u884C\
 OptionPanel.separator.size_limits=\u5927\u5C0F\u9650\u5236
 OptionPanel.separator.spelling=\u62FC\u5B57\u6AA2\u67E5\u9078\u9805
 OptionPanel.separator.status=\u72C0\u614B\u5217
-OptionPanel.separator.tooltip=\u5DE5\u5177\u63D0\u793A\u6642\u9593
 OptionPanel.separator.undo=\u5FA9\u539F
 OptionPanel.separator.updates=\u7A0B\u5F0F\u66F4\u65B0
 OptionPanel.set_property_text=\u66F4\u6539
@@ -1332,7 +1323,6 @@ OptionPanel.use_common_out_point_for_root_node=\u5206\u652F\u7DDA\u4F86\u81EA\u4
 OptionPanel.use_common_out_point_for_root_node.tooltip=\u5206\u652F\u7DDA\u5F9E\u4E3B\u7BC0\u9EDE\u4E0A\u7684\u4E00\u500B\u9EDE\u958B\u59CB
 OptionPanel.use_tabbed_pane=\u9801\u7C3D\u6A21\u5F0F
 OptionPanel.use_tabbed_pane.tooltip=\u5982\u679C\u9078\u5B9A\u5FC3\u667A\u5716\u986F\u793A\u5728\u9801\u7C3D\u4E2D(\u985E\u4F3C FireFox :-) )\u3002
-OptionPanel.user_defined_screen_resolution=\u4F7F\u7528\u8005\u5B9A\u7FA9\u7684\u87A2\u5E55\u89E3\u6790\u5EA6 (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripting\uFF1A\u8A2D\u5B9A\u985E\u5225\u8DEF\u5F91\u6642\u5FC5\u9808\u5141\u8A31\u6A94\u6848\u8B80\u53D6\uFF01
 OptionPanel.validate_invalid_date_format=\u7121\u6548\u7684\u65E5\u671F\u683C\u5F0F
 OptionPanel.validate_invalid_datetime_format=\u7121\u6548\u7684\u65E5\u671F-\u6642\u9593\u683C\u5F0F
@@ -1546,7 +1536,6 @@ ShowAncestorsAction.text=\u986F\u793A\u7956\u5148\u7BC0\u9EDE
 ShowAttributeDialogAction.text=\u5C6C\u6027\u7BA1\u7406\u5E2B...
 ShowDescendantsAction.text=\u986F\u793A\u5B50\u5B6B\u7BC0\u9EDE
 ShowFilterToolbarAction.text=\u7BE9\u9078\u5668\u5DE5\u5177\u5217
-ShowFormatPanel.text=\u6027\u8CEA\u9762\u677F
 ShowFormatPanel.tooltip=\u5448\u73FE\u4E00\u500B\u5C0D\u8A71\u8996\u7A97\uFF0C\u5176\u4E2D\u7BC0\u9EDE\u548C\u5206\u652F\u7DDA\u7684\u5C6C\u6027\u53EF\u4EE5\u540C\u6642\u4FEE\u6539\u3002
 ShowHideNoteAction.text=\u8A3B\u89E3\u8996\u7A97
 ShowHideNoteAction.tooltip=\u5141\u8A31\u958B\u555F\u6216\u95DC\u9589\u8A3B\u89E3\u8996\u7A97\u3002
@@ -1796,7 +1785,6 @@ ToggleMenubarAction.text=\u9078\u55AE\u5217
 ToggleScrollbarsAction.text=\u6372\u8EF8
 ToggleStatusAction.text=\u986F\u793A\u72C0\u614B\u5217
 ToggleToolbarAction.text=(T)\u5DE5\u5177\u5217
-toolbars=\u5DE5\u5177\u5217
 undefined_error=\u975E\u9810\u671F\u7684\u932F\u8AA4\uFF0C\u8ACB\u63D0\u51FA\u932F\u8AA4\u5831\u544A\u3002
 underline=\u5E95\u7DDA
 UnderlineAction.text=\u5E95\u7DDA
diff --git a/freeplane/resources/xml/ExportWithXSLT.xml b/freeplane/resources/xml/ExportWithXSLT.xml
index 1a3c1c1..49463a6 100644
--- a/freeplane/resources/xml/ExportWithXSLT.xml
+++ b/freeplane/resources/xml/ExportWithXSLT.xml
@@ -33,7 +33,7 @@
             file_type="html"
             xslt_file="/xslt/freeplane2applet.xsl"
             create_dir="true"
-            files_to_copy="${org.freeplane.core.dir.lib}freeplaneviewer.jar,/html/freeplane_applet.jnlp"
+            files_to_copy="${org.freeplane.core.dir.lib}freeplaneviewer.jar,${org.freeplane.core.dir.lib}kitfox-svg-salamander-1.1.1-p1.jar,/html/freeplane_applet.jnlp"
             file_prefix=""
             copy_map="true"
             copymode="FILE"
@@ -44,18 +44,21 @@
             				use_common_out_point_for_root_node"/>
     </action>
     <action
-        name="accessories/plugins/ExportWithXSLT_Flash"
+        name="accessories/plugins/Export_JavaWebStart"
     >
         <properties
-            file_type="html"
-            xslt_file="/xslt/freeplane2flash.xsl"
+            file_type="jnlp"
+            xslt_file="/xslt/freeplane2ws.xsl"
             create_dir="true"
-            files_to_copy="visorFreeplane.swf,flashobject.js"
-            file_prefix="/flash/"
+            files_to_copy="${org.freeplane.core.dir.lib}freeplaneviewer.jar,${org.freeplane.core.dir.lib}kitfox-svg-salamander-1.1.1-p1.jar,"
+            file_prefix=""
             copy_map="true"
-            copymode="EXPORT"
+            copymode="FILE"
             mode="FILE"
-            load_file="true" />
+            load_file="true" 
+            set_properties="show_note_icons,
+            				show_icon_for_attributes,
+            				use_common_out_point_for_root_node"/>
     </action>
     <action
         name="accessories/plugins/ExportWithXSLT_TASKSTJI"
diff --git a/freeplane/resources/xml/mapVersions.xml b/freeplane/resources/xml/mapVersions.xml
index 5cfdf2a..f650d56 100644
--- a/freeplane/resources/xml/mapVersions.xml
+++ b/freeplane/resources/xml/mapVersions.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MapVersions>
+	<dialect name="FREEPLANE1_6_0" version = "10" versionBegin="freeplane 1.6.0"  needsConversion="false" anotherDialect="false" appName="Freeplane" url="http://www.freeplane.org" />
 	<dialect name="FREEPLANE1_5_9" version = "9" versionBegin="freeplane 1.5.9"  needsConversion="false" anotherDialect="false" appName="Freeplane" url="http://www.freeplane.org" />
 	<dialect name="FREEPLANE1_5_6" version = "8" versionBegin="freeplane 1.5.6"  needsConversion="false" anotherDialect="false" appName="Freeplane" url="http://www.freeplane.org" />
 	<dialect name="FREEPLANE1_5_5" version = "7" versionBegin="freeplane 1.5.5"  needsConversion="false" anotherDialect="false" appName="Freeplane" url="http://www.freeplane.org" />
diff --git a/freeplane/resources/xslt/freeplane2applet.xsl b/freeplane/resources/xslt/freeplane2applet.xsl
index 1f673fb..25ab50b 100644
--- a/freeplane/resources/xslt/freeplane2applet.xsl
+++ b/freeplane/resources/xslt/freeplane2applet.xsl
@@ -26,19 +26,11 @@
 
   <xsl:output method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" 
     doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    encoding="us-ascii"/>
+    encoding="utf-8"
+    indent="yes"/>
  
 <!-- fc, 20.10.2004: The following parameters are set by freeplane. -->
 <xsl:param name="destination_dir">./</xsl:param>
-<xsl:param name="area_code"></xsl:param>
-<xsl:param name="folding_type">html_export_no_folding</xsl:param>
-	<!-- possible values: 
-		html_export_fold_all, 
-		html_export_no_folding, 
-		html_export_fold_currently_folded, 
-		html_export_based_on_headings: this means, that approx. five levels are given, more deeper nodes are folded.
-		As of the time being, this parameter is not used.
-		-->
 <xsl:param name="propertyList"/>
 <!--
     
@@ -62,7 +54,7 @@ html { height:100% }
             <xsl:attribute name="archive">
             <xsl:text>./</xsl:text>
             <xsl:value-of select="$destination_dir"/>
-            <xsl:text>./freeplaneviewer.jar</xsl:text>
+            <xsl:text>./freeplaneviewer.jar,./kitfox-svg-salamander-1.1.1-p1.jar</xsl:text>
             </xsl:attribute>
             <xsl:attribute name="width">100%</xsl:attribute>
             <xsl:attribute name="height">100%</xsl:attribute>
diff --git a/freeplane/resources/xslt/freeplane2flash.xsl b/freeplane/resources/xslt/freeplane2flash.xsl
deleted file mode 100644
index 3a1dc09..0000000
--- a/freeplane/resources/xslt/freeplane2flash.xsl
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <!--
-/*Freeplane - A Program for creating and viewing Mindmaps
- *Copyright (C) 2006  Christian Foltin <christianfoltin at users.sourceforge.net>
- *See COPYING for Details
- *
- *This program is free software; you can redistribute it and/or
- *modify it under the terms of the GNU General Public License
- *as published by the Free Software Foundation; either version 2
- *of the License, or (at your option) any later version.
- *
- *This program is distributed in the hope that it will be useful,
- *but WITHOUT ANY WARRANTY; without even the implied warranty of
- *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *GNU General Public License for more details.
- *
- *You should have received a copy of the GNU General Public License
- *along with this program; if not, write to the Free Software
- *Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-      
-  -->
-
-  <xsl:output method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-  indent="yes" 
-  doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
- 
-<!-- fc, 20.10.2004: The following parameter is set by freeplane. -->
-<xsl:param name="destination_dir">./</xsl:param>
-<xsl:param name="area_code"></xsl:param>
-<xsl:param name="folding_type">html_export_no_folding</xsl:param>
-	<!-- possible values: 
-		html_export_fold_all, 
-		html_export_no_folding, 
-		html_export_fold_currently_folded, 
-		html_export_based_on_headings: this means, that approx. five levels are given, more deeper nodes are folded.
-		As of the time being, this parameter is not used.
-		-->
-<!--
-    
-    -->
-  <xsl:template match="/">
-  <xsl:variable name="bgcolor">
-  		<xsl:choose>
-		<xsl:when test="map/node/hook[@NAME='MapStyle']/@background">
-			<xsl:value-of select="map/node/hook[@NAME='MapStyle']/@background"/>
-		</xsl:when> 
-		<xsl:otherwise>
-			<xsl:text>#ffffff</xsl:text>
-		</xsl:otherwise>
-		</xsl:choose>
-  </xsl:variable>
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-      <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-		<title><xsl:call-template name="output-title" /></title>
-        <xsl:element name="script">
-            <xsl:attribute name="type">text/javascript</xsl:attribute>
-            <xsl:attribute name="src">./<xsl:value-of select="$destination_dir"/>flashobject.js</xsl:attribute>
-			<xsl:text> </xsl:text><!-- this space is a trick, such that firefox displays the flash...  :( -->
-		</xsl:element>
-<style type="text/css">
-	
-	/* hide from ie on mac \*/
-	html {
-		height: 100%;
-		overflow: hidden;
-	}
-	
-	#flashcontent {
-		height: 100%;
-	}
-	/* end hide */
-
-	body {
-		height: 100%;
-		margin: 0;
-		padding: 0;
-		background-color: <xsl:value-of select="$bgcolor"/>;
-	}
-
-</style>
-      </head>
-		<body>
-	<div id="flashcontent">
-		 Flash plugin or Javascript are turned off.
-		 Activate both  and reload to view the mindmap
-	</div>
-	
-	<script type="text/javascript">
-		var fo = new FlashObject("./<xsl:value-of select="$destination_dir"/>visorFreeplane.swf", "visorFreeplane", "100%", "100%", 8);
-		fo.addParam("quality", "high");
-		fo.addVariable("bgcolor", 0x<xsl:value-of select="substring-after($bgcolor, '#')"/>);
-		fo.addVariable("openUrl", "_blank");
-		fo.addVariable("initLoadFile", "./<xsl:value-of select="$destination_dir"/>map.mm");
-		fo.addVariable("startCollapsedToLevel","2");
-		fo.write("flashcontent");
-	</script>
-   		</body>
-    </html>
-  </xsl:template>
-
-<!-- from toxhtml.xsl -->
-
-	<xsl:template name="output-title">
-		<!-- look if there is any node inside the map (there should never be
-			none, but who knows?) and take its text as the title -->
-		<xsl:choose>
-		<xsl:when test="/map/node/@TEXT">
-			<xsl:value-of select="normalize-space(/map/node/@TEXT)" />
-		</xsl:when>
-		<xsl:when test="/map/node/richcontent[@TYPE='NODE']">
-			<xsl:variable name="t">
-				<xsl:apply-templates select="/map/node/richcontent[@TYPE='NODE']/html/body" mode="strip-tags" />			
-			</xsl:variable>
-			<xsl:value-of select="normalize-space($t)" />
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:text>Mind Map</xsl:text>
-		</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	
-	<xsl:template match="text()|@*"  mode="strip-tags">
-		  <xsl:value-of select="string(.)"/>
-	</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/freeplane/resources/xslt/freeplane2ws.xsl b/freeplane/resources/xslt/freeplane2ws.xsl
new file mode 100644
index 0000000..b6f9e0a
--- /dev/null
+++ b/freeplane/resources/xslt/freeplane2ws.xsl
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+  <!--
+/*Freeplane - A Program for creating and viewing Mindmaps
+ *Copyright (C) 2016 
+ *See COPYING for Details
+ *
+ *This program is free software; you can redistribute it and/or
+ *modify it under the terms of the GNU General Public License
+ *as published by the Free Software Foundation; either version 2
+ *of the License, or (at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program; if not, write to the Free Software
+ *Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+      
+  -->
+
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>
+ 
+<xsl:param name="file_ref"/>
+<xsl:param name="destination_dir"/>
+<xsl:param name="propertyList"/>
+<!--
+    
+    -->
+  <xsl:template match="/">
+  
+  	<xsl:element name="jnlp">
+  		<xsl:attribute name="spec">1.0+</xsl:attribute>
+  		<xsl:attribute name="href"><xsl:value-of select="$file_ref"/></xsl:attribute>
+  		<xsl:attribute name="codebase"><xsl:value-of select="$destination_dir"/></xsl:attribute>
+	    <information>
+	        <title>Freeplane Viewer Applet</title>
+	        <vendor>Freeplane Team</vendor>
+	    </information>
+	    <resources>
+	        <!-- Application Resources -->
+	        <j2se version="1.7+"
+	              href="http://java.sun.com/products/autodl/j2se"/>
+	              <jar href="freeplaneviewer.jar" main="true"/>
+	              <jar href="kitfox-svg-salamander-1.1.1-p1.jar" main="false"/>
+	    </resources>
+	    <security>
+	        <all-permissions/>
+	    </security>
+	    <applet-desc
+	         name="Freeplane Viewer Applet"
+	         main-class="org.freeplane.main.applet.FreeplaneApplet"
+	         width="800"
+	         height="600">
+			 <param name="browsemode_initial_map" value="./map.mm"/>
+			 <param name="selection_method" value="selection_method_direct"/>
+			 <param name="launched_by_java_web_start" value="true"/>
+			<xsl:call-template name="appletParameters">
+                <xsl:with-param name="propertyList" select="$propertyList"/>
+            </xsl:call-template>			 
+	     </applet-desc>
+	     <update check="background"/>
+  	</xsl:element>
+  
+   </xsl:template>
+
+    <xsl:template name="appletParameters">
+       <xsl:param name="propertyList"/>
+       <xsl:if test="$propertyList">
+            <xsl:variable name="property" select="substring-before($propertyList, '$$$')"/>
+            <xsl:variable name="name" select="substring-before($property, '=')"/>
+            <xsl:variable name="value" select="substring-after($property, '=')"/>
+            <xsl:call-template name="appletParam">
+                <xsl:with-param name="name" select="$name"/>
+                <xsl:with-param name="value" select="$value"/>
+            </xsl:call-template>
+            <xsl:variable name="otherProperties" select="substring-after($propertyList, '$$$')"/>
+            <xsl:call-template name="appletParameters">
+                <xsl:with-param name="propertyList" select="$otherProperties"/>
+            </xsl:call-template>
+       </xsl:if>
+    </xsl:template>
+	
+	<xsl:template name="appletParam">
+       <xsl:param name="name"/>
+       <xsl:param name="value"/>
+            <xsl:if test="$value">
+                <xsl:element name="param">
+                    <xsl:attribute name="name"><xsl:value-of select="$name"/></xsl:attribute>
+                    <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
+                </xsl:element>
+            </xsl:if>
+	</xsl:template>
+	
+	<xsl:template match="text()|@*"  mode="strip-tags">
+		  <xsl:value-of select="string(.)"/>
+	</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/freeplane/resources/xslt/xml2mm.xsl b/freeplane/resources/xslt/xml2mm.xsl
index 51291aa..0695988 100644
--- a/freeplane/resources/xslt/xml2mm.xsl
+++ b/freeplane/resources/xslt/xml2mm.xsl
@@ -20,7 +20,7 @@
 			<xsl:if test="not(ancestor::*)">
 				<hook NAME="MapStyle" background="#ffffff">
 					<properties show_icon_for_attributes="false"
-						fit_to_viewport="false;" />
+						fit_to_viewport="false" />
 
 					<map_styles>
 						<stylenode LOCALIZED_TEXT="styles.root_node" STYLE="oval"
diff --git a/freeplane/signjar.gradle b/freeplane/signjar.gradle
index 40b285f..7f7e433 100644
--- a/freeplane/signjar.gradle
+++ b/freeplane/signjar.gradle
@@ -21,6 +21,20 @@ task signViewerJarTsa {
     dependsOn viewerJar
 }
 
+task signSvgJarTsa {
+	onlyIf { props['signjar.alias'] && props['signjar.tsaurl'] }
+	doLast {
+		def svgJar = file('lib/kitfox-svg-salamander-1.1.1-p1.jar')
+		ant.signjar(jar: svgJar,
+			alias: props['signjar.alias'],
+			keystore: props['signjar.keystore'],
+			storetype: props['signjar.storetype'],
+			storepass: props['signjar.storepass'],
+			keypass: props['signjar.keypass'],
+			tsaurl: props['signjar.tsaurl'])
+	}
+}
+
 task signViewerJarNoTsa {
     onlyIf { props['signjar.alias'] && !props['signjar.tsaurl'] }
     doLast {
@@ -32,7 +46,6 @@ task signViewerJarNoTsa {
             storepass: props['signjar.storepass'],
             keypass: props['signjar.keypass'])
     }
-    dependsOn viewerJar
 }
 
 task doNotSignViewerJar {
diff --git a/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java b/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
new file mode 100644
index 0000000..7234d58
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/io/xml/LocalEntityResolver.java
@@ -0,0 +1,15 @@
+package org.freeplane.core.io.xml;
+
+import java.io.Reader;
+
+import org.freeplane.n3.nanoxml.IXMLReader;
+import org.freeplane.n3.nanoxml.XMLEntityResolver;
+import org.freeplane.n3.nanoxml.XMLParseException;
+
+final class LocalEntityResolver extends XMLEntityResolver {
+	@Override
+	protected Reader openExternalEntity(IXMLReader xmlReader, String publicID, String systemID)
+	        throws XMLParseException {
+		throw new XMLParseException("External entities are not allowed");
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/io/xml/XMLLocalParserFactory.java b/freeplane/src/main/java/org/freeplane/core/io/xml/XMLLocalParserFactory.java
new file mode 100644
index 0000000..38ed706
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/io/xml/XMLLocalParserFactory.java
@@ -0,0 +1,12 @@
+package org.freeplane.core.io.xml;
+
+import org.freeplane.n3.nanoxml.IXMLParser;
+
+public class XMLLocalParserFactory {
+
+	public static IXMLParser createLocalXMLParser() {
+		IXMLParser parser = org.freeplane.n3.nanoxml.XMLParserFactory.createDefaultXMLParser();
+		parser.setResolver(new LocalEntityResolver());
+		return parser;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/io/xml/XMLParser.java b/freeplane/src/main/java/org/freeplane/core/io/xml/XMLParser.java
index fd93553..fea2128 100644
--- a/freeplane/src/main/java/org/freeplane/core/io/xml/XMLParser.java
+++ b/freeplane/src/main/java/org/freeplane/core/io/xml/XMLParser.java
@@ -30,6 +30,11 @@ import org.freeplane.n3.nanoxml.XMLParseException;
 class XMLParser extends StdXMLParser implements IXMLParser {
 	private boolean skipNextElementContent = false;
 
+	public XMLParser() {
+		super();
+		setResolver(new LocalEntityResolver());
+	}
+
 	void notParseNextElementContent() {
 		skipNextElementContent = true;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java b/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java
index f8e32ed..3f11d52 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/ResourceController.java
@@ -19,17 +19,22 @@
  */
 package org.freeplane.core.resources;
 
+import java.awt.Color;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+
+import javax.swing.ImageIcon;
+
 import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Vector;
@@ -38,10 +43,12 @@ import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.ActionAcceleratorManager;
 import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.ui.TimePeriodUnits;
+import org.freeplane.core.util.ColorUtils;
 import org.freeplane.core.util.FileUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.Quantity;
 import org.freeplane.features.mode.AController.IActionOnChange;
+import org.freeplane.features.icon.factory.ImageIconFactory;
 import org.freeplane.features.mode.Controller;
 
 /**
@@ -209,6 +216,12 @@ public abstract class ResourceController {
 		}
 	}
 
+
+	public Color getColorProperty(String name) {
+		String string = getProperty(name);
+		return ColorUtils.stringToColor(string);
+	}
+	
 	abstract public Properties getProperties();
 
 	abstract public String getProperty(final String key);
@@ -222,8 +235,8 @@ public abstract class ResourceController {
 		return Collections.unmodifiableCollection(propertyChangeListeners);
 	}
 
-	public URL getResource(final String name) {
-		return getClass().getResource(name);
+	public URL getResource(final String resourcePath) {
+		return getClass().getResource(resourcePath);
 	}
 
 	public InputStream getResourceStream(final String resFileName) throws IOException {
@@ -341,4 +354,47 @@ public abstract class ResourceController {
 			acceleratorManager = new ActionAcceleratorManager();
 		return acceleratorManager;
 	}
+
+	private Map<String, ImageIcon> iconCache = new HashMap<String, ImageIcon>();
+	public ImageIcon getIcon(final String iconKey) {
+		return getIcon(iconKey, ImageIconFactory.DEFAULT_UI_ICON_HEIGHT);
+	}
+
+	public ImageIcon getIcon(String iconKey, Quantity<LengthUnits> height) {
+		ImageIcon icon = iconCache.get(iconKey);
+		if(icon == null){
+			final String iconResource = iconKey.startsWith("/") ? iconKey : getProperty(iconKey, null);
+			icon = loadIcon(height, iconResource);
+		}
+		if(icon != null)
+			iconCache.put(iconKey, icon);
+		return icon;
+	}
+
+	private ImageIcon loadIcon(Quantity<LengthUnits> height, final String resourcePath) {
+		if (resourcePath != null) {
+			URL url = getFirstResource(ImageIconFactory.getAlternativePaths(resourcePath));
+			if (url != null) {
+				return ImageIconFactory.getInstance().getImageIcon(url, height);
+			} else {
+				LogUtils.severe("can not load icon '" + resourcePath + "'");
+			}
+		}
+		return null;
+	}
+
+	public URL getFirstResource(String... resourcePaths) {
+		for(String path : resourcePaths){
+			final URL url = getResource(path);
+			if(url != null)
+				return url;
+		}
+		return null;
+	}
+
+
+	public URL getIconResource(String resourcePath) {
+		final String[] alternativePaths = ImageIconFactory.getAlternativePaths(resourcePath);
+		return getFirstResource(alternativePaths);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/SetBooleanPropertyAction.java b/freeplane/src/main/java/org/freeplane/core/resources/SetBooleanPropertyAction.java
index d70a671..171c66f 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/SetBooleanPropertyAction.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/SetBooleanPropertyAction.java
@@ -39,6 +39,7 @@ public class SetBooleanPropertyAction extends AFreeplaneAction{
 	    	TextUtils.getRawText("OptionPanel." + propertyName),
 	    	null);
 	    this.propertyName = propertyName;
+	    setIcon(propertyName + ".icon");
 	    setTooltip(getTooltipKey());
     }
 
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/WindowConfigurationStorage.java b/freeplane/src/main/java/org/freeplane/core/resources/WindowConfigurationStorage.java
index 1a7c5b4..9cb5678 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/WindowConfigurationStorage.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/WindowConfigurationStorage.java
@@ -5,6 +5,8 @@ import java.io.StringReader;
 import java.io.StringWriter;
 
 import javax.swing.JDialog;
+
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.n3.nanoxml.IXMLParser;
@@ -12,7 +14,6 @@ import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
 import org.freeplane.n3.nanoxml.XMLException;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 import org.freeplane.n3.nanoxml.XMLWriter;
 
 public class WindowConfigurationStorage {
@@ -103,7 +104,7 @@ public class WindowConfigurationStorage {
 	}
 	protected XMLElement unmarschall(final String marshalled, final JDialog dialog) {
 		if (marshalled != null) {
-			final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+			final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 			final IXMLReader xmlReader = new StdXMLReader(new StringReader(marshalled));
 			parser.setReader(xmlReader);
 			try {
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/BooleanProperty.java b/freeplane/src/main/java/org/freeplane/core/resources/components/BooleanProperty.java
index 66fd25e..03b6f77 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/BooleanProperty.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/BooleanProperty.java
@@ -21,6 +21,8 @@ package org.freeplane.core.resources.components;
 
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -49,6 +51,14 @@ public class BooleanProperty extends PropertyBean implements IPropertyControl {
 
 	public void layout(final DefaultFormBuilder builder) {
 		layout(builder, mCheckBox);
+		getLabelComponent().addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				mCheckBox.setSelected(! getBooleanValue());
+			}
+			
+		});
 	}
 
 	public void setEnabled(final boolean pEnabled) {
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/ColorProperty.java b/freeplane/src/main/java/org/freeplane/core/resources/components/ColorProperty.java
index ca856f7..a747b67 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/ColorProperty.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/ColorProperty.java
@@ -25,6 +25,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -57,6 +58,7 @@ public class ColorProperty extends PropertyBean implements IPropertyControl, Act
 			 */
 			private static final long serialVersionUID = 1L;
 			{
+				setBorder(BorderFactory.createEtchedBorder());
 				setUI(BasicButtonUI.createUI(this));
 			}
 		};
@@ -118,8 +120,9 @@ public class ColorProperty extends PropertyBean implements IPropertyControl, Act
 		if (input == null) {
 			input = Color.WHITE;
 		}
-		mButton.setBackground(ColorUtils.alphaToColor(255, input));
-		final Color textColor = UITools.getTextColorForBackground(input);
+		final Color nonTransparent = ColorUtils.makeNonTransparent(input);
+		mButton.setBackground(nonTransparent);
+		final Color textColor = UITools.getTextColorForBackground(nonTransparent);
 		mButton.setForeground(textColor);
 		mButton.setText(ColorUtils.colorToString(input));
 	}
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/ComboProperty.java b/freeplane/src/main/java/org/freeplane/core/resources/components/ComboProperty.java
index 4c78315..a3dd827 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/ComboProperty.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/ComboProperty.java
@@ -27,39 +27,68 @@ import java.util.List;
 import java.util.Vector;
 
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
+import javax.swing.ListCellRenderer;
 
 import org.freeplane.core.ui.components.JComboBoxWithBorder;
+import org.freeplane.core.ui.components.RenderedContent;
+import org.freeplane.core.ui.components.RenderedContentSupplier;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 
 public class ComboProperty extends PropertyBean implements IPropertyControl, ActionListener {
-	static public Vector<String> translate(final String[] possibles) {
-		final Vector<String> possibleTranslations = new Vector<String>(possibles.length);
+	static public Vector<Object> translate(final String[] possibles) {
+		final Vector<Object> displayedItems = new Vector<Object>(possibles.length);
 		for (int i = 0; i < possibles.length; i++) {
-			possibleTranslations.add(TextUtils.getText("OptionPanel." + possibles[i]));
+			displayedItems.add(TextUtils.getText("OptionPanel." + possibles[i]));
 		}
-		return possibleTranslations;
+		return displayedItems;
 	}
 
-	final JComboBox mComboBox;
+	final JComboBoxWithBorder mComboBox;
 	private Vector<String> possibleValues;
 
 	public ComboProperty(final String name, final Collection<String> possibles,
-	                     final Collection<String> possibleTranslations) {
+	                     final Collection<?> displayedItems) {
 		super(name);
 		fillPossibleValues(possibles);
 		mComboBox = new JComboBoxWithBorder();
-		mComboBox.setModel(new DefaultComboBoxModel(new Vector<String>(possibleTranslations)));
+		mComboBox.setModel(new DefaultComboBoxModel(new Vector<Object>(displayedItems)));
 		mComboBox.addActionListener(this);
-		//mComboBox.setRenderer(ComboBoxSmallFontRenderer.INSTANCE);
 	}
 
 	public ComboProperty(final String name, final String[] strings) {
 		this(name, Arrays.asList(strings), ComboProperty.translate(strings));
 	}
+	
+
+	public static <T extends Enum<T>> ComboProperty of(String name, Class<T> enumClass) {
+		T[] enumConstants = enumClass.getEnumConstants();
+		final Vector<String> choices = new Vector<String>(enumConstants.length);
+		final Vector<Object> displayedItems = new Vector<Object>(enumConstants.length);
+		for(final T enumValue : enumConstants){
+			final String choice = ((Enum<?>)enumValue).name();
+			choices.add(choice);
+			final RenderedContent<T> renderedContent;
+			if(enumValue instanceof RenderedContentSupplier<?>) {
+				final RenderedContentSupplier<T> renderedContentSupplier;
+				renderedContentSupplier = (RenderedContentSupplier<T>)enumValue;
+				renderedContent = renderedContentSupplier.createRenderedContent();
+			}
+			else {
+				renderedContent = RenderedContent.of(enumValue);
+			}
+			displayedItems.add(renderedContent);
+		}
+		ComboProperty comboProperty = new ComboProperty(name, choices, displayedItems);
+		comboProperty.setRenderer(RenderedContent.createRenderer());
+		return comboProperty;
+	}
+
+	public void setVerticalMargin(int verticalMargin) {
+		mComboBox.setVerticalMargin(verticalMargin);
+	}
 
 	/**
 	 */
@@ -109,8 +138,8 @@ public class ComboProperty extends PropertyBean implements IPropertyControl, Act
 	 * should call this method only shortly before setting the value with
 	 * setValue.
 	 */
-	public void updateComboBoxEntries(final List<String> possibles, final List<String> possibleTranslations) {
-		mComboBox.setModel(new DefaultComboBoxModel(new Vector<String>(possibleTranslations)));
+	public void updateComboBoxEntries(final List<String> possibles, final List<?> displayedItems) {
+		mComboBox.setModel(new DefaultComboBoxModel(new Vector<Object>(displayedItems)));
 		fillPossibleValues(possibles);
 		if (possibles.size() > 0) {
 			mComboBox.setSelectedIndex(0);
@@ -129,5 +158,9 @@ public class ComboProperty extends PropertyBean implements IPropertyControl, Act
 	    return mComboBox.isEditable();
     }
 
+	public void setRenderer(ListCellRenderer<?> renderer) {
+		mComboBox.setRenderer(renderer);
+	}
+
 
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
index 9e235b8..3eb8d2f 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
@@ -18,6 +18,7 @@
 package org.freeplane.core.resources.components;
 
 import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.awt.GridLayout;
 import java.awt.dnd.DropTarget;
 import java.awt.event.ActionEvent;
@@ -40,6 +41,7 @@ import java.util.Properties;
 import java.util.Vector;
 
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
@@ -49,6 +51,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 import com.jgoodies.forms.factories.Borders;
 import org.apache.commons.lang.StringUtils;
@@ -74,7 +77,7 @@ public class OptionPanel {
 		void writeProperties(Properties props);
 	}
 
-	final static private String OPTION_PANEL_RESOURCE_PREFIX = "OptionPanel.";
+	public final static String OPTION_PANEL_RESOURCE_PREFIX = "OptionPanel.";
 	static final String PREFERENCE_STORAGE_PROPERTY = "OptionPanel_Window_Properties";
 	private Vector<IPropertyControl> controls;
 	final private IOptionPanelFeedback feedback;
@@ -101,11 +104,13 @@ public class OptionPanel {
 	 * @return a right aligned button bar with the given buttons
 	 */
 	public static JPanel buildRightAlignedBar(JButton... buttons) {
-//        ButtonBarBuilder2 builder = new ButtonBarBuilder2();
 		ButtonBarBuilder builder = new ButtonBarBuilder();
 		builder.addGlue();
 		builder.addButton(buttons);
-		return builder.getPanel();
+		final JPanel panel = builder.getPanel();
+		final JPanel outerPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+		outerPanel.add(panel);
+		return outerPanel;
 	}
 	
 	
@@ -212,6 +217,7 @@ public class OptionPanel {
 		topDialog.getRootPane().setDefaultButton(okButton);
 		JButton[] buttons = { saveButton, loadButton, cancelButton, okButton };
 		final JPanel buttonPanel = buildRightAlignedBar(buttons);
+		buttonPanel.setAlignmentX(JComponent.RIGHT_ALIGNMENT);
 		MnemonicSetter.INSTANCE.setComponentMnemonics(buttonPanel);
 		topDialog.getContentPane().add(buttonPanel, BorderLayout.SOUTH);
 	}
@@ -322,8 +328,8 @@ public class OptionPanel {
 
 	@SuppressWarnings("unchecked")
 	public void addChildControls(BooleanProperty parentControl, final DefaultMutableTreeNode controlsTree) {
-		for (final Enumeration<DefaultMutableTreeNode> i = controlsTree.children(); i.hasMoreElements();) {
-			final DefaultMutableTreeNode node = i.nextElement();
+		for (final Enumeration<TreeNode> i = controlsTree.children(); i.hasMoreElements();) {
+			final DefaultMutableTreeNode node = (DefaultMutableTreeNode) i.nextElement();
 			final IPropertyControlCreator creator = (IPropertyControlCreator) node.getUserObject();
 			if (creator != null) {
 				final IPropertyControl control = creator.createControl();
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java
index 68c4ab0..eb29c8b 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanelBuilder.java
@@ -32,6 +32,8 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Vector;
 
+import javax.swing.ImageIcon;
+import javax.swing.ListCellRenderer;
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import org.freeplane.core.io.IElementDOMHandler;
@@ -44,6 +46,7 @@ import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.ui.TimePeriodUnits;
 import org.freeplane.core.util.FileUtils;
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.n3.nanoxml.XMLElement;
 import org.freeplane.n3.nanoxml.XMLException;
@@ -56,6 +59,49 @@ import org.freeplane.n3.nanoxml.XMLException;
  * see {@link #addValidator(IValidator)}.
  */
 public class OptionPanelBuilder {
+	static final class ComboPropertyCreator implements IPropertyControlCreator {
+		private final Vector<String> choices;
+		private final Vector<?> displayedItems;
+		private final String name;
+		private int verticalMargin;
+		private ListCellRenderer<?> renderer;
+		@SuppressWarnings("rawtypes")
+		private Class enumClass;
+
+		ComboPropertyCreator(Vector<String> choices, Vector<?> displayedItems, String name) {
+			this.choices = choices;
+			this.displayedItems = displayedItems;
+			this.name = name;
+			verticalMargin = 0;
+			renderer = null;
+		}
+
+		public IPropertyControl createControl() {
+			@SuppressWarnings("unchecked")
+			final ComboProperty comboProperty = enumClass != null ? ComboProperty.of(name, enumClass) : new ComboProperty(name, choices, displayedItems);
+			if(verticalMargin > 0)
+				comboProperty.setVerticalMargin(verticalMargin);
+			if(renderer != null)
+				comboProperty.setRenderer(renderer);
+			return comboProperty;
+		}
+
+		public ComboPropertyCreator withVerticalMargin(int verticalMargin) {
+			this.verticalMargin = verticalMargin;
+			return this;
+		}
+
+		public ComboPropertyCreator withListCellRenderer(ListCellRenderer<?> createRenderer) {
+			this.renderer = createRenderer;
+			return this;
+		}
+
+		public ComboPropertyCreator withEnum(Class<?> enumClass) {
+			this.enumClass = enumClass;
+			return this;
+		}
+	}
+
 	private class BooleanOptionCreator extends PropertyCreator {
 		@Override
 		public IPropertyControlCreator getCreator(final String name, final XMLElement data) {
@@ -73,34 +119,61 @@ public class OptionPanelBuilder {
 	private class ComboOptionCreator extends PropertyCreator {
 		@Override
 		public IPropertyControlCreator getCreator(final String name, final XMLElement data) {
-			final int childrenCount = data.getChildrenCount();
-			final Vector<String> choices = new Vector<String>(childrenCount);
-			final Vector<String> translations = new Vector<String>(childrenCount);
-			for (int i = 0; i < childrenCount; i++) {
+			String enumClassName = data.getAttribute("enum", null);
+			ComboPropertyCreator comboProperty;
+			if(enumClassName != null) {
+				try {
+					Class<?> enumClass = OptionPanelBuilder.class.getClassLoader().loadClass(enumClassName);
+					comboProperty = createComboProperty(name, enumClass);
+				} 
+				catch (Exception e) {
+					LogUtils.severe(e);
+					return null;
+				}
+			}
+			else {
+				final int childrenCount = data.getChildrenCount();
+				final Vector<String> choices = new Vector<String>(childrenCount);
+				final Vector<Object> displayedItems = new Vector<Object>(childrenCount);
+				addChoicesAndDisplayedItems(data, choices, displayedItems);
+				comboProperty = createComboProperty(name, choices, displayedItems);
+			}
+			final int verticalMargin = Quantity.fromString(data.getAttribute("vertical_margin", "0"), LengthUnits.pt).toBaseUnitsRounded();
+			return comboProperty.withVerticalMargin(verticalMargin);
+		}
+
+		private void addChoicesAndDisplayedItems(final XMLElement data, final Vector<String> choices,
+				final Vector<Object> displayedItems) {
+			for (int i = 0; i < data.getChildrenCount(); i++) {
 				final XMLElement element = data.getChildAtIndex(i);
 				final String choice = element.getAttribute("value", null);
 				choices.add(choice);
-				final String translationKey = element.getAttribute("text", "OptionPanel." + choice);
-				final String translation = TextUtils.getOptionalText(translationKey);
-				translations.add(translation);
+				final String iconName = element.getAttribute("icon", null);
+				final Object displayedItem;
+				if(iconName != null) {
+					displayedItem = new ImageIcon(ResourceController.getResourceController().getResource("/images/" + iconName));
+				}
+				else {
+					final String translationKey = element.getAttribute("text", "OptionPanel." + choice);
+					displayedItem = TextUtils.getOptionalText(translationKey);
+				}
+				displayedItems.add(displayedItem);
 			}
-			return createComboProperty(name, choices, translations);
 		}
 	}
-	
 	private class LanguagesComboCreator extends PropertyCreator {
 		@Override
 		public IPropertyControlCreator getCreator(final String name, final XMLElement data) {
 			final Set<String> locales = findAvailableLocales();
 			locales.add(ResourceBundles.LANGUAGE_AUTOMATIC);
 			final Vector<String> choices = new Vector<String>(locales.size());
-			final Vector<String> translations = new Vector<String>(locales.size());
+			final Vector<String> displayedItems = new Vector<String>(locales.size());
 			// sort according to current locale
 			final TreeMap<String, String> inverseMap = new TreeMap<String, String>(Collator.getInstance());
 			for (String locale : locales) {
 				final String translation = TextUtils.getOptionalText("OptionPanel." + locale);
 				choices.add(locale);
-				translations.add(translation);
+				displayedItems.add(translation);
 				if (inverseMap.containsKey(translation)) {
 					LogUtils.severe("translation " + translation + " is used for more that one locale, for "
 					        + inverseMap.get(translation) + " and for " + locale + ".");
@@ -110,13 +183,13 @@ public class OptionPanelBuilder {
 			if (inverseMap.size() == choices.size()) {
 				// fix #630: Language not sorted alphabetically
 				choices.clear();
-				translations.clear();
+				displayedItems.clear();
 				for (Entry<String, String> entry : inverseMap.entrySet()) {
 					choices.add(entry.getValue());
-					translations.add(entry.getKey());
+					displayedItems.add(entry.getKey());
 				}
 			}
-			return createComboProperty(name, choices, translations);
+			return createComboProperty(name, choices, displayedItems);
 		}
 
 		private Set<String> findAvailableLocales() {
@@ -422,14 +495,14 @@ public class OptionPanelBuilder {
 	}
 
 	public void addComboProperty(final String path, final String name, final Vector<String> choices,
-	                             final Vector<String> translations, final int position) {
-		final IPropertyControlCreator creator = createComboProperty(name, choices, translations);
+	                             final Vector<?> displayedItems, final int position) {
+		final IPropertyControlCreator creator = createComboProperty(name, choices, displayedItems);
 		addCreator(path, creator, name, position);
 	}
 
 	public void addEditableComboProperty(final String path, final String name, final Vector<String> choices,
-			final Vector<String> translations, final int position) {
-		final IPropertyControlCreator creator = createEditableComboProperty(name, choices, translations);
+			final Vector<String> displayedItems, final int position) {
+		final IPropertyControlCreator creator = createEditableComboProperty(name, choices, displayedItems);
 		addCreator(path, creator, name, position);
 	}
 	public void addCreator(final String path, final IPropertyControlCreator creator, final int position) {
@@ -498,20 +571,21 @@ public class OptionPanelBuilder {
 		};
 	}
 
-	private IPropertyControlCreator createComboProperty(final String name, final Vector<String> choices,
-			final Vector<String> translations) {
-		return new IPropertyControlCreator() {
-			public IPropertyControl createControl() {
-				return new ComboProperty(name, choices, translations);
-			}
-		};
+	private ComboPropertyCreator createComboProperty(final String name, final Vector<String> choices,
+			final Vector<?> displayedItems) {
+		return new ComboPropertyCreator(choices, displayedItems, name);
 	}
+	
+	public ComboPropertyCreator createComboProperty(String name, Class<?> enumClass) {
+		return new ComboPropertyCreator(null, null, name).withEnum(enumClass);
+	}
+
 
 	private IPropertyControlCreator createEditableComboProperty(final String name, final Vector<String> choices,
-			final Vector<String> translations) {
+			final Vector<String> displayedItems) {
 		return new IPropertyControlCreator() {
 			public IPropertyControl createControl() {
-				final ComboProperty comboProperty = new ComboProperty(name, choices, translations);
+				final ComboProperty comboProperty = new ComboProperty(name, choices, displayedItems);
 				comboProperty.setEditable(true);
 				return comboProperty;
 			}
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAdapter.java b/freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAdapter.java
index 2f3481d..1c923df 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAdapter.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/PropertyAdapter.java
@@ -36,6 +36,11 @@ public class PropertyAdapter {
 	private String label;
 
 	private final String name;
+	private JLabel labelComponent;
+
+	public JLabel getLabelComponent() {
+		return labelComponent;
+	}
 
 	public PropertyAdapter(final String name) {
 		this(name, "OptionPanel." + name, "OptionPanel." + name + ".tooltip");
@@ -68,14 +73,14 @@ public class PropertyAdapter {
 	protected void layout(DefaultFormBuilder builder, JComponent component){
 		final String labelKey = getLabel();
 		final String optionalText = TextUtils.getOptionalText(labelKey);
-		final JLabel label = builder.append(optionalText, component);
+		labelComponent = builder.append(optionalText, component);
 		if(optionalText != null)
-			TranslatedElement.TEXT.setKey(label, labelKey);
+			TranslatedElement.TEXT.setKey(labelComponent, labelKey);
 		String tooltipKey = getTooltip();
 		String tooltip = TextUtils.getOptionalText(tooltipKey, null);
 		if (tooltipKey != null)
-			TranslatedElement.TOOLTIP.setKey(label, tooltipKey);
-		label.setToolTipText(tooltip);
+			TranslatedElement.TOOLTIP.setKey(labelComponent, tooltipKey);
+		labelComponent.setToolTipText(tooltip);
 		component.setToolTipText(tooltip);
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java b/freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java
index 540c70e..d8e6422 100644
--- a/freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java
+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/ShowPreferencesAction.java
@@ -96,7 +96,10 @@ public class ShowPreferencesAction extends AFreeplaneAction {
 		    OptionPanel.PREFERENCE_STORAGE_PROPERTY);
 		final OptionPanelWindowConfigurationStorage storage = OptionPanelWindowConfigurationStorage.decorateDialog(
 		    marshalled, dialog);
-		if (storage != null) {
+		final String actionCommand = e != null ?  e.getActionCommand() : null;
+		if(actionCommand != null && actionCommand.startsWith(OptionPanel.OPTION_PANEL_RESOURCE_PREFIX))
+			options.setSelectedPanel(actionCommand);
+		else if (storage != null) {
 			options.setSelectedPanel(storage.getPanel());
 		}
 		options.buildPanel(controls);
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/AFreeplaneAction.java b/freeplane/src/main/java/org/freeplane/core/ui/AFreeplaneAction.java
index eed9701..b469d60 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/AFreeplaneAction.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/AFreeplaneAction.java
@@ -19,17 +19,12 @@
  */
 package org.freeplane.core.ui;
 
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 
 import org.freeplane.core.resources.ResourceController;
-import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 
 /**
@@ -76,7 +71,6 @@ public abstract class AFreeplaneAction extends AbstractAction implements IFreepl
 	final private String key;
 	private boolean selected = false;
 	
-	static private Map<String, ImageIcon> iconCache = new HashMap<String, ImageIcon>();
 	final private String rawText;
 
 	public AFreeplaneAction(final String key) {
@@ -90,26 +84,15 @@ public abstract class AFreeplaneAction extends AbstractAction implements IFreepl
 	}
 
 	protected void setIcon(final String iconKey) {
-		final ImageIcon cachedIcon = iconCache.get(iconKey);
-		if(cachedIcon != null){
-			putValue(SMALL_ICON, cachedIcon);
-		}
-		else{
-			final String iconResource = ResourceController.getResourceController().getProperty(iconKey, null);
-			if (iconResource != null) {
-				final URL url = ResourceController.getResourceController().getResource(iconResource);
-				if (url == null) {
-					LogUtils.severe("can not load icon '" + iconResource + "'");
-				}
-				else {
-					final ImageIcon icon = new ImageIcon(url);
-					putValue(SMALL_ICON, icon);
-					iconCache.put(iconKey, icon);
-				}
-			}
-		}
+		ImageIcon icon = ResourceController.getResourceController().getIcon(iconKey);
+		setIcon(icon);
 	}
 
+	protected void setIcon(Icon icon) {
+		putValue(SMALL_ICON, icon);
+	}
+
+
 	protected void setTooltip(String tooltipKey) {
 		final String tooltip = TextUtils.getRawText(tooltipKey, null);
 		if (tooltip != null && !"".equals(tooltip)) {
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java b/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java
index 0c72349..21a6ec4 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/ActionAcceleratorManager.java
@@ -499,7 +499,11 @@ public class ActionAcceleratorManager implements IKeyStrokeProcessor, IAccelerat
 
 	private static String replaceModifiersForMac(String accelerator) {
 		if (Compat.isMacOsX()) {
-			accelerator = accelerator.replaceFirst("CONTROL", "META").replaceFirst("control", "meta");
+			if(accelerator.length() == 5 
+					&& (accelerator.startsWith("alt ") || accelerator.startsWith("ALT ")))
+				accelerator = "control " + accelerator.charAt(4);
+			else
+				accelerator = accelerator.replaceFirst("CONTROL", "META").replaceFirst("control", "meta");
 		}
 		return accelerator;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java b/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java
index 30ba7a0..3575608 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/ColoredIconCreator.java
@@ -4,12 +4,9 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.imageio.ImageIO;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 
@@ -17,9 +14,6 @@ public class ColoredIconCreator{
 	final private Map<Color, Icon> coloredNoteIcons;
 	private final int replacedColorRGB;
 	private final Image originalImage;
-	public ColoredIconCreator(URL iconUrl, Color replacedColor) {
-		this(read(iconUrl), replacedColor);
-	}
 	public ColoredIconCreator(Image originalImage, Color replacedColor) {
 		super();
 		replacedColorRGB = 0xffffff & replacedColor.getRGB();
@@ -27,14 +21,6 @@ public class ColoredIconCreator{
 		this.originalImage = originalImage;
 	}
 	
-	private static BufferedImage read(URL iconUrl){
-		try {
-			return ImageIO.read(iconUrl);
-		} catch (IOException e) {
-			return null;
-		}
-	}
-	
 	private BufferedImage copy(Image img)
 	{
 	    BufferedImage bimage = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_ARGB);
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java b/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java
index 33c1f26..6199d24 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/MenuSplitterConfiguration.java
@@ -1,9 +1,14 @@
 package org.freeplane.core.ui;
 
+import javax.swing.JComboBox;
+
 import org.freeplane.core.resources.ResourceController;
 
 public class MenuSplitterConfiguration {
 	public static final String MAX_MENU_ITEM_COUNT_KEY = "max_menu_item_count";
 	public static final int MAX_MENU_ITEM_COUNT = ResourceController.getResourceController().getIntProperty(
 	    MAX_MENU_ITEM_COUNT_KEY);
+	public static void setMaximumRowCount(JComboBox c){
+		c.setMaximumRowCount(MAX_MENU_ITEM_COUNT);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/DashIconFactory.java b/freeplane/src/main/java/org/freeplane/core/ui/components/DashIconFactory.java
new file mode 100644
index 0000000..2256bf6
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/DashIconFactory.java
@@ -0,0 +1,36 @@
+package org.freeplane.core.ui.components;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Stroke;
+
+import javax.swing.Icon;
+
+public class DashIconFactory {
+
+	public static Icon createIcon(final int width, final int height, final int lineWidth, final int[] dash) {
+		final BasicStroke stroke = UITools.createStroke((float) lineWidth, dash, BasicStroke.JOIN_ROUND);
+		return new Icon() {
+			public void paintIcon(Component c, Graphics g, int x, int y) {
+				Graphics2D g2 = (Graphics2D) g;
+				g2.setColor(Color.BLACK);
+				Stroke oldStroke = g2.getStroke();
+				g2.setStroke(stroke);
+				g2.drawLine(x, y+height / 2, x+width, y+height / 2);
+				g2.setStroke(oldStroke);
+			}
+			
+			public int getIconWidth() {
+				return width;
+			}
+			
+			public int getIconHeight() {
+				return height;
+			}
+		};
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/FButtonBar.java b/freeplane/src/main/java/org/freeplane/core/ui/components/FButtonBar.java
index 38e03db..40a4799 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/FButtonBar.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/FButtonBar.java
@@ -21,6 +21,7 @@ package org.freeplane.core.ui.components;
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;
@@ -34,7 +35,6 @@ import java.util.Map;
 
 import javax.swing.Action;
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -44,12 +44,12 @@ import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.text.JTextComponent;
 
-import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.IAcceleratorChangeListener;
 import org.freeplane.core.ui.IKeyStrokeProcessor;
 import org.freeplane.core.ui.SetAcceleratorOnNextClickAction;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.icon.factory.IconStoreFactory;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.mindmapmode.MModeController;
 
@@ -59,6 +59,7 @@ import org.freeplane.features.mode.mindmapmode.MModeController;
  */
 public class FButtonBar extends JComponent implements IAcceleratorChangeListener, KeyEventDispatcher,
         WindowFocusListener, IKeyStrokeProcessor {
+	private static final Font BUTTON_FONT = new JButton().getFont().deriveFont(UITools.getUIFontSize(1.1));
 	private static final int BUTTON_NUMBER = 12;
 	/**
 	 * 
@@ -124,9 +125,8 @@ public class FButtonBar extends JComponent implements IAcceleratorChangeListener
 	private JButton[] createButtonRow(final int modifiers) {
 		final JButton[] buttons = new JButton[BUTTON_NUMBER];
 		for (int i = 0; i < BUTTON_NUMBER; i++) {
-			final String name = "/images/f" + (i + 1) + ".png";
-			final JButton button = buttons[i] = new JButton(new ImageIcon(
-			    ResourceController.getResourceController().getResource(name))) {
+			final String name = "f" + (i + 1) + ".png";
+			final JButton button = buttons[i] = new JButton(IconStoreFactory.ICON_STORE.getUIIcon(name).getIcon()) {
 				/**
 				 * 
 				 */
@@ -136,6 +136,7 @@ public class FButtonBar extends JComponent implements IAcceleratorChangeListener
 				protected void configurePropertiesFromAction(final Action a) {
 				}
 			};
+			button.setFont(BUTTON_FONT);
 			button.setFocusable(false);
 			button.setBorder(BorderFactory.createEtchedBorder());
 			if (System.getProperty("os.name").startsWith("Mac OS")) {
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/FreeplaneToolBar.java b/freeplane/src/main/java/org/freeplane/core/ui/components/FreeplaneToolBar.java
index 8fee1b6..1ba3f07 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/FreeplaneToolBar.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/FreeplaneToolBar.java
@@ -29,6 +29,7 @@ import java.awt.event.HierarchyEvent;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.JToolBar;
+import javax.swing.SwingConstants;
 
 /**
  * @author Stefan Zechmeister
@@ -47,26 +48,25 @@ public class FreeplaneToolBar extends JToolBar {
 		this.setMargin(FreeplaneToolBar.nullInsets);
 		setFloatable(false);
 		setRollover(true);
-		if (orientation == HORIZONTAL) {
-			super.setLayout(ToolbarLayout.getInstance());
-			addHierarchyBoundsListener(new HierarchyBoundsListener() {
-				public void ancestorResized(final HierarchyEvent e) {
-					revalidate();
-					repaint();
-				}
+		if(orientation == SwingConstants.HORIZONTAL)
+			super.setLayout(ToolbarLayout.horizontal());
+		else
+			super.setLayout(ToolbarLayout.vertical());
+		addHierarchyBoundsListener(new HierarchyBoundsListener() {
+			public void ancestorResized(final HierarchyEvent e) {
+				revalidate();
+				repaint();
+			}
 
-				public void ancestorMoved(final HierarchyEvent e) {
-				}
-			});
-		}
+			public void ancestorMoved(final HierarchyEvent e) {
+			}
+		});
 	}
 	
 	
 
 	@Override
     public void setLayout(LayoutManager mgr) {
-		if (getOrientation() != HORIZONTAL)
-			super.setLayout(mgr);
     }
 
 
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/JAutoToggleButton.java b/freeplane/src/main/java/org/freeplane/core/ui/components/JAutoToggleButton.java
index 90f510a..83cc01f 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/JAutoToggleButton.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/JAutoToggleButton.java
@@ -42,6 +42,10 @@ public class JAutoToggleButton extends JToggleButton implements PropertyChangeLi
 		super(a);
 	}
 
+	public JAutoToggleButton() {
+		super();
+	}
+
 	public JAutoToggleButton(final IFreeplaneAction a, final ButtonModel model) {
 		super(a);
 		model.addChangeListener(this);
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/JComboBoxWithBorder.java b/freeplane/src/main/java/org/freeplane/core/ui/components/JComboBoxWithBorder.java
index 79efd2d..8401f23 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/JComboBoxWithBorder.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/JComboBoxWithBorder.java
@@ -1,6 +1,7 @@
 package org.freeplane.core.ui.components;
 
 import java.awt.Component;
+import java.awt.Insets;
 import java.util.Vector;
 
 import javax.swing.ComboBoxModel;
@@ -8,17 +9,18 @@ import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
-import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 
 import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.ui.MenuSplitterConfiguration;
 import org.freeplane.core.util.Quantity;
 
 @SuppressWarnings("serial")
-public class JComboBoxWithBorder extends JComboBox{
-	private RendererWithBorder rendererWithBorder;
+public class JComboBoxWithBorder<T> extends JComboBox<T>{
 	static private final int MARGIN = new Quantity<LengthUnits>(2, LengthUnits.pt).toBaseUnitsRounded();
-	static private final Border STANDARD_BORDER = new EmptyBorder(0, MARGIN, 0, MARGIN);  
+	static private final EmptyBorder STANDARD_BORDER = new EmptyBorder(0, MARGIN, 0, MARGIN);  
+	private RendererWithBorder rendererWithBorder;
+	private EmptyBorder border = STANDARD_BORDER;  
 	class RendererWithBorder implements ListCellRenderer{
 		@Override
 		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
@@ -29,7 +31,7 @@ public class JComboBoxWithBorder extends JComboBox{
 			final Component listCellRendererComponent = baseRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if(listCellRendererComponent instanceof JComponent) {
 				final JComponent borderOwner = (JComponent) listCellRendererComponent;
-				borderOwner.setBorder(STANDARD_BORDER);
+				borderOwner.setBorder(border);
 			}
 			return listCellRendererComponent;
 		}
@@ -38,26 +40,27 @@ public class JComboBoxWithBorder extends JComboBox{
 
 	public JComboBoxWithBorder() {
 		super();
-		initializeRenderer();
+		initialize();
 	}
 
 	public JComboBoxWithBorder(ComboBoxModel aModel) {
 		super(aModel);
-		initializeRenderer();
+		initialize();
 	}
 
-	public JComboBoxWithBorder(Object[] items) {
+	public JComboBoxWithBorder(T[] items) {
 		super(items);
-		initializeRenderer();
+		initialize();
 	}
 
-	public JComboBoxWithBorder(Vector<?> items) {
+	public JComboBoxWithBorder(Vector<T> items) {
 		super(items);
-		initializeRenderer();
+		initialize();
 	}
 
-	private void initializeRenderer() {
+	private void initialize() {
 		rendererWithBorder = new RendererWithBorder();
+		MenuSplitterConfiguration.setMaximumRowCount(this);
 		updateUI();
 	}
 
@@ -75,4 +78,9 @@ public class JComboBoxWithBorder extends JComboBox{
 		return super.getRenderer();
 	}
 
+	public void setVerticalMargin(int verticalMargin) {
+		final Insets borderInsets = border.getBorderInsets();
+		if(borderInsets.top != verticalMargin || borderInsets.bottom != verticalMargin)
+			border= new EmptyBorder(verticalMargin, MARGIN, verticalMargin, MARGIN);  
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/MultipleImage.java b/freeplane/src/main/java/org/freeplane/core/ui/components/MultipleImage.java
index 8e5d9ed..4a4f8c6 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/MultipleImage.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/MultipleImage.java
@@ -28,7 +28,12 @@ import java.util.List;
 
 import javax.swing.Icon;
 
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.icon.IconController;
 import org.freeplane.features.icon.UIIcon;
+import org.freeplane.features.icon.factory.ImageIconFactory;
+import org.freeplane.features.map.NodeModel;
 
 public class MultipleImage implements Icon {
 	final private List<Icon> mIcons = new ArrayList<Icon>();
@@ -42,8 +47,16 @@ public class MultipleImage implements Icon {
 		mUIIcons.add(uiIcon);
 	}
 
-	public void addLinkIcon(Icon icon) {
-		mIcons.add(icon);
+	public void addIcon(final UIIcon uiIcon, final NodeModel node) {
+		mIcons.add(uiIcon.getIcon(node));
+		mUIIcons.add(uiIcon);
+	}
+
+	public void addLinkIcon(Icon icon, NodeModel node) {
+		final Quantity<LengthUnits> iconHeight = IconController.getController().getIconSize(node);
+		final ImageIconFactory iconFactory = ImageIconFactory.getInstance();
+		final Icon scaledIcon = iconFactory.canScaleIcon(icon) ? iconFactory.getScaledIcon(icon, iconHeight) : icon;
+		mIcons.add(scaledIcon);
 		mUIIcons.add(null);
 	};
 
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/OneTouchCollapseResizer.java b/freeplane/src/main/java/org/freeplane/core/ui/components/OneTouchCollapseResizer.java
index c875e8e..71cd2ac 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/OneTouchCollapseResizer.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/OneTouchCollapseResizer.java
@@ -19,6 +19,8 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.ui.IMapViewManager;
 
 /**
  *
@@ -35,6 +37,7 @@ public class OneTouchCollapseResizer extends JResizer {
 	private Integer resizeComponentIndex;
 
 	private final Set<ComponentCollapseListener> collapseListener = new LinkedHashSet<ComponentCollapseListener>();
+	private Dimension lastPreferredSize = null;
 
 
 
@@ -152,22 +155,27 @@ public class OneTouchCollapseResizer extends JResizer {
 		}
 	}
 
-	public void setExpanded(boolean enabled) {
-		if(this.expanded != enabled) {
-			this.expanded = enabled;
+	public void setExpanded(boolean expanded) {
+		if(this.expanded != expanded) {
+			this.expanded = expanded;
 			try {
 				Component resizedComponent = getResizedComponent();
 				if(resizedComponent instanceof JComponent) {
-					((JComponent) resizedComponent).putClientProperty(COLLAPSED, (enabled ? null : "true"));
+					((JComponent) resizedComponent).putClientProperty(COLLAPSED, (expanded ? null : "true"));
 				}
-				if(enabled) {
-					resizedComponent.setPreferredSize(null);
+				if(expanded) {
+					resizedComponent.setPreferredSize(lastPreferredSize);
 				}
 				else {
+					lastPreferredSize = resizedComponent.isPreferredSizeSet() ?  resizedComponent.getPreferredSize() : null;
 					resizedComponent.setPreferredSize(new Dimension(0,0));
 				}
+				IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+				mapViewManager.moveFocusFromDescendantToSelection(resizedComponent);
+				resizedComponent.setVisible(expanded);
 
-				fireCollapseStateChanged(resizedComponent, enabled);
+				if (!expanded)
+					fireCollapseStateChanged(resizedComponent, expanded);
 
 				recalibrate();
 			}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/OptionalDontShowMeAgainDialog.java b/freeplane/src/main/java/org/freeplane/core/ui/components/OptionalDontShowMeAgainDialog.java
index 3bd6b6c..b9d2057 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/OptionalDontShowMeAgainDialog.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/OptionalDontShowMeAgainDialog.java
@@ -169,12 +169,10 @@ public class OptionalDontShowMeAgainDialog {
 		        5, 5, 0, 0), 0, 0));
 		final ImageIcon questionMark;
 		if(mMessageType == ONLY_OK_SELECTION_IS_SHOWN){
-			questionMark = new ImageIcon(ResourceController.getResourceController().getResource(
-		    "/images/icons/messagebox_warning.png"));
+			questionMark = ResourceController.getResourceController().getIcon("/images/icons/messagebox_warning.png");
 		}
 		else{
-			questionMark = new ImageIcon(ResourceController.getResourceController().getResource(
-		    "/images/icons/help.png"));
+			questionMark = ResourceController.getResourceController().getIcon("/images/icons/help.png");
 		}
 		mDialog.getContentPane().add(
 		    new JLabel(questionMark),
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/RenderedContent.java b/freeplane/src/main/java/org/freeplane/core/ui/components/RenderedContent.java
new file mode 100644
index 0000000..51835bb
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/RenderedContent.java
@@ -0,0 +1,64 @@
+package org.freeplane.core.ui.components;
+
+import java.awt.Component;
+import java.util.Vector;
+
+import javax.swing.Action;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JList;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.util.TextUtils;
+
+public class RenderedContent<T> {
+	public final T value;
+	private final String text;
+	private final Icon icon;
+	public RenderedContent(T value, String text, Icon icon) {
+		super();
+		this.value = value;
+		this.text = text;
+		this.icon = icon;
+	}
+
+	@SuppressWarnings("serial")
+	public static DefaultListCellRenderer createRenderer() {
+		
+		return new DefaultListCellRenderer() {
+            @Override
+            public Component getListCellRendererComponent(JList<?>list, Object value, int index, boolean isSelected,
+                                                          boolean cellHasFocus) {
+            	RenderedContent<?> content = (RenderedContent<?>) value;
+                Object renderedValue = content.text == null ? content.icon : content.text;
+                DefaultListCellRenderer renderer = (DefaultListCellRenderer) super.getListCellRendererComponent(list, renderedValue, index, isSelected, cellHasFocus);
+                if(content.icon != null) {
+                	if(content.text != null)
+                		renderer.setIcon(content.icon);
+                	else
+                		renderer.setHorizontalAlignment(CENTER);
+                }
+                return renderer;
+            }
+        };
+	}
+	
+	public static <T extends Action> RenderedContent<T> of(T action){
+		return new RenderedContent<T>(action, (String) action.getValue(Action.NAME), (Icon) action.getValue(Action.SMALL_ICON));
+	}
+	
+	public static <T extends Action> Vector<RenderedContent<T>> of(T[] actions){
+		Vector<RenderedContent<T>> vector = new Vector<>(actions.length);
+		for(T action : actions)
+			vector.add(RenderedContent.of(action));
+		return vector;
+	}
+	
+	public static <T extends Enum<T>> RenderedContent<T> of(final T enumValue) {
+		final String name = enumValue.name();
+		String text = TextUtils.getText("OptionPanel." + name);
+		final ImageIcon icon = ResourceController.getResourceController().getIcon("OptionPanel." + name + ".icon");
+		return new RenderedContent<T>(enumValue, text, icon);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/RenderedContentSupplier.java b/freeplane/src/main/java/org/freeplane/core/ui/components/RenderedContentSupplier.java
new file mode 100644
index 0000000..e10cf0e
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/RenderedContentSupplier.java
@@ -0,0 +1,5 @@
+package org.freeplane.core.ui.components;
+
+public interface RenderedContentSupplier<T> {
+	RenderedContent<T> createRenderedContent();
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/ToolbarLayout.java b/freeplane/src/main/java/org/freeplane/core/ui/components/ToolbarLayout.java
index 0d3e28f..5a41100 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/ToolbarLayout.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/ToolbarLayout.java
@@ -8,8 +8,14 @@ import java.awt.LayoutManager;
 import javax.swing.JToolBar.Separator;
 
 class ToolbarLayout implements LayoutManager {
-	private static final ToolbarLayout instance = new ToolbarLayout();
 
+	private BlockEndPosition blockEndPosition;
+
+	enum BlockEndPosition{ON_SEPARATOR, ANYWHERE};
+	ToolbarLayout(BlockEndPosition blockEndPosition){
+		this.blockEndPosition = blockEndPosition;
+		
+	}
 	public void addLayoutComponent(final String name, final Component comp) {
 	}
 
@@ -26,14 +32,14 @@ class ToolbarLayout implements LayoutManager {
 		int lastBlockFinish = 0;
 		for (int i = 0;; i++) {
 			final Component component = i < container.getComponentCount() ? container.getComponent(i) : null;
-			if (component == null || component instanceof Separator) {
+			if (component == null || component instanceof Separator || blockEndPosition == BlockEndPosition.ANYWHERE) {
 				if (i > container.getComponentCount() || lastBlockWidth + blockWidth > maxWidth) {
 					int x = 0;
 					for (int j = lastBlockStart; j < lastBlockFinish; j++) {
 						final Component c = container.getComponent(j);
-						final Dimension cPreferredSize = c.getPreferredSize();
-						c.setBounds(x, heigth, cPreferredSize.width, lastBlockHeight);
-						x += cPreferredSize.width;
+						final int width = getPreferredWidth(c, maxWidth);
+						c.setBounds(x, heigth, width, lastBlockHeight);
+						x += width;
 					}
 					heigth += lastBlockHeight;
 					lastBlockWidth = blockWidth;
@@ -45,8 +51,7 @@ class ToolbarLayout implements LayoutManager {
 					lastBlockHeight = Math.max(blockHeight, lastBlockHeight);
 				}
 				lastBlockFinish = i;
-				blockWidth = 0;
-				blockHeight = 0;
+				blockWidth = blockHeight = 0;
 			}
 			if (component == null) {
 				if (lastBlockStart == container.getComponentCount()) {
@@ -55,11 +60,15 @@ class ToolbarLayout implements LayoutManager {
 				lastBlockFinish = container.getComponentCount();
 				continue;
 			}
+			blockWidth += getPreferredWidth(component, maxWidth);
 			final Dimension compPreferredSize = component.getPreferredSize();
-			blockWidth += compPreferredSize.width;
 			blockHeight = Math.max(compPreferredSize.height, blockHeight);
 		}
 	}
+	private int getPreferredWidth(final Component c, final int maxWidth) {
+		final int width = c instanceof Separator && blockEndPosition == BlockEndPosition.ANYWHERE ? maxWidth : c.getPreferredSize().width;
+		return width;
+	}
 
 	public Dimension minimumLayoutSize(final Container comp) {
 		return new Dimension(0, 0);
@@ -73,29 +82,34 @@ class ToolbarLayout implements LayoutManager {
 		int blockHeight = 0;
 		int lastBlockWidth = 0;
 		int lastBlockHeight = 0;
+		int lastBlockStart = 0;
+		int lastBlockFinish = 0;
 		for (int i = 0;; i++) {
 			final Component component = i < container.getComponentCount() ? container.getComponent(i) : null;
-			if (component == null || component instanceof Separator) {
-				if (lastBlockWidth + blockWidth > maxWidth) {
-					width = Math.max(width, lastBlockWidth);
+			if (component == null || component instanceof Separator || blockEndPosition == BlockEndPosition.ANYWHERE) {
+				if (i > container.getComponentCount() || lastBlockWidth + blockWidth > maxWidth) {
 					heigth += lastBlockHeight;
 					lastBlockWidth = blockWidth;
 					lastBlockHeight = blockHeight;
+					lastBlockStart = lastBlockFinish;
 				}
 				else {
 					lastBlockWidth += blockWidth;
 					lastBlockHeight = Math.max(blockHeight, lastBlockHeight);
 				}
-				blockWidth = 0;
-				blockHeight = 0;
+				width = Math.max(width, lastBlockWidth);
+				lastBlockFinish = i;
+				blockWidth = blockHeight = 0;
 			}
 			if (component == null) {
-				width = Math.max(width, lastBlockWidth);
-				heigth += lastBlockHeight;
-				break;
+				if (lastBlockStart == container.getComponentCount()) {
+					break;
+				}
+				lastBlockFinish = container.getComponentCount();
+				continue;
 			}
+			blockWidth += getPreferredWidth(component, maxWidth);
 			final Dimension compPreferredSize = component.getPreferredSize();
-			blockWidth += compPreferredSize.width;
 			blockHeight = Math.max(compPreferredSize.height, blockHeight);
 		}
 		return new Dimension(width, heigth);
@@ -104,7 +118,11 @@ class ToolbarLayout implements LayoutManager {
 	public void removeLayoutComponent(final Component comp) {
 	}
 
-	public static LayoutManager getInstance() {
-		return instance;
+	public static LayoutManager horizontal() {
+		return new ToolbarLayout(BlockEndPosition.ON_SEPARATOR);
+	}
+
+	public static LayoutManager vertical() {
+		return new ToolbarLayout(BlockEndPosition.ANYWHERE);
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/TypedListCellRenderer.java b/freeplane/src/main/java/org/freeplane/core/ui/components/TypedListCellRenderer.java
index 157a847..3fea5ac 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/TypedListCellRenderer.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/TypedListCellRenderer.java
@@ -23,9 +23,14 @@ import java.awt.Component;
 import java.net.URI;
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.Icon;
 import javax.swing.JList;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.features.format.FormattedDate;
-import org.freeplane.features.ui.FrameController;
+import org.freeplane.features.icon.factory.ImageIconFactory;
 
 /**
  * @author Dimitry Polivaev
@@ -46,30 +51,54 @@ public class TypedListCellRenderer extends DefaultListCellRenderer{
      * 
      */
     private static final long serialVersionUID = 1L;
+	private static Icon textIcon;
+	private static Icon numberIcon;
+	private static Icon dateIcon;
+	private static Icon dateTimeIcon;
+	private static Icon linkIcon;
+	
+	static {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		textIcon = resourceController.getIcon("text_icon");
+		numberIcon = resourceController.getIcon("number_icon");
+		dateIcon = resourceController.getIcon("date_icon");
+		dateTimeIcon = resourceController.getIcon("date_time_icon");
+		linkIcon = resourceController.getIcon("link_icon");
+	}
 
 	@Override
 	public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
 	                                              boolean cellHasFocus) {
 		super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+		final Icon icon;
 		if (value instanceof String) {
-			setIcon(FrameController.textIcon);
+			icon = textIcon;
 		}
 		else if (value instanceof FormattedDate) {
 			final FormattedDate fd = (FormattedDate) value;
 			if (fd.containsTime())
-				setIcon(FrameController.dateTimeIcon);
+				icon = dateTimeIcon;
 			else
-				setIcon(FrameController.dateIcon);
+				icon = dateIcon;
 		}
 		else if (value instanceof URI) {
-			setIcon(FrameController.linkIcon);
+			icon = linkIcon;
 		}
 		else if (value instanceof Number) {
-			setIcon(FrameController.numberIcon);
+			icon = numberIcon;
 		}
 		else if (value instanceof ObjectAndIcon) {
-			setIcon(((ObjectAndIcon) value).getIcon());
+			icon = ((ObjectAndIcon) value).getIcon();
+		}
+		else
+			icon = null;
+		final ImageIconFactory iconFactory = ImageIconFactory.getInstance();
+		if(icon != null && iconFactory.canScaleIcon(icon)){
+			final int fontSize = getFont().getSize();
+			setIcon(iconFactory.getScaledIcon(icon, new Quantity<LengthUnits>(fontSize, LengthUnits.px)));
 		}
+		else
+			setIcon(icon);
 		return this;
 	}
 	
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/UITools.java b/freeplane/src/main/java/org/freeplane/core/ui/components/UITools.java
index 52be386..d72e155 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/UITools.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/UITools.java
@@ -42,6 +42,7 @@ import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.net.URI;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -88,6 +89,9 @@ import org.freeplane.main.application.FreeplaneSplashModern;
  * @since 29.12.2008
  */
 public class UITools {
+	public static final String MENU_ITEM_FONT_SIZE_PROPERTY = "menuItemFontSize";
+	public static final String MAIN_FREEPLANE_FRAME = "mainFreeplaneFrame";
+
 	@SuppressWarnings("serial")
     public static final class InsertEolAction extends AbstractAction {
         public void actionPerformed(ActionEvent e) {
@@ -96,7 +100,6 @@ public class UITools {
         }
     }
 
-	public static final String MAIN_FREEPLANE_FRAME = "mainFreeplaneFrame";
 
 	public static void addEscapeActionToDialog(final JDialog dialog) {
 		class EscapeAction extends AbstractAction {
@@ -153,6 +156,8 @@ public class UITools {
 			p.y += y;
 		};
 	}
+	
+	static private final AtomicBoolean errorMessageQueued = new AtomicBoolean(false);
 
 	static public void errorMessage(final Object message) {
 		final String myMessage;
@@ -163,11 +168,26 @@ public class UITools {
 			myMessage = TextUtils.getText("undefined_error");
 		}
 		LogUtils.warn(myMessage);
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				JOptionPane.showMessageDialog(UITools.getCurrentRootComponent(), myMessage, "Freeplane", JOptionPane.ERROR_MESSAGE);
-			}
-		});
+		if(! errorMessageQueued.getAndSet(true))
+			EventQueue.invokeLater(new Runnable() {
+				public void run() {
+					final Component currentRootComponent = UITools.getCurrentRootComponent();
+					if(currentRootComponent != null) {
+						try {
+							currentRootComponent.validate();
+							JOptionPane.showMessageDialog(currentRootComponent, myMessage, "Freeplane", JOptionPane.ERROR_MESSAGE);
+						}
+						catch (Exception e) {
+							currentRootComponent.setVisible(false);
+							UITools.getFrame().setVisible(false);
+							JOptionPane.showMessageDialog(null, myMessage, "Freeplane", JOptionPane.ERROR_MESSAGE);
+							JOptionPane.showMessageDialog(null, TextUtils.getText("program_terminates"), "Freeplane", JOptionPane.ERROR_MESSAGE);
+							System.exit(-1);
+						}
+					}
+					errorMessageQueued.set(false);
+				}
+			});
 	}
 	
 	static public Component getCurrentRootComponent(){
@@ -492,22 +512,6 @@ public class UITools {
 
 	public static final Dimension MAX_BUTTON_DIMENSION = new Dimension(1000, 1000);
 
-// FIXME: not used - can we remove it? -- Volker
-//	public static Controller getController(Component c) {
-//		if(c == null){
-//			return null;
-//		}
-//	    final JRootPane rootPane = SwingUtilities.getRootPane(c);
-//		if(rootPane == null){
-//			return null;
-//		}
-//	    Controller controller = (Controller) rootPane.getClientProperty(Controller.class);
-//	    if(controller != null){
-//	    	return controller;
-//	    }
-//	    return getController(JOptionPane.getFrameForComponent(rootPane));
-//    }
-
 	public static void focusOn(JComponent component) {
 		component.addAncestorListener(new AncestorListener() {
 			public void ancestorRemoved(AncestorEvent event) {
@@ -527,8 +531,14 @@ public class UITools {
 		});
     }
 
-	public static BasicStroke createStroke(int width, final int[] dash) {
-        final float[] fdash;
+	public static BasicStroke createStroke(float width, final int[] dash, int join) {
+		final float[] fdash = toFloats(dash);
+		final BasicStroke stroke = new BasicStroke(width, BasicStroke.CAP_BUTT, join, 1f, fdash, 0f);
+        return stroke;
+	}
+
+	public static float[] toFloats(final int[] dash) {
+		final float[] fdash;
     	if(dash  != null){
     		fdash = new float[dash.length];
     		int i = 0;
@@ -539,9 +549,8 @@ public class UITools {
     	else{
     		fdash = null;
     	}
-    	final BasicStroke stroke = new BasicStroke(width, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 1f, fdash, 0f);
-        return stroke;
-    }
+		return fdash;
+	}
 
 	public static void repaintAll(Container root) {
 		root.repaint();
@@ -632,8 +641,41 @@ public class UITools {
 	}
 
 	private static float getScaleFactor() {
-			return ResourceController.getResourceController().getIntProperty("user_defined_screen_resolution", 96)  / 72f;
+			final ResourceController resourceController = ResourceController.getResourceController();
+			int windowX = resourceController.getIntProperty("appwindow_x", 0);
+			int windowY = resourceController.getIntProperty("appwindow_y", 0);
+			final GraphicsConfiguration graphicsConfiguration = findGraphicsConfiguration(windowX, windowY);
+			final int userDefinedScreenResolution; 
+			if(graphicsConfiguration != null) {
+				final Rectangle screenBounds = graphicsConfiguration.getBounds();
+				final int w = screenBounds.width;
+				final int h = screenBounds.height;
+				final double diagonalPixels = Math.sqrt(w*w + h*h);
+				final double monitorSize = resourceController.getDoubleProperty("monitor_size_inches", 0);
+				if(monitorSize >= 1 && diagonalPixels >= 1){
+					userDefinedScreenResolution = (int) Math.round(diagonalPixels / monitorSize);
+					resourceController.setProperty("user_defined_screen_resolution", userDefinedScreenResolution);
+				}
+				else{
+					userDefinedScreenResolution = resourceController.getIntProperty("user_defined_screen_resolution", 96);
+					final double effectiveMonitorSize = Math.round(diagonalPixels / userDefinedScreenResolution * 10) / 10;
+					resourceController.setDefaultProperty("monitor_size_inches", Double.toString(effectiveMonitorSize));
+				}
+			}
+			else {
+				userDefinedScreenResolution = resourceController.getIntProperty("user_defined_screen_resolution", 96);
+				resourceController.setDefaultProperty("monitor_size_inches", Double.toString(0));
+			}
+			return userDefinedScreenResolution  / 72f;
     }
+
+	private static GraphicsConfiguration findGraphicsConfiguration(int windowX, int windowY) {
+		final GraphicsConfiguration graphicsConfiguration = findGraphicsConfiguration(null, windowX, windowY);
+		if(graphicsConfiguration != null || windowX == 0 && windowY == 0)
+			return graphicsConfiguration;
+		else
+			return findGraphicsConfiguration(null, 0, 0);
+	}
 	
 	public static Font scale(Font font) {
 		return font.deriveFont(font.getSize2D()*FONT_SCALE_FACTOR);
@@ -693,4 +735,8 @@ public class UITools {
 			runnable.run();
 	}
 
+	public static float getUIFontSize(double scalingFactor) {
+		return (int)Math.round(FONT_SCALE_FACTOR*scalingFactor * ResourceController.getResourceController().getIntProperty(MENU_ITEM_FONT_SIZE_PROPERTY, 10));
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/calendar/JDayChooser.java b/freeplane/src/main/java/org/freeplane/core/ui/components/calendar/JDayChooser.java
index 93da46d..98f3abe 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/calendar/JDayChooser.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/calendar/JDayChooser.java
@@ -41,6 +41,8 @@ import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicButtonUI;
 
+import org.freeplane.core.ui.components.UITools;
+
 /**
  * JDayChooser is a bean for choosing a day.
  *
@@ -1010,7 +1012,7 @@ public class JDayChooser extends JPanel implements ActionListener, KeyListener,
 	@Override
 	public void updateUI() {
 		super.updateUI();
-		setFont(Font.decode("Dialog Plain 11"));
+		setFont(UITools.scale(Font.decode("Dialog Plain 11")));
 		if (weekPanel != null) {
 			weekPanel.updateUI();
 		}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java b/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java
index c04de2c..dcc17f9 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/html/CssRuleBuilder.java
@@ -91,11 +91,13 @@ public class CssRuleBuilder {
 		return rule.toString();
 	}
 
-	public CssRuleBuilder withMaxWidthAsPt(Quantity<?>... widths) {
+	public CssRuleBuilder withMaxWidthAsPt(float zoom, Quantity<?>... widths) {
 		int maxBaseUnits = -1;
 		for(Quantity<?> width : widths)
-			if(width != null)
-				maxBaseUnits = Math.max(maxBaseUnits, width.toBaseUnitsRounded());
+			if(width != null) {
+				final int zoomedBaseUnits = (int) (zoom * width.toBaseUnits() + 0.5d);
+				maxBaseUnits = Math.max(maxBaseUnits, zoomedBaseUnits);
+			}
 		if(maxBaseUnits >= 0)
 	   		rule.append("width: ")
 			.append(maxBaseUnits).append("pt")
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledHTML.java b/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledHTML.java
index b963fec..1373b97 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledHTML.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/components/html/ScaledHTML.java
@@ -46,7 +46,7 @@ public class ScaledHTML extends BasicHTML{
      * string of html.
      */
     public static View createHTMLView(JLabel c, String html) {
-	ScaledEditorKit kit = ScaledEditorKit.create();
+	ScaledEditorKit kit = SynchronousScaledEditorKit.create();
 	Document doc = kit.createDefaultDocument(c);
 	Object base = c.getClientProperty(documentBaseKey);
 	if (base instanceof URL) {
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java b/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java
new file mode 100644
index 0000000..5d440b3
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/ui/image/BigBufferedImage.java
@@ -0,0 +1,231 @@
+package org.freeplane.core.ui.image;
+
+/*
+ * @author Zsolt Pocze, Dimitry Polivaev
+ */
+
+import java.awt.Point;
+import java.awt.color.ColorSpace;
+import java.awt.image.BandedSampleModel;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.RenderedImage;
+import java.awt.image.SampleModel;
+import java.awt.image.WritableRaster;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.util.HashSet;
+import java.util.Hashtable;
+
+import sun.nio.ch.DirectBuffer;
+
+
+public class BigBufferedImage extends BufferedImage {
+
+    private static final String TMP_DIR = System.getProperty("java.io.tmpdir");
+	public static final int MAX_PIXELS_IN_MEMORY = 50 * 1024 * 1024;
+
+    public static BufferedImage create(int width, int height, int imageType){
+    	if(width * height > MAX_PIXELS_IN_MEMORY)
+			try {
+				final File tempDir = new File(TMP_DIR);
+				return createBigBufferedImage(tempDir, width, height, imageType);
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		else
+    		return new BufferedImage(width, height, imageType);
+    }
+
+
+	private static BufferedImage createBigBufferedImage(File tempDir, int width, int height, int imageType)
+			throws FileNotFoundException, IOException {
+		FileDataBuffer buffer = new FileDataBuffer(tempDir, width * height, 4);
+        ColorModel colorModel = null;
+        BandedSampleModel sampleModel = null;
+        switch (imageType) {
+            case TYPE_INT_RGB:
+                colorModel = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                        new int[]{8, 8, 8, 0},
+                        false,
+                        false,
+                        ComponentColorModel.TRANSLUCENT,
+                        DataBuffer.TYPE_BYTE);
+                sampleModel = new BandedSampleModel(DataBuffer.TYPE_BYTE, width, height, 3);
+                break;
+            case TYPE_INT_ARGB:
+                colorModel = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                        new int[]{8, 8, 8, 8},
+                        true,
+                        false,
+                        ComponentColorModel.TRANSLUCENT,
+                        DataBuffer.TYPE_BYTE);
+                sampleModel = new BandedSampleModel(DataBuffer.TYPE_BYTE, width, height, 4);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported image type: " + imageType);
+        }
+        SimpleRaster raster = new SimpleRaster(sampleModel, buffer, new Point(0, 0));
+        BigBufferedImage image = new BigBufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), null);
+        return image;
+	}
+
+
+    private BigBufferedImage(ColorModel cm, SimpleRaster raster, boolean isRasterPremultiplied, Hashtable<?, ?> properties) {
+        super(cm, raster, isRasterPremultiplied, properties);
+    }
+
+    public void dispose(){
+    	((SimpleRaster) getRaster()).dispose();
+    }
+    
+    static public void dispose(RenderedImage image){
+    	if(image instanceof BigBufferedImage){
+    		((BigBufferedImage) image).dispose();
+    	}
+    }
+
+    private static class SimpleRaster extends WritableRaster {
+
+        public SimpleRaster(SampleModel sampleModel, FileDataBuffer dataBuffer, Point origin) {
+            super(sampleModel, dataBuffer, origin);
+        }
+
+		public void dispose() {
+			((FileDataBuffer)getDataBuffer()).dispose();
+		}
+
+    }
+    
+	private static final class FileDataBufferDeleterHook extends Thread {
+		static {
+			Runtime.getRuntime().addShutdownHook(new FileDataBufferDeleterHook());
+		}
+		private static final HashSet<FileDataBuffer> undisposedBuffers = new HashSet<>();
+		@Override
+		public void run() {
+			final FileDataBuffer[] buffers = undisposedBuffers.toArray(new FileDataBuffer[0]);
+			for(FileDataBuffer b :buffers)
+				b.disposeNow();
+		}
+	}
+	
+    private static class FileDataBuffer extends DataBuffer {
+        private final String id = "buffer-" + System.currentTimeMillis() + "-" + ((int) (Math.random() * 1000));
+        private File dir;
+        private String path;
+        private File[] files;
+        private RandomAccessFile[] accessFiles;
+        private MappedByteBuffer[] buffer;
+
+        public FileDataBuffer(File dir, int size) throws FileNotFoundException, IOException {
+            super(TYPE_BYTE, size);
+            this.dir = dir;
+            init();
+        }
+
+		public FileDataBuffer(File dir, int size, int numBanks) throws FileNotFoundException, IOException {
+            super(TYPE_BYTE, size, numBanks);
+            this.dir = dir;
+            init();
+        }
+
+        private void init() throws FileNotFoundException, IOException {
+        	FileDataBufferDeleterHook.undisposedBuffers.add(this);
+            if (dir == null) {
+                dir = new File(".");
+            }
+            if (!dir.exists()) {
+                throw new RuntimeException("FileDataBuffer constructor parameter dir does not exist: " + dir);
+            }
+            if (!dir.isDirectory()) {
+                throw new RuntimeException("FileDataBuffer constructor parameter dir is not a directory: " + dir);
+            }
+            path = dir.getPath() + "/" + id;
+            File subDir = new File(path);
+            subDir.mkdir();
+            buffer = new MappedByteBuffer[banks];
+            accessFiles = new RandomAccessFile[banks];
+            files = new File[banks];
+            for (int i = 0; i < banks; i++) {
+                File file = files[i] = new File(path + "/bank" + i + ".dat");
+				final RandomAccessFile randomAccessFile = accessFiles[i] = new RandomAccessFile(file, "rw");
+                buffer[i] = randomAccessFile.getChannel().map(FileChannel.MapMode.READ_WRITE, 0, getSize());
+            }
+        }
+
+        @Override
+        public int getElem(int bank, int i) {
+            return buffer[bank].get(i) & 0xff;
+        }
+
+        @Override
+        public void setElem(int bank, int i, int val) {
+            buffer[bank].put(i, (byte) val);
+        }
+        
+		@Override
+		protected void finalize() throws Throwable {
+			dispose();
+		}
+
+		private void disposeNow() {
+			final MappedByteBuffer[] disposedBuffer = this.buffer;
+			this.buffer = null;
+			disposeNow(disposedBuffer);
+		}
+		
+		public void dispose() {
+			final MappedByteBuffer[] disposedBuffer = this.buffer;
+			this.buffer = null;
+			new Thread() {
+				@Override
+				public void run() {
+					disposeNow(disposedBuffer);
+				}
+			}.start();
+		}
+
+		/**
+		 * There appears to be a bug in the Java code associated with MappedByteBuffer instances (maybe other
+		 * related classes as well?) in that the file.delete() does not delete the file.  
+		 * For more details about the problem and various attempts to get around this problem, see the following  
+		 * <a href="http://stackoverflow.com/questions/2972986/how-to-unmap-a-file-from-memory-mapped-using-filechannel-in-java/5036003#5036003">link.</a>
+		 * 
+		 * The only solution that appears to work requires the use of interface DirectBuffer 
+		 * which is an internal interface. In the future, this interface might disappear or the referenced methods
+		 * might change their signatures.  This is why Eclipse creates the error messages labeled "Access restriction".
+		 * 
+		 * @param disposedBuffer Array of MappedByteBuffer instances that are to be disposed of
+		 */
+		private void disposeNow(final MappedByteBuffer[] disposedBuffer) {
+			FileDataBufferDeleterHook.undisposedBuffers.remove(this);
+			if(disposedBuffer != null) {
+				for(MappedByteBuffer b : disposedBuffer) {
+					((DirectBuffer) b).cleaner().clean();
+				}
+				for(RandomAccessFile file : accessFiles) {
+					try {
+						file.close();
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+				accessFiles = null;
+				for(File file : files) {
+					file.delete();
+				}
+				files = null;
+				new File(path).delete();
+				path = null;
+			}
+		}
+		
+    }
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionFinder.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionFinder.java
index 5832423..3301f48 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionFinder.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/action/ActionFinder.java
@@ -10,6 +10,7 @@ import org.freeplane.core.ui.menubuilders.generic.EntryVisitor;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.features.mode.FreeplaneActions;
 import org.freeplane.features.styles.SetBooleanMapPropertyAction;
+import org.freeplane.features.styles.SetBooleanMapViewPropertyAction;
 
 public class ActionFinder implements EntryVisitor{
 
@@ -19,18 +20,20 @@ public class ActionFinder implements EntryVisitor{
 		this.freeplaneActions = freeplaneActions;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public void visit(final Entry target) {
 		final String actionName = target.getName();
 		if (!actionName.isEmpty() && new EntryAccessor().getAction(target) == null) {
 			AFreeplaneAction action = freeplaneActions.getAction(actionName);
 			if(action == null) {
-				for (final Class<? extends AFreeplaneAction> actionClass : Arrays.asList(SetBooleanPropertyAction.class, SetBooleanMapPropertyAction.class)){
-					AFreeplaneAction newAction = createAction(actionClass, actionName);
-					action = newAction;
-					if(action !=  null) {
-						freeplaneActions.addAction(action);
+				for (final Class<? extends AFreeplaneAction> actionClass : Arrays.asList(SetBooleanPropertyAction.class, SetBooleanMapPropertyAction.class, SetBooleanMapViewPropertyAction.class)){
+					final String setBooleanPropertyActionPrefix = actionClass.getSimpleName() + ".";
+					if (actionName.startsWith(setBooleanPropertyActionPrefix)) {
+						String propertyName = actionName.substring(setBooleanPropertyActionPrefix.length());
+						action = createAction(actionClass, propertyName);
+						if(action !=  null) {
+							freeplaneActions.addAction(action);
+						}
 						break;
 					}
 				}
@@ -40,17 +43,7 @@ public class ActionFinder implements EntryVisitor{
 		}
 	}
 
-	AFreeplaneAction createAction(final Class<? extends AFreeplaneAction> actionClass, final String actionName) {
-		final String setBooleanPropertyActionPrefix = actionClass.getSimpleName() + ".";
-		AFreeplaneAction newAction = null;
-		if (actionName.startsWith(setBooleanPropertyActionPrefix)) {
-			String propertyName = actionName.substring(setBooleanPropertyActionPrefix.length());
-			newAction = createSetBooleanPropertyAction(actionClass, propertyName);
-		}
-		return newAction;
-	}
-
-	protected AFreeplaneAction createSetBooleanPropertyAction(
+	AFreeplaneAction createAction(
 			Class<? extends AFreeplaneAction> actionClass, String propertyName) {
 		try {
 			return actionClass.getConstructor(String.class).newInstance(propertyName);
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilder.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilder.java
index 28a3fda..07b3c47 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilder.java
@@ -22,6 +22,7 @@ import org.freeplane.core.ui.menubuilders.generic.EntryPopupListener;
 import org.freeplane.core.ui.menubuilders.generic.EntryVisitor;
 import org.freeplane.core.ui.menubuilders.generic.ResourceAccessor;
 import org.freeplane.core.ui.textchanger.TranslatedElement;
+import org.freeplane.core.util.LogUtils;
 
 public class JMenuItemBuilder implements EntryVisitor{
 
@@ -65,6 +66,14 @@ public class JMenuItemBuilder implements EntryVisitor{
 	}
 
 	private Component createActionComponent(Entry entry) {
+		
+		// FIXME actually not possible
+		final Object alreadyExistingComponent = entryAccessor.getComponent(entry);
+		if(alreadyExistingComponent != null) {
+			LogUtils.severe("BUG : component already exists at " + entry.getPath());
+			return null;
+		}
+		
 	    final Component component = menuActionComponentProvider.createComponent(entry);
 		final AFreeplaneAction action = entryAccessor.getAction(entry);
 		if (action != null) {
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuActionComponentProvider.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuActionComponentProvider.java
index a592140..40e3da7 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuActionComponentProvider.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuActionComponentProvider.java
@@ -46,6 +46,7 @@ public class MenuActionComponentProvider implements ComponentProvider {
 			}
 			final KeyStroke accelerator = accelerators.getAccelerator(action);
 			actionComponent.setAccelerator(accelerator);
+			MenuIconScaling.scaleIcon(actionComponent);
 			return actionComponent;
 		}
 		else if(entry.builders().contains("separator")){
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java
new file mode 100644
index 0000000..412e4a8
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuIconScaling.java
@@ -0,0 +1,24 @@
+package org.freeplane.core.ui.menubuilders.menu;
+
+import java.awt.Font;
+
+import javax.swing.AbstractButton;
+import javax.swing.Icon;
+
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.icon.factory.ImageIconFactory;
+
+class MenuIconScaling {
+	
+	static void scaleIcon(final AbstractButton actionComponent) {
+		final Icon icon = actionComponent.getIcon();
+		final ImageIconFactory imageIconFactory = ImageIconFactory.getInstance();
+		if (icon != null && imageIconFactory.canScaleIcon(icon)) {
+			final Font font = actionComponent.getFont();
+			final int fontHeight = actionComponent.getFontMetrics(font).getHeight();
+			final Quantity<LengthUnits> iconHeight = new Quantity<LengthUnits>(1.2 * fontHeight, LengthUnits.px);
+			actionComponent.setIcon(imageIconFactory.getScaledIcon(icon, iconHeight));
+		}
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuRadioActionComponentProvider.java b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuRadioActionComponentProvider.java
index 473827a..653e560 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuRadioActionComponentProvider.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/menubuilders/menu/MenuRadioActionComponentProvider.java
@@ -53,6 +53,7 @@ public class MenuRadioActionComponentProvider implements ComponentProvider {
 			buttonGroup.add(actionComponent);
 			final KeyStroke accelerator = accelerators.getAccelerator(action);
 			actionComponent.setAccelerator(accelerator);
+			MenuIconScaling.scaleIcon(actionComponent);
 			return actionComponent;
 		}
 		else if(entry.builders().contains("separator")){
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElementFactory.java b/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElementFactory.java
new file mode 100644
index 0000000..f7b4114
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/core/ui/textchanger/TranslatedElementFactory.java
@@ -0,0 +1,123 @@
+package org.freeplane.core.ui.textchanger;
+
+import javax.swing.AbstractButton;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JRadioButton;
+import javax.swing.JToggleButton;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.LabelAndMnemonicSetter;
+import org.freeplane.core.ui.components.JAutoToggleButton;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.icon.factory.ImageIconFactory;
+
+public class TranslatedElementFactory {
+	
+	public static JButton createButton(Action action, String labelKey) {
+		final JButton component = action != null ? new JButton(action) : new JButton();
+		final String text = TextUtils.getRawText(labelKey);
+		LabelAndMnemonicSetter.setLabelAndMnemonic(component, text);
+		TranslatedElement.TEXT.setKey(component, labelKey);
+		createTooltip(component, labelKey + ".tooltip");
+		return component;
+	}
+
+	public static JButton createButton(String labelKey) {
+		return createButton(null, labelKey);
+	}
+	
+	public static JToggleButton createToggleButton(Action action, String labelKey) {
+		final JToggleButton component = action != null ? new JAutoToggleButton(action) : new JAutoToggleButton();
+		final String text = TextUtils.getRawText(labelKey);
+		LabelAndMnemonicSetter.setLabelAndMnemonic(component, text);
+		TranslatedElement.TEXT.setKey(component, labelKey);
+		createTooltip(component, labelKey + ".tooltip");
+		return component;
+	}
+
+	public static JToggleButton createToggleButton(String labelKey) {
+		return createToggleButton(null, labelKey);
+	}
+	
+	public static JCheckBox createCheckBox(String labelKey) {
+		final String text = TextUtils.getText(labelKey);
+		final JCheckBox component = new JCheckBox();
+		LabelAndMnemonicSetter.setLabelAndMnemonic(component, text);
+		TranslatedElement.TEXT.setKey(component, labelKey);
+		createTooltip(component, labelKey + ".tooltip");
+		return component;
+	}
+
+	public static void createTitledBorder(JComponent component, String labelKey) {
+		final String text = TextUtils.getText(labelKey);
+		component.setBorder(BorderFactory.createTitledBorder(text));
+		TranslatedElement.BORDER.setKey(component, labelKey);
+	}
+
+	public static JLabel createLabel(String labelKey) {
+		final String text = TextUtils.getText(labelKey);
+		final JLabel component = new JLabel(text);
+		TranslatedElement.TEXT.setKey(component, labelKey);
+		createTooltip(component, labelKey + ".tooltip");
+		return component;
+	}
+
+	public static void createTooltip(JComponent component, String labelKey) {
+		final String text = TextUtils.getOptionalText(labelKey, null);
+		if(text != null){
+			component.setToolTipText(text);
+		}
+		TranslatedElement.TOOLTIP.setKey(component, labelKey);
+	}
+
+	public static JButton createButtonWithIcon(Action action, final String iconKey, final String tooltipKey ) {
+		final ImageIcon icon = ResourceController.getResourceController().getIcon(iconKey, ImageIconFactory.DEFAULT_UI_ICON_HEIGHT);
+		final JButton button;
+		if (action == null)
+			button = new JButton(icon);
+		else {
+			button = new JButton(action);
+			button.setText(null);
+			button.setIcon(icon);
+		}
+		createTooltip(button, tooltipKey);
+		return button;
+	}
+	public static JButton createButtonWithIcon(final String iconKey, final String tooltipKey ) {
+		return createButtonWithIcon(null, iconKey, tooltipKey);
+	}
+	
+	public static JToggleButton createToggleButtonWithIconAndLabel(final String iconKey, String labelKey) {
+		JToggleButton button = createToggleButton(labelKey);
+		return addIcon(button, iconKey);
+	}
+
+	public static JToggleButton createToggleButtonWithIcon(final String iconKey, String tooltipKey) {
+		final JToggleButton button = new JAutoToggleButton();
+		createTooltip(button, tooltipKey);
+		return addIcon(button, iconKey);
+	}
+
+	public static <T extends AbstractButton> T addIcon(T button, final String iconKey) {
+		final ImageIcon icon = ResourceController.getResourceController().getIcon(iconKey, ImageIconFactory.DEFAULT_UI_ICON_HEIGHT);
+		button.setIcon(icon);
+		return button;
+	}
+
+	public static JRadioButton createRadioButton(String labelKey) {
+		final JRadioButton component = new JRadioButton();
+		final String text = TextUtils.getRawText(labelKey);
+		LabelAndMnemonicSetter.setLabelAndMnemonic(component, text);
+		TranslatedElement.TEXT.setKey(component, labelKey);
+		createTooltip(component, labelKey + ".tooltip");
+		return component;
+	}
+
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/core/ui/textchanger/UITextChanger.java b/freeplane/src/main/java/org/freeplane/core/ui/textchanger/UITextChanger.java
index ba5d450..7d8f563 100644
--- a/freeplane/src/main/java/org/freeplane/core/ui/textchanger/UITextChanger.java
+++ b/freeplane/src/main/java/org/freeplane/core/ui/textchanger/UITextChanger.java
@@ -35,7 +35,6 @@ import javax.swing.text.JTextComponent;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.LabelAndMnemonicSetter;
 import org.freeplane.core.ui.components.UITools;
-import org.freeplane.core.util.FreeplaneIconUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.mode.Controller;
@@ -43,8 +42,9 @@ import org.freeplane.features.mode.Controller;
 class UITextChanger implements KeyEventDispatcher {
 	private static final String REPLACE_TEXT = "uiTextChanger.replaceText";
 	private static final String ORIGINAL_TEXT_IS_NOT_DEFINED = "uiTextChanger.originalTextIsNotDefined";
-	private static final ImageIcon WEBLATE_ICON = FreeplaneIconUtils.createImageIcon("/images/weblate-32.png");
+	private static final ImageIcon WEBLATE_ICON = ResourceController.getResourceController().getIcon("/images/weblate-32.png");
 	private static final String TEXT_FIELD_TRANSLATION_KEY = TranslatedElement.class.getName() + ".translationKey";
+	private static final float BORDER_TITLE_FONT_SIZE = UITools.getUIFontSize(1.0);
 	private TextChangeHotKeyAction textChangeAcceleratorAction;
 
 	public UITextChanger(TextChangeHotKeyAction textChangeAcceleratorAction) {
@@ -275,7 +275,7 @@ class UITextChanger implements KeyEventDispatcher {
 			textField.setToolTipText(originalRawText);
 		textField.addFocusListener(textFieldTextSelector);
 		String titleKey = element.getTitleKey();
-		UITools.addTitledBorder(textField, TextUtils.getRawText(titleKey), Math.round(UITools.FONT_SCALE_FACTOR*10));
+		UITools.addTitledBorder(textField, TextUtils.getRawText(titleKey), BORDER_TITLE_FONT_SIZE);
 		textField.putClientProperty(TranslatedElement.class, element);
 		textField.putClientProperty(TEXT_FIELD_TRANSLATION_KEY, translationKey);
 		TranslatedElement.BORDER.setKey(textField, titleKey);
diff --git a/freeplane/src/main/java/org/freeplane/core/util/Compat.java b/freeplane/src/main/java/org/freeplane/core/util/Compat.java
index 9ca1dcd..4d54252 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/Compat.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/Compat.java
@@ -154,8 +154,8 @@ public class Compat {
 	    return Arrays.asList("gnome-shell", "mate", "other...").contains(System.getenv("DESKTOP_SESSION"));
     }
 	
-	final public static String CURRENT_VERSION_DIR= File.separatorChar + "1.5.x";
-	final public static String PREVIOUS_VERSION_DIR_NAME = "1.3.x";
+	final public static String CURRENT_VERSION_DIR= File.separatorChar + "1.6.x";
+	final public static String PREVIOUS_VERSION_DIR_NAME = "1.5.x";
 	
 	private static String userFpDir = null;
 
diff --git a/freeplane/src/main/java/org/freeplane/core/util/FileUtils.java b/freeplane/src/main/java/org/freeplane/core/util/FileUtils.java
index 7ebe250..80c12ab 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/FileUtils.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/FileUtils.java
@@ -346,4 +346,8 @@ public class FileUtils {
 	    }
 	}
 
+	public static String validFileNameOf(String proposal) {
+		return proposal.replaceAll("[&:/\\\\\0%$#~\\?\\*]+", "");
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/util/FreeplaneIconUtils.java b/freeplane/src/main/java/org/freeplane/core/util/FreeplaneIconUtils.java
index 2e26e38..d262863 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/FreeplaneIconUtils.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/FreeplaneIconUtils.java
@@ -1,5 +1,8 @@
 package org.freeplane.core.util;
 
+import java.awt.Dimension;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -15,11 +18,18 @@ import org.freeplane.features.icon.MindIcon;
 import org.freeplane.features.icon.factory.MindIconFactory;
 import org.freeplane.features.icon.mindmapmode.MIconController;
 
+import com.kitfox.svg.SVGDiagram;
+import com.kitfox.svg.SVGUniverse;
+import com.kitfox.svg.app.beans.SVGIcon;
+
 /** utility methods to access Freeplane's (builtin and user) icons. */
 public class FreeplaneIconUtils {
 
+	private static final String ANTIALIAS_SVG = "antialias_svg";
+	private static SVGUniverse svgUniverse;
+
 	public static Icon createStandardIcon(String iconKey) {
-        return MindIconFactory.create(iconKey).getIcon();
+        return MindIconFactory.createIcon(iconKey).getIcon();
     }
 
 	/** lists all icons that are available in the icon selection dialog. This may include user icons
@@ -38,12 +48,6 @@ public class FreeplaneIconUtils {
 		return createImageIcon(resourceUrl);
 	}
 	
-	public static ImageIcon createImageIconByResourceKey(final String resourceKey) {
-		final ResourceController resourceController = ResourceController.getResourceController();
-		final URL resourceUrl = resourceController.getResource(resourceController.getProperty(resourceKey));
-		return createImageIcon(resourceUrl);
-	}
-
 	public static ImageIcon createImageIconPrivileged(final URL resourceUrl) {
 		return AccessController.doPrivileged(new PrivilegedAction<ImageIcon>() {
 			@Override
@@ -56,4 +60,80 @@ public class FreeplaneIconUtils {
 	private static ImageIcon createImageIcon(final URL resourceUrl) {
 		return new ImageIcon(resourceUrl);
 	}
+
+	private static boolean isSvgAntialiasEnabled() {
+		return ResourceController.getResourceController().getBooleanProperty(ANTIALIAS_SVG);
+	}
+
+	public static SVGIcon createSVGIcon(final URL url, final int heightPixels) {
+		return AccessController.doPrivileged(new PrivilegedAction<SVGIcon>() {
+			@Override
+			public SVGIcon run() {
+				return new SVGIconCreator(url).setHeight(heightPixels).create();
+			}
+		});
+	}
+
+	public static SVGIcon createSVGIconHavingWidth(final URL url, final int widthPixels) {
+		return AccessController.doPrivileged(new PrivilegedAction<SVGIcon>() {
+			@Override
+			public SVGIcon run() {
+				return new SVGIconCreator(url).setWidth(widthPixels).create();
+			}
+		});
+	}
+
+
+	public static SVGIcon createSVGIcon(final URL url) {
+		return AccessController.doPrivileged(new PrivilegedAction<SVGIcon>() {
+			@Override
+			public SVGIcon run() {
+				return new SVGIconCreator(url).create();
+			}
+		});
+	}
+	
+	private static class SVGIconCreator {
+		private float aspectRatio;
+		private SVGIcon icon;
+		
+		SVGIconCreator (URL url) {
+			if (svgUniverse == null)
+				svgUniverse = new SVGUniverse();
+
+			icon = new SVGIcon();
+			URI svgUri;
+			try {
+				try {
+					new URI(url.toString());
+					svgUri = svgUniverse.loadSVG(url);
+				}
+				catch (URISyntaxException ex){
+					svgUri = svgUniverse.loadSVG(url.openStream(), url.getPath());
+				}
+				icon.setSvgUniverse(svgUniverse);
+				icon.setSvgURI(svgUri);
+				final SVGDiagram diagram = svgUniverse.getDiagram(svgUri);
+				aspectRatio = diagram.getHeight()/diagram.getWidth();
+				icon.setAutosize(SVGIcon.AUTOSIZE_STRETCH);
+				icon.setAntiAlias(isSvgAntialiasEnabled());
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+		
+		public SVGIcon create() {
+			return icon;
+		}
+		
+		SVGIconCreator setHeight(final int heightPixels) {
+			icon.setPreferredSize(new Dimension((int)(heightPixels / aspectRatio), heightPixels));
+			return this;
+		}
+		
+		SVGIconCreator setWidth(final int widthPixels) {
+			icon.setPreferredSize(new Dimension(widthPixels, (int)(widthPixels * aspectRatio)));
+			return this;
+		}
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/util/FreeplaneVersion.java b/freeplane/src/main/java/org/freeplane/core/util/FreeplaneVersion.java
index 0a695a0..69c6444 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/FreeplaneVersion.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/FreeplaneVersion.java
@@ -32,7 +32,7 @@ public class FreeplaneVersion implements Comparable<FreeplaneVersion> {
 	private static final FreeplaneVersion VERSION = FreeplaneVersion.loadVersion();
 	public static final String VERSION_KEY = "freeplane_version";
 	public static final String VERSION_PROPERTIES = "/version.properties";
-	public static final String XML_VERSION = "freeplane 1.5.9";
+	public static final String XML_VERSION = "freeplane 1.6.0";
 	/** major version, the 1 in "1.0.38 rc" */
 	private final int mMaj;
 	/** mid version, the 0 in "1.0.38 rc" */
diff --git a/freeplane/src/main/java/org/freeplane/core/util/HtmlUtils.java b/freeplane/src/main/java/org/freeplane/core/util/HtmlUtils.java
index 0a807bc..d342bd5 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/HtmlUtils.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/HtmlUtils.java
@@ -216,7 +216,10 @@ public class HtmlUtils {
 					result.append("</p>\n<p>");
 					break;
 				default:
-					result.append(myChar);
+					if (myChar < 32 || myChar > 126)
+						result.append("&#").append(Integer.toString(myChar)).append(';');
+					else
+						result.append(myChar);
 			}
 		}
 		result.append("</p></body></html>");
@@ -375,7 +378,7 @@ public class HtmlUtils {
 					 result = new StringBuilder((int) (text.length() * 1.2));
 					 result.append(text.subSequence(0, i));
 				}
-				result.append("&#x").append(Integer.toString(intValue, 16)).append(';');
+				result.append("&#").append(Integer.toString(intValue)).append(';');
 			}
 			else if(result != null){
 				result.append(myChar);
@@ -572,26 +575,6 @@ public class HtmlUtils {
 			}
 		}
 	}
-
-	/**
-	 * @return true, if well formed XML.
-	 */
-	public static boolean isWellformedXml(final String xml) {
-		try {
-			final SAXParserFactory factory = SAXParserFactory.newInstance();
-			factory.setValidating(false);
-			factory.newSAXParser().parse(new InputSource(new StringReader(xml)), new DefaultHandler());
-			return true;
-		}
-		catch (final SAXParseException e) {
-			LogUtils.warn("XmlParseError on line " + e.getLineNumber() + " of " + xml, e);
-		}
-		catch (final Exception e) {
-			LogUtils.severe("XmlParseError", e);
-		}
-		return false;
-	}
-
 	public static String toHtml(final String xhtmlText) {
 		return HtmlUtils.SLASHED_TAGS_PATTERN.matcher(xhtmlText).replaceAll("<$1>");
 	}
@@ -605,9 +588,6 @@ public class HtmlUtils {
 		try {
 			XHTMLWriter.html2xhtml(reader, writer);
 			final String resultXml = writer.toString();
-			if (!HtmlUtils.isWellformedXml(resultXml)) {
-				return HtmlUtils.toXMLEscapedText(htmlText);
-			}
 			return resultXml;
 		}
 		catch (final IOException e) {
diff --git a/freeplane/src/main/java/org/freeplane/core/util/LogUtils.java b/freeplane/src/main/java/org/freeplane/core/util/LogUtils.java
index 367bc38..e823223 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/LogUtils.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/LogUtils.java
@@ -48,6 +48,7 @@ import org.freeplane.core.resources.ResourceController;
  */
 public class LogUtils {
     private static final Logger LOGGER = Logger.global;
+	private static final int MAX_LOG_SIZE = 1 * 1024 * 1024;
 	static private boolean loggerCreated = false;
 
 	public static void createLogger() {
@@ -83,10 +84,10 @@ public class LogUtils {
 			parentLogger.addHandler(stdConsoleHandler);
 			LoggingOutputStream los;
 			Logger logger = Logger.getLogger(StdFormatter.STDOUT.getName());
-			los = new LoggingOutputStream(logger, StdFormatter.STDOUT);
+			los = new LoggingOutputStream(logger, StdFormatter.STDOUT, MAX_LOG_SIZE);
 			System.setOut(new PrintStream(los, true));
 			logger = Logger.getLogger(StdFormatter.STDERR.getName());
-			los = new LoggingOutputStream(logger, StdFormatter.STDERR);
+			los = new LoggingOutputStream(logger, StdFormatter.STDERR, MAX_LOG_SIZE);
 			System.setErr(new PrintStream(los, true));
 		}
 		catch (final Exception e) {
diff --git a/freeplane/src/main/java/org/freeplane/core/util/LoggingOutputStream.java b/freeplane/src/main/java/org/freeplane/core/util/LoggingOutputStream.java
index 41d5a21..39439ee 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/LoggingOutputStream.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/LoggingOutputStream.java
@@ -30,6 +30,7 @@ class LoggingOutputStream extends ByteArrayOutputStream {
 	final private Level level;
 	final private String lineSeparator;
 	final private Logger logger;
+	private int availableSpace;
 
 	/**
 	 * Constructor
@@ -39,10 +40,11 @@ class LoggingOutputStream extends ByteArrayOutputStream {
 	 * @param level
 	 *            Level at which to write the log message
 	 */
-	public LoggingOutputStream(final Logger logger, final Level level) {
+	public LoggingOutputStream(final Logger logger, final Level level, int maximumLogSize) {
 		super();
 		this.logger = logger;
 		this.level = level;
+		this.availableSpace = maximumLogSize;
 		lineSeparator = System.getProperty("line.separator");
 	}
 
@@ -66,4 +68,22 @@ class LoggingOutputStream extends ByteArrayOutputStream {
 		}
 		logger.logp(level, "", "", record);
 	}
+
+	@Override
+	public synchronized void write(int b) {
+		if(availableSpace > 0) {
+			availableSpace--;
+			super.write(b);
+		}
+	}
+
+	@Override
+	public synchronized void write(byte[] b, int off, int len) {
+		if(availableSpace > 0) {
+			availableSpace-=len;
+			super.write(b, off, len);
+		}
+	}
+	
+	
 }
diff --git a/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java b/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java
index 2c3ff41..0caf23c 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/MenuUtils.java
@@ -96,7 +96,8 @@ public class MenuUtils {
 				// but only for a few of these Icons are available
 				return null;
 			}
-			return new MindIcon(resource.replaceAll("/images/(.*).png", "../$1"));
+			final String name = resource.replaceAll("/images/(.*).png", "../$1");
+			return new MindIcon(name);
 		}
 
 		@Override
diff --git a/freeplane/src/main/java/org/freeplane/core/util/Quantity.java b/freeplane/src/main/java/org/freeplane/core/util/Quantity.java
index 7a031ed..5855f10 100644
--- a/freeplane/src/main/java/org/freeplane/core/util/Quantity.java
+++ b/freeplane/src/main/java/org/freeplane/core/util/Quantity.java
@@ -1,5 +1,7 @@
 package org.freeplane.core.util;
 
+import org.freeplane.core.ui.LengthUnits;
+
 public class Quantity <U extends Enum<U> & Convertible >{
 	
 	public static <U extends Enum<U> & Convertible>  Quantity<U> fromString(String valueString, U defaultUnit) {
@@ -97,4 +99,8 @@ public class Quantity <U extends Enum<U> & Convertible >{
 	public Quantity<U> add(double value, U unit) {
 		return add(new Quantity<U>(value, unit));
 	}
+
+	public Quantity<U> zoomBy(double zoom) {
+		return new Quantity<U>(value * zoom, unit);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/DashVariant.java b/freeplane/src/main/java/org/freeplane/features/DashVariant.java
new file mode 100644
index 0000000..7a6fff5
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/DashVariant.java
@@ -0,0 +1,34 @@
+package org.freeplane.features;
+
+import javax.swing.Icon;
+
+import org.freeplane.core.ui.components.DashIconFactory;
+import org.freeplane.core.ui.components.RenderedContent;
+import org.freeplane.core.ui.components.RenderedContentSupplier;
+import org.freeplane.core.ui.components.UITools;
+
+public enum DashVariant  implements RenderedContentSupplier<DashVariant> {
+	SOLID(null), 
+	CLOSE_DOTS(new int[]{3, 3}), 
+	DASHES(new int[]{7, 7}), 
+	DISTANT_DOTS(new int[]{2, 7}), 
+	DOTS_AND_DASHES(new int[]{2, 7, 7, 7});
+	
+	public static DashVariant DEFAULT = DashVariant.SOLID;
+	public final int[] variant;
+	public final Icon icon;
+
+	private DashVariant(int[] variant) {
+		this.variant = variant;
+		final int LINE_WIDTH = 2;
+		final int ICON_HEIGHT = Math.round(12 * UITools.FONT_SCALE_FACTOR);
+		final int ICON_WIDTH = ICON_HEIGHT * 5;
+		icon = DashIconFactory.createIcon(ICON_WIDTH, ICON_HEIGHT, LINE_WIDTH, variant);
+	}
+
+	@Override
+	public RenderedContent<DashVariant> createRenderedContent() {
+		return new RenderedContent<DashVariant>(this, null, icon);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeCompareCondition.java b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeCompareCondition.java
index c01eb30..1da5da3 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeCompareCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeCompareCondition.java
@@ -96,7 +96,7 @@ public class AttributeCompareCondition extends CompareConditionAdapter {
 				continue;
 			}
 			final Object originalContent = attributes.getValueAt(i, 1);
-			final Object content = textController.getTransformedObjectNoThrow(originalContent, node, null);
+			final Object content = textController.getTransformedObjectNoFormattingNoThrow(originalContent, node, null);
 			if (checkContent(content))
 				return true;
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeConditionController.java b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeConditionController.java
index feb9913..0e628d6 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeConditionController.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeConditionController.java
@@ -31,6 +31,7 @@ import javax.swing.ListModel;
 import org.freeplane.core.resources.TranslatedObject;
 import org.freeplane.core.ui.FixedBasicComboBoxEditor;
 import org.freeplane.core.ui.components.TypedListCellRenderer;
+import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.core.util.collection.DoubleListModel;
 import org.freeplane.core.util.collection.ExtendedComboBoxModel;
@@ -38,9 +39,10 @@ import org.freeplane.core.util.collection.SortedComboBoxModel;
 import org.freeplane.features.filter.condition.ASelectableCondition;
 import org.freeplane.features.filter.condition.ConditionFactory;
 import org.freeplane.features.filter.condition.IElementaryConditionController;
-import org.freeplane.features.link.LinkTransformer;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.mode.Controller;
+import org.freeplane.features.text.TextController;
+import org.freeplane.features.text.TransformationException;
 import org.freeplane.features.ui.FrameController;
 import org.freeplane.n3.nanoxml.XMLElement;
 
@@ -147,8 +149,15 @@ static final TranslatedObject ANY_ATTRIBUTE_NAME_OR_VALUE_OBJECT = new Translate
             SortedComboBoxModel linkedList = new SortedComboBoxModel();
             for(int i = 0; i < list.getSize();i++){
             	final Object value = list.getElementAt(i);
-            	final Object transformedValue = new LinkTransformer(Controller.getCurrentModeController(), 1).transformContent(value, map);
-            	linkedList.add(transformedValue);
+            	final TextController textController = TextController.getController();
+            	if (! textController.isFormula(value, null, null)) {
+					try {
+						final Object transformedValue = textController.getTransformedObject(value, map.getRootNode(), null);
+						linkedList.add(transformedValue);
+					} catch (TransformationException e) {
+						LogUtils.severe(e);
+					}
+            	}
             }
             values.setExtensionList(linkedList);
         }
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java
index f2ee1ea..b44665f 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeController.java
@@ -234,13 +234,18 @@ public class AttributeController implements IExtension {
 				final boolean showIcon = Boolean.parseBoolean(showAttributeIcon);
 				if(showIcon) {
 					if (attributeIcon == null) {
-						attributeIcon = IconStoreFactory.create().getUIIcon("showAttributes.png");
+						attributeIcon = IconStoreFactory.ICON_STORE.getUIIcon("showAttributes.png");
 					}
 					return attributeIcon;
 				}
 				else
 					return null;
 			}
+
+			@Override
+			public boolean mustIncludeInIconRegistry() {
+				return true;
+			}
 		});
     }
 	
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeRegistry.java b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeRegistry.java
index 3c86e54..dee6236 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/AttributeRegistry.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/AttributeRegistry.java
@@ -35,6 +35,7 @@ import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
+import org.freeplane.features.text.TextController;
 import org.freeplane.n3.nanoxml.XMLElement;
 
 /**
@@ -47,7 +48,7 @@ public class AttributeRegistry implements IExtension {
 		AttributeRegistry registry = (AttributeRegistry) map.getExtension(AttributeRegistry.class);
 		if (registry == null) {
 			final AttributeController attributeController = AttributeController.getController();
-			registry = new AttributeRegistry(attributeController);
+			registry = new AttributeRegistry(attributeController, TextController.getController());
 			map.addExtension(AttributeRegistry.class, registry);
 			final NodeModel rootNode = map.getRootNode();
 			if(rootNode != null)
@@ -69,16 +70,11 @@ public class AttributeRegistry implements IExtension {
 	private AttributeRegistryTableModel myTableModel = null;
 	private Boolean restrictionModel;
 	protected int visibleElementsNumber;
+	private final TextController textController;
 
-	/**
-	 *
-	 */
-	public AttributeRegistry() {
-		super();
-	}
-
-	public AttributeRegistry(final AttributeController attributeController) {
+	public AttributeRegistry(final AttributeController attributeController, final TextController textController) {
 		super();
+		this.textController = textController;
 		attributeListeners = new HashSet<IAttributesListener>();
 		changeListeners = new HashSet<ChangeListener>();
 		isAttributeLayoutChanged = false;
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeManagerDialog.java b/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeManagerDialog.java
index c9ff0b5..7e562d2 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeManagerDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeManagerDialog.java
@@ -29,7 +29,6 @@ import java.awt.event.WindowEvent;
 import javax.swing.AbstractAction;
 import javax.swing.Box;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JScrollPane;
@@ -38,12 +37,12 @@ import javax.swing.ListSelectionModel;
 import javax.swing.WindowConstants;
 import javax.swing.border.EmptyBorder;
 
-import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.core.util.collection.IListModel;
 import org.freeplane.features.attribute.AttributeRegistry;
+import org.freeplane.features.icon.factory.IconStoreFactory;
 import org.freeplane.features.map.IMapSelectionListener;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
@@ -187,8 +186,7 @@ public class AttributeManagerDialog extends JDialog implements IMapSelectionList
 		}
 	}
 
-	static final Icon editButtonImage = new ImageIcon(ResourceController.getResourceController().getResource(
-	    "/images/edit12.png"));
+	static final Icon editButtonImage = IconStoreFactory.ICON_STORE.getUIIcon("edit12.png").getIcon();
 	private static final long serialVersionUID = 1L;
 // // 	final private Controller controller;
 	private ImportAttributesDialog importDialog = null;
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeRegistryTable.java b/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeRegistryTable.java
index 62d8c8b..82a0af3 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeRegistryTable.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/AttributeRegistryTable.java
@@ -26,7 +26,6 @@ import javax.swing.AbstractAction;
 import javax.swing.AbstractCellEditor;
 import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -123,8 +122,7 @@ class AttributeRegistryTable extends JTable {
 		}
 	}
 
-	static final private Icon checkBoxImage = new ImageIcon(ResourceController.getResourceController().getResource(
-	    "/images/checkbox12.png"));
+	static final private Icon checkBoxImage = ResourceController.getResourceController().getIcon("/images/checkbox12.png");
 	private static final ButtonRenderer editButtonRenderer = new ButtonRenderer(AttributeManagerDialog.editButtonImage,
 	    TextUtils.getText("attributes_edit_tooltip"));
 	/**
diff --git a/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/ImportAttributesDialog.java b/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/ImportAttributesDialog.java
index d7251fb..8a1bd5f 100644
--- a/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/ImportAttributesDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/attribute/mindmapmode/ImportAttributesDialog.java
@@ -56,7 +56,7 @@ import org.freeplane.features.mode.Controller;
 import org.freeplane.features.ui.IMapViewManager;
 
 class ImportAttributesDialog extends JDialog implements TreeSelectionListener {
-	private static final IconStore STORE = IconStoreFactory.create();
+	private static final IconStore STORE = IconStoreFactory.ICON_STORE;
 
 	static private class AttributeTreeNodeInfo extends TreeNodeInfo {
 		final private boolean restricted;
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/ClipboardController.java b/freeplane/src/main/java/org/freeplane/features/clipboard/ClipboardController.java
index 4cf3997..7bbc5f8 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/ClipboardController.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/ClipboardController.java
@@ -436,20 +436,15 @@ public class ClipboardController implements IExtension {
 		for (int i = 0; i < depth; ++i) {
 			fileout.write(indentation);
 		}
-		if (plainTextContent.matches(" *")) {
-			fileout.write("o");
+		if (NodeLinks.getValidLink(mindMapNodeModel) != null) {
+			final String link = NodeLinks.getLinkAsString(mindMapNodeModel);
+			if (!link.equals(plainTextContent)) {
+				fileout.write(plainTextContent + " ");
+			}
+			fileout.write("<" + link + ">");
 		}
 		else {
-			if (NodeLinks.getValidLink(mindMapNodeModel) != null) {
-				final String link = NodeLinks.getLinkAsString(mindMapNodeModel);
-				if (!link.equals(plainTextContent)) {
-					fileout.write(plainTextContent + " ");
-				}
-				fileout.write("<" + link + ">");
-			}
-			else {
-				fileout.write(plainTextContent);
-			}
+			fileout.write(plainTextContent);
 		}
 		fileout.write("\n");
 		writeChildrenText(mindMapNodeModel, fileout, depth, indentation);
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/CopySingleAction.java b/freeplane/src/main/java/org/freeplane/features/clipboard/CopySingleAction.java
index 46cc06f..20f538e 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/CopySingleAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/CopySingleAction.java
@@ -39,7 +39,7 @@ class CopySingleAction extends AFreeplaneAction {
 
 	public void actionPerformed(final ActionEvent e) {
 		final Controller controller = Controller.getCurrentController();
-		final Collection<NodeModel> selection = controller.getSelection().getSelection();
+		final Collection<NodeModel> selection = controller.getSelection().getSortedSelection(false);
 		final ModeController modeController = Controller.getCurrentModeController();
 		final Transferable copy = ((ClipboardController) modeController.getExtension(ClipboardController.class))
 		    .copySingle(selection);
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java b/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java
index b6babd9..8aae402 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/MindMapHTMLWriter.java
@@ -166,8 +166,8 @@ class MindMapHTMLWriter {
 
 	private void writeBodyWithFolding(final NodeModel rootNodeOfBranch) throws IOException {
 		writeJavaScript();
-		fileout.write("<SPAN class=\"foldspecial\" onclick=\"fold_document()\">All +</SPAN>" + lf);
-		fileout.write("<SPAN class=\"foldspecial\" onclick=\"unfold_document()\">All -</SPAN>" + lf);
+		fileout.write("<SPAN class=\"foldspecial\" onclick=\"unfold_document()\">All +</SPAN>" + lf);
+		fileout.write("<SPAN class=\"foldspecial\" onclick=\"fold_document()\">All -</SPAN>" + lf);
 		writeHTML(rootNodeOfBranch, "1", 0, /* isRoot */true, true, /* depth */
 		1);
 		fileout.write("<SCRIPT type=\"text/javascript\">" + lf);
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java
index 5d09cc9..6bffdf0 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/MClipboardController.java
@@ -24,7 +24,6 @@ import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.dnd.DnDConstants;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
@@ -46,7 +45,6 @@ import javax.swing.text.ElementIterator;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 
-import org.apache.commons.lang.StringUtils;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.ExampleFileFilter;
 import org.freeplane.core.ui.components.UITools;
@@ -88,25 +86,16 @@ import org.freeplane.view.swing.features.filepreview.ViewerController.PasteMode;
 public class MClipboardController extends ClipboardController {
 	public static final String RESOURCES_REMIND_USE_RICH_TEXT_IN_NEW_NODES = "remind_use_rich_text_in_new_nodes";
 	private class DirectHtmlFlavorHandler implements IDataFlavorHandler {
-		private String textFromClipboard;
+		private final String textFromClipboard;
 
 		public DirectHtmlFlavorHandler(final String textFromClipboard) {
 			this.textFromClipboard = textFromClipboard;
 		}
 
 		void paste(final NodeModel target) {
-			textFromClipboard = cleanHtml(textFromClipboard);
-			final NodeModel node = Controller.getCurrentModeController().getMapController().newNode(textFromClipboard,
+			final String text = cleanHtml(textFromClipboard);
+			final NodeModel node = Controller.getCurrentModeController().getMapController().newNode(text,
 					Controller.getCurrentController().getMap());
-			final String text = textFromClipboard;
-			final Matcher m = HREF_PATTERN.matcher(text);
-			if (m.matches()) {
-				final String body = m.group(2);
-				if (!body.matches(".*<\\s*a.*")) {
-					final String href = m.group(1);
-					((MLinkController) LinkController.getController()).setLinkTypeDependantLink(node, href);
-				}
-			}
 			((MMapController) Controller.getCurrentModeController().getMapController()).insertNode(node, target);
 		}
 
@@ -124,21 +113,35 @@ public class MClipboardController extends ClipboardController {
 		}
 
 		public void paste(Transferable t, final NodeModel target, final boolean asSibling, final boolean isLeft, int dropAction) {
-	        if (LinkController.getLinkType() == LinkController.LINK_RELATIVE_TO_MINDMAP && target.getMap().getFile() == null) {
+			boolean copyFile = dropAction == DnDConstants.ACTION_COPY;
+	        final File mapFile = target.getMap().getFile();
+			if ((copyFile || LinkController.getLinkType() == LinkController.LINK_RELATIVE_TO_MINDMAP) && mapFile == null) {
 	        	JOptionPane.showMessageDialog(Controller.getCurrentController().getViewController().getCurrentRootComponent(),
 	        	    TextUtils.getText("map_not_saved"), "Freeplane", JOptionPane.WARNING_MESSAGE);
 	        	return;
 	        }
-			boolean pasteImages = dropAction == DnDConstants.ACTION_COPY;
 			ViewerController viewerController = ((ViewerController)Controller.getCurrentModeController().getExtension(ViewerController.class));
-			for (final File file : fileList) {
-				if(pasteImages  && viewerController.paste(file, target, PasteMode.valueOf(asSibling), isLeft)){
-					continue;
+			boolean pasteImagesFromFiles = ResourceController.getResourceController().getBooleanProperty("pasteImagesFromFiles");
+			for (final File sourceFile : fileList) {
+				final File file;
+				if(copyFile){
+					try {
+						file = new TargetFileCreator().createTargetFile(mapFile, sourceFile.getName());
+						file.getParentFile().mkdirs();
+						FileUtils.copyFile(sourceFile, file);
+					} catch (IOException e) {
+						LogUtils.warn(e);
+						continue;
+					}
+				}
+				else
+					file = sourceFile;
+				if(! pasteImagesFromFiles || !viewerController.paste(file, target, PasteMode.valueOf(asSibling), isLeft)) {
+					final MMapController mapController = (MMapController) Controller.getCurrentModeController().getMapController();
+					final NodeModel node = mapController.newNode(file.getName(), target.getMap());
+					((MLinkController) LinkController.getController()).setLinkTypeDependantLink(node, file);
+					mapController.insertNode(node, target, asSibling, isLeft, isLeft);
 				}
-				final MMapController mapController = (MMapController) Controller.getCurrentModeController().getMapController();
-				final NodeModel node = mapController.newNode(file.getName(), target.getMap());
-				((MLinkController) LinkController.getController()).setLinkTypeDependantLink(node, file);
-				mapController.insertNode(node, target, asSibling, isLeft, isLeft);
 			}
 		}
 	}
@@ -257,11 +260,11 @@ public class MClipboardController extends ClipboardController {
 			this.textFromClipboard = textFromClipboard;
 		}
 
-		private String addFragment(final HTMLDocument doc, final Element element, final int depth, final int start,
+		private void addFragment(final HTMLDocument doc, final Element element, final int depth, final int start,
 		                           final int end, final LinkedList<TextFragment> htmlFragments)
 		        throws BadLocationException, IOException {
 			final String paragraphText = doc.getText(start, end - start).trim();
-			if (paragraphText.length() > 0) {
+			if (paragraphText.length() > 0 || element.getName().equals("img")) {
 				final StringWriter out = new StringWriter();
 				new PasteHtmlWriter(out, element, doc, start, end - start).write();
 				final String string = out.toString();
@@ -271,7 +274,6 @@ public class MClipboardController extends ClipboardController {
 					htmlFragments.add(htmlFragment);
 				}
 			}
-			return paragraphText;
 		}
 
 		private Element getParentElement(final HTMLDocument doc) {
@@ -297,9 +299,9 @@ public class MClipboardController extends ClipboardController {
 
 		private void pasteHtmlWithoutRedisplay(final Object t, final NodeModel parent, final boolean asSibling,
 		                                       final boolean isLeft) {
-			String textFromClipboard = (String) t;
-			textFromClipboard = cleanHtml(textFromClipboard);
-			final TextFragment[] htmlFragments = split(textFromClipboard);
+			final String textFromClipboard = (String) t;
+			final String cleanedTextFromClipboard = cleanHtml(textFromClipboard);
+			final TextFragment[] htmlFragments = split(cleanedTextFromClipboard);
 			pasteStringWithoutRedisplay(htmlFragments, parent, asSibling, isLeft);
 		}
 
@@ -409,39 +411,35 @@ public class MClipboardController extends ClipboardController {
             	UITools.errorMessage(TextUtils.getRawText("map_not_saved"));
             	return;
             }
-            final String mmFileName = mindmapFile.getName();
-            String fileNameTemplate = mmFileName.substring(0, mmFileName.lastIndexOf('.')) + "_";
-            while (fileNameTemplate.length() < 3)
-            	fileNameTemplate = fileNameTemplate + '_';
             //file that we'll save to disk.
-            File file;
+            File imageFile;
             try {
-            	final File dir = mindmapFile.getParentFile();
-            	file = File.createTempFile(fileNameTemplate, "."+ImageAdder.IMAGE_FORMAT, dir);
-            	String imgfilepath=file.getAbsolutePath();
-            	File tempFile = file = new File(imgfilepath);
-            	final JFileChooser fileChooser = new JFileChooser(file);		
+            	imageFile = new TargetFileCreator().createTargetFile(mindmapFile, ImageAdder.IMAGE_FORMAT);
+    			imageFile.getParentFile().mkdirs();
+            	String imgfilepath=imageFile.getAbsolutePath();
+            	File tempFile = imageFile = new File(imgfilepath);
+            	final JFileChooser fileChooser = new JFileChooser(imageFile);		
             	final ExampleFileFilter filter = new ExampleFileFilter();
             	filter.addExtension(ImageAdder.IMAGE_FORMAT);
             	fileChooser.setAcceptAllFileFilterUsed(false);
             	fileChooser.setFileFilter(filter);
-            	fileChooser.setSelectedFile(file);
+            	fileChooser.setSelectedFile(imageFile);
             	int returnVal = fileChooser.showSaveDialog(UITools.getCurrentRootComponent());
             	if (returnVal != JFileChooser.APPROVE_OPTION) {
             		tempFile.delete();
             		return;
             	}
-            	file = fileChooser.getSelectedFile();
-            	if(tempFile.exists() && ! file.getAbsoluteFile().equals(tempFile)){
+            	imageFile = fileChooser.getSelectedFile();
+            	if(tempFile.exists() && ! imageFile.getAbsoluteFile().equals(tempFile)){
             		tempFile.delete();
             	}
-            	if(file.isDirectory())
+            	if(imageFile.isDirectory())
             		return;
-            	if(! FileUtils.getExtension(file.getName()).equals(ImageAdder.IMAGE_FORMAT))
-            		file = new File(file.getPath() + '.' + ImageAdder.IMAGE_FORMAT);
-            	final NodeModel node = mapController.newNode(file.getName(), target.getMap());
+            	if(! FileUtils.getExtension(imageFile.getName()).equals(ImageAdder.IMAGE_FORMAT))
+            		imageFile = new File(imageFile.getPath() + '.' + ImageAdder.IMAGE_FORMAT);
+            	final NodeModel node = mapController.newNode(imageFile.getName(), target.getMap());
             	mapController.insertNode(node, target, asSibling, isLeft, isLeft);
-            	new ImageAdder(image, mapController, mindmapFile, file).attachImageToNode(node);
+            	new ImageAdder(image, mapController, mindmapFile, imageFile).attachImageToNode(node);
             }
             catch (IOException e) {
             	e.printStackTrace();
@@ -450,8 +448,6 @@ public class MClipboardController extends ClipboardController {
 
     }
 	private static final Pattern HEADER_REGEX = Pattern.compile("h(\\d)", Pattern.CASE_INSENSITIVE);
-	private static final Pattern HREF_PATTERN = Pattern
-	    .compile("<html>\\s*<body>\\s*<a\\s+href=\"([^>]+)\">(.*)</a>\\s*</body>\\s*</html>");
 	private static final String RESOURCE_UNFOLD_ON_PASTE = "unfold_on_paste";
 	public static final String RESOURCES_CUT_NODES_WITHOUT_QUESTION = "cut_nodes_without_question";
 
@@ -472,17 +468,20 @@ public class MClipboardController extends ClipboardController {
 		createActions();
 	}
 
-	private String cleanHtml(String in) {
-		in = in.replaceFirst("(?i)(?s)<head>.*</head>", "").replaceFirst("(?i)(?s)^.*<html[^>]*>", "<html>")
+	private String cleanHtml(String content) {
+		content = content.replaceFirst("(?i)(?s)<head>.*</head>", "").replaceFirst("(?i)(?s)^.*<html[^>]*>", "<html>")
 		    .replaceFirst("(?i)(?s)<body [^>]*>", "<body>").replaceAll("(?i)(?s)<script.*?>.*?</script>", "")
 		    .replaceAll("(?i)(?s)</?tbody.*?>", "").replaceAll("(?i)(?s)<!--.*?-->", "").replaceAll(
 		        "(?i)(?s)</?o[^>]*>", "");
-		if (StringUtils.equals(ResourceController.getResourceController().getProperty(
-		    "cut_out_pictures_when_pasting_html"), "true")) {
-			in = in.replaceAll("(?i)(?s)<img[^>]*>", "");
+		if (ResourceController.getResourceController().getBooleanProperty("cut_out_pictures_when_pasting_html")) {
+			String contentWithoutImages = content.replaceAll("(?i)(?s)<img[^>]*>", "");
+			final boolean contentContainsOnlyImages = HtmlUtils.htmlToPlain(contentWithoutImages).trim().isEmpty();
+			if(! contentContainsOnlyImages) {
+				content = contentWithoutImages;
+			}
 		}
-		in = HtmlUtils.unescapeHTMLUnicodeEntity(in);
-		return in;
+		content = HtmlUtils.unescapeHTMLUnicodeEntity(content);
+		return content;
 	}
 
 	/**
@@ -535,17 +534,6 @@ public class MClipboardController extends ClipboardController {
 			catch (final IOException e) {
 			}
 		}
-		if (t.isDataFlavorSupported(MindMapNodesSelection.fileListFlavor)) {
-			try {
-				final List<File> fileList = castToFileList(t.getTransferData(MindMapNodesSelection.fileListFlavor));
-				if (!shouldIgnoreFileListFlavor(fileList))
-					return new FileListFlavorHandler(fileList);
-			}
-			catch (final UnsupportedFlavorException e) {
-			}
-			catch (final IOException e) {
-			}
-		}
 		final ResourceController resourceController = ResourceController.getResourceController();
 		DataFlavor supportedHtmlFlavor = getSupportedHtmlFlavor(t);
 		if (supportedHtmlFlavor != null) {
@@ -576,6 +564,17 @@ public class MClipboardController extends ClipboardController {
 			catch (final IOException e) {
 			}
 		}
+		if (t.isDataFlavorSupported(MindMapNodesSelection.fileListFlavor)) {
+			try {
+				final List<File> fileList = castToFileList(t.getTransferData(MindMapNodesSelection.fileListFlavor));
+				if (!shouldIgnoreFileListFlavor(fileList))
+					return new FileListFlavorHandler(fileList);
+			}
+			catch (final UnsupportedFlavorException e) {
+			}
+			catch (final IOException e) {
+			}
+		}
 		if (t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
 			try {
 				final String plainTextFromClipboard = t.getTransferData(DataFlavor.stringFlavor).toString();
@@ -600,7 +599,7 @@ public class MClipboardController extends ClipboardController {
 	}
 
 	private boolean shouldIgnoreFileListFlavor(final List<File> fileList) {
-		if(fileList.isEmpty())
+		if(fileList == null || fileList.isEmpty())
 			return true;
 		final File file = fileList.get(0);
 		if(file.isDirectory())
@@ -696,10 +695,12 @@ public class MClipboardController extends ClipboardController {
 		if (t == null) {
 			return;
 		}
-		/*
-		 * DataFlavor[] fl = t.getTransferDataFlavors(); for (int i = 0; i <
-		 * fl.length; i++) { System.out.println(fl[i]); }
-		 */
+//		
+//		DataFlavor[] fl = t.getTransferDataFlavors();
+//		for (int i = 0; i < fl.length; i++) {
+//			System.out.println(fl[i]);
+//		}
+
 		final IDataFlavorHandler handler = getFlavorHandler(t);
 		paste(t, handler, target, asSibling, isLeft, dropAction);
 	}
@@ -729,7 +730,7 @@ public class MClipboardController extends ClipboardController {
 			final ModeController modeController = Controller.getCurrentModeController();
 			if (!asSibling && modeController.getMapController().isFolded(target)
 			        && ResourceController.getResourceController().getBooleanProperty(RESOURCE_UNFOLD_ON_PASTE)) {
-				modeController.getMapController().setFoldedAndScroll(target, false);
+				modeController.getMapController().unfoldAndScroll(target);
 			}
 			for (final NodeModel child : newNodes) {
 				AttributeController.getController().performRegistrySubtreeAttributes(child);
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/SelectedPasteAction.java b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/SelectedPasteAction.java
index 0a55dd3..1c829e4 100644
--- a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/SelectedPasteAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/SelectedPasteAction.java
@@ -25,6 +25,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
 
+import javax.swing.Action;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.JOptionPane;
@@ -56,8 +57,8 @@ class SelectedPasteAction extends AFreeplaneAction {
 			return;
 		}
 		final JPanel options = createPane(flavorHandlers);
-		if (JOptionPane.CANCEL_OPTION == JOptionPane.showConfirmDialog((Component) e.getSource(), options, e
-		    .getActionCommand(), JOptionPane.OK_CANCEL_OPTION)) {
+		if (JOptionPane.CANCEL_OPTION == JOptionPane.showConfirmDialog((Component) e.getSource(), options, 
+				(String) getValue(Action.NAME), JOptionPane.OK_CANCEL_OPTION)) {
 			return;
 		}
 		final NodeModel parent = Controller.getCurrentController().getSelection().getSelected();
diff --git a/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java
new file mode 100644
index 0000000..2d43c77
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/clipboard/mindmapmode/TargetFileCreator.java
@@ -0,0 +1,47 @@
+package org.freeplane.features.clipboard.mindmapmode;
+
+import java.io.File;
+import java.io.IOException;
+
+class TargetFileCreator {
+	File createTargetFile(File mindmapFile, String prototypeName) throws IOException{
+		final String mapFileNameWithExtension = mindmapFile.getName();
+		final String mapFileName = removeExtension(mapFileNameWithExtension);
+		final File mindMapDirectory = mindmapFile.getParentFile();
+		final File mapFilesDirectory = new File(mindMapDirectory, mapFileName + "_files");
+		if (! mapFilesDirectory.exists() || mapFilesDirectory.isDirectory()) {
+			if(prototypeName.contains(".")){
+				final File target = new File(mapFilesDirectory, prototypeName);
+				if(! target.exists())
+					return target;
+			}
+			String sourceFileName = removeExtension(prototypeName);
+			String fileNameTemplate = sourceFileName + "_";
+			while (fileNameTemplate.length() < 3)
+				fileNameTemplate = fileNameTemplate + '_';
+			mapFilesDirectory.mkdir();
+			File targetFile = File.createTempFile(fileNameTemplate, "."+ getExtension(prototypeName), mapFilesDirectory);
+			return targetFile;
+			
+		} else {
+			String sourceFileName = removeExtension(prototypeName);
+			String fileNameTemplate = mapFileName + "_" + sourceFileName + "_";
+			while (fileNameTemplate.length() < 3)
+				fileNameTemplate = fileNameTemplate + '_';
+			File targetFile = File.createTempFile(fileNameTemplate, "."+ getExtension(prototypeName), mindMapDirectory);
+			return targetFile;
+		}
+	}
+
+	private String removeExtension(final String fileNameWithExtension) {
+		final int extensionIndex = fileNameWithExtension.lastIndexOf('.');
+		if(extensionIndex >= 0)
+			return fileNameWithExtension.substring(0,  extensionIndex);
+		else
+			return fileNameWithExtension;
+	}
+	
+	private String getExtension(final String fileNameWithExtension) {
+		return fileNameWithExtension.substring(fileNameWithExtension.lastIndexOf('.') + 1);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/cloud/CloudController.java b/freeplane/src/main/java/org/freeplane/features/cloud/CloudController.java
index 3122a7c..4af386a 100644
--- a/freeplane/src/main/java/org/freeplane/features/cloud/CloudController.java
+++ b/freeplane/src/main/java/org/freeplane/features/cloud/CloudController.java
@@ -26,7 +26,6 @@ import java.util.Collection;
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.io.ReadManager;
 import org.freeplane.core.io.WriteManager;
-import org.freeplane.core.resources.IFreeplanePropertyListener;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.util.ColorUtils;
 import org.freeplane.features.cloud.CloudModel.Shape;
@@ -45,23 +44,21 @@ import org.freeplane.features.styles.MapStyleModel;
  * @author Dimitry Polivaev
  */
 public class CloudController implements IExtension {
-	protected static class CloudAdapterListener implements IFreeplanePropertyListener {
-		public void propertyChanged(final String propertyName, final String newValue, final String oldValue) {
-			if (propertyName.equals(CloudController.RESOURCES_CLOUD_COLOR)) {
-				standardColor = ColorUtils.stringToColor(newValue);
-			}
-		}
-	}
-
 	static final Stroke DEF_STROKE = new BasicStroke(3);
 	public static final int DEFAULT_WIDTH = -1;
-	private static CloudAdapterListener listener = null;
 	public static final int NORMAL_WIDTH = 3;
 	public static final String RESOURCES_CLOUD_COLOR = "standardcloudcolor";
-	private static Color standardColor = null;
+	public static final String RESOURCES_CLOUD_SHAPE = "standardcloudshape";
 
 	public static Color getStandardColor() {
-		return standardColor;
+		final ResourceController resourceController = ResourceController.getResourceController();
+		final String colorCode = resourceController.getProperty(CloudController.RESOURCES_CLOUD_COLOR);
+		return ColorUtils.stringToColor(colorCode);
+	}
+
+	public static Shape getStandardShape() {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		return resourceController.getEnumProperty(CloudController.RESOURCES_CLOUD_SHAPE, Shape.ARC);
 	}
 
 	public static CloudController getController() {
@@ -81,11 +78,6 @@ public class CloudController implements IExtension {
 	public CloudController(final ModeController modeController) {
 //		this.modeController = modeController;
 		cloudHandlers = new ExclusivePropertyChain<CloudModel, NodeModel>();
-		if (listener == null) {
-			listener = new CloudAdapterListener();
-			ResourceController.getResourceController().addPropertyChangeListener(listener);
-		}
-		updateStandards();
 		addCloudGetter(IPropertyHandler.STYLE, new IPropertyHandler<CloudModel, NodeModel>() {
 			public CloudModel getProperty(final NodeModel node, final CloudModel currentValue) {
 				return getStyleCloud(node.getMap(), LogicalStyleController.getController(modeController).getStyles(node));
@@ -123,10 +115,6 @@ public class CloudController implements IExtension {
 		return cloud != null ? cloud.getColor() : null;
 	}
 
-	public Color getExteriorColor(final NodeModel node) {
-		return getColor(node).darker();
-	}
-
 	public int getWidth(final NodeModel node) {
 		return NORMAL_WIDTH;
 	}
@@ -135,20 +123,12 @@ public class CloudController implements IExtension {
 		return cloudHandlers.removeGetter(key);
 	}
 
-	private void updateStandards() {
-		if (standardColor == null) {
-			final String stdColor = ResourceController.getResourceController().getProperty(
-			    CloudController.RESOURCES_CLOUD_COLOR);
-			standardColor = ColorUtils.stringToColor(stdColor);
-		}
-	}
-
 	public CloudModel getCloud(final NodeModel model) {
 		return cloudHandlers.getProperty(model);
 	}
 
 	public Shape getShape(NodeModel node) {
 		final CloudModel cloud = getCloud(node);
-		return cloud != null ? cloud.getShape() : null;
+		return cloud != null ? cloud.getShape() : getStandardShape();
     }
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/cloud/mindmapmode/MCloudController.java b/freeplane/src/main/java/org/freeplane/features/cloud/mindmapmode/MCloudController.java
index e043136..0f9f294 100644
--- a/freeplane/src/main/java/org/freeplane/features/cloud/mindmapmode/MCloudController.java
+++ b/freeplane/src/main/java/org/freeplane/features/cloud/mindmapmode/MCloudController.java
@@ -100,6 +100,7 @@ public class MCloudController extends CloudController {
 			return;
 		}
 		final Color color = cloud != null ? cloud.getColor() : CloudController.getStandardColor();
+		final Shape shape = cloud != null ? cloud.getShape() : CloudController.getStandardShape();
 		final ModeController modeController = Controller.getCurrentModeController();
 		final IActor actor = new IActor() {
 			public void act() {
@@ -120,6 +121,7 @@ public class MCloudController extends CloudController {
 			private void enable() {
 				final CloudModel cloud = new CloudModel();
 				cloud.setColor(color);
+				cloud.setShape(shape);
 				final MapController mapController = modeController.getMapController();
 				CloudModel.setModel(node, cloud);
 				mapController.nodeChanged(node);
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColorHook.java b/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColorHook.java
index 88b71f7..f1b8b15 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColorHook.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/AutomaticEdgeColorHook.java
@@ -25,6 +25,7 @@ import org.freeplane.features.edge.AutomaticEdgeColor.Rule;
 import org.freeplane.features.edge.mindmapmode.MEdgeController;
 import org.freeplane.features.map.AMapChangeListenerAdapter;
 import org.freeplane.features.map.MapController;
+import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.map.NodeMoveEvent;
 import org.freeplane.features.mode.Controller;
@@ -32,7 +33,6 @@ import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.mode.NodeHookDescriptor;
 import org.freeplane.features.mode.PersistentNodeHook;
 import org.freeplane.features.mode.mindmapmode.MModeController;
-import org.freeplane.features.styles.AutomaticLayoutController;
 import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.styles.LogicalStyleModel;
 import org.freeplane.features.styles.MapStyleModel;
@@ -59,13 +59,12 @@ public class AutomaticEdgeColorHook extends PersistentNodeHook implements IExten
 				final EdgeModel edgeModel = EdgeModel.createEdgeModel(child);
 				if(null == edgeModel.getColor()){
 					final MEdgeController controller = (MEdgeController) EdgeController.getController();
-					final AutomaticEdgeColor model = (AutomaticEdgeColor) getMapHook(parent.getMap());
+					final MapModel map = parent.getMap();
+					final AutomaticEdgeColor model = (AutomaticEdgeColor) getMapHook(map);
 					model.increaseColorCounter();
-					int colorCounter = model.getColorCounter();
-					AutomaticLayoutController automaticLatoutController = modeController.getExtension(AutomaticLayoutController.class);
-					NodeModel styleNode = automaticLatoutController.getStyleNode(parent.getMap(), colorCounter, true);
-					if(styleNode != null){
-						controller.setColor(child, controller.getColor(styleNode));
+					if(controller.areEdgeColorsAvailable(map)){
+						int colorCounter = model.getColorCounter();
+						controller.setColor(child, controller.getEdgeColor(map, colorCounter));
 					}
 				}
 			}
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/EdgeBuilder.java b/freeplane/src/main/java/org/freeplane/features/edge/EdgeBuilder.java
index f8b5156..4cad6eb 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/EdgeBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/EdgeBuilder.java
@@ -31,6 +31,7 @@ import org.freeplane.core.io.ITreeWriter;
 import org.freeplane.core.io.ReadManager;
 import org.freeplane.core.io.WriteManager;
 import org.freeplane.core.util.ColorUtils;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.map.MapWriter;
 import org.freeplane.features.map.NodeBuilder;
 import org.freeplane.features.map.NodeModel;
@@ -102,6 +103,12 @@ class EdgeBuilder implements IElementDOMHandler, IExtensionElementWriter, IEleme
 				}
 			}
 		});
+		reader.addAttributeHandler("edge", "DASH", new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final EdgeModel edge = (EdgeModel) userObject;
+				edge.setDash(DashVariant.valueOf(value));
+			}
+		});
 	}
 
 	/**
@@ -142,7 +149,8 @@ class EdgeBuilder implements IElementDOMHandler, IExtensionElementWriter, IEleme
 		final String style = EdgeStyle.toString(styleObj);
 		final Color color = forceFormatting ? ec.getColor(node) : model.getColor();
 		final int width = forceFormatting ? ec.getWidth(node) : model.getWidth();
-		if (forceFormatting || style != null || color != null || width != EdgeModel.DEFAULT_WIDTH) {
+		final DashVariant dash = forceFormatting ? ec.getDash(node) : model.getDash();
+		if (forceFormatting || style != null || color != null || width != EdgeModel.DEFAULT_WIDTH || dash != null) {
 			final XMLElement edge = new XMLElement();
 			edge.setName("edge");
 			boolean relevant = false;
@@ -167,6 +175,10 @@ class EdgeBuilder implements IElementDOMHandler, IExtensionElementWriter, IEleme
 				}
 				relevant = true;
 			}
+			if (dash != null) {
+				edge.setAttribute("DASH", dash.name());
+				relevant = true;
+			}
 			if (relevant) {
 				writer.addElement(model, edge);
 			}
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/EdgeColorConfiguration.java b/freeplane/src/main/java/org/freeplane/features/edge/EdgeColorConfiguration.java
new file mode 100644
index 0000000..232c20e
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/edge/EdgeColorConfiguration.java
@@ -0,0 +1,28 @@
+package org.freeplane.features.edge;
+
+import java.awt.Color;
+import java.util.List;
+
+public class EdgeColorConfiguration{
+	private static final int ROOT_COLOR_INDEX = 0;
+	private static final int FIRST_CYCLIC_COLOR_INDEX = ROOT_COLOR_INDEX + 1;
+	public List<Color> colors;
+
+	public EdgeColorConfiguration(List<Color> colors) {
+		super();
+		this.colors = colors;
+	}
+
+	public boolean areEdgeColorsAvailable() {
+		return ! colors.isEmpty();
+	}
+
+	public Color getEdgeColor(int colorCounter) {
+		if(colorCounter < colors.size())
+			return colors.get(colorCounter);
+		else if(FIRST_CYCLIC_COLOR_INDEX == colors.size())
+			return EdgeController.STANDARD_EDGE_COLOR;
+		else
+			return colors.get(FIRST_CYCLIC_COLOR_INDEX + (colorCounter - FIRST_CYCLIC_COLOR_INDEX) % (colors.size() - FIRST_CYCLIC_COLOR_INDEX)); 
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/EdgeColorsConfigurationFactory.java b/freeplane/src/main/java/org/freeplane/features/edge/EdgeColorsConfigurationFactory.java
new file mode 100644
index 0000000..5dcdedf
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/edge/EdgeColorsConfigurationFactory.java
@@ -0,0 +1,80 @@
+package org.freeplane.features.edge;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.WeakHashMap;
+
+import org.freeplane.core.util.ColorUtils;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.styles.AutomaticLayoutController;
+import org.freeplane.features.styles.MapStyle;
+import org.freeplane.features.styles.MapStyleModel;
+
+public class EdgeColorsConfigurationFactory {
+	public static final String EDGE_COLOR_CONFIGURATION_PROPERTY = "edgeColorConfiguration";
+	private final static WeakHashMap<String, EdgeColorConfiguration> configurations = new WeakHashMap<>();
+	private ModeController modeController;
+
+	public EdgeColorsConfigurationFactory(ModeController modeController) {
+		this.modeController = modeController;
+	}
+
+	public EdgeColorConfiguration create(MapModel map){
+		MapStyleModel mapStyle = MapStyleModel.getExtension(map);
+		final String configurationString = mapStyle.getProperty(EDGE_COLOR_CONFIGURATION_PROPERTY);
+		if(configurationString != null)
+			return load(configurationString);
+		else {
+			final EdgeColorConfiguration newConfiguration = createNewConfiguration(map);
+			String newConfigurationString = save(newConfiguration);
+			mapStyle.setProperty(EDGE_COLOR_CONFIGURATION_PROPERTY, newConfigurationString);
+			configurations.put(newConfigurationString, newConfiguration);
+			return newConfiguration;
+		}
+	}
+
+	private EdgeColorConfiguration createNewConfiguration(MapModel map) {
+		ArrayList<Color> colors = new ArrayList<>();
+		AutomaticLayoutController automaticLayoutController = modeController.getExtension(AutomaticLayoutController.class);
+		EdgeController edgeController = modeController.getExtension(EdgeController.class);
+		for(int levelStyleCounter = 0;;levelStyleCounter++){
+			NodeModel styleNode = automaticLayoutController.getStyleNode(map, levelStyleCounter);
+			if(styleNode == null)
+				break;
+			colors.add(edgeController.getColor(styleNode));
+		}
+		return new EdgeColorConfiguration(colors);
+	}
+
+	private EdgeColorConfiguration load(String configurationString) {
+		final EdgeColorConfiguration knownConfiguration = configurations.get(configurationString);
+		if(knownConfiguration != null)
+			return knownConfiguration;
+		final String[] colorStrings = configurationString.split(",");
+		ArrayList<Color> colors = new ArrayList<>(colorStrings.length);
+		for(String color : colorStrings)
+			colors.add(ColorUtils.stringToColor(color));
+		final EdgeColorConfiguration edgeColorConfiguration = new EdgeColorConfiguration(colors);
+		configurations.put(configurationString, knownConfiguration);
+		return edgeColorConfiguration;
+	}
+	
+	public String save(EdgeColorConfiguration configuration) {
+		StringBuilder sb = new StringBuilder();
+		for(Color color : configuration.colors) {
+			if(sb.length() > 0)
+				sb.append(',');
+			sb.append(ColorUtils.colorToRGBAString(color));
+		}
+		return sb.toString();
+	}
+
+	public void setConfiguration(MapModel map, EdgeColorConfiguration edgeColorConfiguration) {
+		final String serializedConfiguration = save(edgeColorConfiguration);
+		modeController.getExtension(MapStyle.class).setProperty(map, EDGE_COLOR_CONFIGURATION_PROPERTY, serializedConfiguration);
+		configurations.put(serializedConfiguration, edgeColorConfiguration);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/EdgeController.java b/freeplane/src/main/java/org/freeplane/features/edge/EdgeController.java
index 3119ab7..7faeeff 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/EdgeController.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/EdgeController.java
@@ -28,6 +28,7 @@ import org.freeplane.core.io.WriteManager;
 import org.freeplane.core.util.ConstantObject;
 import org.freeplane.core.util.ObjectRule;
 import org.freeplane.core.util.RuleReference;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
@@ -63,13 +64,17 @@ public class EdgeController implements IExtension {
 // 	private final ModeController modeController;
 	final private ExclusivePropertyChain<EdgeStyle, NodeModel> styleHandlers;
 	final private ExclusivePropertyChain<Integer, NodeModel> widthHandlers;
+	final private ExclusivePropertyChain<DashVariant, NodeModel> dashHandlers;
 	private ModeController modeController;
+	final protected EdgeColorsConfigurationFactory edgeColorsConfigurationFactory;
 
 	public EdgeController(final ModeController modeController) {
 		this.modeController = modeController;
+		edgeColorsConfigurationFactory = new EdgeColorsConfigurationFactory(modeController);
 		colorHandlers = new ExclusivePropertyChain<ObjectRule<Color, Rules>, NodeModel>();
 		styleHandlers = new ExclusivePropertyChain<EdgeStyle, NodeModel>();
 		widthHandlers = new ExclusivePropertyChain<Integer, NodeModel>();
+		dashHandlers = new ExclusivePropertyChain<DashVariant, NodeModel>();
 		
 		addColorGetter(IPropertyHandler.NODE, new IPropertyHandler<ObjectRule<Color, Rules>, NodeModel>() {
 			public ObjectRule<Color, Rules> getProperty(final NodeModel node, final ObjectRule<Color, Rules> currentValue) {
@@ -135,6 +140,22 @@ public class EdgeController implements IExtension {
 				return new Integer(EdgeModel.WIDTH_THIN);
 			}
 		});
+		
+		addDashGetter(IPropertyHandler.STYLE, new IPropertyHandler<DashVariant, NodeModel>() {
+			public DashVariant getProperty(final NodeModel node, final DashVariant currentValue) {
+				return getStyleDash(node.getMap(), LogicalStyleController.getController(modeController).getStyles(node));
+			}
+		});
+		
+		addDashGetter(IPropertyHandler.DEFAULT, new IPropertyHandler<DashVariant, NodeModel>() {
+			public DashVariant getProperty(NodeModel node, final DashVariant currentValue) {
+				if(node.getParentNode() != null){
+					return null;
+				}
+				return DashVariant.DEFAULT;
+			}
+		});
+		
 		final MapController mapController = Controller.getCurrentModeController().getMapController();
 		final ReadManager readManager = mapController.getReadManager();
 		final WriteManager writeManager = mapController.getWriteManager();
@@ -153,10 +174,15 @@ public class EdgeController implements IExtension {
 	}
 
 	public IPropertyHandler<Integer, NodeModel> addWidthGetter(final Integer key,
-	                                                           final IPropertyHandler<Integer, NodeModel> getter) {
+			final IPropertyHandler<Integer, NodeModel> getter) {
 		return widthHandlers.addGetter(key, getter);
 	}
 
+	public IPropertyHandler<DashVariant, NodeModel> addDashGetter(final Integer key,
+			final IPropertyHandler<DashVariant, NodeModel> getter) {
+		return dashHandlers.addGetter(key, getter);
+	}
+
 	public Color getColor(final NodeModel node) {
 		return getColor(node, true);
 	}
@@ -199,6 +225,18 @@ public class EdgeController implements IExtension {
 			return getWidth(node.getParentNode());
 		return width;
     }
+	
+	public DashVariant getDash(NodeModel node) {
+		return getDash(node, true);
+	}
+
+	public DashVariant getDash(NodeModel node, final boolean resolveParent) {
+	    final DashVariant dash = dashHandlers.getProperty(node);
+		if(dash == null && resolveParent)
+			return getDash(node.getParentNode());
+		return dash;
+	}
+	
 
 	private ObjectRule<Color, Rules> getStyleEdgeColorRule(NodeModel node) {
 		MapModel map = node.getMap(); 
@@ -241,6 +279,28 @@ public class EdgeController implements IExtension {
 		}
 		return null;
 	}
+	
+	private DashVariant getStyleDash(final MapModel map, final Collection<IStyle> collection) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : collection){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final EdgeModel styleModel = EdgeModel.getModel(styleNode);
+			if (styleModel == null) {
+				continue;
+			}
+			final DashVariant dash = styleModel.getDash();
+			if (dash == null ) {
+				continue;
+			}
+			return dash;
+		}
+		return null;
+	}
+	
+	
 
 	private EdgeStyle getStyleStyle(final MapModel map, final Collection<IStyle> collection) {
 		final MapStyleModel model = MapStyleModel.getExtension(map);
@@ -274,4 +334,14 @@ public class EdgeController implements IExtension {
 		return new ConstantObject<Color, Rules>(styleColor);
 	}
 
+
+	public boolean areEdgeColorsAvailable(MapModel map) {
+		final EdgeColorConfiguration configuration = edgeColorsConfigurationFactory.create(map);
+		return configuration.areEdgeColorsAvailable();
+	}
+
+	public Color getEdgeColor(MapModel map, int colorCounter) {
+		final EdgeColorConfiguration configuration = edgeColorsConfigurationFactory.create(map);
+		return configuration.getEdgeColor(colorCounter);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/EdgeModel.java b/freeplane/src/main/java/org/freeplane/features/edge/EdgeModel.java
index 96d1b3b..77383ae 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/EdgeModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/EdgeModel.java
@@ -22,6 +22,7 @@ package org.freeplane.features.edge;
 import java.awt.Color;
 
 import org.freeplane.core.extension.IExtension;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.map.NodeModel;
 
 public class EdgeModel implements IExtension {
@@ -50,6 +51,15 @@ public class EdgeModel implements IExtension {
 	private Color color;
 	private EdgeStyle style;
 	private int width = EdgeModel.DEFAULT_WIDTH;
+	private DashVariant dash;
+
+	public DashVariant getDash() {
+		return dash;
+	}
+
+	public void setDash(DashVariant dash) {
+		this.dash = dash;
+	}
 
 	public EdgeModel() {
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/EdgeStyle.java b/freeplane/src/main/java/org/freeplane/features/edge/EdgeStyle.java
index 7b0c74a..d211ec6 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/EdgeStyle.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/EdgeStyle.java
@@ -19,11 +19,8 @@ public enum EdgeStyle {
 		return name;
 	}
 
-	public int getNodeLineWidth(final int width) {
-		final int nlWidth = (int) (nodeLineWeight * width);
-		if (nlWidth == 0) {
-			return 1;
-		}
+	public float getNodeLineWidth(final int width) {
+		final float nlWidth = nodeLineWeight * width;
 		return nlWidth;
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/ColorListEditorPanelBuilder.java b/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/ColorListEditorPanelBuilder.java
new file mode 100644
index 0000000..b0d16d8
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/ColorListEditorPanelBuilder.java
@@ -0,0 +1,321 @@
+package org.freeplane.features.edge.mindmapmode;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+
+import org.freeplane.core.ui.ColorTracker;
+import org.freeplane.core.ui.components.JRestrictedSizeScrollPane;
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.core.util.ColorUtils;
+
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.RowSpec;
+
+public class ColorListEditorPanelBuilder {
+	private final JPanel panel;
+	private final CellConstraints cc;
+	private final FormLayout formlayout;
+	private final List<Color> colors;
+	private final List<RowButtons> buttons;
+	
+	private final static Font BUTTON_FONT;
+	private final static String MOVE_DOWN = "2";
+	private final static String MOVE_UP = "1";
+	private final static String DELETE = "3";
+	private final static String ADD = "4";
+	static {
+		try (final InputStream fontResource = ColorListEditorPanelBuilder.class.getResourceAsStream("/fonts/listcontrols.ttf")){
+			final float fontSize = Math.round(UITools.FONT_SCALE_FACTOR * 14);
+			BUTTON_FONT = Font.createFont(Font.TRUETYPE_FONT, fontResource).deriveFont(fontSize);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	private class ColorAdder implements ActionListener {
+		private final int index;
+		public ColorAdder(int index) {
+			super();
+			this.index = index;
+		}
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			final Color color;
+			if (index > 0) {
+				color = colors.get(index - 1);
+			} else {
+				color = Color.GRAY;
+			}
+			colors.add(index, color);
+			addColorButtonRow();
+			for(int i = index; i < colors.size() - 1; i++) {
+				RowButtons r = buttons.get(i);
+				r.updatePickColorButton();
+				
+			}
+			if(colors.size() >= 2)
+				buttons.get(colors.size() - 2).updateMoveColorDownButton();
+			SwingUtilities.invokeLater(new Runnable() {
+				@Override
+				public void run() {
+					buttons.get(index).scrollToVisible();
+				}
+			});
+		}
+	}
+
+	private class RowButtons {
+		private class ColorSwapper implements ActionListener {
+			final private int direction;
+			public ColorSwapper(int direction) {
+				super();
+				this.direction = direction;
+			}
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final Color movedColor = colors.get(index);
+				final int swappedColorIndex = index + direction;
+				final Color otherColorColor = colors.get(swappedColorIndex);
+				colors.set(index, otherColorColor);
+				colors.set(swappedColorIndex, movedColor);
+				updatePickColorButton();
+				updateMoveColorDownButton();
+				RowButtons r = buttons.get(swappedColorIndex);
+				r.updatePickColorButton();
+				r.updateMoveColorDownButton();
+			}
+		}
+
+		private final JLabel rowNumber;
+		private final JButton pickColor;
+		private final JButton moveColorUp;
+		private final JButton addNextColor;
+		private final JButton deleteColor;
+		private final JButton moveColorDown;
+		final private int index;
+		public RowButtons(final int index) {
+			super();
+			rowNumber = new JLabel(Integer.toString(index) + ":");
+			rowNumber.setHorizontalAlignment(SwingConstants.RIGHT);
+			pickColor = new JButton();
+			moveColorUp = new JButton();
+			moveColorDown = new JButton();
+			addNextColor = new JButton();
+			deleteColor = new JButton();
+			this.index = index;
+			initialize();
+		}
+		
+		private void initialize() {
+			rowNumber.setName("rowNumber");
+			initializePickColorButton();
+			initializeMoveColorUpButton();
+			initializeMoveColorDownButton();
+			initializeAddButton();
+			initializeDeleteButton();
+			appendRowsToPanel();
+			addComponentsToPanel();
+		}
+
+		private void initializePickColorButton() {
+			pickColor.setName("pickColor");
+			pickColor.addActionListener(new ActionListener() {
+				
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					final Color newColor = ColorTracker.showCommonJColorChooserDialog(pickColor, "Pick color", colors.get(index), null);
+					if(newColor != null){
+						colors.set(index, newColor);
+						updatePickColorButton();
+						updateMoveColorDownButton();
+					}
+				}
+			});
+			updatePickColorButton();
+
+		}
+
+		private void initializeMoveColorDownButton() {
+			moveColorDown.setName("moveColorDown");
+			moveColorDown.setFont(BUTTON_FONT);
+			moveColorDown.setText(MOVE_DOWN);
+			moveColorDown.addActionListener(new ColorSwapper(+1));
+			updateMoveColorDownButton();
+		}
+
+		private void initializeMoveColorUpButton() {
+			moveColorUp.setName("moveColorUp");
+			moveColorUp.setFont(BUTTON_FONT);
+			moveColorUp.setText(MOVE_UP);
+			moveColorUp.addActionListener(new ColorSwapper(-1));
+			moveColorUp.setVisible(index > 0);
+		}
+
+		private void initializeAddButton() {
+			addNextColor.setName("addNextColor");
+			addNextColor.setFont(BUTTON_FONT);
+			addNextColor.setText(ADD);
+			addNextColor.addActionListener(new ColorAdder(index + 1));
+		}
+
+		private void initializeDeleteButton() {
+			deleteColor.setName("deleteColor");
+			deleteColor.setFont(BUTTON_FONT);
+			deleteColor.setText(DELETE);
+			deleteColor.addActionListener(new ActionListener() {
+				
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					colors.remove(index);
+					for(int i = index; i < colors.size(); i++) {
+						RowButtons r = buttons.get(i);
+						r.updatePickColorButton();
+					}
+					if(colors.size() > 0) {
+						RowButtons r = buttons.get(colors.size() - 1);
+						r.updateMoveColorDownButton();
+					}
+					final int lastButtonRowIndex = buttons.size() - 1;
+					buttons.get(lastButtonRowIndex).removeFromPanel();
+					buttons.remove(lastButtonRowIndex);
+					panel.repaint();
+					SwingUtilities.invokeLater(new Runnable() {
+						
+						@Override
+						public void run() {
+						}
+					});
+				}
+			});
+		}
+
+		private void addComponentsToPanel() {
+			final int row = getFormRow();
+			panel.add(rowNumber, cc.xy(1, row));
+			panel.add(pickColor, cc.xy(3, row));
+			panel.add(moveColorUp, cc.xy(5, row));
+			panel.add(moveColorDown, cc.xy(7, row));
+			panel.add(deleteColor, cc.xy(9, row));
+			panel.add(addNextColor, cc.xy(11, row));
+		}
+
+		private void appendRowsToPanel() {
+			formlayout.appendRow(RowSpec.decode("CENTER:4DLU:NONE"));
+			formlayout.appendRow(RowSpec.decode("CENTER:DEFAULT:NONE"));
+		}
+		public void scrollToVisible() {
+			pickColor.scrollRectToVisible(new Rectangle(0, 0, pickColor.getWidth(), pickColor.getHeight()));
+		}
+		private int getFormRow() {
+			return index * 2 + 3;
+		}
+		
+		private void updateMoveColorDownButton() {
+			moveColorDown.setVisible(index < colors.size() -1);
+		}
+
+		private void updatePickColorButton() {
+			Color color = colors.get(index);
+			pickColor.setBackground(ColorUtils.makeNonTransparent(color));
+			final Color textColor = UITools.getTextColorForBackground(color);
+			pickColor.setForeground(textColor);
+			pickColor.setText(ColorUtils.colorToString(color));
+		}
+		private void removeFromPanel() {
+			panel.remove(rowNumber);
+			panel.remove(pickColor);
+			panel.remove(moveColorUp);
+			panel.remove(moveColorDown);
+			panel.remove(addNextColor);
+			panel.remove(deleteColor);
+			final int row = getFormRow();
+			formlayout.removeRow(row);
+			formlayout.removeRow(row - 1);
+		}
+	}
+
+	/**
+	 * Main method for panel
+	 */
+	public static void main(String[] args) {
+		final List<Color> colorList = new ArrayList<>(100);
+		for(int i = 0; i < 100; i++)
+			colorList.add(Color.WHITE);
+		final JComponent panel = new ColorListEditorPanelBuilder(colorList).getPanel();
+		JScrollPane jscrollpane = new JRestrictedSizeScrollPane(panel);
+		jscrollpane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+		jscrollpane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		jscrollpane.setMaximumSize(new Dimension(Integer.MAX_VALUE, 600));
+		JOptionPane.showConfirmDialog(null, jscrollpane);
+	}
+	
+	public ColorListEditorPanelBuilder(List<Color> colors) {
+		super();
+		this.colors = new ArrayList<>();
+		panel = new JPanel();
+		panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+		formlayout = new FormLayout(
+				"FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:108DLU:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE",
+				"");
+		cc = new CellConstraints();
+
+		formlayout.setColumnGroups(new int[][] { { 5, 7, 9, 11 } });
+		panel.setLayout(formlayout);
+		buttons = new ArrayList<>();
+		this.colors.clear();
+		this.colors.addAll(colors);
+		addAddColorButton();
+		addColorButtons();
+	}
+
+
+
+	public JComponent getPanel() {
+		return panel;
+	}
+
+	private void addColorButtons() {
+		for(@SuppressWarnings("unused") Color c : colors) {
+			addColorButtonRow();
+		}
+	}
+
+	private void addColorButtonRow() {
+		final RowButtons rowButtons = new RowButtons(buttons.size());
+		buttons.add(rowButtons);
+	}
+
+	private void addAddColorButton() {
+		formlayout.appendRow(RowSpec.decode("CENTER:DEFAULT:NONE"));
+		JButton addColor = new JButton();
+		addColor.addActionListener(new ColorAdder(0));
+		addColor.setName("addColor");
+		addColor.setFont(BUTTON_FONT);
+		addColor.setText(ADD);
+		panel.add(addColor, cc.xy(11, 1));
+	}
+
+	public List<Color> getColors() {
+		return colors;
+	}
+
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/MEdgeController.java b/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/MEdgeController.java
index 558abf6..938bdcf 100644
--- a/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/MEdgeController.java
+++ b/freeplane/src/main/java/org/freeplane/features/edge/mindmapmode/MEdgeController.java
@@ -20,12 +20,24 @@
 package org.freeplane.features.edge.mindmapmode;
 
 import java.awt.Color;
+import java.awt.Dimension;
+import java.util.List;
+
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+import org.freeplane.core.ui.components.JRestrictedSizeScrollPane;
+import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.util.ObjectRule;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.DashVariant;
+import org.freeplane.features.edge.EdgeColorConfiguration;
 import org.freeplane.features.edge.EdgeController;
 import org.freeplane.features.edge.EdgeModel;
 import org.freeplane.features.edge.EdgeStyle;
 import org.freeplane.features.map.IExtensionCopier;
+import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
@@ -113,6 +125,7 @@ public class MEdgeController extends EdgeController {
 			}
 			resolveColor(to);
 			resolveWidth(to);
+			resolveDash(to);
 			resolveStyle(to);
         }
 
@@ -148,6 +161,22 @@ public class MEdgeController extends EdgeController {
 			return modeController.getExtension(EdgeController.class).getWidth(node, false);
 		}
 
+		private void resolveDash(NodeModel to) {
+	        if (null != getDash(to))
+				return;
+			for(NodeModel source = to.getParentNode(); source != null; source = source.getParentNode() ){
+				final DashVariant width = getDash(source);
+				if(width != null){
+					EdgeModel.createEdgeModel(to).setDash(width);
+					return;
+				}
+			}
+        }
+
+		private DashVariant getDash(NodeModel node) {
+			return modeController.getExtension(EdgeController.class).getDash(node, false);
+		}
+
 		private void resolveStyle(NodeModel to) {
 	        if (null != getStyle(to))
 				return;
@@ -292,4 +321,63 @@ public class MEdgeController extends EdgeController {
 		};
 		modeController.execute(actor, node.getMap());
 	}
+
+	public void setDash(final NodeModel node, final DashVariant dash) {
+		final ModeController modeController = Controller.getCurrentModeController();
+		final DashVariant oldDash = EdgeModel.createEdgeModel(node).getDash();
+		if (dash == oldDash) {
+			return;
+		}
+		final IActor actor = new IActor() {
+			public void act() {
+				EdgeModel.createEdgeModel(node).setDash(dash);
+				modeController.getMapController().nodeChanged(node);
+				edgeWidthRefresh(node);
+			}
+
+			private void edgeWidthRefresh(final NodeModel node) {
+				for (final NodeModel child : modeController.getMapController().childrenUnfolded(node)) {
+					if(child.getViewers().isEmpty())
+						continue;
+					final EdgeModel edge = EdgeModel.getModel(child);
+					if (edge == null || edge.getWidth() == EdgeModel.WIDTH_PARENT) {
+						modeController.getMapController().nodeRefresh(child);
+						edgeWidthRefresh(child);
+					}
+				}
+			}
+
+			public String getDescription() {
+				return "setDash";
+			}
+
+			public void undo() {
+				EdgeModel.createEdgeModel(node).setDash(oldDash);
+				modeController.getMapController().nodeChanged(node);
+				edgeWidthRefresh(node);
+			}
+		};
+		modeController.execute(actor, node.getMap());
+	}
+
+	public void editEdgeColorConfiguration(MapModel map) {
+		final List<Color> oldColors = edgeColorsConfigurationFactory.create(map).colors;
+		final ColorListEditorPanelBuilder colorListEditorPanelBuilder = new ColorListEditorPanelBuilder(oldColors);
+		final JComponent panel = colorListEditorPanelBuilder.getPanel();
+		JScrollPane jscrollpane = new JRestrictedSizeScrollPane(panel);
+		UITools.setScrollbarIncrement(jscrollpane);
+		jscrollpane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+		jscrollpane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		jscrollpane.setMaximumSize(new Dimension(Integer.MAX_VALUE, 600));
+		String title = TextUtils.getText("editEdgeColors");
+		final int status = JOptionPane.showConfirmDialog(UITools.getCurrentFrame(), jscrollpane, title, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
+		switch(status)
+		{
+		case JOptionPane.OK_OPTION:
+			final List<Color> newColors = colorListEditorPanelBuilder.getColors();
+			edgeColorsConfigurationFactory.setConfiguration(map, new EdgeColorConfiguration(newColors));
+			break;
+		default:
+		}
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/encrypt/EncryptionController.java b/freeplane/src/main/java/org/freeplane/features/encrypt/EncryptionController.java
index 0175414..b9bf32c 100644
--- a/freeplane/src/main/java/org/freeplane/features/encrypt/EncryptionController.java
+++ b/freeplane/src/main/java/org/freeplane/features/encrypt/EncryptionController.java
@@ -39,7 +39,7 @@ import org.freeplane.features.mode.ModeController;
  * Feb 13, 2011
  */
 public class EncryptionController implements IExtension {
-	private static final IconStore STORE = IconStoreFactory.create();
+	private static final IconStore STORE = IconStoreFactory.ICON_STORE;
 	private static UIIcon decryptedIcon = STORE.getUIIcon("unlock.png");
 	private static UIIcon encryptedIcon = STORE.getUIIcon("lock.png");
 	
@@ -67,6 +67,11 @@ public class EncryptionController implements IExtension {
 				}
 				return null;
 			}
+
+			@Override
+			public boolean mustIncludeInIconRegistry() {
+				return true;
+			}
 		});
     }
 
diff --git a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportController.java b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportController.java
index 7267005..4557b93 100644
--- a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportController.java
+++ b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportController.java
@@ -13,6 +13,7 @@ import java.util.Properties;
 import javax.swing.filechooser.FileFilter;
 
 import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.FileUtils;
@@ -25,7 +26,6 @@ import org.freeplane.n3.nanoxml.IXMLParser;
 import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 
 /**
  * A registry of all XSLT scripts that are available to transform a .mm file into another format.
@@ -75,7 +75,7 @@ public class ExportController implements IExtension{
 	private void createXSLTExportActions( final String xmlDescriptorFile) {
 		InputStream xmlDescriptorStream = null;
 		try {
-			final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+			final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 			final URL resource = ResourceController.getResourceController().getResource(xmlDescriptorFile);
 			xmlDescriptorStream = resource.openStream();
 			final IXMLReader reader = new StdXMLReader(xmlDescriptorStream);
diff --git a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportToImage.java b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportToImage.java
index 77ed03a..9f66d7d 100644
--- a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportToImage.java
+++ b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportToImage.java
@@ -17,6 +17,7 @@
  */
 package org.freeplane.features.export.mindmapmode;
 
+import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.File;
@@ -38,9 +39,12 @@ import javax.swing.filechooser.FileFilter;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.ExampleFileFilter;
 import org.freeplane.core.ui.components.UITools;
+import org.freeplane.core.ui.image.BigBufferedImage;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 
 /**
@@ -52,14 +56,23 @@ public class ExportToImage implements IExportEngine {
 	private final String imageDescripton;
 	private final String imageType;
 
+	public static ExportToImage toPNG(){
+		return new ExportToImage("png", "to png");
+	}
+	
 	ExportToImage( final String imageType, final String imageDescripton) {
 		this.imageType = imageType;
 		this.imageDescripton = imageDescripton;
 	}
 
 	public void export(MapModel map, File toFile) {
+		export(map, null, null, null, toFile);
+	}
+
+	public void export(MapModel map, final Dimension slideSize, NodeModel placedNode, NodePosition placedNodePosition, File toFile) {
+		RenderedImage image = null;
 		try {
-			final RenderedImage image = new ImageCreator(getImageResolutionDPI()).createBufferedImage(map);
+			image = placedNode != null ? new ImageCreator(getImageResolutionDPI()).createBufferedImage(map, slideSize, placedNode, placedNodePosition) : new ImageCreator(getImageResolutionDPI()).createBufferedImage(map);
 			if (image != null) {
 				exportToImage(image, toFile);
 			}
@@ -67,8 +80,11 @@ public class ExportToImage implements IExportEngine {
 		catch (final OutOfMemoryError ex) {
 			UITools.errorMessage(TextUtils.getText("out_of_memory"));
 		}
+		finally {
+			if (image != null)
+				BigBufferedImage.dispose(image);
+		}
 	}
-
 	/**
 	 * Export image.
 	 * @param toFile 
diff --git a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportWithXSLT.java b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportWithXSLT.java
index beb5e1e..056f583 100644
--- a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportWithXSLT.java
+++ b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ExportWithXSLT.java
@@ -28,6 +28,7 @@ import java.io.OutputStreamWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -291,8 +292,10 @@ public class ExportWithXSLT implements IExportEngine {
 		try {
 			final TransformerFactory transFact = TransformerFactory.newInstance();
 			final Transformer trans = transFact.newTransformer(xsltSource);
-			final URI uri = new URI(null, null, saveFile.getName() + "_files/", null);
-			trans.setParameter("destination_dir", uri.toString());
+			trans.setParameter("file_ref", saveFile.getAbsoluteFile().toURI().toString());
+			final String fileName = saveFile.getName();
+			final String fileNameEncoded = toRelativeUri(fileName);
+			trans.setParameter("destination_dir", fileNameEncoded + "_files/");
 			trans.setParameter("area_code", areaCode);
 			trans.setParameter("folding_type", resourceController.getProperty(
 			"html_export_folding"));
@@ -320,6 +323,10 @@ public class ExportWithXSLT implements IExportEngine {
 		return true;
     }
 
+	private String toRelativeUri(final String fileName) throws URISyntaxException {
+		return new URI(null, null, fileName, null).toString();
+	}
+
 	public FileFilter getFileFilter() {
 		return new ExampleFileFilter(getProperty("file_type"), TextUtils.getText(name + ".text"));
     }
diff --git a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ImageCreator.java b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ImageCreator.java
index 7386ba9..1fc1542 100644
--- a/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ImageCreator.java
+++ b/freeplane/src/main/java/org/freeplane/features/export/mindmapmode/ImageCreator.java
@@ -19,9 +19,12 @@
  */
 package org.freeplane.features.export.mindmapmode;
 
+import java.awt.Dimension;
 import java.awt.image.RenderedImage;
 
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 
 /**
@@ -43,6 +46,14 @@ class ImageCreator{
         return controller.getMapViewManager().createImage(imageResolutionInDpi);
 	}
 
+	public RenderedImage createBufferedImage(MapModel map, final Dimension slideSize, NodeModel placedNode, NodePosition placedNodePosition) {
+		final Controller controller = Controller.getCurrentController();
+		if(! map.equals(controller.getMap())) {
+			return null;
+        }
+        return controller.getMapViewManager().createImage(slideSize, placedNode, placedNodePosition, imageResolutionInDpi);
+	}
+
 	public int getImageResolutionDPI() {
 	    return imageResolutionInDpi;
     }
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/AFilterComposerDialog.java b/freeplane/src/main/java/org/freeplane/features/filter/AFilterComposerDialog.java
index 4df73f5..d12e894 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/AFilterComposerDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/AFilterComposerDialog.java
@@ -31,7 +31,6 @@ import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.Collection;
 
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.DefaultComboBoxModel;
@@ -42,6 +41,7 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
 import javax.swing.border.EmptyBorder;
@@ -52,6 +52,7 @@ import javax.swing.filechooser.FileFilter;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.LabelAndMnemonicSetter;
 import org.freeplane.core.ui.components.UITools;
+import org.freeplane.core.ui.textchanger.TranslatedElementFactory;
 import org.freeplane.core.util.FileUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
@@ -162,16 +163,25 @@ public abstract class AFilterComposerDialog extends JDialog implements IMapSelec
             else {
             	btnUp.setEnabled(true);
             	btnDown.setEnabled(true);
-            	btnDelete.setEnabled(true);
+            	final boolean areValuesOnlySelected = !isNullSelected();
+            	btnDelete.setEnabled(areValuesOnlySelected);
 	            final int maxSelectionIndex = elementaryConditionList.getMaxSelectionIndex();
 				final boolean oneElementChosen = minSelectionIndex == maxSelectionIndex;
-				btnNot.setEnabled(oneElementChosen);
-				btnName.setEnabled(oneElementChosen);
-				btnAnd.setEnabled(! oneElementChosen);
-				btnOr.setEnabled(! oneElementChosen);
+				btnNot.setEnabled(oneElementChosen && areValuesOnlySelected);
+				btnName.setEnabled(oneElementChosen && areValuesOnlySelected);
+				btnAnd.setEnabled(! oneElementChosen && areValuesOnlySelected);
+				btnOr.setEnabled(! oneElementChosen && areValuesOnlySelected);
 				btnSplit.setEnabled(oneElementChosen && elementaryConditionList.getSelectedValue() instanceof ICombinedCondition);
             }
 		}
+
+		private boolean isNullSelected() {
+			for(Object selectedValue : elementaryConditionList.getSelectedValuesList()){
+				if(selectedValue == null)
+					return true;
+			}
+			return false;
+		}
 	}
 
 	private class CreateConjunctConditionAction extends AFreeplaneAction {
@@ -583,9 +593,15 @@ public abstract class AFilterComposerDialog extends JDialog implements IMapSelec
 		UITools.addEscapeActionToDialog(this);
 		pack();
 	}
+	
+	
+
+	public void setConditionRenderer(ListCellRenderer cellRenderer) {
+		elementaryConditionList.setCellRenderer(cellRenderer);
+	}
 
-	private JButton addAction(Action action, boolean enabled) {
-	    JButton button = new JButton(action);
+	private JButton addAction(AFreeplaneAction action, boolean enabled) {
+	    JButton button = TranslatedElementFactory.createButtonWithIcon(action, action.getIconKey(), action.getTextKey());
 		button.setMaximumSize(UITools.MAX_BUTTON_DIMENSION);
 		conditionButtonBox.add(Box.createVerticalStrut(GAP_BETWEEN_BUTTONS));
 		conditionButtonBox.add(button);
@@ -628,7 +644,6 @@ public abstract class AFilterComposerDialog extends JDialog implements IMapSelec
 			int selectedIndex = internalConditionsModel.getIndexOf(selectedItem);
 			if (selectedIndex >= 0) {
 				elementaryConditionList.setSelectedIndex(selectedIndex);
-				return;
 			}
 		}
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/Filter.java b/freeplane/src/main/java/org/freeplane/features/filter/Filter.java
index d3b8c8c..6073f2e 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/Filter.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/Filter.java
@@ -20,8 +20,9 @@
 package org.freeplane.features.filter;
 
 import java.util.Collection;
+import java.util.HashMap;
+
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.features.filter.condition.ICondition;
@@ -39,15 +40,54 @@ public class Filter {
 		final ResourceController resourceController = ResourceController.getResourceController();
 		return new Filter(null, resourceController.getBooleanProperty("filter.showAncestors"), resourceController.getBooleanProperty("filter.showDescendants"), false);
 	}
+	
+	public interface FilterInfoAccessor{
+		public FilterInfo getFilterInfo(NodeModel node);
+	}
+	
+	static public FilterInfoAccessor DEFAULT_FILTER_INFO_ACCESSOR = new FilterInfoAccessor() {
+		
+		@Override
+		public FilterInfo getFilterInfo(NodeModel node) {
+			return node.getFilterInfo();
+		}
+	};
+	
+	static public Filter createOneTimeFilter(final ICondition condition, final boolean areAncestorsShown,
+            final boolean areDescendantsShown, final boolean applyToVisibleNodesOnly) {
+		
+		FilterInfoAccessor oneTimeFilterAccessor = new FilterInfoAccessor() {
+			HashMap<NodeModel, FilterInfo> filterInfos = new HashMap<>();
+			
+			@Override
+			public FilterInfo getFilterInfo(NodeModel node) {
+				FilterInfo filterInfo = filterInfos.get(node);
+				if(filterInfo == null) {
+					filterInfo = new FilterInfo();
+					filterInfos.put(node, filterInfo);
+				}
+				return filterInfo;
+			}
+		};
+		return new Filter(condition, areAncestorsShown, areDescendantsShown, applyToVisibleNodesOnly, oneTimeFilterAccessor);
+	}
 
 	final private boolean appliesToVisibleNodesOnly;
 	final private ICondition condition;
-	final private int options;
+	final int options;
+
+	final private FilterInfoAccessor accessor;
 
 	public Filter(final ICondition condition, final boolean areAncestorsShown,
-	              final boolean areDescendantsShown, final boolean applyToVisibleNodesOnly) {
+            final boolean areDescendantsShown, final boolean applyToVisibleNodesOnly) {
+		this(condition, areAncestorsShown, areDescendantsShown, applyToVisibleNodesOnly, DEFAULT_FILTER_INFO_ACCESSOR);
+	}
+	public Filter(final ICondition condition, final boolean areAncestorsShown,
+	              final boolean areDescendantsShown, final boolean applyToVisibleNodesOnly,
+	              FilterInfoAccessor accessor) {
 		super();
 		this.condition = condition;
+		this.accessor = accessor;
 		int options = FilterInfo.FILTER_INITIAL_VALUE | FilterInfo.FILTER_SHOW_MATCHED;
 		if (areAncestorsShown) {
 			options += FilterInfo.FILTER_SHOW_ANCESTOR;
@@ -61,7 +101,7 @@ public class Filter {
 	}
 
 	void addFilterResult(final NodeModel node, final int flag) {
-		node.getFilterInfo().add(flag);
+		getFilterInfo(node).add(flag);
 	}
 
 	protected boolean appliesToVisibleNodesOnly() {
@@ -72,7 +112,7 @@ public class Filter {
 
 	void displayFilterStatus() {
 		if (filterIcon == null) {
-			filterIcon = new ImageIcon(ResourceController.getResourceController().getResource("/images/filter.png"));
+			filterIcon = ResourceController.getResourceController().getIcon("/images/filter.png");
 		}
 		if (getCondition() != null) {
 			Controller.getCurrentController().getViewController().addStatusInfo("filter", null, filterIcon);
@@ -97,11 +137,7 @@ public class Filter {
 			final Filter oldFilter = map.getFilter();
 			map.setFilter(this);
 			if (force || !isConditionStronger(oldFilter)) {
-				final NodeModel root = map.getRootNode();
-				resetFilter(root);
-				if (filterChildren(root, checkNode(root), false)) {
-					addFilterResult(root, FilterInfo.FILTER_SHOW_ANCESTOR);
-				}
+				calculateFilterResults(map);
 			}
 			final IMapSelection selection = Controller.getCurrentController().getSelection();
 			final NodeModel selected = selection.getSelected();
@@ -114,13 +150,21 @@ public class Filter {
 			Controller.getCurrentController().getViewController().setWaitingCursor(false);
 		}
 	}
+	public void calculateFilterResults(final MapModel map) {
+		final NodeModel root = map.getRootNode();
+		resetFilter(root);
+		if (filterChildren(root, checkNode(root), false)) {
+			addFilterResult(root, FilterInfo.FILTER_SHOW_ANCESTOR);
+		}
+	}
 
 	private boolean applyFilter(final NodeModel node,
 	                            final boolean isAncestorSelected, final boolean isAncestorEclipsed,
 	                            boolean isDescendantSelected) {
-		final boolean conditionSatisfied = checkNode(node);
+		final boolean canBeShown = ! shouldRemainInvisible(node);
+		final boolean conditionSatisfied = canBeShown && checkNode(node);
 		resetFilter(node);
-		if (isAncestorSelected) {
+		if (isAncestorSelected && canBeShown) {
 			addFilterResult(node, FilterInfo.FILTER_SHOW_DESCENDANT);
 		}
 		if (conditionSatisfied) {
@@ -130,12 +174,13 @@ public class Filter {
 		else {
 			addFilterResult(node, FilterInfo.FILTER_SHOW_HIDDEN);
 		}
-		if (isAncestorEclipsed) {
+		if (isAncestorEclipsed && canBeShown) {
 			addFilterResult(node, FilterInfo.FILTER_SHOW_ECLIPSED);
 		}
 		if (filterChildren(node, conditionSatisfied || isAncestorSelected, !conditionSatisfied
 		        || isAncestorEclipsed)) {
-			addFilterResult(node, FilterInfo.FILTER_SHOW_ANCESTOR);
+			if(canBeShown)
+				addFilterResult(node, FilterInfo.FILTER_SHOW_ANCESTOR);
 			isDescendantSelected = true;
 		}
 		return isDescendantSelected;
@@ -161,11 +206,15 @@ public class Filter {
 		if (condition == null) {
 			return true;
 		}
-		if (appliesToVisibleNodesOnly && !node.hasVisibleContent()) {
+		if (shouldRemainInvisible(node)) {
 			return false;
 		}
 		return condition.checkNode(node);
 	}
+	
+	private boolean shouldRemainInvisible(final NodeModel node) {
+		return condition != null && appliesToVisibleNodesOnly && !node.hasVisibleContent();
+	}
 
 	private boolean filterChildren(final NodeModel node,
 	                               final boolean isAncestorSelected, final boolean isAncestorEclipsed) {
@@ -196,17 +245,18 @@ public class Filter {
 		if (condition == null) {
 			return true;
 		}
-		final int filterResult = node.getFilterInfo().get();
-		return ((options & FilterInfo.FILTER_SHOW_ANCESTOR) != 0 || (options & FilterInfo.FILTER_SHOW_ECLIPSED) >= (filterResult & FilterInfo.FILTER_SHOW_ECLIPSED))
-		        && ((options & filterResult & ~FilterInfo.FILTER_SHOW_ECLIPSED) != 0);
+		return getFilterInfo(node).isVisible(this.options);
 	}
-
 	private void refreshMap(Object source, MapModel map) {
 		Controller.getCurrentModeController().getMapController().fireMapChanged(new MapChangeEvent(source, map, Filter.class, null, this));
 	}
 
 	private void resetFilter(final NodeModel node) {
-		node.getFilterInfo().reset();
+		getFilterInfo(node).reset();
+	}
+
+	private FilterInfo getFilterInfo(final NodeModel node) {
+		return accessor.getFilterInfo(node);
 	}
 
 	private void selectVisibleNode() {
@@ -233,8 +283,4 @@ public class Filter {
 		}
 		mapSelection.setSiblingMaxLevel(mapSelection.getSelected().getNodeLevel(false));
 	}
-
-	public boolean matches(NodeModel nodeModel) {
-		return 0 != (nodeModel.getFilterInfo().get() & FilterInfo.FILTER_SHOW_MATCHED);
-	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/FilterComposerDialog.java b/freeplane/src/main/java/org/freeplane/features/filter/FilterComposerDialog.java
new file mode 100644
index 0000000..01ee564
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/filter/FilterComposerDialog.java
@@ -0,0 +1,68 @@
+package org.freeplane.features.filter;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.filter.condition.ASelectableCondition;
+
+ at SuppressWarnings("serial")
+public class FilterComposerDialog extends AFilterComposerDialog{
+
+	final private List<ASelectableCondition> conditions ;
+	private DefaultComboBoxModel model;
+	
+	public FilterComposerDialog() {
+        super(TextUtils.getText("filter_dialog"), true);
+        conditions = new LinkedList<ASelectableCondition>();
+    }
+
+	protected DefaultComboBoxModel createModel() {
+		conditions.clear();
+		initializeModel();
+		return model;
+    }
+
+	protected void initializeModel() {
+	    if(model == null){
+			model = new DefaultComboBoxModel();
+		}
+    }
+	
+	protected boolean applyModel(DefaultComboBoxModel model, int[] selectedIndices) {
+		if(this.model != model)
+			throw new IllegalArgumentException();
+		if(selectedIndices.length > 1){
+			return false;
+		}
+		conditions.clear();
+		for(int i : selectedIndices){
+			conditions.add((ASelectableCondition) model.getElementAt(i));
+		}
+	    return true;
+    }
+			
+	public List<ASelectableCondition> getConditions() {
+    	return conditions;
+    }
+
+	public void addCondition(ASelectableCondition value) {
+		initializeModel();
+		if (model.getIndexOf(value) == -1){
+			model.addElement(value);
+		}
+    }
+
+
+	public ASelectableCondition editCondition(ASelectableCondition value) {
+		initializeModel();
+		if(value != null)
+			setSelectedItem(value);
+	    show();
+	    List<ASelectableCondition> conditions = getConditions();
+	    if(isSuccess())
+	    	return conditions.isEmpty() ? null : conditions.get(0);
+	    return value;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/FilterController.java b/freeplane/src/main/java/org/freeplane/features/filter/FilterController.java
index cb2f42b..20b4d03 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/FilterController.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/FilterController.java
@@ -19,8 +19,10 @@
  */
 package org.freeplane.features.filter;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.EventQueue;
+import java.awt.Graphics2D;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -50,6 +52,7 @@ import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 
 import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.ButtonModelStateChangeListenerForProperty;
@@ -68,6 +71,8 @@ import org.freeplane.features.filter.condition.DefaultConditionRenderer;
 import org.freeplane.features.filter.condition.ICondition;
 import org.freeplane.features.filter.condition.NoFilteringCondition;
 import org.freeplane.features.filter.condition.SelectedViewCondition;
+import org.freeplane.features.highlight.HighlightController;
+import org.freeplane.features.highlight.NodeHighlighter;
 import org.freeplane.features.map.CloneOfSelectedViewCondition;
 import org.freeplane.features.map.IMapSelectionListener;
 import org.freeplane.features.map.MapController.Direction;
@@ -83,7 +88,6 @@ import org.freeplane.n3.nanoxml.IXMLParser;
 import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 import org.freeplane.n3.nanoxml.XMLWriter;
 
 /**
@@ -157,7 +161,7 @@ public class FilterController implements IMapSelectionListener, IExtension {
 		}
 	}
 
-	static final String FREEPLANE_FILTER_EXTENSION_WITHOUT_DOT = "mmfilter";
+	public static final String FREEPLANE_FILTER_EXTENSION_WITHOUT_DOT = "mmfilter";
 	private static final ASelectableCondition NO_FILTERING = NoFilteringCondition.createCondition();
 
 	public static FilterController getController(Controller controller) {
@@ -169,7 +173,21 @@ public class FilterController implements IMapSelectionListener, IExtension {
 	}
 
 	public static void install() {
-		Controller.getCurrentController().addExtension(FilterController.class, new FilterController());
+		final Controller controller = Controller.getCurrentController();
+		final FilterController extension = new FilterController();
+		controller.addExtension(FilterController.class, extension);
+		controller.getExtension(HighlightController.class).addNodeHighlighter(new NodeHighlighter() {
+			@Override
+			public boolean isNodeHighlighted(NodeModel node, boolean isPrinting) {
+				return !isPrinting && FilterController.getController(controller).isNodeHighlighted(node);
+			}
+			
+			@Override
+			public void configure(Graphics2D g, boolean isPrinting) {
+				g.setColor(Color.MAGENTA);
+			}
+		});
+
 	}
 
 	private final ButtonModel applyToVisibleNodeOnly;
@@ -496,7 +514,7 @@ public class FilterController implements IMapSelectionListener, IExtension {
 			final boolean showPopupOnError)
 	        throws IOException {
 		try {
-			final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+			final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 			File filterFile = new File(pathToFilterFile);
 			final IXMLReader reader = new StdXMLReader(new BufferedInputStream(new FileInputStream(filterFile)));
 			parser.setReader(reader);
@@ -654,4 +672,5 @@ public class FilterController implements IMapSelectionListener, IExtension {
 		final ASelectableCondition selectedCondition = getSelectedCondition();
 		return NO_FILTERING != selectedCondition && null != selectedCondition;
 	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/FilterInfo.java b/freeplane/src/main/java/org/freeplane/features/filter/FilterInfo.java
index 4829dfb..76253a9 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/FilterInfo.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/FilterInfo.java
@@ -45,10 +45,6 @@ public class FilterInfo {
 		info |= flag;
 	}
 
-	int get() {
-		return info;
-	}
-
 	/**
 	 */
 	public boolean isAncestor() {
@@ -80,4 +76,10 @@ public class FilterInfo {
 	public boolean isUnset() {
 		return info == FilterInfo.FILTER_INITIAL_VALUE;
 	}
+
+	boolean isVisible(final int filterOptions) {
+		final boolean showAsAncestor = (filterOptions & FilterInfo.FILTER_SHOW_ANCESTOR) != 0;
+		return (showAsAncestor || (filterOptions & FilterInfo.FILTER_SHOW_ECLIPSED) >= (info & FilterInfo.FILTER_SHOW_ECLIPSED))
+		        && ((filterOptions & info & ~FilterInfo.FILTER_SHOW_ECLIPSED) != 0);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java b/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java
index 519221d..7b0c3ab 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/FoundNodes.java
@@ -50,7 +50,7 @@ class FoundNodes implements IExtension {
 			}
 			oldPathIterator.remove();
 			if (oldPathNode != null) {
-				Controller.getCurrentModeController().getMapController().setFolded(oldPathNode, true);
+				Controller.getCurrentModeController().getMapController().fold(oldPathNode);
 			}
 		}
 		this.nodesUnfoldedByDisplay.addAll(nodesUnfoldedByDisplay);
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/NextPresentationItemAction.java b/freeplane/src/main/java/org/freeplane/features/filter/NextPresentationItemAction.java
index 6c67b08..63c58ea 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/NextPresentationItemAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/NextPresentationItemAction.java
@@ -3,20 +3,30 @@ package org.freeplane.features.filter;
 import java.awt.event.ActionEvent;
 
 import org.freeplane.core.ui.AFreeplaneAction;
-import org.freeplane.features.map.HideChildSubtree;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.map.MapController.Direction;
 import org.freeplane.features.mode.Controller;
+import org.freeplane.features.ui.IMapViewManager;
 
 public class NextPresentationItemAction extends AFreeplaneAction {
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
+	private final Direction direction;
 
-	public NextPresentationItemAction() {
-		super("NextPresentationItemAction");
+	static public NextPresentationItemAction createFoldingAction(){
+		return new NextPresentationItemAction(Direction.FORWARD_N_FOLD, "NextPresentationItemAction");
+	}
+	
+	static public NextPresentationItemAction createNotFoldingAction(){
+		return new NextPresentationItemAction(Direction.FORWARD, "NotFoldingNextPresentationItemAction");
+	}
+	
+	private NextPresentationItemAction(Direction direction, String key) {
+		super(key);
+		this.direction = direction;
 	}
 
 	/**
@@ -24,8 +34,10 @@ public class NextPresentationItemAction extends AFreeplaneAction {
 	 */
 	public void actionPerformed(final ActionEvent e) {
 		final FilterController filterController = FilterController.getCurrentFilterController();
-		final NodeModel start = Controller.getCurrentController().getSelection().getSelected();
-		final NodeModel next = filterController.findNext(start, null, Direction.FORWARD_N_FOLD, null);
+		final Controller controller = Controller.getCurrentController();
+		final NodeModel start = controller.getSelection().getSelected();
+		final IMapViewManager mapViewManager = controller.getMapViewManager();
+		final NodeModel next = filterController.findNext(start, null, direction, null);
 		if(next != null){
 			final MapController mapController = Controller.getCurrentModeController().getMapController();
 			if (!next.hasVisibleContent()) {
@@ -36,8 +48,13 @@ public class NextPresentationItemAction extends AFreeplaneAction {
             for (int i = 1; i < path.length; i++) {
             	final NodeModel nodeOnPath = path[i];
             	final NodeModel parentNode = nodeOnPath.getParentNode();
-            	while(parentNode.isFolded() || nodeOnPath.containsExtension(HideChildSubtree.class))
+            	if(parentNode.isFolded())
             		mapController.showNextChild(parentNode);
+            	else {
+            		if(mapViewManager.isChildHidden(nodeOnPath)) {
+            			mapController.showNextChild(parentNode);
+            	}
+            	}
             }
             Controller.getCurrentController().getSelection().selectAsTheOnlyOneSelected(next);
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/condition/ASelectableCondition.java b/freeplane/src/main/java/org/freeplane/features/filter/condition/ASelectableCondition.java
index baa608f..f26f8c8 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/condition/ASelectableCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/condition/ASelectableCondition.java
@@ -8,6 +8,7 @@ import java.security.PrivilegedExceptionAction;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 
+import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
 
@@ -68,15 +69,24 @@ public abstract class ASelectableCondition  implements ICondition{
     }
 	protected abstract String createDescription();
 	
+	public boolean checkNodeInFormulaContext(NodeModel node){
+		return checkNode(node);
+	}
+	
 	final public JComponent getListCellRendererComponent() {
 		if (renderer == null) {
-			renderer = createRendererComponent();
-			if(userName != null){
-				final JCondition jCondition = new JCondition();
-				jCondition.add(new JLabel(userName + " : "));
-				jCondition.add(renderer);
-				renderer = jCondition;
-			}
+			this.renderer = createGraphicComponent();
+		}
+		return renderer;
+	}
+
+	public JComponent createGraphicComponent() {
+		JComponent renderer = createRendererComponent();
+		if(userName != null){
+			final JCondition jCondition = new JCondition();
+			jCondition.add(new JLabel(userName + " : "));
+			jCondition.add(renderer);
+			renderer = jCondition;
 		}
 		return renderer;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/condition/ConjunctConditions.java b/freeplane/src/main/java/org/freeplane/features/filter/condition/ConjunctConditions.java
index 60c9785..125a309 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/condition/ConjunctConditions.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/condition/ConjunctConditions.java
@@ -51,10 +51,7 @@ public class ConjunctConditions extends ASelectableCondition implements ICombine
 
 	final private ASelectableCondition[] conditions;
 
-	/**
-	 *
-	 */
-	public ConjunctConditions(final ASelectableCondition[] conditions) {
+	public ConjunctConditions(final ASelectableCondition... conditions) {
 		this.conditions = conditions;
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/filter/condition/DisjunctConditions.java b/freeplane/src/main/java/org/freeplane/features/filter/condition/DisjunctConditions.java
index 1dc7445..65fc8c0 100644
--- a/freeplane/src/main/java/org/freeplane/features/filter/condition/DisjunctConditions.java
+++ b/freeplane/src/main/java/org/freeplane/features/filter/condition/DisjunctConditions.java
@@ -54,7 +54,7 @@ public class DisjunctConditions extends ASelectableCondition implements ICombine
 	/**
 	 *
 	 */
-	public DisjunctConditions(final ASelectableCondition[] conditions) {
+	public DisjunctConditions(final ASelectableCondition... conditions) {
 		this.conditions = conditions;
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/format/FormatController.java b/freeplane/src/main/java/org/freeplane/features/format/FormatController.java
index f6457bc..34b8e3f 100644
--- a/freeplane/src/main/java/org/freeplane/features/format/FormatController.java
+++ b/freeplane/src/main/java/org/freeplane/features/format/FormatController.java
@@ -40,6 +40,7 @@ import java.util.Vector;
 
 import org.apache.commons.lang.StringUtils;
 import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.resources.IFreeplanePropertyListener;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.resources.components.IValidator;
@@ -52,7 +53,6 @@ import org.freeplane.n3.nanoxml.IXMLParser;
 import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 import org.freeplane.n3.nanoxml.XMLWriter;
 
 /**
@@ -194,7 +194,7 @@ public class FormatController implements IExtension, IFreeplanePropertyListener
 			return;
 		}
 		try {
-			final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+			final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 			inputStream = new BufferedInputStream(new FileInputStream(configXml));
 			final IXMLReader reader = new StdXMLReader(inputStream);
 			parser.setReader(reader);
diff --git a/freeplane/src/main/java/org/freeplane/features/format/ScannerController.java b/freeplane/src/main/java/org/freeplane/features/format/ScannerController.java
index a5c4b7b..731d743 100644
--- a/freeplane/src/main/java/org/freeplane/features/format/ScannerController.java
+++ b/freeplane/src/main/java/org/freeplane/features/format/ScannerController.java
@@ -19,6 +19,15 @@
  */
 package org.freeplane.features.format;
 
+import static org.freeplane.features.format.IFormattedObject.TYPE_DATE;
+import static org.freeplane.features.format.IFormattedObject.TYPE_DATETIME;
+import static org.freeplane.features.format.IFormattedObject.TYPE_NUMBER;
+import static org.freeplane.features.format.Parser.STYLE_DATE;
+import static org.freeplane.features.format.Parser.STYLE_DECIMAL;
+import static org.freeplane.features.format.Parser.STYLE_ISODATE;
+import static org.freeplane.features.format.Parser.STYLE_NUMBERLITERAL;
+import static org.freeplane.features.format.Parser.createParser;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,6 +44,7 @@ import java.util.Vector;
 
 import org.apache.commons.lang.StringUtils;
 import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.resources.IFreeplanePropertyListener;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.components.UITools;
@@ -45,7 +55,6 @@ import org.freeplane.n3.nanoxml.IXMLParser;
 import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 import org.freeplane.n3.nanoxml.XMLWriter;
 
 /**
@@ -175,36 +184,31 @@ public class ScannerController implements IExtension, IFreeplanePropertyListener
     private Scanner createScanner_en() {
 		final Scanner s = new Scanner(new String[] { "en" }, true);
 		s.setFirstChars("+-0123456789.");
-		final String tNumber = IFormattedObject.TYPE_NUMBER;
-		final String tDate = IFormattedObject.TYPE_DATETIME;
 		final Locale loc = new Locale("en");
-		s.addParser(Parser.createParser(Parser.STYLE_DECIMAL, tNumber, null, loc, "supports locale specific numbers"));
+		s.addParser(Parser.createParser(STYLE_DECIMAL, TYPE_NUMBER, null, loc, "supports locale specific numbers"));
 		// number literals are a subset of english localized decimal parser
-		// s.addParser(Parser.createParser(Parser.STYLE_NUMBERLITERAL, tNumber, null, loc, "numbers like 12345.12"));
-		s.addParser(Parser.createParser(Parser.STYLE_ISODATE, tDate, null, loc, "ISO reader for date and date/time"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "M/d", loc, "completes date with current year"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "M/d/y", loc, "parses 4/21/11 or 4/21/2011"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "M/d/y H:m", loc, "parses datetime"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "M/d/y H:m:s", loc, "parses datetime"));
-        s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "H:m", loc, "parses time, sets date to today"));
+		s.addParser(Parser.createParser(STYLE_DATE, TYPE_DATE, "M/d", loc, "completes date with current year"));
+		s.addParser(Parser.createParser(STYLE_DATE, TYPE_DATE, "M/d/y", loc, "parses 4/21/11 or 4/21/2011"));
+		s.addParser(Parser.createParser(STYLE_DATE, TYPE_DATETIME, "M/d/y H:m", loc, "parses datetime"));
+		s.addParser(Parser.createParser(STYLE_DATE, TYPE_DATETIME, "M/d/y H:m:s", loc, "parses datetime"));
+        s.addParser(Parser.createParser(STYLE_DATE, TYPE_DATETIME, "H:m", loc, "parses time, sets date to today"));
+        s.addParser(Parser.createParser(STYLE_ISODATE, TYPE_DATETIME, null, loc, "ISO reader for date and date/time"));
 		return s;
 	}
 
 	private Scanner createScanner_de() {
 		final Scanner s = new Scanner(new String[] { "de" }, false);
 		s.setFirstChars("+-0123456789,.");
-		final String tNumber = IFormattedObject.TYPE_NUMBER;
-		final String tDate = IFormattedObject.TYPE_DATETIME;
 		final Locale loc = new Locale("de");
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M", loc, "completes date with current year"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y", loc, "parses 21.4.11 or 21.4.2011"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y H:m", loc, "parses datetime"));
-		s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y H:m:s", loc, "parses datetime"));
-        s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "H:m", loc, "parses time, sets date to today"));
-		s.addParser(Parser.createParser(Parser.STYLE_DECIMAL, tNumber, null, loc,
+		s.addParser(createParser(STYLE_DATE, TYPE_DATE, "d.M", loc, "completes date with current year"));
+		s.addParser(createParser(STYLE_DATE, TYPE_DATE, "d.M.y", loc, "parses 21.4.11 or 21.4.2011"));
+		s.addParser(createParser(STYLE_DATE, TYPE_DATETIME, "d.M.y H:m", loc, "parses datetime"));
+		s.addParser(createParser(STYLE_DATE, TYPE_DATETIME, "d.M.y H:m:s", loc, "parses datetime"));
+        s.addParser(createParser(STYLE_DATE, TYPE_DATETIME, "H:m", loc, "parses time, sets date to today"));
+		s.addParser(createParser(STYLE_DECIMAL, TYPE_NUMBER, null, loc,
 		    "uses comma as decimal separator: 1.234,12"));
-		s.addParser(Parser.createParser(Parser.STYLE_ISODATE, tDate, null, loc, "ISO reader for date and date/time"));
-		s.addParser(Parser.createParser(Parser.STYLE_NUMBERLITERAL, tNumber, null, loc,
+		s.addParser(createParser(STYLE_ISODATE, TYPE_DATETIME, null, loc, "ISO reader for date and date/time"));
+		s.addParser(createParser(STYLE_NUMBERLITERAL, TYPE_NUMBER, null, loc,
 		    "support dot as decimal separator (if nothing else matches)"));
 		return s;
 	}
@@ -212,19 +216,16 @@ public class ScannerController implements IExtension, IFreeplanePropertyListener
 	private Scanner createScanner_hr() {
 	    final Scanner s = new Scanner(new String[] { "hr" }, false);
 	    s.setFirstChars("+-0123456789,.");
-	    final String tNumber = IFormattedObject.TYPE_NUMBER;
-	    final String tDate = IFormattedObject.TYPE_DATETIME;
 	    final Locale loc = new Locale("hr");
-	    s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M", loc, "completes date with current year"));
-	    s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y", loc, "parses 21.4.11 or 21.4.2011"));
-	    s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y.", loc, "parses 21.4.11. or 21.4.2011."));
-        s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y. H:m.", loc, "parses datetime"));
-        s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "d.M.y. H:m:s", loc, "parses datetime"));
-	    s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, "H:m", loc, "parses time, sets date to today"));
-	    s.addParser(Parser.createParser(Parser.STYLE_DECIMAL, tNumber, null, loc,
+	    s.addParser(createParser(STYLE_DATE, TYPE_DATE, "d.M", loc, "completes date with current year"));
+	    s.addParser(createParser(STYLE_DATE, TYPE_DATE, "d.M.y.", loc, "parses 21.4.11. or 21.4.2011."));
+        s.addParser(createParser(STYLE_DATE, TYPE_DATETIME, "d.M.y. H:m.", loc, "parses datetime"));
+        s.addParser(createParser(STYLE_DATE, TYPE_DATETIME, "d.M.y. H:m:s", loc, "parses datetime"));
+	    s.addParser(createParser(STYLE_DATE, TYPE_DATETIME, "H:m", loc, "parses time, sets date to today"));
+	    s.addParser(createParser(STYLE_DECIMAL, TYPE_NUMBER, null, loc,
 	            "uses comma as decimal separator: 1.234,12"));
-	    s.addParser(Parser.createParser(Parser.STYLE_ISODATE, tDate, null, loc, "ISO reader for date and date/time"));
-	    s.addParser(Parser.createParser(Parser.STYLE_NUMBERLITERAL, tNumber, null, loc,
+	    s.addParser(createParser(STYLE_ISODATE, TYPE_DATETIME, null, loc, "ISO reader for date and date/time"));
+	    s.addParser(createParser(STYLE_NUMBERLITERAL, TYPE_NUMBER, null, loc,
 	            "support dot as decimal separator (if nothing else matches)"));
 	    return s;
 	}
@@ -232,22 +233,20 @@ public class ScannerController implements IExtension, IFreeplanePropertyListener
     private Scanner createScanner(Locale loc) {
         final Scanner s = new Scanner(new String[] { loc.toString() }, false);
         s.setFirstChars("+-0123456789,.");
-        final String tNumber = IFormattedObject.TYPE_NUMBER;
-        final String tDate = IFormattedObject.TYPE_DATETIME;
         final DateFormat shortDateTimeFormat = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
             loc);
         if (shortDateTimeFormat instanceof SimpleDateFormat) {
-            s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate,
+            s.addParser(createParser(STYLE_DATE, TYPE_DATETIME,
                 ((SimpleDateFormat) shortDateTimeFormat).toPattern(), loc, "short datetime format"));
         }
         final DateFormat shortDateFormat = SimpleDateFormat.getDateInstance(DateFormat.SHORT, loc);
         if (shortDateFormat instanceof SimpleDateFormat) {
-            s.addParser(Parser.createParser(Parser.STYLE_DATE, tDate, ((SimpleDateFormat) shortDateFormat).toPattern(),
+            s.addParser(createParser(STYLE_DATE, TYPE_DATE, ((SimpleDateFormat) shortDateFormat).toPattern(),
                 loc, "short date format"));
         }
-        s.addParser(Parser.createParser(Parser.STYLE_DECIMAL, tNumber, null, loc, "number format"));
-        s.addParser(Parser.createParser(Parser.STYLE_ISODATE, tDate, null, loc, "ISO reader for date and date/time"));
-        s.addParser(Parser.createParser(Parser.STYLE_NUMBERLITERAL, tNumber, null, loc,
+        s.addParser(createParser(STYLE_DECIMAL, TYPE_NUMBER, null, loc, "number format"));
+        s.addParser(createParser(STYLE_ISODATE, TYPE_DATETIME, null, loc, "ISO reader for date and date/time"));
+        s.addParser(createParser(STYLE_NUMBERLITERAL, TYPE_NUMBER, null, loc,
             "support dot as decimal separator (if nothing else matches)"));
         return s;
     }
@@ -259,7 +258,7 @@ public class ScannerController implements IExtension, IFreeplanePropertyListener
 			return;
 		}
 		try {
-			final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+			final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 			final IXMLReader reader = new StdXMLReader(new BufferedInputStream(new FileInputStream(configXml)));
 			parser.setReader(reader);
 			final XMLElement loader = (XMLElement) parser.parse();
diff --git a/freeplane/src/main/java/org/freeplane/features/help/FilePropertiesAction.java b/freeplane/src/main/java/org/freeplane/features/help/FilePropertiesAction.java
index b774a64..3a0c295 100644
--- a/freeplane/src/main/java/org/freeplane/features/help/FilePropertiesAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/help/FilePropertiesAction.java
@@ -110,7 +110,7 @@ class FilePropertiesAction extends AFreeplaneAction {
         if(filter != null && filter.getCondition() != null){
             final ICondition matchesFilterCondition = new ICondition() {
                 public boolean checkNode(NodeModel node) {
-                    return filter.matches(node);
+                    return node.getFilterInfo().isMatched();
                 }
             };
             nodeTotalFiltered = getNodeCount(rootNode, matchesFilterCondition);
@@ -155,7 +155,7 @@ class FilePropertiesAction extends AFreeplaneAction {
 		c.insets = new Insets(0, 10, 0, 10);
 		c.anchor = GridBagConstraints.FIRST_LINE_START;
 		//fileNamePath
-		final URL imageURL = ResourceController.getResourceController().getResource("/images/filenew.png");
+		final URL imageURL = ResourceController.getResourceController().getIconResource("/images/filenew.png");
 		final JLabel fileIcon = new JLabel(ImageIconFactory.getInstance().getImageIcon(imageURL));
 		gridbag.setConstraints(fileIcon, c);
 		panel.add(fileIcon);
@@ -216,7 +216,7 @@ class FilePropertiesAction extends AFreeplaneAction {
 		c.ipady = 5;
 		c.gridwidth = 1;
 		c.gridx = 0;
-		final URL imageURL2 = ResourceController.getResourceController().getResource("/images/MapStats.png");
+		final URL imageURL2 = ResourceController.getResourceController().getIconResource("/images/MapStats.png");
 		final JLabel MapStatsIcon = new JLabel(ImageIconFactory.getInstance().getImageIcon(imageURL2));
 		gridbag.setConstraints(MapStatsIcon, c);
 		panel.add(MapStatsIcon);
@@ -280,7 +280,7 @@ class FilePropertiesAction extends AFreeplaneAction {
 		c.ipady = 5;
 		c.gridwidth = 1;
 		c.gridx = 0;
-		final URL imageURL3 = ResourceController.getResourceController().getResource("/images/BranchStats.png");
+		final URL imageURL3 = ResourceController.getResourceController().getIconResource("/images/BranchStats.png");
 		final JLabel BranchStatsIcon = new JLabel(ImageIconFactory.getInstance().getImageIcon(imageURL3));
 		gridbag.setConstraints(BranchStatsIcon, c);
 		panel.add(BranchStatsIcon);
diff --git a/freeplane/src/main/java/org/freeplane/features/help/HelpController.java b/freeplane/src/main/java/org/freeplane/features/help/HelpController.java
index 9fe2a38..7f8ad72 100644
--- a/freeplane/src/main/java/org/freeplane/features/help/HelpController.java
+++ b/freeplane/src/main/java/org/freeplane/features/help/HelpController.java
@@ -50,7 +50,6 @@ public class HelpController implements IExtension {
 		controller.addAction(new OpenSourceForgeURLAction("ReportBugAction",  resourceController.getProperty("bugTrackerLocation")));
 		controller.addAction(new OpenSourceForgeURLAction("RequestFeatureAction",  resourceController.getProperty("featureTrackerLocation")));
 		controller.addAction(new OpenSourceForgeURLAction("AskForHelp",  resourceController.getProperty("helpForumLocation")));
-		controller.addAction(new OpenURLAction("WebDocuAction",  resourceController.getProperty("webDocuLocation")));
 		final String defaultMap = resourceController.getProperty("docu_map");
 		controller.addAction(new DocumentationAction("DocumentationAction", defaultMap));
 		final String tutorialMap = resourceController.getProperty("tutorial_map");
@@ -58,13 +57,6 @@ public class HelpController implements IExtension {
 		final String whatsNewMap = resourceController.getProperty("whatsnew_map");
 		controller.addAction(new DocumentationAction("WhatsNewAction", whatsNewMap));
 		controller.addAction(new HotKeyInfoAction());
-		controller.addAction(new OnlineDocumentationAction("OnlineReference", "docu-online"));
 	}
 
-	/**
-	 * @param e
-	 */
-	public void webDocu(final ActionEvent e) {
-	    Controller.getCurrentController().getAction("WebDocuAction").actionPerformed(e);
-	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/help/HotKeyInfoAction.java b/freeplane/src/main/java/org/freeplane/features/help/HotKeyInfoAction.java
index 4e39328..d7fece4 100644
--- a/freeplane/src/main/java/org/freeplane/features/help/HotKeyInfoAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/help/HotKeyInfoAction.java
@@ -29,6 +29,7 @@ import javax.swing.JEditorPane;
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.components.UITools;
@@ -55,7 +56,7 @@ public class HotKeyInfoAction extends AFreeplaneAction{
 	// ==========================================================================
 	//                 format accelerator map as html text
 	// ==========================================================================
-	private String formatAsHtml(final Enumeration<DefaultMutableTreeNode> children) {
+	private String formatAsHtml(final Enumeration<TreeNode> children) {
 		final StringBuilder builder = new StringBuilder();
 		builder.append("<html><head><style type=\"text/css\">" //
 		        //doesn't work: + "  table { margin: 1px 0px; border-spacing: 0px; }"//
@@ -68,7 +69,7 @@ public class HotKeyInfoAction extends AFreeplaneAction{
 		return builder.toString();
 	}
 
-	private void appendAsHtml(final StringBuilder builder, final Enumeration<DefaultMutableTreeNode> children,
+	private void appendAsHtml(final StringBuilder builder, final Enumeration<TreeNode> children,
 	                                 final String title, final int level) {
 		if(! title.equals(""))
 			builder.append("<h").append(level).append('>').append(title).append("</h").append(level).append('>');
@@ -77,13 +78,13 @@ public class HotKeyInfoAction extends AFreeplaneAction{
 
 	@SuppressWarnings("unchecked")
 	private void appendChildrenAsHtml(final StringBuilder builder,
-	                                         final Enumeration<DefaultMutableTreeNode> children, final String title,
+	                                         final Enumeration<TreeNode> children, final String title,
 	                                         final int level) {
 		final ArrayList<MenuEntry> menuEntries = new ArrayList<MenuEntry>();
 		final ArrayList<DefaultMutableTreeNode> submenus = new ArrayList<DefaultMutableTreeNode>();
 		// sort and divide
 		while (children.hasMoreElements()) {
-			final DefaultMutableTreeNode node = children.nextElement();
+			final DefaultMutableTreeNode node = (DefaultMutableTreeNode) children.nextElement();
 			if (node.isLeaf()) {
 				menuEntries.add((MenuEntry) node.getUserObject());
 			}
diff --git a/freeplane/src/main/java/org/freeplane/features/highlight/HighlightController.java b/freeplane/src/main/java/org/freeplane/features/highlight/HighlightController.java
new file mode 100644
index 0000000..0446554
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/highlight/HighlightController.java
@@ -0,0 +1,32 @@
+package org.freeplane.features.highlight;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.freeplane.core.extension.IExtension;
+import org.freeplane.features.map.NodeModel;
+
+public class HighlightController implements IExtension{
+	final private List<NodeHighlighter> nodeHighlighters;
+
+	public HighlightController() {
+		super();
+		this.nodeHighlighters = new ArrayList<>();
+	} 
+	
+	public List<NodeHighlighter> getHighlighters(NodeModel node, boolean isPrinting){
+		final ArrayList<NodeHighlighter> highlighters = new ArrayList<>();
+		for(NodeHighlighter highlighter : nodeHighlighters)
+			if(highlighter.isNodeHighlighted(node, isPrinting))
+				highlighters.add(highlighter);
+		return highlighters;
+	}
+	
+	public void addNodeHighlighter(NodeHighlighter highlighter){
+		nodeHighlighters.add(highlighter);
+	}
+
+	public void removeNodeHighlighter(NodeHighlighter highlighter){
+		nodeHighlighters.remove(highlighter);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/highlight/NodeHighlighter.java b/freeplane/src/main/java/org/freeplane/features/highlight/NodeHighlighter.java
new file mode 100644
index 0000000..903f069
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/highlight/NodeHighlighter.java
@@ -0,0 +1,13 @@
+package org.freeplane.features.highlight;
+
+import java.awt.BasicStroke;
+import java.awt.Graphics2D;
+import java.awt.Stroke;
+
+import org.freeplane.features.map.NodeModel;
+
+public interface NodeHighlighter {
+	public Stroke DEFAULT_STROKE = new BasicStroke(2.0f);
+	public boolean isNodeHighlighted(NodeModel node, boolean isPrinting);
+	public void configure(Graphics2D g, boolean isPrinting);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/HierarchicalIcons.java b/freeplane/src/main/java/org/freeplane/features/icon/HierarchicalIcons.java
index c5d7f71..74a88ba 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/HierarchicalIcons.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/HierarchicalIcons.java
@@ -35,6 +35,7 @@ import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.mode.NodeHookDescriptor;
 import org.freeplane.features.mode.PersistentNodeHook;
+import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.styles.MapStyle;
 import org.freeplane.features.styles.MapStyleModel;
 import org.freeplane.n3.nanoxml.XMLElement;
@@ -58,6 +59,11 @@ public class HierarchicalIcons extends PersistentNodeHook implements INodeChange
 				else
 					return null;
 			}
+
+			@Override
+			public boolean mustIncludeInIconRegistry() {
+				return false;
+			}
 		});
 		new HierarchicalIcons2();
 	}
@@ -166,8 +172,13 @@ public class HierarchicalIcons extends PersistentNodeHook implements INodeChange
 		if (!topNode.containsExtension(getClass()) && !topNode.getMap().getRootNode().containsExtension(getClass())) {
 			return;
 		}
-		gatherLeavesAndSetStyle(topNode);
-		gatherLeavesAndSetParentsStyle(topNode);
+		final MapModel map = topNode.getMap();
+		final boolean mapStylesAreAlreadyLoaded = null != MapStyleModel.getExtension(map);
+		if (mapStylesAreAlreadyLoaded) {
+			gatherLeavesAndSetStyle(topNode);
+			gatherLeavesAndSetParentsStyle(topNode);
+		} else
+			LogicalStyleController.getController().refreshMap(map);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/IStateIconProvider.java b/freeplane/src/main/java/org/freeplane/features/icon/IStateIconProvider.java
index f7de5b1..af1f02d 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/IStateIconProvider.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/IStateIconProvider.java
@@ -27,4 +27,5 @@ import org.freeplane.features.map.NodeModel;
  */
 public interface IStateIconProvider {
 	UIIcon getStateIcon(NodeModel node);
+	boolean mustIncludeInIconRegistry();
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/IconContainedCondition.java b/freeplane/src/main/java/org/freeplane/features/icon/IconContainedCondition.java
index b6c5acf..d6426c3 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/IconContainedCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/IconContainedCondition.java
@@ -33,7 +33,7 @@ import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
 public class IconContainedCondition extends ASelectableCondition {
-	private static final IconStore STORE = IconStoreFactory.create();
+	private static final IconStore STORE = IconStoreFactory.ICON_STORE;
 	static final String ICON = "ICON";
 	static final String NAME = "icon_contained_condition";
 
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/IconController.java b/freeplane/src/main/java/org/freeplane/features/icon/IconController.java
index b9523ef..f8cc5a1 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/IconController.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/IconController.java
@@ -26,10 +26,13 @@ import java.util.List;
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.io.ReadManager;
 import org.freeplane.core.io.WriteManager;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.features.filter.FilterController;
 import org.freeplane.features.filter.condition.ConditionFactory;
 import org.freeplane.features.icon.factory.IconStoreFactory;
 import org.freeplane.features.map.MapController;
+import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.CombinedPropertyChain;
 import org.freeplane.features.mode.Controller;
@@ -44,6 +47,9 @@ import org.freeplane.features.styles.StyleNode;
  * @author Dimitry Polivaev
  */
 public class IconController implements IExtension {
+
+	private static final Quantity<LengthUnits> DEFAULT_ICON_SIZE = new Quantity<LengthUnits>(12, LengthUnits.pt);
+
 	final private CombinedPropertyChain<Collection<MindIcon>, NodeModel> iconHandlers;
 	public static IconController getController() {
 		final ModeController modeController = Controller.getCurrentModeController();
@@ -59,9 +65,8 @@ public class IconController implements IExtension {
 		conditionFactory.addConditionController(50, new PriorityConditionController());
 	}
 
-	public static void install( final IconController iconController) {
-		final ModeController modeController = Controller.getCurrentModeController();
-		modeController.addExtension(IconController.class, iconController);
+	public void install(final ModeController modeController) {
+		modeController.addExtension(IconController.class, this);
 	}
 
 // 	final private ModeController modeController;
@@ -87,7 +92,7 @@ public class IconController implements IExtension {
 		final MapController mapController = modeController.getMapController();
 		final ReadManager readManager = mapController.getReadManager();
 		final WriteManager writeManager = mapController.getWriteManager();
-		final IconBuilder textBuilder = new IconBuilder(this, IconStoreFactory.create());
+		final IconBuilder textBuilder = new IconBuilder(this, IconStoreFactory.ICON_STORE);
 		textBuilder.registerBy(readManager, writeManager);
 		addIconGetter(IPropertyHandler.STYLE, new IPropertyHandler<Collection<MindIcon>, NodeModel>() {
 			public Collection<MindIcon> getProperty(final NodeModel node, final Collection<MindIcon> currentValue) {
@@ -132,8 +137,10 @@ public class IconController implements IExtension {
 			final UIIcon stateIcon = provider.getStateIcon(node);
 			if(stateIcon != null){
 				icons.add(stateIcon);
-				final IconRegistry iconRegistry = node.getMap().getIconRegistry();
-				iconRegistry.addIcon(stateIcon);
+				if(provider.mustIncludeInIconRegistry()) {
+					final IconRegistry iconRegistry = node.getMap().getIconRegistry();
+					iconRegistry.addIcon(stateIcon);
+				}
 			}
 		}
 		return icons;
@@ -150,4 +157,30 @@ public class IconController implements IExtension {
 		return processed;
 	}
 
+	private Quantity<LengthUnits> getStyleIconSize(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final Quantity<LengthUnits> iconSize = styleNode.getSharedData().getIcons().getIconSize();
+			if (iconSize == null) {
+				continue;
+			}
+			return iconSize;
+		}
+		return DEFAULT_ICON_SIZE;
+	}
+
+	public Quantity<LengthUnits> getIconSize(NodeModel node)
+	{
+		final MapModel map = node.getMap();
+		final ModeController modeController = Controller.getCurrentModeController();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> styles = styleController.getStyles(node);
+		final Quantity<LengthUnits> size = getStyleIconSize(map, styles);
+		return size;
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/IconStore.java b/freeplane/src/main/java/org/freeplane/features/icon/IconStore.java
index 4bbc659..47d002a 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/IconStore.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/IconStore.java
@@ -115,7 +115,7 @@ public class IconStore {
 			return mindIcons.get(name);
 		}
 		// icons in directory /image are not registered
-		final MindIcon mindIcon = MindIconFactory.create(name);
+		final MindIcon mindIcon = MindIconFactory.createIcon(name);
 		if (ResourceController.getResourceController().getResource(mindIcon.getPath()) != null) {
 			return mindIcon;
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/PriorityCompareCondition.java b/freeplane/src/main/java/org/freeplane/features/icon/PriorityCompareCondition.java
index 48dd287..f84fcd1 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/PriorityCompareCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/PriorityCompareCondition.java
@@ -41,7 +41,7 @@ public class PriorityCompareCondition extends CompareConditionAdapter {
 	static final String NAME = "priority_compare_condition";
 	static final String SUCCEED = "SUCCEED";
 	static final String VALUE = "VALUE";
-	private static final IconStore STORE = IconStoreFactory.create();
+	private static final IconStore STORE = IconStoreFactory.ICON_STORE;
 
 	static ASelectableCondition load(final XMLElement element) {
 		return new PriorityCompareCondition(element.getAttribute(PriorityCompareCondition.VALUE, null), Integer
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/PriorityConditionController.java b/freeplane/src/main/java/org/freeplane/features/icon/PriorityConditionController.java
index c273d06..e211306 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/PriorityConditionController.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/PriorityConditionController.java
@@ -40,7 +40,7 @@ import org.freeplane.n3.nanoxml.XMLElement;
  */
 class PriorityConditionController implements IElementaryConditionController {
 	static final String FILTER_PRIORITY = "filter_priority";
-	private static final IconStore STORE = IconStoreFactory.create();
+	private static final IconStore STORE = IconStoreFactory.ICON_STORE;
 
 	public PriorityConditionController() {
 		super();
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/UIIcon.java b/freeplane/src/main/java/org/freeplane/features/icon/UIIcon.java
index 2b94193..e2c8aaf 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/UIIcon.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/UIIcon.java
@@ -26,8 +26,11 @@ import javax.swing.Icon;
 import javax.swing.KeyStroke;
 
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.icon.factory.ImageIconFactory;
+import org.freeplane.features.map.NodeModel;
 
 /**
  * Base class for all icons used in FreePlane.
@@ -90,6 +93,11 @@ public class UIIcon implements IIconInformation, Comparable<UIIcon> {
 		return ImageIconFactory.getInstance().getImageIcon(this);
 	}
 
+	public Icon getIcon(final NodeModel node) {
+		final Quantity<LengthUnits> iconHeight = IconController.getController().getIconSize(node);
+		return ImageIconFactory.getInstance().getImageIcon(this, iconHeight);
+	}
+
 	public KeyStroke getKeyStroke() {
 		return null;
 	}
@@ -103,7 +111,7 @@ public class UIIcon implements IIconInformation, Comparable<UIIcon> {
 			return resourceURL;
 		}
 		final String path = getPath();
-		resourceURL = RESOURCE_CONTROLLER.getResource(path);
+		resourceURL = RESOURCE_CONTROLLER.getIconResource(path);
 		return resourceURL;
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/UIIconSet.java b/freeplane/src/main/java/org/freeplane/features/icon/UIIconSet.java
index ff20f3b..5f73563 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/UIIconSet.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/UIIconSet.java
@@ -27,6 +27,7 @@ import java.util.List;
 import javax.swing.Icon;
 
 import org.freeplane.core.ui.components.MultipleImage;
+import org.freeplane.features.map.NodeModel;
 
 public class UIIconSet extends UIIcon {
 	final Collection<UIIcon> uiIcons;
@@ -58,10 +59,15 @@ public class UIIconSet extends UIIcon {
 
 	@Override
 	public Icon getIcon() {
+		throw new RuntimeException(new NoSuchMethodException());
+	}
+	
+	@Override
+	public Icon getIcon(final NodeModel node) {
 		if (compoundIcon == null) {
 			compoundIcon = new MultipleImage();
 			for (final UIIcon icon : imageIcons) {
-				compoundIcon.addIcon(icon);
+				compoundIcon.addIcon(icon, node);
 			}
 		}
 		return compoundIcon;
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/ZoomedIcon.java b/freeplane/src/main/java/org/freeplane/features/icon/ZoomedIcon.java
index 4054ccc..ff4e604 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/ZoomedIcon.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/ZoomedIcon.java
@@ -29,8 +29,13 @@ import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.icon.factory.ImageIconFactory;
+import org.freeplane.features.map.NodeModel;
+
 public class ZoomedIcon extends UIIcon {
-	final static private Map<UIIcon, Map<Float, ImageIcon>> zoomedIcons = new HashMap<UIIcon, Map<Float, ImageIcon>>();
+	final static private Map<UIIcon, Map<Float, ImageIcon>> zoomedBitmapIcons = new HashMap<UIIcon, Map<Float, ImageIcon>>();
 	private final UIIcon uiIcon;
 	private final float zoom;
 	private ImageIcon zoomedIcon;
@@ -43,11 +48,26 @@ public class ZoomedIcon extends UIIcon {
 
 	@Override
 	public Icon getIcon() {
+		throw new RuntimeException(new NoSuchMethodException());
+	}
+	
+	@Override
+	public Icon getIcon(final NodeModel node) {
+		if(uiIcon.getUrl().getPath().endsWith(".svg")) {
+			final Quantity<LengthUnits> iconHeight = IconController.getController().getIconSize(node);
+			return ImageIconFactory.getInstance().getImageIcon(this, iconHeight.zoomBy(zoom));
+		}
+		else {
+			return getZoomedBitmapIcon();
+		}
+	}
+
+	private Icon getZoomedBitmapIcon() {
 		if (zoomedIcon == null) {
-			Map<Float, ImageIcon> icons = zoomedIcons.get(uiIcon);
+			Map<Float, ImageIcon> icons = zoomedBitmapIcons.get(uiIcon);
 			if (icons == null) {
 				icons = new HashMap<Float, ImageIcon>();
-				zoomedIcons.put(uiIcon, icons);
+				zoomedBitmapIcons.put(uiIcon, icons);
 			}
 			zoomedIcon = icons.get(zoom);
 			if (zoomedIcon != null) {
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/factory/IconStoreFactory.java b/freeplane/src/main/java/org/freeplane/features/icon/factory/IconStoreFactory.java
index 28ffb75..a0b1319 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/factory/IconStoreFactory.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/factory/IconStoreFactory.java
@@ -51,22 +51,10 @@ public class IconStoreFactory {
 	private static final String GROUP_KEY = "icons.group.%s";
 	private static final String GROUP_ICON_KEY = "IconGroupPopupAction.%s.icon";
 	private static final String GROUP_DESC_KEY = "IconGroupPopupAction.%s.text";
-	private static IconStore groups;
-
-	/**
-	 * 
-	 * Creates an IconStore from the property file. If one was already
-	 * constructed it will be returned without creating a new one.
-	 * 
-	 * @return
-	 */
-	public static IconStore create() {
-		if (groups != null) {
-			return groups;
-		}
-		groups = new IconStore();
-		IconStoreFactory.setIconGroups(groups);
-		return groups;
+	public static IconStore ICON_STORE;
+	static {
+		ICON_STORE = new IconStore();
+		IconStoreFactory.setIconGroups(ICON_STORE);
 	}
 
 	private static void setIconGroups(final IconStore iconStore) {
@@ -77,7 +65,7 @@ public class IconStoreFactory {
 			UIIcon groupIcon = null;
 			if ("user".equals(groupName)) {
 				icons = IconStoreFactory.getUserIcons();
-				groupIcon = MindIconFactory.create("user_icon");
+				groupIcon = MindIconFactory.createIcon("user_icon");
 			}
 			else {
 				final String groupIconName = RESOURCE_CONTROLLER.getProperty(String.format(GROUP_ICON_KEY, groupName));
@@ -97,7 +85,7 @@ public class IconStoreFactory {
 		    .split(SEPARATOR);
 		final Map<String, MindIcon> icons = new LinkedHashMap<String, MindIcon>(iconNames.length);
 		for (final String iconName : iconNames) {
-			final MindIcon icon = MindIconFactory.create(iconName);
+			final MindIcon icon = MindIconFactory.createIcon(iconName);
 			icons.put(iconName, icon);
 		}
 		return icons;
@@ -120,8 +108,7 @@ public class IconStoreFactory {
 	private static List<MindIcon> getUserIcons(final File iconDir, final String dir) {
 		final String[] userIconArray = iconDir.list(new FilenameFilter() {
 			public boolean accept(final File dir, final String name) {
-				final int nameLength = name.length();
-				return nameLength > 4 && name.substring(nameLength - 4).equalsIgnoreCase(".png") || new File(dir, name).isDirectory();
+				return name.matches("(?i).*\\.(svg|png)$") || new File(dir, name).isDirectory();
 			}
 		});
 		if (userIconArray == null) {
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/factory/ImageIconFactory.java b/freeplane/src/main/java/org/freeplane/features/icon/factory/ImageIconFactory.java
index f619acd..0f62303 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/factory/ImageIconFactory.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/factory/ImageIconFactory.java
@@ -20,12 +20,16 @@
 package org.freeplane.features.icon.factory;
 
 import java.net.URL;
+import java.util.Locale;
 import java.util.WeakHashMap;
 
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.util.FreeplaneIconUtils;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.features.icon.UIIcon;
 
 /**
@@ -36,31 +40,81 @@ import org.freeplane.features.icon.UIIcon;
  *
  */
 public final class ImageIconFactory {
+	public static final Quantity<LengthUnits> DEFAULT_UI_ICON_HEIGHT = ResourceController.getResourceController().getLengthQuantityProperty("toolbar_icon_height");
 	private static final ImageIconFactory FACTORY = new ImageIconFactory();
 	private static final String DEFAULT_IMAGE_PATH = "/images/";
-	private static final ImageIcon ICON_NOT_FOUND = new ImageIcon(ResourceController.getResourceController()
+	private static final ImageIcon ICON_NOT_FOUND = FACTORY.getImageIcon(ResourceController.getResourceController()
 	    .getResource(DEFAULT_IMAGE_PATH + "IconNotFound.png"));
-	private final WeakHashMap<URL, ImageIcon> ICON_CACHE = new WeakHashMap<URL, ImageIcon>();
+	private static final String USE_SVG_ICONS = "use_svg_icons";
+	private final WeakValueCache<String, ImageIcon> ICON_CACHE = new WeakValueCache<String, ImageIcon>();
+	private final WeakHashMap<ImageIcon, URL> ICON_URLS = new WeakHashMap<ImageIcon, URL>();
 
 	public static ImageIconFactory getInstance() {
 		return FACTORY;
 	}
 
 	public ImageIcon getImageIcon(final UIIcon uiIcon) {
-		return getImageIcon(uiIcon.getUrl());
+		return getImageIcon(uiIcon.getUrl(), DEFAULT_UI_ICON_HEIGHT);
 	}
 
 	public ImageIcon getImageIcon(final URL url) {
+		return getImageIcon(url, DEFAULT_UI_ICON_HEIGHT);
+	}
+
+	private String createCacheKey(final URL url, final int heightPixels) {
+		return url.toString() + "#" + heightPixels;
+	}
+
+
+	public Icon getImageIcon(UIIcon uiIcon, Quantity<LengthUnits> iconHeight) {
+		return getImageIcon(uiIcon.getUrl(), iconHeight);
+	}
+	
+	public ImageIcon getImageIcon(final URL url, Quantity<LengthUnits> iconHeight) {
 		ImageIcon result = ICON_NOT_FOUND;
 		if (url != null) {
-			if (ICON_CACHE.containsKey(url)) {
-				result = ICON_CACHE.get(url);
+			final int heightPixels = iconHeight.toBaseUnitsRounded();
+			final String cacheKey = createCacheKey(url, heightPixels);
+			if (ICON_CACHE.containsKey(cacheKey)) {
+				result = ICON_CACHE.get(cacheKey);
 			}
 			else {
-				result = FreeplaneIconUtils.createImageIconPrivileged(url);
-				ICON_CACHE.put(url, result);
+				if (url.getPath().toLowerCase(Locale.ENGLISH).endsWith(".svg")) {
+					result = FreeplaneIconUtils.createSVGIcon(url, heightPixels);
+				} else {
+					result = FreeplaneIconUtils.createImageIconPrivileged(url);
+				}
+				ICON_CACHE.put(cacheKey, result);
+				ICON_URLS.put(result, url);
 			}
 		}
 		return result;
 	}
+
+	public boolean canScaleIcon(final Icon icon) {
+		return ICON_URLS.containsKey(icon);
+		
+	}
+	public Icon getScaledIcon(final Icon icon, Quantity<LengthUnits> iconHeight) {
+		if(iconHeight.toBaseUnitsRounded() == icon.getIconHeight())
+			return icon;
+		final URL iconUrl = ICON_URLS.get(icon);
+		if (iconUrl != null)
+			return getImageIcon(iconUrl, iconHeight);
+		else
+			throw new IllegalArgumentException("unknown icon");
+	}
+
+	static public boolean isSvgIconsEnabled() {
+		return ResourceController.getResourceController().getBooleanProperty(ImageIconFactory.USE_SVG_ICONS);
+	}
+
+	public static String[] getAlternativePaths(final String resourcePath) {
+		final String pngSuffix = ".png";
+		if(isSvgIconsEnabled() && resourcePath.endsWith(pngSuffix)) {
+			final String svgPath = resourcePath.substring(0, resourcePath.length() - pngSuffix.length()) + ".svg";
+			return new String[]{svgPath, resourcePath};
+		} else
+			return new String[]{resourcePath};
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/factory/MindIconFactory.java b/freeplane/src/main/java/org/freeplane/features/icon/factory/MindIconFactory.java
index bc599ff..429c97c 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/factory/MindIconFactory.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/factory/MindIconFactory.java
@@ -31,7 +31,7 @@ public class MindIconFactory {
 	 * Constructs a MindIcon with the given name from the property file.
 	 * The name of the icon is the file name without the extension.
 	 */
-	public static MindIcon create(final String name) {
+	public static MindIcon createIcon(final String name) {
 		final String translationKeyLabel = name.indexOf('/') > 0 ? "" : String.format(DESC_KEY, name);
 		return new MindIcon(name, name + ".png", translationKeyLabel);
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/factory/WeakValueCache.java b/freeplane/src/main/java/org/freeplane/features/icon/factory/WeakValueCache.java
new file mode 100644
index 0000000..631c250
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/icon/factory/WeakValueCache.java
@@ -0,0 +1,26 @@
+package org.freeplane.features.icon.factory;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+public class WeakValueCache<K, V> {
+	final private Map<K, WeakReference<V>> map = new HashMap<>();
+
+	public boolean containsKey(String key) {
+		final WeakReference<V> weakReference = map.get(key);
+		return weakReference != null && weakReference.get() != null;
+	}
+
+	public V get(K key) {
+		final WeakReference<V> weakReference = map.get(key);
+		return weakReference != null ? weakReference.get() : null;
+	}
+
+	public void put(K key, V value) {
+		if(value == null)
+			throw new IllegalArgumentException("null values are not allowed");
+		final WeakReference<V> reference = new WeakReference<>(value);
+		map.put(key, reference);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconAction.java b/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconAction.java
index a8b46f2..87c0e3d 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconAction.java
@@ -31,28 +31,33 @@ import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.icon.IIconInformation;
 import org.freeplane.features.icon.IconController;
 import org.freeplane.features.icon.MindIcon;
+import org.freeplane.features.icon.factory.IconStoreFactory;
 import org.freeplane.features.icon.factory.ImageIconFactory;
 import org.freeplane.features.map.NodeModel;
 
 class IconAction extends AMultipleNodeAction implements IIconInformation {
 
 	private static final long serialVersionUID = 1L;
-	final private MindIcon icon;
+	final private MindIcon mindIcon;
 
 	public IconAction( final MindIcon _icon) {
-		super("IconAction." + _icon.getName(), _icon.getTranslationValueLabel(), ImageIconFactory.getInstance()
-		    .getImageIcon(_icon));
-		icon = _icon;
+		super("IconAction." + _icon.getName(), _icon.getTranslationValueLabel(), null);
+		mindIcon = _icon;
+		setIcon(getIcon());
 		putValue(Action.SHORT_DESCRIPTION, getTranslationValueLabel());
 	}
 
+	private MindIcon replaceByUserDefinedIcon() {
+		return IconStoreFactory.ICON_STORE.getMindIcon(mindIcon.getName());
+	}
+
 	@Override
 	public void actionPerformed(final ActionEvent e, final NodeModel node) {
-		((MIconController) IconController.getController()).addIcon(node, icon);
+		((MIconController) IconController.getController()).addIcon(node, replaceByUserDefinedIcon());
 	}
 	
 	public String getTranslationKeyLabel() {
-		return icon.getTranslationKeyLabel();
+		return mindIcon.getTranslationKeyLabel();
 	}
 
 	@Override
@@ -61,24 +66,24 @@ class IconAction extends AMultipleNodeAction implements IIconInformation {
 	}
 
 	public String getTranslationValueLabel() {
-		return icon.getTranslationValueLabel();
+		return mindIcon.getTranslationValueLabel();
 	}
 
 	public Icon getIcon() {
-		return ImageIconFactory.getInstance().getImageIcon(icon);
+		return ImageIconFactory.getInstance().getImageIcon(replaceByUserDefinedIcon());
 	}
 
 	public KeyStroke getKeyStroke() {
-		final String keystrokeResourceName = icon.getShortcutKey();
+		final String keystrokeResourceName = mindIcon.getShortcutKey();
 		final String keyStrokeDescription = ResourceController.getResourceController().getProperty(keystrokeResourceName);
 		return UITools.getKeyStroke(keyStrokeDescription);
 	}
 
 	public MindIcon getMindIcon() {
-		return icon;
+		return replaceByUserDefinedIcon();
 	}
 
 	public String getShortcutKey() {
-		return icon.getShortcutKey();
+		return mindIcon.getShortcutKey();
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconSelectionPlugin.java b/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconSelectionPlugin.java
index 2f545a8..23d1fb0 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconSelectionPlugin.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/IconSelectionPlugin.java
@@ -21,16 +21,12 @@ import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 
 import javax.swing.Action;
-import javax.swing.ListModel;
 
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.components.IconSelectionPopupDialog;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.icon.IIconInformation;
 import org.freeplane.features.icon.IconController;
-import org.freeplane.features.icon.IconRegistry;
-import org.freeplane.features.icon.MindIcon;
-import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
@@ -50,24 +46,15 @@ public class IconSelectionPlugin extends AFreeplaneAction {
 		ArrayList<IIconInformation> actions = new ArrayList<IIconInformation>();
 		
 		final Controller controller = Controller.getCurrentController();
-		final MapModel map = controller.getMap();
-		final IconRegistry iconRegistry = map.getIconRegistry();
-		final ListModel usedIcons = iconRegistry.getIconsAsListModel();
-		for(int i = 0; i < usedIcons.getSize(); i++){
-			final Object icon = usedIcons.getElementAt(i);
-			if(icon instanceof MindIcon){
-				actions.add(new IconAction((MindIcon) icon));
-			}
-		}
 
-		final MIconController mIconController = (MIconController) IconController.getController();
-		for (AFreeplaneAction aFreeplaneAction : mIconController.getIconActions())
-			actions.add((IIconInformation) aFreeplaneAction);
-		
 		actions.add((IIconInformation) modeController.getAction("RemoveIcon_0_Action"));
 		actions.add((IIconInformation) modeController.getAction("RemoveIconAction"));
 		actions.add((IIconInformation) modeController.getAction("RemoveAllIconsAction"));
 
+		final MIconController mIconController = (MIconController) IconController.getController();
+		for (AFreeplaneAction aFreeplaneAction : mIconController.getIconActions())
+			actions.add((IIconInformation) aFreeplaneAction);
+		
 		final IconSelectionPopupDialog selectionDialog = new IconSelectionPopupDialog(UITools.getCurrentFrame(), actions);
 		final NodeModel selected = controller.getSelection().getSelected();
 		controller.getMapViewManager().scrollNodeToVisible(selected);
diff --git a/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/MIconController.java b/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/MIconController.java
index d5b5afb..6c13456 100644
--- a/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/MIconController.java
+++ b/freeplane/src/main/java/org/freeplane/features/icon/mindmapmode/MIconController.java
@@ -21,6 +21,7 @@ package org.freeplane.features.icon.mindmapmode;
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.Point;
@@ -49,6 +50,7 @@ import org.freeplane.core.resources.components.KeyProperty;
 import org.freeplane.core.resources.components.OptionPanelBuilder;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.IndexedTree;
+import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.ui.MenuSplitter;
 import org.freeplane.core.ui.components.FreeplaneToolBar;
 import org.freeplane.core.ui.components.JAutoScrollBarPane;
@@ -59,17 +61,25 @@ import org.freeplane.core.ui.menubuilders.generic.EntryAccessor;
 import org.freeplane.core.ui.menubuilders.generic.EntryVisitor;
 import org.freeplane.core.ui.menubuilders.generic.PhaseProcessor.Phase;
 import org.freeplane.core.undo.IActor;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.filter.condition.ICondition;
 import org.freeplane.features.icon.IIconInformation;
+import org.freeplane.features.icon.IconContainedCondition;
 import org.freeplane.features.icon.IconController;
+import org.freeplane.features.icon.IconExistsCondition;
 import org.freeplane.features.icon.IconGroup;
 import org.freeplane.features.icon.IconStore;
 import org.freeplane.features.icon.MindIcon;
 import org.freeplane.features.icon.factory.IconStoreFactory;
 import org.freeplane.features.map.IExtensionCopier;
+import org.freeplane.features.map.INodeChangeListener;
+import org.freeplane.features.map.NodeChangeEvent;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.mode.mindmapmode.MModeController;
+import org.freeplane.features.styles.ConditionPredicate;
+import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.ui.CollapseableBoxBuilder;
 import org.freeplane.features.ui.FrameController;
 
@@ -77,6 +87,18 @@ import org.freeplane.features.ui.FrameController;
  * @author Dimitry Polivaev
  */
 public class MIconController extends IconController {
+	private static final Insets ICON_SUBMENU_INSETS = new Insets(3, 0, 3, 0);
+	private static final int ARROW_SIZE = Math.round(UITools.getUIFontSize(0.8));
+	private static final Font ARROW_FONT = new Font("SansSerif", 0, ARROW_SIZE);
+	private static final ConditionPredicate DEPENDS_ON_ICON = new ConditionPredicate() {
+		
+		@Override
+		public boolean test(ICondition condition) {
+			return condition instanceof IconContainedCondition 
+					|| condition instanceof IconExistsCondition;
+		}
+	};
+
 	private final class IconActionBuilder implements EntryVisitor {
 		private final HashMap<String, Entry> submenuEntries = new HashMap<String, Entry>();
 		final private ModeController modeController;
@@ -191,7 +213,7 @@ public class MIconController extends IconController {
 	}
 
 	private final Map<MindIcon, AFreeplaneAction> iconActions = new LinkedHashMap<MindIcon, AFreeplaneAction>();
-	private final IconStore STORE = IconStoreFactory.create();
+	private final IconStore STORE = IconStoreFactory.ICON_STORE;
 	private final JToolBar iconToolBar;
 	private final Box iconBox;
 
@@ -206,11 +228,28 @@ public class MIconController extends IconController {
 		UITools.setScrollbarIncrement(iconToolBarScrollPane);
 		UITools.addScrollbarIncrementPropertyListener(iconToolBarScrollPane);
 		FrameController frameController = (FrameController) modeController.getController().getViewController();
-		iconBox = new CollapseableBoxBuilder(frameController).setPropertyNameBase("leftToolbarVisible").setResizeable(false).createBox(iconToolBarScrollPane, Direction.LEFT);
+		iconBox = new CollapseableBoxBuilder(frameController).setPropertyNameBase("leftToolbarVisible").setResizeable(true).createBox(iconToolBarScrollPane, Direction.LEFT);
 		createIconActions(modeController);
 		createPreferences();
 		modeController.addUiBuilder(Phase.ACTIONS, "icon_actions", new IconActionBuilder(modeController));
 	}
+	
+	@Override
+	public void install(final ModeController modeController) {
+		super.install(modeController);
+		modeController.getMapController().addNodeChangeListener(new INodeChangeListener() {
+			
+			@Override
+			public void nodeChanged(NodeChangeEvent event) {
+				final NodeModel node = event.getNode();
+				if(event.getProperty().equals(NodeModel.NODE_ICON)
+						&& LogicalStyleController.getController().conditionalStylesOf(node).dependOnCondition(DEPENDS_ON_ICON)){
+					modeController.getMapController().delayedNodeRefresh(node, NodeModel.UNKNOWN_PROPERTY, null, null);
+				}
+			}
+		});
+	}
+
 
 	public void addIcon(final NodeModel node, final MindIcon icon) {
 		final IActor actor = new IActor() {
@@ -250,6 +289,30 @@ public class MIconController extends IconController {
 		Controller.getCurrentModeController().execute(actor, node.getMap());
 	}
 
+	public void changeIconSize(final NodeModel node, final Quantity<LengthUnits> iconSize)
+	{
+		final IActor actor = new IActor() {
+
+			private Quantity<LengthUnits> oldIconSize;
+
+			public void act() {
+				oldIconSize = node.getSharedData().getIcons().getIconSize();
+				node.getSharedData().getIcons().setIconSize(iconSize);
+				Controller.getCurrentModeController().getMapController().nodeChanged(node, NodeModel.NODE_ICON_SIZE, null, iconSize);
+			}
+
+			public String getDescription() {
+				return "changeIconSize";
+			}
+
+			public void undo() {
+				node.getSharedData().getIcons().setIconSize(oldIconSize);
+				Controller.getCurrentModeController().getMapController().nodeChanged(node, NodeModel.NODE_ICON_SIZE, oldIconSize, null);
+			}
+		};
+		Controller.getCurrentModeController().execute(actor, node.getMap());
+	}
+
 	private void createIconActions(final ModeController modeController) {
 		modeController.addAction(new RemoveIconAction(0));
 		modeController.addAction(new RemoveIconAction(-1));
@@ -313,8 +376,8 @@ public class MIconController extends IconController {
 				return new Point(getWidth(), 0);
 			}
 		};
-		menu.setFont(menu.getFont().deriveFont(8F));
-		menu.setMargin(new Insets(0, 0, 0, 0));
+		menu.setFont(ARROW_FONT);
+		menu.setMargin(ICON_SUBMENU_INSETS);
 		menu.setIcon(group.getGroupIcon().getIcon());
 		for (final MindIcon icon : group.getIcons()) {
 			addActionToIconSubmenu(menu, icon, icon.getFileName());
diff --git a/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java b/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java
new file mode 100644
index 0000000..5ed5615
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/link/ConnectorArrows.java
@@ -0,0 +1,46 @@
+package org.freeplane.features.link;
+
+import java.net.URL;
+
+import javax.swing.Icon;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.components.RenderedContent;
+import org.freeplane.core.ui.components.RenderedContentSupplier;
+import org.freeplane.core.util.FreeplaneIconUtils;
+import org.freeplane.core.util.TextUtils;
+
+public enum ConnectorArrows implements RenderedContentSupplier<ConnectorArrows>{
+	 NONE(ArrowType.NONE, ArrowType.NONE, "none", "arrow-mode-none.svg"), 
+	 FORWARD(ArrowType.NONE, ArrowType.DEFAULT, "forward", "arrow-mode-forward.svg"), 
+	 BACKWARD(ArrowType.DEFAULT, ArrowType.NONE, "backward", "arrow-mode-backward.svg"), 
+	 BOTH(ArrowType.DEFAULT, ArrowType.DEFAULT, "both", "arrow-mode-both.svg");
+	
+	public static ConnectorArrows DEFAULT = ConnectorArrows.FORWARD;
+	
+	public final ArrowType start;
+	public final ArrowType end;
+	public final String text;
+	public final Icon icon;
+	
+	private RenderedContent<ConnectorArrows> renderedContent;
+
+
+	
+	private ConnectorArrows(ArrowType start, ArrowType end, String description, String iconName) {
+		this.start = start;
+		this.end = end;
+		final URL url = ResourceController.getResourceController().getResource("/images/" + iconName);
+		icon = FreeplaneIconUtils.createSVGIcon(url);
+		text = TextUtils.getText("ChangeConnectorArrowsAction." + description + ".text");
+	}
+
+	
+	@Override
+	public RenderedContent<ConnectorArrows> createRenderedContent() {
+		if(renderedContent == null) {
+			renderedContent = new RenderedContent<ConnectorArrows>(this, text, icon);
+		}
+		return renderedContent;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/link/ConnectorModel.java b/freeplane/src/main/java/org/freeplane/features/link/ConnectorModel.java
index 257e7d7..2021515 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/ConnectorModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/ConnectorModel.java
@@ -33,10 +33,11 @@ public class ConnectorModel extends NodeLinkModel {
 	
 	final private ConnectorProperties connectorProperties;
 	
-	public ConnectorModel(final NodeModel source, final String targetID, final Color color,
-	                      final int alpha, final Shape shape, final int width,
+	public ConnectorModel(final NodeModel source, final String targetID,
+			final ConnectorArrows connectorEnds, int[] dash, 
+			final Color color,final int alpha, final Shape shape, final int width,
 	                      final String labelFontFamily, final int labelFontSize) {
-		this(source, targetID, new ConnectorProperties(color, alpha, shape, width, labelFontFamily, labelFontSize));
+		this(source, targetID, new ConnectorProperties(connectorEnds, dash, color, alpha, shape, width, labelFontFamily, labelFontSize));
 	}
 
 	private ConnectorModel(final NodeModel source, final String targetID, final ConnectorProperties connectorProperties) {
diff --git a/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java b/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java
index becc7d5..38d3cb6 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/ConnectorProperties.java
@@ -46,19 +46,21 @@ class ConnectorProperties{
 	private String labelFontFamily;
 	private int labelFontSize;
 
-	public ConnectorProperties(final Color color,
+	public ConnectorProperties(ConnectorArrows connectorEnds, int[] dash, final Color color,
 	                      final int alpha, final Shape shape, final int width,
 	                      final String labelFontFamily, final int labelFontSize) {
 		assert color != null;
 		assert shape != null;
+		assert connectorEnds!=null;
+		this.startArrow = connectorEnds.start;
+		this.endArrow = connectorEnds.end;
+		this.dash = dash;
 		this.color = color;
 		this.setAlpha(alpha);
 		this.width = width;
 		this.shape = shape;
 		this.labelFontFamily = labelFontFamily;
 		this.labelFontSize = labelFontSize;
-		startArrow = ArrowType.NONE;
-		endArrow = ArrowType.DEFAULT;
 	}
 	public Shape getShape() {
 		return shape;
diff --git a/freeplane/src/main/java/org/freeplane/features/link/LinkBuilder.java b/freeplane/src/main/java/org/freeplane/features/link/LinkBuilder.java
index 568f4de..f503bc3 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/LinkBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/LinkBuilder.java
@@ -57,6 +57,7 @@ public class LinkBuilder implements IElementDOMHandler, IReadCompletionListener{
 
 	protected NodeLinkModel createArrowLink(final NodeModel source, final String targetID) {
 		return new ConnectorModel(source, targetID, 
+				ConnectorArrows.DEFAULT, null,
 			linkController.getStandardConnectorColor(),
 			linkController.getStandardConnectorAlpha(),
 			linkController.getStandardConnectorShape(),
diff --git a/freeplane/src/main/java/org/freeplane/features/link/LinkController.java b/freeplane/src/main/java/org/freeplane/features/link/LinkController.java
index 032b235..e0f27f1 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/LinkController.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/LinkController.java
@@ -71,10 +71,8 @@ import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.MenuUtils;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.filter.FilterController;
-import org.freeplane.features.icon.IconStore;
-import org.freeplane.features.icon.UIIcon;
-import org.freeplane.features.icon.factory.IconStoreFactory;
 import org.freeplane.features.link.ConnectorModel.Shape;
 import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.map.INodeSelectionListener;
@@ -114,10 +112,6 @@ public class LinkController extends SelectionController implements IExtension {
 		linkController.init();
 	}
 
-	public static final String LINK_ICON = ResourceController.getResourceController().getProperty("link_icon");
-	private static final String MAIL_ICON = ResourceController.getResourceController().getProperty("mail_icon");
-	public static final String LINK_LOCAL_ICON = ResourceController.getResourceController().getProperty("link_local_icon");
-
  	final protected ModeController modeController;
 
 	public LinkController(ModeController modeController) {
@@ -240,7 +234,7 @@ public class LinkController extends SelectionController implements IExtension {
 	    		final GotoLinkNodeAction gotoLinkNodeAction = new GotoLinkNodeAction(LinkController.this, target);
 	    		gotoLinkNodeAction.configureText("follow_graphical_link", target);
 	    		if (!(link instanceof ConnectorModel)) {
-	    			gotoLinkNodeAction.putValue(Action.SMALL_ICON, ICON_STORE.getUIIcon(LINK_LOCAL_ICON).getIcon());
+	    			gotoLinkNodeAction.putValue(Action.SMALL_ICON, LinkType.LOCAL.icon);
 	    		}
 	    		if (firstAction) {
 	    			entry.addChild(new Entry().setBuilders("separator"));
@@ -443,6 +437,8 @@ public class LinkController extends SelectionController implements IExtension {
 
 	public static final String RESOURCES_LINK_COLOR = "standardlinkcolor";
 	private static final String RESOURCES_CONNECTOR_SHAPE = "connector_shape";
+	private static final String RESOURCES_CONNECTOR_ARROWS = "connector_arrows";
+	private static final String RESOURCES_DASH_VARIANT = "connector_dash";
 	private static final String RESOURCES_CONNECTOR_COLOR_ALPHA = "connector_alpha";
 	private static final String RESOURCES_CONNECTOR_WIDTH = "connector_width";
 
@@ -532,7 +528,9 @@ public class LinkController extends SelectionController implements IExtension {
 			else {
 				loadURI(link);
 			}
-			onSelect(modeController.getController().getSelection().getSelected());
+			final IMapSelection selection = modeController.getController().getSelection();
+			if(selection != null)
+				onSelect(selection.getSelected());
 		}
     }
 
@@ -792,20 +790,22 @@ public class LinkController extends SelectionController implements IExtension {
 		return width;
 	}
 
-	public void setStandardConnectorWidth(final int width) {
-		final String value = Integer.toString(width);
-		ResourceController.getResourceController().setProperty(RESOURCES_CONNECTOR_WIDTH, value);
-	}
-
 	public Color getStandardConnectorColor() {
         final String standardColor = ResourceController.getResourceController().getProperty(RESOURCES_LINK_COLOR);
 		final Color color = ColorUtils.stringToColor(standardColor);
         return color;
     }
 
-	public void setStandardConnectorColor(final Color color) {
-		String value = ColorUtils.colorToString(color);
-		ResourceController.getResourceController().setProperty(RESOURCES_LINK_COLOR, value);
+	public ConnectorArrows getStandardConnectorArrows() {
+		final String standard = ResourceController.getResourceController().getProperty(RESOURCES_CONNECTOR_ARROWS);
+		final ConnectorArrows arrows = ConnectorArrows.valueOf(standard);
+		return arrows;
+	}
+	
+	public DashVariant getStandardDashVariant() {
+		final String standard = ResourceController.getResourceController().getProperty(RESOURCES_DASH_VARIANT);
+		final DashVariant variant = DashVariant.valueOf(standard);
+		return variant;
 	}
 
 	public Shape getStandardConnectorShape() {
@@ -814,23 +814,12 @@ public class LinkController extends SelectionController implements IExtension {
 		return shape;
 	}
 
-	public void setStandardConnectorShape(final Shape shape) {
-		String value = shape.toString();
-		ResourceController.getResourceController().setProperty(RESOURCES_CONNECTOR_SHAPE, value);
-	}
-
-
 	public int getStandardConnectorAlpha() {
 		final String standardAlpha = ResourceController.getResourceController().getProperty(RESOURCES_CONNECTOR_COLOR_ALPHA);
 		final int alpha = Integer.valueOf(standardAlpha);
 		return alpha;
 	}
 
-	public void setStandardAlpha(final int alpha) {
-		final String value = Integer.toString(alpha);
-		ResourceController.getResourceController().setProperty(RESOURCES_CONNECTOR_COLOR_ALPHA, value);
-	}
-
 	public int getAlpha(ConnectorModel connectorModel) {
 		return connectorModel.getAlpha();
     }
@@ -843,17 +832,16 @@ public class LinkController extends SelectionController implements IExtension {
 	    return ResourceController.getResourceController().getProperty("label_font_family");
     }
 
-	private static final String MENUITEM_ICON = "icons/button.png";
-	private static final String EXECUTABLE_ICON = ResourceController.getResourceController().getProperty("executable_icon");
-	private static final IconStore ICON_STORE = IconStoreFactory.create();
+	private static final String MENUITEM_ICON = "menuitem_icon";
+	private static final String EXECUTABLE_ICON = "executable_icon";
+	private static final String LINK_ICON = "link_icon";
+	private static final String MAIL_ICON = "mail_icon";
+	private static final String LINK_LOCAL_ICON = "link_local_icon";
+
 	public static enum LinkType{
 		LOCAL(LINK_LOCAL_ICON), MAIL(MAIL_ICON), EXECUTABLE(EXECUTABLE_ICON), MENU(MENUITEM_ICON), DEFAULT(LINK_ICON);
-		LinkType(String iconPath){
-			final UIIcon uiIcon = ICON_STORE.getUIIcon(iconPath);
-			if(uiIcon == null)
-				this.icon =  null;
-			else
-				this.icon =  uiIcon.getIcon();
+		LinkType(String iconKey){
+			this.icon =  ResourceController.getResourceController().getIcon(iconKey);
 		}
 		final public Icon icon;
 	}
@@ -868,7 +856,7 @@ public class LinkController extends SelectionController implements IExtension {
 	    	    Icon icon = menuItemCache.get(menuItemKey);
                 if (icon == null) {
                     final Icon menuItemIcon = MenuUtils.getMenuItemIcon(menuItemKey);
-                    icon = (menuItemIcon == null) ? ICON_STORE.getUIIcon(MENUITEM_ICON).getIcon() : menuItemIcon;
+                    icon = (menuItemIcon == null) ? LinkType.MENU.icon : menuItemIcon;
                     menuItemCache.put(menuItemKey, icon);
                 }
 	    	    return icon;
@@ -937,4 +925,8 @@ public class LinkController extends SelectionController implements IExtension {
 		final Boolean formatNodeAsHyperlink = linkModel.formatNodeAsHyperlink();
 		return formatNodeAsHyperlink;
 	}
+
+	public void loadURI(NodeModel node, URI uri) {
+		loadURI(uri);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/link/LinkTransformer.java b/freeplane/src/main/java/org/freeplane/features/link/LinkTransformer.java
index 6382b65..2c31451 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/LinkTransformer.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/LinkTransformer.java
@@ -23,6 +23,7 @@ import java.net.URI;
 
 import javax.swing.Icon;
 
+import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.components.ObjectAndIcon;
 import org.freeplane.features.format.PatternFormat;
 import org.freeplane.features.map.MapModel;
@@ -30,13 +31,14 @@ import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.text.AbstractContentTransformer;
 import org.freeplane.features.text.TextController;
-import org.freeplane.features.ui.FrameController;
 
 /**
  * @author Dimitry Polivaev
  * Mar 3, 2011
  */
 public class LinkTransformer extends AbstractContentTransformer {
+	
+	private static Icon localLinkIcon = ResourceController.getResourceController().getIcon("link_local_icon");
 	private ModeController modeController;
 
 	public LinkTransformer(ModeController modeController, int priority) {
@@ -67,8 +69,7 @@ public class LinkTransformer extends AbstractContentTransformer {
 		final NodeModel target = map.getNodeForID(nodeID);
 		if(target != null){
 			final String shortText = TextController.getController(modeController).getShortPlainText(target);
-			final Icon icon = FrameController.localLinkIcon;
-			return new ObjectAndIcon(shortText, icon);
+			return new ObjectAndIcon(shortText, localLinkIcon);
 		}
 		else
 			return content;
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorArrowsAction.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorArrowsAction.java
index 5913c98..ed9e7fc 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorArrowsAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorArrowsAction.java
@@ -23,6 +23,7 @@ import java.awt.event.ActionEvent;
 
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.features.link.ArrowType;
+import org.freeplane.features.link.ConnectorArrows;
 import org.freeplane.features.link.ConnectorModel;
 import org.freeplane.features.link.LinkController;
 
@@ -35,13 +36,12 @@ class ChangeConnectorArrowsAction extends AFreeplaneAction {
 	ArrowType endArrow;
 	ArrowType startArrow;
 
-	public ChangeConnectorArrowsAction(final MLinkController linkController, final String key,
-	                                   final ConnectorModel arrowLink, final ArrowType startArrow,
-	                                   final ArrowType endArrow) {
-		super("ChangeConnectorArrowsAction." + key);
+	public ChangeConnectorArrowsAction(final MLinkController linkController, final ConnectorArrows arrows,
+	                                   final ConnectorModel arrowLink) {
+		super("ChangeConnectorArrowsAction." + arrows.name().toLowerCase(), arrows.text, arrows.icon);
 		this.arrowLink = arrowLink;
-		this.startArrow = startArrow;
-		this.endArrow = endArrow;
+		this.startArrow = arrows.start;
+		this.endArrow = arrows.end;
 		final boolean selected = arrowLink.getStartArrow().equals(startArrow)
 		        && arrowLink.getEndArrow().equals(endArrow);
 		setSelected(selected);
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorDashAction.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorDashAction.java
index 5702d9e..cecd275 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorDashAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/ChangeConnectorDashAction.java
@@ -19,65 +19,35 @@
  */
 package org.freeplane.features.link.mindmapmode;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Stroke;
 import java.awt.event.ActionEvent;
 import java.util.Arrays;
 
-import javax.swing.Icon;
 import org.freeplane.core.ui.AFreeplaneAction;
-import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.link.ConnectorModel;
 import org.freeplane.features.link.LinkController;
 
 class ChangeConnectorDashAction extends AFreeplaneAction {
-	private static final int ICON_HEIGHT = 6;
-	private static final int ICON_WIDTH = 60;
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	private ConnectorModel arrowLink;
-	private final int[] dash;
+	private ConnectorModel connector;
+	private final DashVariant dash;
 
 	public ChangeConnectorDashAction(final MLinkController linkController,
-	                                   final ConnectorModel arrowLink, final int[] dash) {
-		super("ChangeConnectorDashAction", "", createIcon(dash));
-		this.arrowLink = arrowLink;
+	                                   final ConnectorModel connector, final DashVariant dash) {
+		super("ChangeConnectorDashAction", "", dash.icon);
+		this.connector = connector;
 		this.dash = dash;
-		final int[] dash2 = arrowLink.getDash();
-		final boolean selected = dash2 == dash || dash != null && Arrays.equals(dash, dash2);
+		final int[] dash2 = connector.getDash();
+		final int[] variant = dash.variant;
+		final boolean selected = dash2 == variant || variant != null && Arrays.equals(variant, dash2);
 		setSelected(selected);
 	}
 
 	public void actionPerformed(final ActionEvent e) {
 		final MLinkController linkController = (MLinkController) LinkController.getController();
-		linkController.setConnectorDash(arrowLink, dash);
-	}
-	
-	private static Icon createIcon(final int[] dash){
-		final BasicStroke stroke = UITools.createStroke(2, dash);
-		return new Icon() {
-			public void paintIcon(Component c, Graphics g, int x, int y) {
-				Graphics2D g2 = (Graphics2D) g;
-				g2.setColor(Color.BLACK);
-				Stroke oldStroke = g2.getStroke();
-				g2.setStroke(stroke);
-				g2.drawLine(x, y+ICON_HEIGHT / 2, x+ICON_WIDTH, y+ICON_HEIGHT / 2);
-				g2.setStroke(oldStroke);
-			}
-			
-			public int getIconWidth() {
-				return ICON_WIDTH;
-			}
-			
-			public int getIconHeight() {
-				return ICON_HEIGHT;
-			}
-		};
+		linkController.setConnectorDash(connector, dash.variant);
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java
index 06d34d8..edba0e3 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MLinkController.java
@@ -37,19 +37,18 @@ import java.awt.event.WindowEvent;
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.Vector;
 
 import javax.swing.Action;
 import javax.swing.ActionMap;
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.FocusManager;
-import javax.swing.Icon;
 import javax.swing.InputMap;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
-import javax.swing.JList;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JSlider;
@@ -61,11 +60,16 @@ import javax.swing.SwingUtilities;
 
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.ui.components.JComboBoxWithBorder;
+import org.freeplane.core.ui.components.RenderedContent;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.undo.IActor;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.link.ArrowType;
+import org.freeplane.features.link.ConnectorArrows;
 import org.freeplane.features.link.ConnectorModel;
 import org.freeplane.features.link.ConnectorModel.Shape;
 import org.freeplane.features.link.HyperTextLinkModel;
@@ -86,7 +90,6 @@ import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.spellchecker.mindmapmode.SpellCheckerController;
 import org.freeplane.features.styles.LogicalStyleKeys;
-import org.freeplane.features.url.UrlManager;
 
 /**
  * @author Dimitry Polivaev
@@ -141,6 +144,7 @@ public class MLinkController extends LinkController {
 		public void act() {
 			NodeLinks nodeLinks = NodeLinks.createLinkExtension(source);
 			arrowLink = new ConnectorModel(source, targetID,
+				getStandardConnectorArrows(), getStandardDashVariant().variant,
 				getStandardConnectorColor(), getStandardConnectorAlpha(),
 				getStandardConnectorShape(), getStandardConnectorWidth(),
 				getStandardLabelFontFamily(), getStandardLabelFontSize());
@@ -415,12 +419,12 @@ public class MLinkController extends LinkController {
 
 
 		AFreeplaneAction[] arrowActions = new AFreeplaneAction[]{
-                new ChangeConnectorArrowsAction(this, "none", link, ArrowType.NONE, ArrowType.NONE),
-                new ChangeConnectorArrowsAction(this, "forward", link, ArrowType.NONE, ArrowType.DEFAULT),
-                new ChangeConnectorArrowsAction(this, "backward", link, ArrowType.DEFAULT, ArrowType.NONE),
-                new ChangeConnectorArrowsAction(this, "both", link, ArrowType.DEFAULT, ArrowType.DEFAULT)
+                new ChangeConnectorArrowsAction(this, ConnectorArrows.NONE, link),
+                new ChangeConnectorArrowsAction(this, ConnectorArrows.FORWARD, link),
+                new ChangeConnectorArrowsAction(this, ConnectorArrows.BACKWARD, link),
+                new ChangeConnectorArrowsAction(this, ConnectorArrows.BOTH, link)
 		};
-        final JComboBox connectorArrows = createActionBox(arrowActions);
+        JComboBoxWithBorder connectorArrows = createActionBox(arrowActions);
 		addPopupComponent(arrowLinkPopup, TextUtils.getText("connector_arrows"), connectorArrows);
 
         final boolean twoNodesConnector = ! link.getSource().equals(link.getTarget());
@@ -440,17 +444,16 @@ public class MLinkController extends LinkController {
                     new ChangeConnectorShapeAction(this, link, Shape.LINEAR_PATH)
             };
         }
-            final JComboBox connectorShapes = createActionBox(shapeActions);
+            final JComboBoxWithBorder connectorShapes = createActionBox(shapeActions);
             addPopupComponent(arrowLinkPopup, TextUtils.getText("connector_shapes"), connectorShapes);
 
-        AFreeplaneAction[] dashActions = new AFreeplaneAction[] {
-                new ChangeConnectorDashAction(this, link, null),
-                new ChangeConnectorDashAction(this, link, new int[]{3, 3}),
-                new ChangeConnectorDashAction(this, link, new int[]{7, 7}),
-                new ChangeConnectorDashAction(this, link, new int[]{2, 7}),
-                new ChangeConnectorDashAction(this, link, new int[]{2, 7, 7, 7})
-        };
-        final JComboBox connectorDashes = createActionBox(dashActions);
+            
+        ArrayList<AFreeplaneAction> dashActions = new ArrayList<AFreeplaneAction>();
+        for (DashVariant  variant : DashVariant.values())
+        	dashActions.add(new ChangeConnectorDashAction(this, link, variant));
+        final JComboBoxWithBorder connectorDashes = createActionBox(dashActions.toArray(new AFreeplaneAction[dashActions.size()]));
+		final int verticalMargin = new Quantity<>(3, LengthUnits.pt).toBaseUnitsRounded();
+        connectorDashes.setVerticalMargin(verticalMargin);
         addPopupComponent(arrowLinkPopup, TextUtils.getText("connector_lines"), connectorDashes);
 
 		final SpinnerNumberModel widthModel = new SpinnerNumberModel(link.getWidth(),1, 32, 1);
@@ -557,35 +560,23 @@ public class MLinkController extends LinkController {
 	}
 
     @SuppressWarnings("serial")
-    protected JComboBox createActionBox(AFreeplaneAction[] items) {
-        final JComboBox box = new JComboBoxWithBorder();
+    protected JComboBoxWithBorder createActionBox(AFreeplaneAction[] items) {
+        final JComboBoxWithBorder box = new JComboBoxWithBorder();
         box.setEditable(false);
-        box.setModel(new DefaultComboBoxModel(items));
-        for(AFreeplaneAction item : items){
-            if(item.isSelected()){
+        Vector<RenderedContent<AFreeplaneAction>> renderedContent = RenderedContent.of(items);
+		box.setModel(new DefaultComboBoxModel<>(renderedContent));
+        for(RenderedContent<AFreeplaneAction> item : renderedContent){
+            if(item.value.isSelected()){
                 box.setSelectedItem(item);
                 break;
             }
         }
-        box.setRenderer(new DefaultListCellRenderer() {
-            @Override
-            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
-                                                          boolean cellHasFocus) {
-                Action action = (Action) value;
-                Icon icon = (Icon)action.getValue(Action.SMALL_ICON);
-                String text = (String)action.getValue(Action.NAME);
-                Object renderedValue = text == null ? icon : text;
-                DefaultListCellRenderer renderer = (DefaultListCellRenderer) super.getListCellRendererComponent(list, renderedValue, index, isSelected, cellHasFocus);
-                if(text != null && icon != null)
-                    renderer.setIcon(icon);
-                return renderer;
-            }
-        });
+        box.setRenderer(RenderedContent.createRenderer());
         box.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
-                AFreeplaneAction item = (AFreeplaneAction)e.getItem();
+            	RenderedContent<AFreeplaneAction> item = (RenderedContent<AFreeplaneAction>)e.getItem();
                 final JComboBox box = (JComboBox) e.getSource();
-                item.actionPerformed(new ActionEvent(box, ActionEvent.ACTION_PERFORMED, null));
+                item.value.actionPerformed(new ActionEvent(box, ActionEvent.ACTION_PERFORMED, null));
             }
         });
         return box;
@@ -999,12 +990,6 @@ public class MLinkController extends LinkController {
 	}
 
 	@Override
-    @SuppressWarnings("deprecation")
-    public void loadURI(URI uri) {
-		UrlManager.getController().loadURL(uri);
-    }
-
-	@Override
 	protected void loadURL(final NodeModel node, final ActionEvent e) {
 		// load as documentation map if the node belongs to a documentation map
 		boolean addDocuMapAttribute = node.getMap().containsExtension(DocuMapAttribute.class)
@@ -1022,6 +1007,22 @@ public class MLinkController extends LinkController {
 		}
 	}
 
+	public void loadURI(NodeModel node, URI uri) {
+		// load as documentation map if the node belongs to a documentation map
+		boolean addDocuMapAttribute = node.getMap().containsExtension(DocuMapAttribute.class)
+				&& ! modeController.containsExtension(DocuMapAttribute.class);
+		if(addDocuMapAttribute){
+			modeController.addExtension(DocuMapAttribute.class, DocuMapAttribute.instance);
+		}
+		try{
+			loadURI(uri);
+		}
+		finally{
+			if(addDocuMapAttribute){
+				modeController.removeExtension(DocuMapAttribute.class);
+			}
+		}
+	}
 	public String getAnchorID() {
 		return anchorID;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java
index a056b2e..d3416ec 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/MakeLinkFromAnchorAction.java
@@ -70,8 +70,10 @@ public class MakeLinkFromAnchorAction extends AFreeplaneAction {
 			final String sourceNodeID = sourceID.substring( sourceID.indexOf("#")+1 );
 			
 			final NodeModel sourceNode = modeControllerForSelectedMap.getMapController().getNodeFromID(sourceNodeID);
-
-			linkController.setLinkTypeDependantLink(sourceNode, targetID.substring(targetID.indexOf("#")));
+			
+			if(sourceNode != null) {
+				linkController.setLinkTypeDependantLink(sourceNode, targetID.substring(targetID.indexOf("#")));
+			}
 			
 		} else {
 		
diff --git a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/SelectMenuItemDialog.java b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/SelectMenuItemDialog.java
index 99d11b4..7c02e74 100644
--- a/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/SelectMenuItemDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/link/mindmapmode/SelectMenuItemDialog.java
@@ -94,7 +94,7 @@ public class SelectMenuItemDialog extends JDialog {
 			setOpenIcon(null);
 			setClosedIcon(null);
 			// set default
-			setLeafIcon(MindIconFactory.create(DEFAULT_ICON).getIcon());
+			setLeafIcon(MindIconFactory.createIcon(DEFAULT_ICON).getIcon());
 		}
 
 		@Override
diff --git a/freeplane/src/main/java/org/freeplane/features/map/FoldingController.java b/freeplane/src/main/java/org/freeplane/features/map/FoldingController.java
index 6f95f51..f46e265 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/FoldingController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/FoldingController.java
@@ -242,14 +242,12 @@ public class FoldingController implements IMouseWheelEventHandler, IExtension {
 		return k;
 	}
 
-	public int getMinDepth(final NodeModel node) {
+	private int getMinDepth(final NodeModel node) {
 		final EncryptionModel encryptionModel = EncryptionModel.getModel(node);
 		if (encryptionModel != null && !encryptionModel.isAccessible() ) {
 			return Integer.MAX_VALUE;
 		}
 		final MapController mapController = Controller.getCurrentModeController().getMapController();
-		if(node.containsExtension(HideChildSubtree.class))
-			return depth(node) - 1;
 		if (mapController.isFolded(node)) {
 			return depth(node);
 		}
@@ -269,14 +267,13 @@ public class FoldingController implements IMouseWheelEventHandler, IExtension {
 	public boolean handleMouseWheelEvent(final MouseWheelEvent e) {
 		if ((e.getModifiers() & InputEvent.ALT_MASK) != 0) {
 			Controller controller = Controller.getCurrentController();
-			final NodeModel rootNode = controller.getMap().getRootNode();
+			final IMapSelection selection = controller.getSelection();
+			final NodeModel node = selection.getSelected();
 			if (e.getWheelRotation() > 0) {
-				unfoldOneStage(rootNode);
+				unfoldOneStage(node);
 			}
 			else {
-				final ModeController modeController = controller.getModeController();
-				modeController.getMapController().select(controller.getMap().getRootNode());
-				foldOneStage(rootNode);
+				foldOneStage(node);
 			}
 			return true;
 		}
@@ -284,8 +281,8 @@ public class FoldingController implements IMouseWheelEventHandler, IExtension {
 	}
 
 	private void setFolded(final NodeModel node, final boolean state) {
-		final MapController mapController = Controller.getCurrentModeController().getMapController();
 		if (! node.isRoot()) {
+			final MapController mapController = Controller.getCurrentModeController().getMapController();
 			mapController.setFolded(node, state);
 		}
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/map/HideChildSubtree.java b/freeplane/src/main/java/org/freeplane/features/map/HideChildSubtree.java
deleted file mode 100644
index d194005..0000000
--- a/freeplane/src/main/java/org/freeplane/features/map/HideChildSubtree.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2012 Dimitry
- *
- *  This file author is Dimitry
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.features.map;
-
-import org.freeplane.core.extension.IExtension;
-
-/**
- * @author Dimitry Polivaev
- * 22.04.2012
- */
-public class HideChildSubtree implements IExtension {
-
-	final public static HideChildSubtree instance = new HideChildSubtree();
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/map/IMapSelection.java b/freeplane/src/main/java/org/freeplane/features/map/IMapSelection.java
index 75683c7..966193e 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/IMapSelection.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/IMapSelection.java
@@ -28,11 +28,24 @@ import java.util.Set;
  * 04.01.2009
  */
 public interface IMapSelection {
+
+	public enum NodePosition {
+		WEST, CENTER, EAST;
+	}
+	
 	public void centerNode(final NodeModel node);
+	
+	public void centerNodeSlowly(final NodeModel node);
+
+	public void moveNodeTo(final NodeModel node, NodePosition position);
+	
+	public void slowlyMoveNodeTo(final NodeModel node, NodePosition position);
 
 	public NodeModel getSelected();
 
 	public Set<NodeModel> getSelection();
+	
+	public List<String> getOrderedSelectionIds();
 
 	public List<NodeModel> getOrderedSelection();
 
diff --git a/freeplane/src/main/java/org/freeplane/features/map/MapController.java b/freeplane/src/main/java/org/freeplane/features/map/MapController.java
index adb9af9..82ba4f0 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/MapController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/MapController.java
@@ -51,6 +51,7 @@ import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.util.DelayedRunner;
+import org.freeplane.core.util.LogUtils;
 import org.freeplane.features.filter.FilterController;
 import org.freeplane.features.filter.condition.ConditionFactory;
 import org.freeplane.features.map.MapWriter.Mode;
@@ -64,6 +65,7 @@ import org.freeplane.features.url.UrlManager;
 import org.freeplane.main.addons.AddOnsController;
 import org.freeplane.n3.nanoxml.XMLException;
 import org.freeplane.n3.nanoxml.XMLParseException;
+import org.freeplane.view.swing.map.NodeView;
 
 /**
  * @author Dimitry Polivaev
@@ -247,6 +249,8 @@ public class MapController extends SelectionController implements IExtension{
 			actionSelectorOnChange.remove(action);
 		}
 	}
+	
+	
 
 	/**
 	 * This class sortes nodes by ascending depth of their paths to root. This
@@ -289,6 +293,7 @@ public class MapController extends SelectionController implements IExtension{
 	public MapController(ModeController modeController) {
 		super();
 		modeController.setMapController(this);
+		refresher = new Refresher();
 		this.modeController = modeController;
 		mapLifeCycleListeners = new LinkedList<IMapLifeCycleListener>();
 		addMapLifeCycleListener(modeController.getController());
@@ -324,42 +329,75 @@ public class MapController extends SelectionController implements IExtension{
 		createActions(modeController);
 	}
 
-	public void setFoldedAndScroll(final NodeModel node, final boolean folded){
-		if(Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(node) != folded){
-			setFolded(node, folded);
-			if(! folded && ResourceController.getResourceController().getBooleanProperty("scrollOnUnfold")){
-				SwingUtilities.invokeLater(new Runnable() {
-					@Override
-					public void run() {
-						Controller.getCurrentController().getSelection().scrollNodeTreeToVisible(node);
-					}
-				});
-				
-			}
+	public void unfoldAndScroll(final NodeModel node) {
+		final boolean wasFoldedOnCurrentView = canBeUnfoldedOnCurrentView(node);
+		unfold(node);
+		if (wasFoldedOnCurrentView && ResourceController.getResourceController().getBooleanProperty("scrollOnUnfold")) {
+			SwingUtilities.invokeLater(new Runnable() {
+				@Override
+				public void run() {
+					Controller.getCurrentController().getSelection().scrollNodeTreeToVisible(node);
+				}
+			});
+			
 		}
 	}
 	
-	public void setFolded(final NodeModel node, final boolean folded) {
-		if (node == null) {
-			throw new IllegalArgumentException("setFolded was called with a null node.");
+	public void setFolded(final NodeModel node, final boolean fold) {
+		if(!fold || node.isRoot())
+			unfold(node);
+		else
+			fold(node);
+	}
+
+	public void toggleFolded(final NodeModel node) {
+		if (canBeUnfoldedOnCurrentView(node)) {
+			unfold(node);
+		}
+		else{
+			fold(node);
 		}
+	}
+
+	public void toggleFoldedAndScroll(final NodeModel node){
+		if(canBeUnfoldedOnCurrentView(node))
+			unfoldAndScroll(node);
+		else
+			fold(node);
+	}
+
+	public void unfold(final NodeModel node) {
 		if (node.getChildCount() == 0)
 			return;
-		final boolean unfold = ! folded;
-		final boolean childShown = unfoldHiddenChildren(node);
+		final boolean hiddenChildShown = unfoldHiddenChildren(node);
 		boolean mapChanged = false;
-	    if (unfold && unfoldInvisibleChildren(node, true))
-	        mapChanged = true;
-	    if (!(node.isRoot() && folded)) {
-	    	if (node.isFolded() != folded) {
-	    		mapChanged = true;
-	    	}
-	    	setFoldingState(node, folded);
-	    }
+	    if (canBeUnfoldedOnCurrentView(node)) {
+	    	unfoldUpToVisibleChild(node);
+			mapChanged = true;
+		} else if (node.isFolded()) {
+			mapChanged = true;
+			setFoldingState(node, false);
+		}
+		if(mapChanged){
+			fireFoldingChanged(node);
+		}
+		if(hiddenChildShown)
+	        fireNodeUnfold(node);
+	}
+	
+	public void fold(final NodeModel node) {
+		if (node.getChildCount() == 0|| node.isRoot())
+			return;
+		final boolean hiddenChildShown = unfoldHiddenChildren(node);
+		boolean mapChanged = false;
+	    if (!node.isFolded()) {
+			mapChanged = true;
+		}
+	    setFoldingState(node, true);
 		if(mapChanged){
 			fireFoldingChanged(node);
 		}
-		if(childShown)
+		if(hiddenChildShown)
 	        fireNodeUnfold(node);
 	}
 
@@ -371,42 +409,37 @@ public class MapController extends SelectionController implements IExtension{
 	public boolean showNextChild(final NodeModel node) {
 		if (node.getChildCount() == 0)
 			return false;
-		final boolean unfold = Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(node);
+		final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+		final boolean unfold = mapViewManager.isFoldedOnCurrentView(node);
 		if (unfold){
-			for(NodeModel child:childrenUnfolded(node)){
-				child.addExtension(HideChildSubtree.instance);
-			}
+			mapViewManager.hideChildren(node);
 			setFoldingState(node, false);
 		}
-		boolean childMadeVisible = false;
+		boolean childShown = false;
 		for(NodeModel child:childrenUnfolded(node)){
-			if (child.removeExtension(HideChildSubtree.instance) &&
-					(child.hasVisibleContent() || unfoldInvisibleChildren(child, true))){
-				childMadeVisible = true;
-				break;
+			if (mapViewManager.showHiddenNode(child)) {
+				if (child.hasVisibleContent()) {
+					childShown = true;
+					break;
+				} else if (canBeUnfoldedOnCurrentView(child)) {
+					unfoldUpToVisibleChild(child);
+					childShown = true;
+					break;
+				}
 			}
 		}
-		if(childMadeVisible){
+		if(childShown){
 			fireNodeUnfold(node);
 		}
-		return childMadeVisible;
+		return childShown;
 	}
 
 
 	private void fireNodeUnfold(final NodeModel node) {
-		node.fireNodeChanged(new NodeChangeEvent(node, HideChildSubtree.instance, null,
+		node.fireNodeChanged(new NodeChangeEvent(node, NodeView.Properties.HIDDEN_CHILDREN, null,
 				null));
     }
 
-	public boolean hasHiddenChildren(final NodeModel node){
-		for(NodeModel child:childrenUnfolded(node)){
-			if (child.containsExtension(HideChildSubtree.class)){
-				return true;
-			}
-		}
-		return false;
-	}
-
 	private void fireFoldingChanged(final NodeModel node) {
 	    if (isFoldingPersistentAlways()) {
 	    	final MapModel map = node.getMap();
@@ -422,32 +455,36 @@ public class MapController extends SelectionController implements IExtension{
 
 
 	protected boolean unfoldHiddenChildren(NodeModel node) {
-		final List<NodeModel> children = childrenFolded(node);
-		boolean changed = false;
-		for (NodeModel child : children){
-			if(child.removeExtension(HideChildSubtree.class) != null)
-				changed = true;
-		}
-		return changed;
-    }
+		final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+		return ! mapViewManager.isFoldedOnCurrentView(node) 
+				&& mapViewManager.unfoldHiddenChildren(node);
+	}
 
 
-	private boolean unfoldInvisibleChildren(final NodeModel node, final boolean reportUnfolded) {
-		boolean visibleFound = false;
-		boolean unfolded = false;
+	public boolean canBeUnfoldedOnCurrentView(final NodeModel node) {
+		final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+		final boolean isFolded = mapViewManager.isFoldedOnCurrentView(node) ||  mapViewManager.hasHiddenChildren(node);
 		for(int i = 0; i < node.getChildCount(); i++){
 			final NodeModel child = node.getChildAt(i);
-			if(child.hasVisibleContent())
-				visibleFound = true;
-			else if(unfoldInvisibleChildren(child, false) && child.isFolded()){
-				visibleFound = unfolded = true;
-				setFoldingState(node, false);
+			if(child.hasVisibleContent()){
+				if (isFolded)
+					return true;
+			} else if (node.getFilterInfo().isAncestor() && canBeUnfoldedOnCurrentView(child)) {
+				return true;
 			}
 		}
-		if(reportUnfolded)
-			return unfolded;
-		else
-			return visibleFound;
+		return false;
+	}
+
+	private void unfoldUpToVisibleChild(final NodeModel node) {
+		for(int i = 0; i < node.getChildCount(); i++){
+			final NodeModel child = node.getChildAt(i);
+			if (!child.hasVisibleContent() && canBeUnfoldedOnCurrentView(child)) {
+				unfoldUpToVisibleChild(child);
+			}
+		}
+		setFoldingState(node, false);
+
 	}
 
 	public void addMapChangeListener(final IMapChangeListener listener) {
@@ -483,23 +520,6 @@ public class MapController extends SelectionController implements IExtension{
 		return node.getChildren();
 	}
 
-	public boolean close(final MapModel map) {
-		closeWithoutSaving(map);
-		return true;
-	}
-	
-	public boolean closeAllMaps() {
-		final Controller controller = getModeController().getController();
-		for (MapModel map = controller.getMap(); map != null; map = controller.getMap()){
-			final boolean closingNotCancelled = close(map);
-			if (!closingNotCancelled) {
-				return false;
-			}
-			
-		}
-		return true;
-	}
-
 	public void closeWithoutSaving(final MapModel map) {
 		fireMapRemoved(map);
 		map.destroy();
@@ -536,7 +556,7 @@ public class MapController extends SelectionController implements IExtension{
 			if (nodesUnfoldedByDisplay != null && isFolded(nodeOnPath)) {
             	nodesUnfoldedByDisplay.add(nodeOnPath);
             }
-			setFolded(nodeOnPath, false);
+			unfold(nodeOnPath);
 		}
 	}
 
@@ -616,29 +636,6 @@ public class MapController extends SelectionController implements IExtension{
 		getMapWriter().writeMapAsXml(map, fileout, mode, false, forceFormat);
 	}
 
-	private Boolean getCommonFoldingState(final Collection<NodeModel> list) {
-		Boolean state = null;
-		for(final NodeModel node : list){
-			if (node.getChildCount() == 0) {
-				continue;
-			}
-			if (state == null) {
-				state = canBeUnfolded(node);
-			}
-			else {
-				if (canBeUnfolded(node) != state) {
-					return null;
-				}
-			}
-		}
-		return state;
-	}
-
-
-	private boolean canBeUnfolded(final NodeModel node) {
-		return Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(node) ||  hasHiddenChildren(node);
-	}
-
 	public MapReader getMapReader() {
 		return mapReader;
 	}
@@ -860,11 +857,11 @@ public class MapController extends SelectionController implements IExtension{
 	}
 
 	// nodes may only be refreshed by their own ModeController, so we have to store that too
-	private final ConcurrentHashMap<NodeRefreshKey, NodeRefreshValue> nodesToRefresh = new ConcurrentHashMap<NodeRefreshKey, NodeRefreshValue>();
 	private final ActionEnablerOnChange actionEnablerOnChange;
 	private final ActionSelectorOnChange actionSelectorOnChange;
+	private final Refresher refresher;
 
-	private static class NodeRefreshKey{
+	static class NodeRefreshKey{
 		final NodeModel node;
 		final Object property;
 		public NodeRefreshKey(NodeModel node, Object property) {
@@ -888,7 +885,7 @@ public class MapController extends SelectionController implements IExtension{
 		}
 	}
 
-	private static class NodeRefreshValue{
+	static class NodeRefreshValue{
 		final ModeController controller;
 		Object oldValue;
 		Object newValue;
@@ -901,38 +898,53 @@ public class MapController extends SelectionController implements IExtension{
 		}
 
 	}
-
-	/** optimization of nodeRefresh() as it handles multiple nodes in one Runnable, even nodes that weren't on the
-	 * list when the thread was started.*/
-	public void delayedNodeRefresh(final NodeModel node, final Object property, final Object oldValue,
-	                               final Object newValue) {
-	    final boolean startThread = nodesToRefresh.isEmpty();
-	    final NodeRefreshValue value = new NodeRefreshValue(Controller.getCurrentModeController(), oldValue, newValue);
-		final NodeRefreshKey key = new NodeRefreshKey(node, property);
-		final NodeRefreshValue old = nodesToRefresh.put(key, value);
-		if(old != null && old.newValue != value.newValue){
-			old.newValue = value.newValue;
-			nodesToRefresh.put(key, old);
-		}
-        if (startThread) {
-			final Runnable refresher = new Runnable() {
-				public void run() {
-					final ModeController currentModeController = Controller.getCurrentModeController();
-					final Iterator<Entry<NodeRefreshKey, NodeRefreshValue>> it = nodesToRefresh.entrySet().iterator();
-					while (it.hasNext()) {
-					    final Entry<NodeRefreshKey, NodeRefreshValue> entry = it.next();
-					    final NodeRefreshValue info = entry.getValue();
-					    if (info.controller == currentModeController){
-					        final NodeRefreshKey key = entry.getKey();
-							currentModeController.getMapController().nodeRefresh(key.node, key.property, info.oldValue, info.newValue);
-					    }
-					    it.remove();
+	
+	static class Refresher { 
+		private final ConcurrentHashMap<NodeRefreshKey, NodeRefreshValue> nodesToRefresh = new ConcurrentHashMap<NodeRefreshKey, NodeRefreshValue>();
+		private boolean refreshRunning;
+
+		/** optimization of nodeRefresh() as it handles multiple nodes in one Runnable, even nodes that weren't on the
+		 * list when the thread was started.*/
+		void delayedNodeRefresh(final NodeModel node, final Object property, final Object oldValue,
+				final Object newValue) {
+			final boolean startThread = nodesToRefresh.isEmpty();
+			final NodeRefreshValue value = new NodeRefreshValue(Controller.getCurrentModeController(), oldValue, newValue);
+			final NodeRefreshKey key = new NodeRefreshKey(node, property);
+			final NodeRefreshValue old = nodesToRefresh.put(key, value);
+			if(old != null && old.newValue != value.newValue){
+				old.newValue = value.newValue;
+				nodesToRefresh.put(key, old);
+			}
+			if (startThread) {
+				final Runnable refresher = new Runnable() {
+					public void run() {
+						final ModeController currentModeController = Controller.getCurrentModeController();
+						@SuppressWarnings("unchecked")
+						final Entry<NodeRefreshKey, NodeRefreshValue>[] entries = nodesToRefresh.entrySet().toArray(new Entry[]{} );
+						nodesToRefresh.clear();
+						refreshRunning = true;
+						try {
+							for (Entry<NodeRefreshKey, NodeRefreshValue> entry : entries) {
+								final NodeRefreshValue info = entry.getValue();
+								if (info.controller == currentModeController){
+									final NodeRefreshKey key = entry.getKey();
+									currentModeController.getMapController().nodeRefresh(key.node, key.property, info.oldValue, info.newValue);
+								}
+							}
+						} finally {
+							refreshRunning = false;
+						}
 					}
-				}
-			};
-			EventQueue.invokeLater(refresher);
+				};
+				EventQueue.invokeLater(refresher);
+			}
 		}
 	}
+	public void delayedNodeRefresh(final NodeModel node, final Object property, final Object oldValue,
+			final Object newValue){
+		refresher.delayedNodeRefresh(node, property, oldValue, newValue);
+	}
+	
 
 	public void removeMapChangeListener(final IMapChangeListener listener) {
 		mapChangeListeners.remove(listener);
@@ -1021,14 +1033,26 @@ public class MapController extends SelectionController implements IExtension{
 	}
 
 	public void toggleFolded(final Collection<NodeModel> collection) {
-		Boolean isFolded = getCommonFoldingState(collection);
-		final boolean shouldBeFolded = isFolded != null ?  ! isFolded : true;
+		Boolean shouldBeFolded = ! canBeUnfoldedOnCurrentView(collection);
 		final NodeModel nodes[] = collection.toArray(new NodeModel[]{});
 		for (final NodeModel node:nodes) {
 			setFolded(node, shouldBeFolded);
 		}
 	}
 
+	private boolean canBeUnfoldedOnCurrentView(Collection<NodeModel> collection) {
+		for(NodeModel node : collection){
+			if(node.isRoot())
+				return false;
+		}
+		for(NodeModel node : collection){
+			if(canBeUnfoldedOnCurrentView(node))
+				return true;
+		}
+		return false;
+	}
+
+
 	public ModeController getModeController() {
 		return modeController;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/map/MapModel.java b/freeplane/src/main/java/org/freeplane/features/map/MapModel.java
index 5c514dc..27a92ed 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/MapModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/MapModel.java
@@ -296,4 +296,9 @@ public class MapModel {
 			nodes.put(id, null);
 		}
 	}
+
+	public boolean close() {
+		Controller.getCurrentModeController().getMapController().closeWithoutSaving(this);
+		return true;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java b/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java
index 25627a3..834787c 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/MapNavigationUtils.java
@@ -21,7 +21,7 @@ public class MapNavigationUtils {
     		final int index = parentNode.getIndex(current) + 1;
     		final int childCount = parentNode.getChildCount();
     		if (direction == Direction.FORWARD_N_FOLD) {
-    			Controller.getCurrentModeController().getMapController().setFolded(current, true);
+    			Controller.getCurrentModeController().getMapController().fold(current);
     		}
     		if (index < childCount) {
     			final NodeModel next = (NodeModel) parentNode.getChildAt(index);
@@ -48,12 +48,12 @@ public class MapNavigationUtils {
     			break;
     		}
     		if (direction == Direction.BACK_N_FOLD) {
-    			Controller.getCurrentModeController().getMapController().setFolded(current, true);
+    			Controller.getCurrentModeController().getMapController().fold(current);
     		}
     		final int index = parentNode.getIndex(current) - 1;
     		if (index < 0) {
     			if (direction == Direction.BACK_N_FOLD) {
-    				Controller.getCurrentModeController().getMapController().setFolded(parentNode, true);
+    				Controller.getCurrentModeController().getMapController().fold(parentNode);
     			}
     			if (atEnd(parentNode, end)) {
     				return null;
diff --git a/freeplane/src/main/java/org/freeplane/features/map/NodeIconSetModel.java b/freeplane/src/main/java/org/freeplane/features/map/NodeIconSetModel.java
index 860785d..3566bab 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/NodeIconSetModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/NodeIconSetModel.java
@@ -22,14 +22,28 @@ package org.freeplane.features.map;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.features.icon.MindIcon;
 
 /**
  * @author Dimitry Polivaev 20.11.2008
  */
-class NodeIconSetModel {
+public class NodeIconSetModel {
 	/** stores the icons associated with this node. */
 	protected List<MindIcon> icons;
+	protected Quantity<LengthUnits> iconSize = null;
+
+	public void setIconSize(final Quantity<LengthUnits> iconSize)
+	{
+		this.iconSize = iconSize;
+	}
+
+	public Quantity<LengthUnits> getIconSize()
+	{
+		return iconSize;
+	}
 
 	void addIcon(final MindIcon icon) {
 		createIcons();
diff --git a/freeplane/src/main/java/org/freeplane/features/map/NodeModel.java b/freeplane/src/main/java/org/freeplane/features/map/NodeModel.java
index a0d6fca..833aa55 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/NodeModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/NodeModel.java
@@ -65,6 +65,7 @@ public class NodeModel{
 	public final static int UNKNOWN_POSITION = 0;
 	static public final Object UNKNOWN_PROPERTY = new Object();
 	public static final String NODE_ICON = "icon";
+	public static final String NODE_ICON_SIZE = "icon_size";
 	static public final Object HYPERLINK_CHANGED = "hyperlink_changed";
 
 	private final List<NodeModel> children;
@@ -486,8 +487,7 @@ public class NodeModel{
 	public void setLeft(final boolean isLeft) {
 		position = isLeft ? NodeModel.LEFT_POSITION : NodeModel.RIGHT_POSITION;
 		if (!isRoot()) {
-			for (int i = 0; i < getChildCount(); i++) {
-				final NodeModel child = getChildAt(i);
+			for (final NodeModel child : children) {
 				if (child.position != position) {
 					child.setLeft(isLeft);
 				}
@@ -499,7 +499,7 @@ public class NodeModel{
 	 */
 	public void setMap(final MapModel map) {
 		this.map = map;
-		for (final NodeModel child : getChildrenInternal()) {
+		for (final NodeModel child : children) {
 			child.setMap(map);
 		}
 	}
@@ -507,7 +507,8 @@ public class NodeModel{
 	public void setParent(final NodeModel newParent) {
 		if(parent == null && newParent != null && newParent.isAttached())
 	        attach();
-		else if(parent != null && parent.isAttached() &&  (newParent == null || !newParent.isAttached()))
+		else if(parent != null && parent.isAttached() &&  (newParent == null || !newParent.isAttached())
+				|| newParent == null && isAttached())
 	        detach();
 		parent = newParent;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/map/NodePosition.java b/freeplane/src/main/java/org/freeplane/features/map/NodePosition.java
new file mode 100644
index 0000000..8443f5d
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/map/NodePosition.java
@@ -0,0 +1 @@
+package org.freeplane.features.map;
diff --git a/freeplane/src/main/java/org/freeplane/features/map/NodeWriter.java b/freeplane/src/main/java/org/freeplane/features/map/NodeWriter.java
index cd6731e..b28c6d0 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/NodeWriter.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/NodeWriter.java
@@ -29,6 +29,9 @@ import org.freeplane.core.io.ITreeWriter;
 import org.freeplane.core.io.WriteManager;
 import org.freeplane.core.io.xml.TreeXmlWriter;
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.icon.IconController;
 import org.freeplane.features.link.LinkBuilder;
 import org.freeplane.features.map.MapWriter.Hint;
 import org.freeplane.features.map.MapWriter.Mode;
@@ -139,12 +142,26 @@ public class NodeWriter implements IElementWriter, IAttributeWriter {
 			}
 		}
 		if(! isNodeAlreadyWritten || Mode.EXPORT.equals(mode)) {
+			writeIconSize(writer, node);
 			linkBuilder.writeAttributes(writer, node);
 			writer.addExtensionAttributes(node, node.getSharedExtensions().values());
 		}
 		writer.addExtensionAttributes(node, node.getIndividualExtensionValues());
 	}
 
+	private void writeIconSize(final ITreeWriter writer, final NodeModel node) {
+		final boolean forceFormatting = Boolean.TRUE.equals(writer.getHint(MapWriter.WriterHint.FORCE_FORMATTING));
+		Quantity<LengthUnits> iconSize = null;
+		if (forceFormatting) {
+			final IconController iconController = IconController.getController();
+			iconSize = iconController.getIconSize(node);
+		} else
+			iconSize = node.getSharedData().getIcons().getIconSize();
+		if (iconSize != null) {
+			writer.addAttribute("ICON_SIZE", iconSize.toString());
+		}
+	}
+
 	private void writeReferenceNodeId(ITreeWriter writer, NodeModel node) {
 	    final NodeModel referenceNode = alreadyWrittenSharedContent.get(node.getSharedData());
 	    if(referenceNode != null){
diff --git a/freeplane/src/main/java/org/freeplane/features/map/ShowNextChildAction.java b/freeplane/src/main/java/org/freeplane/features/map/ShowNextChildAction.java
index 33bd2b4..53ebc8d 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/ShowNextChildAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/ShowNextChildAction.java
@@ -24,6 +24,7 @@ import java.awt.event.ActionEvent;
 import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.EnabledAction;
 import org.freeplane.features.mode.Controller;
+import org.freeplane.features.ui.IMapViewManager;
 
 /**
  * @author Dimitry Polivaev
@@ -49,7 +50,8 @@ public class ShowNextChildAction extends AFreeplaneAction {
 		if(controller.getSelection() != null) {
 			final NodeModel selected = controller.getSelection().getSelected();
 			final MapController mapController = controller.getModeController().getMapController();
-		    super.setEnabled(controller.getMapViewManager().isFoldedOnCurrentView(selected) || mapController.hasHiddenChildren(selected));
+		    final IMapViewManager mapViewManager = controller.getMapViewManager();
+			super.setEnabled(mapViewManager.isFoldedOnCurrentView(selected) || mapViewManager.hasHiddenChildren(selected));
 		}
 		else {
 			super.setEnabled(false);
diff --git a/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java b/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java
index 13e97bd..d7294f1 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/SummaryLevels.java
@@ -13,10 +13,24 @@ public class SummaryLevels{
 	public  final int highestSummaryLevel;
 	public  final boolean[] sides;
 	private final NodeModel parentNode;
+	
 	public SummaryLevels(NodeModel parentNode) {
+		this(parentNode, false);
+	}
+	
+	public static SummaryLevels of(NodeModel parentNode) {
+		return new SummaryLevels(parentNode, false);
+	}
+
+	
+	public static SummaryLevels ignoringChildNodes(NodeModel parentNode) {
+		return new SummaryLevels(parentNode, true);
+	}
+	
+	private SummaryLevels(NodeModel parentNode, boolean ignoreChildNodes) {
 		this.parentNode = parentNode;
 		int highestSummaryLevel = 0;
-		int childCount = parentNode.getChildCount();
+		int childCount = ignoreChildNodes ? 0 : parentNode.getChildCount();
 		this.summaryLevels = new int[childCount];
 		this.sides = sidesOf(parentNode);
 		for(boolean isLeft : sides){
diff --git a/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java b/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java
index 440e825..a80fef0 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/ToggleFoldedAction.java
@@ -46,8 +46,7 @@ class ToggleFoldedAction extends AFreeplaneAction {
 			r.toggleFolded(selectedNodes);
 		else {
 			final NodeModel selectedNode = r.getSelectedNode();
-			boolean folded = Controller.getCurrentController().getMapViewManager().isFoldedOnCurrentView(selectedNode);
-			r.setFoldedAndScroll(selectedNode, ! folded);
+			r.toggleFoldedAndScroll(selectedNode);
 		}
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java b/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java
index 6dc0115..056fc84 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/filemode/FMapController.java
@@ -51,12 +51,6 @@ public class FMapController extends MapController {
 		return new FNodeModel((File) userObject, map);
 	}
 
-	public void toggleFolded(final NodeModel node) {
-		if (hasChildren(node) && !node.isRoot()) {
-			setFolded(node, !isFolded(node));
-		}
-	}
-
 	public void newMap(File file) {
 		newMap(new File[]{file});
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java b/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java
index c08479d..ffe30bf 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/filemode/FNodeModel.java
@@ -20,6 +20,11 @@
 package org.freeplane.features.map.filemode;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 import org.freeplane.features.link.NodeLinks;
@@ -33,6 +38,8 @@ import org.freeplane.features.map.NodeModel;
 class FNodeModel extends NodeModel {
 	final private File file;
 	final private File[] directoryFiles;
+	private boolean hasChildren = false;
+	private boolean hasNoChildren = false;
 
 	public FNodeModel(final File file, final MapModel map) {
 		super(map);
@@ -51,26 +58,31 @@ class FNodeModel extends NodeModel {
 
 	@Override
 	public List<NodeModel> getChildren() {
-		if (!getChildrenInternal().isEmpty()) {
-			return super.getChildren();
-		}
-		try {
-			final File[] files = file != null ? file.listFiles() : directoryFiles;
-			if (files != null) {
-				for (File childFile : files) {
-					if (!childFile.isHidden() || file == null) {
-						final FNodeModel fileNodeModel = new FNodeModel(childFile, getMap());
-						NodeLinks.createLinkExtension(fileNodeModel).setHyperLink(childFile.toURI());
-						fileNodeModel.setLeft(isNewChildLeft());
-						getChildrenInternal().add(getChildCount(), fileNodeModel);
-						fileNodeModel.setParent(this);
+		initializeChildNodes();
+		return super.getChildren();
+	}
+
+	private void initializeChildNodes() {
+		if (super.getChildrenInternal().isEmpty() && hasChildren()) {
+			try {
+				final File[] files = file != null ? file.listFiles() : directoryFiles;
+				if (files != null) {
+					int childCount = 0;
+					for (File childFile : files) {
+						if (!childFile.isHidden() || file == null) {
+							final FNodeModel fileNodeModel = new FNodeModel(childFile, getMap());
+							NodeLinks.createLinkExtension(fileNodeModel).setHyperLink(childFile.toURI());
+							fileNodeModel.setLeft(isRoot() ?  (childCount % 2 == 1) : isLeft());
+							super.getChildrenInternal().add(childCount, fileNodeModel);
+							childCount++;
+							fileNodeModel.setParent(this);
+						}
 					}
 				}
 			}
+			catch (final SecurityException se) {
+			}
 		}
-		catch (final SecurityException se) {
-		}
-		return super.getChildren();
 	}
 
 	public File getFile() {
@@ -87,16 +99,53 @@ class FNodeModel extends NodeModel {
         }
         return name;
     }
+	
+	@Override
+	public int getChildCount(){
+		if(directoryFiles != null)
+			return directoryFiles.length;
+		else if(hasChildren()) {
+			initializeChildNodes();
+			return super.getChildCount();
+		}
+		else {
+			return 0;
+		}
+	}
+	
+	
 
     @Override
-	public boolean hasChildren() {
-		return directoryFiles != null || !file.isFile() && !getChildren().isEmpty();
+	protected List<NodeModel> getChildrenInternal() {
+    	initializeChildNodes();
+    	return super.getChildrenInternal();
 	}
 
 	@Override
-	public boolean isLeaf() {
-		return directoryFiles == null && file.isFile();
+	public boolean hasChildren() {
+    	if(hasChildren)
+    		return true;
+    	if(hasNoChildren)
+    		return false;
+		if (directoryFiles != null || containsFiles()){
+			hasChildren = true;
+			return true;
+		}
+		else{
+			hasNoChildren = true;
+			return false;
+		}
 	}
+    
+    private boolean containsFiles(){
+    	if(file.isFile())
+    		return false;
+		try(DirectoryStream<Path> dirStream = Files.newDirectoryStream(Paths.get(file.toURI()))) {
+            return dirStream.iterator().hasNext();
+        } catch (IOException e) {
+			return false;
+		}
+    }
 
 	@Override
 	public String toString() {
diff --git a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java
index f133923..ebf51fd 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapController.java
@@ -197,7 +197,7 @@ public class MMapController extends MapController {
 			case MMapController.NEW_CHILD: {
 				final boolean parentFolded = isFolded(targetNode);
 				if (parentFolded) {
-					setFolded(targetNode, false);
+					unfold(targetNode);
 				}
 				final int position = ResourceController.getResourceController().getProperty("placenewbranches").equals(
 				    "last") ? targetNode.getChildCount() : 0;
@@ -341,12 +341,9 @@ public class MMapController extends MapController {
 		Controller.getCurrentModeController().execute(actor, map);
     }
 
-	/**
-	 * Return false if user has canceled.
-	 */
-	@Override
 	public boolean close(final MapModel map) {
 		if (!map.isSaved()) {
+			Controller.getCurrentController().getMapViewManager().changeToMap(map);
 			final String text = TextUtils.getText("save_unsaved") + "\n" + map.getTitle();
 			final String title = TextUtils.getText("SaveAction.text");
 			Component dialogParent;
@@ -829,7 +826,7 @@ public class MMapController extends MapController {
 		final NodeModel targetNode = target;
 		final boolean parentFolded = isFolded(targetNode);
 		if (parentFolded) {
-			setFolded(targetNode, false);
+			unfold(targetNode);
 		}
 		if (!isWriteable(target)) {
 			UITools.errorMessage(TextUtils.getText("node_is_write_protected"));
diff --git a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapModel.java b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapModel.java
index d4444c1..7c6f543 100644
--- a/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/map/mindmapmode/MMapModel.java
@@ -30,6 +30,9 @@ import org.freeplane.core.undo.UndoHandler;
 import org.freeplane.core.util.SysUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.map.MapModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.mode.mindmapmode.MModeController;
 import org.freeplane.features.url.UrlManager;
 import org.freeplane.features.url.mindmapmode.DoAutomaticSave;
 import org.freeplane.features.url.mindmapmode.DummyLockManager;
@@ -134,4 +137,12 @@ public class MMapModel extends MapModel {
 	void setTimerForAutomaticSaving(final Timer timerForAutomaticSaving) {
 		this.timerForAutomaticSaving = timerForAutomaticSaving;
 	}
+
+	@Override
+	public boolean close() {
+		final Controller controller = Controller.getCurrentController();
+		final ModeController modeController = controller.getModeController(MModeController.MODENAME);
+		final MMapController mapController = (MMapController) modeController.getMapController();
+		return mapController.close(this);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/CenterSelectedNodeAction.java b/freeplane/src/main/java/org/freeplane/features/mode/CenterSelectedNodeAction.java
deleted file mode 100644
index 6ed043c..0000000
--- a/freeplane/src/main/java/org/freeplane/features/mode/CenterSelectedNodeAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.features.mode;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JRootPane;
-import javax.swing.SwingUtilities;
-
-import org.freeplane.core.ui.AFreeplaneAction;
-import org.freeplane.features.map.IMapSelection;
-
-/**
- * @author foltin
- */
-class CenterSelectedNodeAction extends AFreeplaneAction {
-	static final String NAME = "center_selected";
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public CenterSelectedNodeAction() {
-		super("CenterSelectedNodeAction");
-	}
-
-	public void actionPerformed(final ActionEvent e) {
-		final IMapSelection selection = Controller.getCurrentController().getSelection();
-		final Component mapView = Controller.getCurrentController().getMapViewManager().getMapViewComponent();
-		final JRootPane rootPane = SwingUtilities.getRootPane(mapView);
-		if (!rootPane.isValid()) {
-			rootPane.revalidate();
-		}
-		selection.centerNode(selection.getSelected());
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/CloseAllMapsAction.java b/freeplane/src/main/java/org/freeplane/features/mode/CloseAllMapsAction.java
new file mode 100644
index 0000000..149dd9c
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/mode/CloseAllMapsAction.java
@@ -0,0 +1,19 @@
+package org.freeplane.features.mode;
+
+import java.awt.event.ActionEvent;
+
+import org.freeplane.core.ui.AFreeplaneAction;
+
+ at SuppressWarnings("serial")
+class CloseAllMapsAction extends AFreeplaneAction{
+
+	public CloseAllMapsAction() {
+		super("CloseAllMapsAction");
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		Controller.getCurrentController().closeAllMaps();
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/CloseAllOtherMapsAction.java b/freeplane/src/main/java/org/freeplane/features/mode/CloseAllOtherMapsAction.java
new file mode 100644
index 0000000..63c4281
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/mode/CloseAllOtherMapsAction.java
@@ -0,0 +1,22 @@
+package org.freeplane.features.mode;
+
+import java.awt.event.ActionEvent;
+
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.features.map.MapModel;
+
+ at SuppressWarnings("serial")
+class CloseAllOtherMapsAction extends AFreeplaneAction{
+
+	public CloseAllOtherMapsAction() {
+		super("CloseAllOtherMapsAction");
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		final Controller controller = Controller.getCurrentController();
+		final MapModel mapToKeepOpen = controller.getMap();
+		controller.closeAllMaps(mapToKeepOpen);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/Controller.java b/freeplane/src/main/java/org/freeplane/features/mode/Controller.java
index 36b61a1..2ce9d0a 100644
--- a/freeplane/src/main/java/org/freeplane/features/mode/Controller.java
+++ b/freeplane/src/main/java/org/freeplane/features/mode/Controller.java
@@ -25,8 +25,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -42,6 +42,7 @@ import org.freeplane.core.resources.components.IValidator;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.features.map.IMapLifeCycleListener;
 import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.ui.IMapViewManager;
 import org.freeplane.features.ui.ViewController;
@@ -78,7 +79,11 @@ public class Controller extends AController implements FreeplaneActions, IMapLif
 		this.optionPanelController = new OptionPanelController();
 		extensionContainer = new ExtensionContainer(new HashMap<Class<? extends IExtension>, IExtension>());
 		addAction(new MoveToRootAction());
-		addAction(new CenterSelectedNodeAction());
+		addAction(new MoveSelectedNodeAction(NodePosition.EAST));
+		addAction(new MoveSelectedNodeAction(NodePosition.CENTER));
+		addAction(new MoveSelectedNodeAction(NodePosition.WEST));
+		addAction(new CloseAllMapsAction());
+		addAction(new CloseAllOtherMapsAction());
 	}
 
 	public void addExtension(final Class<? extends IExtension> clazz, final IExtension extension) {
@@ -330,4 +335,23 @@ public class Controller extends AController implements FreeplaneActions, IMapLif
 		}
 	}
 
+	public boolean closeAllMaps(){
+		return closeAllMaps(null);
+	}
+	
+	boolean closeAllMaps(MapModel mapToKeepOpen) {
+		boolean closingNotCancelled = true;
+		for (MapModel map = getMap(); map != null && map != mapToKeepOpen && closingNotCancelled; map = getMap()){
+			closingNotCancelled = map.close();
+		}
+		HashSet<MapModel> otherMaps = new HashSet(getMapViewManager().getMaps().values());
+		otherMaps.remove(mapToKeepOpen);
+		otherMaps.remove(getMap());
+		for (MapModel map : otherMaps){
+			closingNotCancelled = map.close() && closingNotCancelled;
+		}
+		
+		return closingNotCancelled;
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/MapExtensions.java b/freeplane/src/main/java/org/freeplane/features/mode/MapExtensions.java
new file mode 100644
index 0000000..8c6f953
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/mode/MapExtensions.java
@@ -0,0 +1,17 @@
+package org.freeplane.features.mode;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.freeplane.core.extension.IExtension;
+
+public class MapExtensions {
+	static private Set<Class<? extends IExtension>> mapExtensionClasses = new HashSet<Class<? extends IExtension>>();
+
+	public static boolean isMapExtension(final Class<? extends IExtension> clazz) {
+		return mapExtensionClasses.contains(clazz);
+	}
+	public static void registerMapExtension(final Class<? extends IExtension> extensionClass){
+		mapExtensionClasses.add(extensionClass);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/MoveSelectedNodeAction.java b/freeplane/src/main/java/org/freeplane/features/mode/MoveSelectedNodeAction.java
new file mode 100644
index 0000000..2c61718
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/mode/MoveSelectedNodeAction.java
@@ -0,0 +1,61 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.mode;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JRootPane;
+import javax.swing.SwingUtilities;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.IMapSelection.NodePosition;
+
+/**
+ * @author foltin
+ */
+class MoveSelectedNodeAction extends AFreeplaneAction {
+	private static final String MOVE_SLOWLY_PROPERTY = "slow_scroll_selected_node";
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private final NodePosition nodePosition;
+
+	public MoveSelectedNodeAction(NodePosition nodePosition) {
+		super("MoveSelectedNodeAction." + nodePosition.name());
+		this.nodePosition = nodePosition;
+	}
+
+	public void actionPerformed(final ActionEvent e) {
+		final IMapSelection selection = Controller.getCurrentController().getSelection();
+		final Component mapView = Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+		final JRootPane rootPane = SwingUtilities.getRootPane(mapView);
+		if (!rootPane.isValid()) {
+			rootPane.revalidate();
+		}
+		if(ResourceController.getResourceController().getBooleanProperty(MOVE_SLOWLY_PROPERTY))
+			selection.slowlyMoveNodeTo(selection.getSelected(), nodePosition);
+		else
+			selection.moveNodeTo(selection.getSelected(), nodePosition);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/PersistentNodeHook.java b/freeplane/src/main/java/org/freeplane/features/mode/PersistentNodeHook.java
index 6813159..dd63e99 100644
--- a/freeplane/src/main/java/org/freeplane/features/mode/PersistentNodeHook.java
+++ b/freeplane/src/main/java/org/freeplane/features/mode/PersistentNodeHook.java
@@ -24,9 +24,7 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.io.IElementDOMHandler;
@@ -43,11 +41,6 @@ import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
 public abstract class PersistentNodeHook {
-	static private Set<Class<? extends IExtension>> mapExtensionClasses = new HashSet<Class<? extends IExtension>>();
-
-	public static boolean isMapExtension(final Class<? extends IExtension> clazz) {
-		return mapExtensionClasses.contains(clazz);
-	}
 
 	public abstract class HookAction extends AFreeplaneAction {
 		private static final long serialVersionUID = 1L;
@@ -179,7 +172,7 @@ public abstract class PersistentNodeHook {
 		super();
 		final Class<? extends IExtension> extensionClass = getExtensionClass();
         if (getHookAnnotation().onceForMap()) {
-			mapExtensionClasses.add(extensionClass);
+			MapExtensions.registerMapExtension(extensionClass);
 		}
 		//		this.modeController = modeController;
 		//		controller = modeController.getController();
@@ -426,7 +419,7 @@ public abstract class PersistentNodeHook {
 	public static void removeMapExtensions(NodeModel node) {
 		final IExtension[] extensionArray = node.getSharedExtensions().values().toArray(new IExtension[]{});
 		for(IExtension extension : extensionArray){
-			if(PersistentNodeHook.isMapExtension(extension.getClass())){
+			if(MapExtensions.isMapExtension(extension.getClass())){
 				node.removeExtension(extension);
 			}
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/mode/browsemode/BModeController.java b/freeplane/src/main/java/org/freeplane/features/mode/browsemode/BModeController.java
deleted file mode 100644
index fde3777..0000000
--- a/freeplane/src/main/java/org/freeplane/features/mode/browsemode/BModeController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.features.mode.browsemode;
-
-import org.freeplane.features.mode.Controller;
-import org.freeplane.features.mode.ModeController;
-
-public class BModeController extends ModeController {
-	static public final String MODENAME = "Browse";
-
-	public BModeController(final Controller controller) {
-		super(controller);
-	}
-
-	@Override
-	public String getModeName() {
-		return BModeController.MODENAME;
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeBorderModel.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeBorderModel.java
new file mode 100644
index 0000000..7c84c71
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeBorderModel.java
@@ -0,0 +1,176 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2011 dimitry
+ *
+ *  This file author is dimitry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.nodestyle;
+
+import java.awt.Color;
+
+import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.DashVariant;
+import org.freeplane.features.map.NodeModel;
+
+/**
+ * @author Dimitry Polivaev
+ * Nov 13, 2011
+ */
+public class NodeBorderModel implements IExtension {
+	
+	public static NodeBorderModel getModel(final NodeModel node) {
+		return node.getExtension(NodeBorderModel.class);
+	}
+	
+	public static NodeBorderModel createNodeBorderModel(final NodeModel node) {
+		NodeBorderModel styleModel = node.getExtension(NodeBorderModel.class);
+		if (styleModel == null) {
+			styleModel = new NodeBorderModel();
+			node.addExtension(styleModel);
+		}
+		return styleModel;
+	}
+
+	private Boolean borderWidthMatchesEdgeWidth = null;
+	private Quantity<LengthUnits> borderWidth = null;
+
+	private Boolean borderDashMatchesEdgeDash = null;
+	private DashVariant borderDash = null;
+
+	private Boolean borderColorMatchesEdgeColor = null;
+	private Color borderColor = null;
+
+	public Boolean getBorderWidthMatchesEdgeWidth() {
+		return borderWidthMatchesEdgeWidth;
+	}
+	
+	public static Boolean getBorderWidthMatchesEdgeWidth(final NodeModel node) {
+		final NodeBorderModel extension = node.getExtension(NodeBorderModel.class);
+		return extension == null ? null : extension.getBorderWidthMatchesEdgeWidth();
+	}
+
+	public static Quantity<LengthUnits> getBorderWidth(final NodeModel node) {
+		final NodeBorderModel extension = node.getExtension(NodeBorderModel.class);
+		return extension == null ? null : extension.getBorderWidth();
+	}
+
+	public Quantity<LengthUnits> getBorderWidth() {
+		return borderWidth;
+	}
+
+	public static void setBorderWidthMatchesEdgeWidth(final NodeModel node, final Boolean borderWidthMatchesEdgeWidth) {
+		createNodeBorderModel(node).setBorderWidthMatchesEdgeWidth(borderWidthMatchesEdgeWidth);
+	}
+
+	public static void setBorderWidth(final NodeModel node, final Quantity<LengthUnits> borderWidth) {
+		createNodeBorderModel(node).setBorderWidth(borderWidth);
+	}
+
+	public void setBorderWidth(Quantity<LengthUnits> borderWidth) {
+		this.borderWidth = borderWidth;
+		
+	}
+
+	public void setBorderWidthMatchesEdgeWidth(Boolean borderWidthMatchesEdgeWidth) {
+		this.borderWidthMatchesEdgeWidth = borderWidthMatchesEdgeWidth;
+	}
+
+	public Boolean getBorderDashMatchesEdgeDash() {
+		return borderDashMatchesEdgeDash;
+	}
+	
+	public static Boolean getBorderDashMatchesEdgeDash(final NodeModel node) {
+		final NodeBorderModel extension = node.getExtension(NodeBorderModel.class);
+		return extension == null ? null : extension.getBorderDashMatchesEdgeDash();
+	}
+
+	public static DashVariant getBorderDash(final NodeModel node) {
+		final NodeBorderModel extension = node.getExtension(NodeBorderModel.class);
+		return extension == null ? null : extension.getBorderDash();
+	}
+
+	public DashVariant getBorderDash() {
+		return borderDash;
+	}
+
+	public static void setBorderDashMatchesEdgeDash(final NodeModel node, final Boolean borderDashMatchesEdgeDash) {
+		createNodeBorderModel(node).setBorderDashMatchesEdgeDash(borderDashMatchesEdgeDash);
+	}
+
+	public static void setBorderDash(final NodeModel node, final DashVariant borderDash) {
+		createNodeBorderModel(node).setBorderDash(borderDash);
+	}
+
+	public void setBorderDash(DashVariant borderDash) {
+		this.borderDash = borderDash;
+		
+	}
+
+	public void setBorderDashMatchesEdgeDash(Boolean borderDashMatchesEdgeDash) {
+		this.borderDashMatchesEdgeDash = borderDashMatchesEdgeDash;
+	}
+
+	public Boolean getBorderColorMatchesEdgeColor() {
+		return borderColorMatchesEdgeColor;
+	}
+	
+	public static Boolean getBorderColorMatchesEdgeColor(final NodeModel node) {
+		final NodeBorderModel extension = node.getExtension(NodeBorderModel.class);
+		return extension == null ? null : extension.getBorderColorMatchesEdgeColor();
+	}
+
+	public static Color getBorderColor(final NodeModel node) {
+		final NodeBorderModel extension = node.getExtension(NodeBorderModel.class);
+		return extension == null ? null : extension.getBorderColor();
+	}
+
+
+	public Color getBorderColor() {
+		return borderColor;
+	}
+
+	public static void setBorderColorMatchesEdgeColor(final NodeModel node, final Boolean borderColorMatchesEdgeColor) {
+		createNodeBorderModel(node).setBorderColorMatchesEdgeColor(borderColorMatchesEdgeColor);
+	}
+
+	public static void setBorderColor(final NodeModel node, final Color borderColor) {
+		createNodeBorderModel(node).setBorderColor(borderColor);
+	}
+
+	public void setBorderColor(Color borderColor) {
+		this.borderColor = borderColor;
+		
+	}
+
+	public void setBorderColorMatchesEdgeColor(Boolean borderColorMatchesEdgeColor) {
+		this.borderColorMatchesEdgeColor = borderColorMatchesEdgeColor;
+	}
+
+	public void copyTo(NodeBorderModel to) {
+	    if(borderWidthMatchesEdgeWidth != null)
+	    	to.setBorderWidthMatchesEdgeWidth(borderWidthMatchesEdgeWidth);
+	    if(borderDashMatchesEdgeDash != null)
+	    	to.setBorderDashMatchesEdgeDash(borderDashMatchesEdgeDash);
+	    if(borderWidth != null)
+	    	to.setBorderWidth(borderWidth);
+	    if(borderColorMatchesEdgeColor != null)
+	    	to.setBorderColorMatchesEdgeColor(borderColorMatchesEdgeColor);
+	    if(borderColor != null)
+	    	to.setBorderColor(borderColor);
+    }
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleBuilder.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleBuilder.java
index 4a3d1b3..0da8562 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleBuilder.java
@@ -37,12 +37,13 @@ import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.util.ColorUtils;
 import org.freeplane.core.util.FreeplaneVersion;
 import org.freeplane.core.util.Quantity;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.map.MapWriter;
 import org.freeplane.features.map.NodeBuilder;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.map.NodeWriter;
 import org.freeplane.features.nodestyle.NodeStyleModel.Shape;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
 import org.freeplane.n3.nanoxml.XMLElement;
 
 class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, IExtensionAttributeWriter,
@@ -204,6 +205,8 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 			reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "TEMPLATE", formatHandler);
 		}
 
+		// save to 1.1: MAX_WIDTH="200" MAX_WIDTH_QUANTITY="200.0 px"
+		// save: MAX_WIDTH="200.0 px"
 		final IAttributeHandler nodeMaxNodeWidthQuantityHandler = new IAttributeHandler() {
 			public void setAttribute(final Object userObject, final String value) {
 				final NodeModel node = (NodeModel) userObject;
@@ -225,6 +228,16 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 		reader.addAttributeHandler(NodeBuilder.XML_NODE, "MAX_WIDTH", nodeMaxNodeWidthHandler);
 		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "MAX_WIDTH", nodeMaxNodeWidthHandler);
 
+		final IAttributeHandler nodeIconSizeHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				Quantity<LengthUnits> iconSize = Quantity.fromString(value, LengthUnits.px);
+				node.getSharedData().getIcons().setIconSize(iconSize);
+			}
+		};
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "ICON_SIZE", nodeIconSizeHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "ICON_SIZE", nodeIconSizeHandler);
+
 		final IAttributeHandler nodeMinNodeWidthQuantityHandler = new IAttributeHandler() {
 			public void setAttribute(final Object userObject, final String value) {
 				final NodeModel node = (NodeModel) userObject;
@@ -249,11 +262,75 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 		final IAttributeHandler textAlignHandler = new IAttributeHandler() {
 			public void setAttribute(final Object userObject, final String value) {
 				final NodeModel node = (NodeModel) userObject;
-				NodeStyleModel.setTextAlign(node, TextAlign.valueOf(value));
+				NodeStyleModel.setHorizontalTextAlignment(node, HorizontalTextAlignment.valueOf(value));
 			}
 		};
 		reader.addAttributeHandler(NodeBuilder.XML_NODE, "TEXT_ALIGN", textAlignHandler);
 		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "TEXT_ALIGN", textAlignHandler);
+
+		final IAttributeHandler borderWidthMatchesEdgeWidthHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderWidthMatchesEdgeWidth(node, Boolean.valueOf(value));
+			}
+		};
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_WIDTH_LIKE_EDGE", borderWidthMatchesEdgeWidthHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_WIDTH_LIKE_EDGE", borderWidthMatchesEdgeWidthHandler);
+
+		final IAttributeHandler borderWidthHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderWidth(node, Quantity.fromString(value, LengthUnits.px));
+			}
+		};
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_WIDTH", borderWidthHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_WIDTH", borderWidthHandler);
+
+		final IAttributeHandler borderDashMatchesEdgeDashHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderDashMatchesEdgeDash(node, Boolean.valueOf(value));
+			}
+		};
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_DASH_LIKE_EDGE", borderDashMatchesEdgeDashHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_DASH_LIKE_EDGE", borderDashMatchesEdgeDashHandler);
+
+		final IAttributeHandler borderDashHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderDash(node, DashVariant.valueOf(value));
+			}
+		};
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_DASH", borderDashHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_DASH", borderDashHandler);
+
+		final IAttributeHandler borderColorMatchesEdgeColorHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderColorMatchesEdgeColor(node, Boolean.valueOf(value));
+			}
+		};
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_COLOR_LIKE_EDGE", borderColorMatchesEdgeColorHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_COLOR_LIKE_EDGE", borderColorMatchesEdgeColorHandler);
+
+		final IAttributeHandler borderColorHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderColor(node, ColorUtils.stringToColor(value, NodeBorderModel.getBorderColor(node)));
+			}
+		};
+		final IAttributeHandler borderColorAlphaHandler = new IAttributeHandler() {
+			public void setAttribute(final Object userObject, final String value) {
+				final NodeModel node = (NodeModel) userObject;
+				NodeBorderModel.setBorderColor(node, ColorUtils.alphaToColor(value, NodeBorderModel.getBorderColor(node)));
+			}
+		};
+
+		
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_COLOR", borderColorHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_NODE, "BORDER_COLOR_ALPHA", borderColorAlphaHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_COLOR", borderColorHandler);
+		reader.addAttributeHandler(NodeBuilder.XML_STYLENODE, "BORDER_COLOR_ALPHA", borderColorAlphaHandler);
 	}
 
 	/**
@@ -268,6 +345,7 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 		writer.addExtensionElementWriter(NodeStyleModel.class, this);
 		writer.addExtensionAttributeWriter(NodeStyleModel.class, this);
 		writer.addExtensionAttributeWriter(NodeSizeModel.class, this);
+		writer.addExtensionAttributeWriter(NodeBorderModel.class, this);
 	}
 
 	public void setAttributes(final String tag, final Object node, final XMLElement attributes) {
@@ -281,6 +359,7 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 		final NodeModel node = (NodeModel) userObject;
 		writeAttributes(writer, node, (NodeStyleModel)null, true);
 		writeAttributes(writer, node, (NodeSizeModel)null, true);
+		writeAttributes(writer, node, (NodeBorderModel)null, true);
 	}
 
 	public void writeAttributes(final ITreeWriter writer, final Object userObject, final IExtension extension) {
@@ -288,14 +367,20 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 		if (forceFormatting) {
 			return;
 		}
+		final NodeModel node = (NodeModel)userObject;
 		if(extension instanceof NodeStyleModel){
 			final NodeStyleModel style = (NodeStyleModel) extension;
-			writeAttributes(writer, null, style, false);
+			writeAttributes(writer, node, style, false);
 			return;
 		}
 		if(extension instanceof NodeSizeModel){
 			final NodeSizeModel size = (NodeSizeModel) extension;
-			writeAttributes(writer, null, size, false);
+			writeAttributes(writer, node, size, false);
+			return;
+		}
+		if(extension instanceof NodeBorderModel){
+			final NodeBorderModel border = (NodeBorderModel) extension;
+			writeAttributes(writer, null, border, false);
 			return;
 		}
 
@@ -328,18 +413,19 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 		if (uniformShape) {
 			writer.addAttribute("UNIFORM_SHAPE", "true");
 		}
-		final Boolean numbered = forceFormatting ? nsc.getNodeNumbering(node) : style.getNodeNumbering();
-		if (numbered != null && numbered) {
-			writer.addAttribute("NUMBERED", numbered.toString());
+		final Boolean numbered = forceFormatting ? Boolean.valueOf(nsc.getNodeNumbering(node)) : style.getNodeNumbering();
+		if (numbered != null) {
+			writer.addAttribute("NUMBERED", Boolean.toString(numbered));
 		}
 		final String format = forceFormatting ? nsc.getNodeFormat(node) : style.getNodeFormat();
 		if (format != null) {
 			writer.addAttribute("FORMAT", format);
 		}
-		final TextAlign textAlign = forceFormatting ? nsc.getTextAlign(node) : style.getTextAlign();
-		if (textAlign != null) {
-			writer.addAttribute("TEXT_ALIGN", textAlign.toString());
+		final HorizontalTextAlignment textAlignment = forceFormatting ? nsc.getHorizontalTextAlignment(node) : style.getHorizontalTextAlignment();
+		if (textAlignment != null) {
+			writer.addAttribute("TEXT_ALIGN", textAlignment.toString());
 		}
+
 	}
 
 	private void writeAttributes(final ITreeWriter writer, final NodeModel node, final NodeSizeModel size,
@@ -354,6 +440,35 @@ class NodeStyleBuilder implements IElementDOMHandler, IExtensionElementWriter, I
 			BackwardCompatibleQuantityWriter.forWriter(writer).writeQuantity("MIN_WIDTH", minTextWidth);
 		}
 	}
+	
+	private void writeAttributes(final ITreeWriter writer, final NodeModel node, final NodeBorderModel border,
+			final boolean forceFormatting) {
+		final Boolean borderWidthMatchesEdgeWidth = forceFormatting ? nsc.getBorderWidthMatchesEdgeWidth(node) : border.getBorderWidthMatchesEdgeWidth();
+		if (borderWidthMatchesEdgeWidth != null) {
+			writer.addAttribute("BORDER_WIDTH_LIKE_EDGE", borderWidthMatchesEdgeWidth.toString());
+		}
+		final Quantity<LengthUnits> borderWidth = forceFormatting ? nsc.getBorderWidth(node) : border.getBorderWidth();
+		if (borderWidth != null) {
+			writer.addAttribute("BORDER_WIDTH", borderWidth.toString());
+		}
+		final Boolean borderColorMatchesEdgeColor = forceFormatting ? nsc.getBorderColorMatchesEdgeColor(node) : border.getBorderColorMatchesEdgeColor();
+		if (borderColorMatchesEdgeColor != null) {
+			writer.addAttribute("BORDER_COLOR_LIKE_EDGE", borderColorMatchesEdgeColor.toString());
+		}
+		final Color borderColor = forceFormatting ? nsc.getBorderColor(node) : border.getBorderColor();
+		if (borderColor != null) {
+			ColorUtils.addColorAttributes(writer, "BORDER_COLOR", "BORDER_COLOR_ALPHA", borderColor);
+		}
+		final Boolean borderDashMatchesEdgeDash = forceFormatting ? nsc.getBorderDashMatchesEdgeDash(node) : border.getBorderDashMatchesEdgeDash();
+		if (borderDashMatchesEdgeDash != null) {
+			writer.addAttribute("BORDER_DASH_LIKE_EDGE", borderDashMatchesEdgeDash.toString());
+		}
+		DashVariant borderDash = forceFormatting ? nsc.getBorderDash(node) : border.getBorderDash();
+		if (borderDash != null) {
+			writer.addAttribute("BORDER_DASH", borderDash.name());
+		}
+	}
+	
 	public void writeContent(final ITreeWriter writer, final Object userObject, final String tag) throws IOException {
 		final boolean forceFormatting = Boolean.TRUE.equals(writer.getHint(MapWriter.WriterHint.FORCE_FORMATTING));
 		if (!forceFormatting) {
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleController.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleController.java
index 1e8db89..b75e6df 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleController.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleController.java
@@ -28,16 +28,20 @@ import org.freeplane.core.io.WriteManager;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.util.Quantity;
+import org.freeplane.features.DashVariant;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.format.PatternFormat;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.SummaryNode;
 import org.freeplane.features.mode.CombinedPropertyChain;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ExclusivePropertyChain;
 import org.freeplane.features.mode.IPropertyHandler;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.nodestyle.NodeStyleModel.Shape;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
 import org.freeplane.features.styles.IStyle;
 import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.styles.MapStyleModel;
@@ -67,11 +71,12 @@ public class NodeStyleController implements IExtension {
  	final private ModeController modeController;
 	final private ExclusivePropertyChain<ShapeConfigurationModel, NodeModel> shapeHandlers;
 	final private ExclusivePropertyChain<Color, NodeModel> textColorHandlers;
-	final private ExclusivePropertyChain<TextAlign, NodeModel> textAlignHandlers;
+	final private ExclusivePropertyChain<HorizontalTextAlignment, NodeModel> horizontalTextAlignmentHandlers;
 	public static final String NODE_NUMBERING = "NodeNumbering";
 	
 	private static final Quantity<LengthUnits> DEFAULT_MINIMUM_WIDTH = new Quantity<LengthUnits>(0, LengthUnits.cm);
 	private static final Quantity<LengthUnits> DEFAULT_MAXIMUM_WIDTH = new Quantity<LengthUnits>(10, LengthUnits.cm);
+	private static final Quantity<LengthUnits> DEFAULT_BORDER_WIDTH = new Quantity<LengthUnits>(1, LengthUnits.px);
 
 	public NodeStyleController(final ModeController modeController) {
 		this.modeController = modeController;
@@ -80,7 +85,7 @@ public class NodeStyleController implements IExtension {
 		textColorHandlers = new ExclusivePropertyChain<Color, NodeModel>();
 		backgroundColorHandlers = new ExclusivePropertyChain<Color, NodeModel>();
 		shapeHandlers = new ExclusivePropertyChain<ShapeConfigurationModel, NodeModel>();
-		textAlignHandlers = new ExclusivePropertyChain<TextAlign, NodeModel>();
+		horizontalTextAlignmentHandlers = new ExclusivePropertyChain<HorizontalTextAlignment, NodeModel>();
 		
 		addFontGetter(IPropertyHandler.DEFAULT, new IPropertyHandler<Font, NodeModel>() {
 			public Font getProperty(final NodeModel node, final Font currentValue) {
@@ -124,15 +129,15 @@ public class NodeStyleController implements IExtension {
 			}
 		});
 		
-		addTextAlignGetter(IPropertyHandler.DEFAULT, new IPropertyHandler<TextAlign, NodeModel>() {
-			public TextAlign getProperty(final NodeModel node, final TextAlign currentValue) {
-				return TextAlign.DEFAULT;
+		addTextAlignGetter(IPropertyHandler.DEFAULT, new IPropertyHandler<HorizontalTextAlignment, NodeModel>() {
+			public HorizontalTextAlignment getProperty(final NodeModel node, final HorizontalTextAlignment currentValue) {
+				return HorizontalTextAlignment.DEFAULT;
 			}
 		});
 		
-		addTextAlignGetter(IPropertyHandler.STYLE, new IPropertyHandler<TextAlign, NodeModel>() {
-			public TextAlign getProperty(final NodeModel node, final TextAlign currentValue) {
-				return getTextAlign(node.getMap(), LogicalStyleController.getController(modeController).getStyles(node));
+		addTextAlignGetter(IPropertyHandler.STYLE, new IPropertyHandler<HorizontalTextAlignment, NodeModel>() {
+			public HorizontalTextAlignment getProperty(final NodeModel node, final HorizontalTextAlignment currentValue) {
+				return getHorizontalTextAlignment(node.getMap(), LogicalStyleController.getController(modeController).getStyles(node));
 			}
 		});
 		
@@ -153,9 +158,9 @@ public class NodeStyleController implements IExtension {
 		return textColorHandlers.addGetter(key, getter);
 	}
 
-	public IPropertyHandler<TextAlign, NodeModel> addTextAlignGetter(final Integer key,
-            final IPropertyHandler<TextAlign, NodeModel> getter) {
-		return textAlignHandlers.addGetter(key, getter);
+	public IPropertyHandler<HorizontalTextAlignment, NodeModel> addTextAlignGetter(final Integer key,
+            final IPropertyHandler<HorizontalTextAlignment, NodeModel> getter) {
+		return horizontalTextAlignmentHandlers.addGetter(key, getter);
 	}
 
 	public IPropertyHandler<Font, NodeModel> addFontGetter(final Integer key,
@@ -196,7 +201,7 @@ public class NodeStyleController implements IExtension {
 		return null;
 	}
 
-	private Quantity<LengthUnits> getStyleMaxNodeWidth(final MapModel map, final Collection<IStyle> styleKeys) {
+	private Quantity<LengthUnits> getMaxNodeWidth(final MapModel map, final Collection<IStyle> styleKeys) {
 		final MapStyleModel model = MapStyleModel.getExtension(map);
 		for(IStyle styleKey : styleKeys){
 			final NodeModel styleNode = model.getStyleNode(styleKey);
@@ -236,6 +241,128 @@ public class NodeStyleController implements IExtension {
 		return DEFAULT_MINIMUM_WIDTH;
 	}
 	
+	private Boolean getBorderWidthMatchesEdgeWidth(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final NodeBorderModel borderModel = NodeBorderModel.getModel(styleNode);
+			if (borderModel == null) {
+				continue;
+			}
+			final Boolean borderWidthMatchesEdgeWidth = borderModel.getBorderWidthMatchesEdgeWidth();
+			if (borderWidthMatchesEdgeWidth == null) {
+				continue;
+			}
+			return borderWidthMatchesEdgeWidth;
+		}
+		return false;
+	}
+	
+	private Quantity<LengthUnits> getBorderWidth(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final NodeBorderModel borderModel = NodeBorderModel.getModel(styleNode);
+			if (borderModel == null) {
+				continue;
+			}
+			final Quantity<LengthUnits> borderWidth = borderModel.getBorderWidth();
+			if (borderWidth == null) {
+				continue;
+			}
+			return borderWidth;
+		}
+		return DEFAULT_BORDER_WIDTH;
+	}
+	
+	
+	private Boolean getBorderDashMatchesEdgeDash(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final NodeBorderModel borderModel = NodeBorderModel.getModel(styleNode);
+			if (borderModel == null) {
+				continue;
+			}
+			final Boolean borderDashMatchesEdgeDash = borderModel.getBorderDashMatchesEdgeDash();
+			if (borderDashMatchesEdgeDash == null) {
+				continue;
+			}
+			return borderDashMatchesEdgeDash;
+		}
+		return false;
+	}
+	
+	private DashVariant getBorderDash(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final NodeBorderModel borderModel = NodeBorderModel.getModel(styleNode);
+			if (borderModel == null) {
+				continue;
+			}
+			final DashVariant borderDash = borderModel.getBorderDash();
+			if (borderDash == null) {
+				continue;
+			}
+			return borderDash;
+		}
+		return DashVariant.DEFAULT;
+	}
+	
+	
+	private Boolean getBorderColorMatchesEdgeColor(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final NodeBorderModel borderModel = NodeBorderModel.getModel(styleNode);
+			if (borderModel == null) {
+				continue;
+			}
+			final Boolean borderColorMatchesEdgeColor = borderModel.getBorderColorMatchesEdgeColor();
+			if (borderColorMatchesEdgeColor == null) {
+				continue;
+			}
+			return borderColorMatchesEdgeColor;
+		}
+		return true;
+	}
+	
+	private Color getBorderColor(final MapModel map, final Collection<IStyle> styleKeys) {
+		final MapStyleModel model = MapStyleModel.getExtension(map);
+		for(IStyle styleKey : styleKeys){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final NodeBorderModel borderModel = NodeBorderModel.getModel(styleNode);
+			if (borderModel == null) {
+				continue;
+			}
+			final Color borderColor = borderModel.getBorderColor();
+			if (borderColor == null) {
+				continue;
+			}
+			return borderColor;
+		}
+		return EdgeController.STANDARD_EDGE_COLOR;
+	}
+	
 	public static Font getDefaultFont() {
 		final int fontSize = NodeStyleController.getDefaultFontSize();
 		final int fontStyle = NodeStyleController.getDefaultFontStyle();
@@ -287,8 +414,8 @@ public class NodeStyleController implements IExtension {
 		return createFont(baseFont, fontFamilyName, fontSize, bold, italic);
 	}
 
-	public TextAlign getTextAlign(final NodeModel node) {
-		return textAlignHandlers.getProperty(node);
+	public HorizontalTextAlignment getHorizontalTextAlignment(final NodeModel node) {
+		return horizontalTextAlignmentHandlers.getProperty(node);
 	}
 
 	private Font createFont(final Font baseFont, String family, Integer size, Boolean bold, Boolean italic) {
@@ -357,7 +484,7 @@ public class NodeStyleController implements IExtension {
 		return null;
 	}
 
-	private TextAlign getTextAlign(final MapModel map, final Collection<IStyle> style) {
+	private HorizontalTextAlignment getHorizontalTextAlignment(final MapModel map, final Collection<IStyle> style) {
 		final MapStyleModel model = MapStyleModel.getExtension(map);
 		for(IStyle styleKey : style){
 			final NodeModel styleNode = model.getStyleNode(styleKey);
@@ -368,11 +495,11 @@ public class NodeStyleController implements IExtension {
 			if (styleModel == null) {
 				continue;
 			}
-			final TextAlign textAlign = styleModel.getTextAlign();
-			if (textAlign == null) {
+			final HorizontalTextAlignment textAlignment = styleModel.getHorizontalTextAlignment();
+			if (textAlignment == null) {
 				continue;
 			}
-			return textAlign;
+			return textAlignment;
 		}
 		return null;
 	}
@@ -410,36 +537,107 @@ public class NodeStyleController implements IExtension {
 		return getFont(node).isItalic();
 	}
 
-	public Boolean getNodeNumbering(NodeModel node) {
-		final NodeStyleModel style = (NodeStyleModel) node.getExtension(NodeStyleModel.class);
-		if (style == null)
-			return false;
-		final Boolean nodeNumbering = style.getNodeNumbering();
-		return nodeNumbering == null ? false : nodeNumbering.booleanValue();
-	}
-
 	public String getNodeFormat(NodeModel node) {
-		final NodeStyleModel style = (NodeStyleModel) node.getExtension(NodeStyleModel.class);
-		return style == null ? null : style.getNodeFormat();
-	}
+		Collection<IStyle> collection = LogicalStyleController.getController(modeController).getStyles(node);
+		final MapStyleModel model = MapStyleModel.getExtension(node.getMap());
+		for(IStyle styleKey : collection){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final String format = NodeStyleModel.getNodeFormat(styleNode);
+			if (format != null) {
+				return format;
+			}
+        } 
+		// do not return PatternFormat.IDENTITY_PATTERN if parse_data=false because that would
+		// automatically disable all IContentTransformers!
+		return PatternFormat.STANDARD_FORMAT_PATTERN;
+    }
+
+    public boolean getNodeNumbering(NodeModel node) {
+    	if(SummaryNode.isFirstGroupNode(node) || SummaryNode.isSummaryNode(node))
+    		return false;
+		Collection<IStyle> collection = LogicalStyleController.getController(modeController).getStyles(node);
+		final MapStyleModel model = MapStyleModel.getExtension(node.getMap());
+		for(IStyle styleKey : collection){
+			final NodeModel styleNode = model.getStyleNode(styleKey);
+			if (styleNode == null) {
+				continue;
+			}
+			final Boolean numbering = NodeStyleModel.getNodeNumbering(styleNode);
+			if (numbering != null) {
+				return numbering;
+			}
+		}
+		return false;
+    }
 
 	public Quantity<LengthUnits> getMaxWidth(NodeModel node) {
 		final MapModel map = node.getMap();
 		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
 		final Collection<IStyle> style = styleController.getStyles(node);
-		final Quantity<LengthUnits> maxTextWidth = getStyleMaxNodeWidth(map, style);
+		final Quantity<LengthUnits> maxTextWidth = getMaxNodeWidth(map, style);
 		return maxTextWidth;
     }
 
 	public Quantity<LengthUnits> getMinWidth(NodeModel node) {
 		final MapModel map = node.getMap();
 		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
-		final Collection<IStyle> style = styleController.getStyles(node);
-		final Quantity<LengthUnits> minWidth = getStyleMinWidth(map, style);
+		final Collection<IStyle> styles = styleController.getStyles(node);
+		final Quantity<LengthUnits> minWidth = getStyleMinWidth(map, styles);
 		return minWidth;
     }
 
 	public ModeController getModeController() {
 	    return modeController;
     }
+
+	public Boolean getBorderWidthMatchesEdgeWidth(NodeModel node) {
+		final MapModel map = node.getMap();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> style = styleController.getStyles(node);
+		final Boolean borderWidthMatchesEdgeWidth = getBorderWidthMatchesEdgeWidth(map, style);
+		return borderWidthMatchesEdgeWidth;
+	}
+
+	public Boolean getBorderDashMatchesEdgeDash(NodeModel node) {
+		final MapModel map = node.getMap();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> style = styleController.getStyles(node);
+		final Boolean borderDashMatchesEdgeDash = getBorderDashMatchesEdgeDash(map, style);
+		return borderDashMatchesEdgeDash;
+	}
+
+	public Quantity<LengthUnits> getBorderWidth(NodeModel node) {
+		final MapModel map = node.getMap();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> style = styleController.getStyles(node);
+		final Quantity<LengthUnits> borderWidth = getBorderWidth(map, style);
+		return borderWidth;
+	}
+
+	public DashVariant getBorderDash(NodeModel node) {
+		final MapModel map = node.getMap();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> style = styleController.getStyles(node);
+		final DashVariant borderDash = getBorderDash(map, style);
+		return borderDash;
+	}
+
+	public Boolean getBorderColorMatchesEdgeColor(NodeModel node) {
+		final MapModel map = node.getMap();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> style = styleController.getStyles(node);
+		final Boolean borderColorMatchesEdgeColor = getBorderColorMatchesEdgeColor(map, style);
+		return borderColorMatchesEdgeColor;
+	}
+
+	public Color getBorderColor(NodeModel node) {
+		final MapModel map = node.getMap();
+		final LogicalStyleController styleController = LogicalStyleController.getController(modeController);
+		final Collection<IStyle> style = styleController.getStyles(node);
+		final Color borderColor = getBorderColor(map, style);
+		return borderColor;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleModel.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleModel.java
index 34bf9bb..730a8c0 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodestyle/NodeStyleModel.java
@@ -45,7 +45,7 @@ public class NodeStyleModel implements IExtension, Cloneable {
 
 	}
 
-	public enum TextAlign {
+	public enum HorizontalTextAlignment {
 		DEFAULT(SwingConstants.LEFT), 
 		LEFT(SwingConstants.LEFT), 
 		RIGHT(SwingConstants.RIGHT), 
@@ -53,7 +53,7 @@ public class NodeStyleModel implements IExtension, Cloneable {
 		
 		final public int swingConstant;
 
-		TextAlign(int swingConstant){
+		HorizontalTextAlignment(int swingConstant){
 			this.swingConstant = swingConstant;}
 	};
 
@@ -121,9 +121,9 @@ public class NodeStyleModel implements IExtension, Cloneable {
 		return styleModel == null ? null : styleModel.isItalic();
 	}
 
-	public static TextAlign getTextAlign(final NodeModel node) {
+	public static HorizontalTextAlignment getHorizontalTextAlignment(final NodeModel node) {
 		final NodeStyleModel styleModel = node.getExtension(NodeStyleModel.class);
-		return styleModel == null ? null : styleModel.getTextAlign();
+		return styleModel == null ? null : styleModel.getHorizontalTextAlignment();
 	}
 
 	public static void setBackgroundColor(final NodeModel node, final Color color) {
@@ -176,9 +176,9 @@ public class NodeStyleModel implements IExtension, Cloneable {
 		styleModel.setShapeConfiguration(shape);
 	}
 	
-	public static void setTextAlign(final NodeModel node, final TextAlign textAlign) {
+	public static void setHorizontalTextAlignment(final NodeModel node, final HorizontalTextAlignment textAlignment) {
 		final NodeStyleModel styleModel = NodeStyleModel.createNodeStyleModel(node);
-		styleModel.setTextAlign(textAlign);
+		styleModel.setHorizontalTextAlignment(textAlignment);
 	}
 
 	private Color backgroundColor;
@@ -190,35 +190,35 @@ public class NodeStyleModel implements IExtension, Cloneable {
 	private ShapeConfigurationModel shapeConfiguration = ShapeConfigurationModel.NULL_SHAPE;
 	private Boolean nodeNumbering = null;
 	private String nodeFormat = null;
-	private  TextAlign textAlign = null;
+	private  HorizontalTextAlignment horizontalTextAlignment = null;
 
 	@Override
 	protected NodeStyleModel clone() {
 		return copyTo(new NodeStyleModel());
 	}
 
-	public NodeStyleModel copyTo(final NodeStyleModel nodeStyleModel) {
+	public NodeStyleModel copyTo(final NodeStyleModel to) {
 	    if(color != null)
-	        nodeStyleModel.setColor(color);
+	        to.setColor(color);
 	    if(backgroundColor != null)
-	        nodeStyleModel.setBackgroundColor(backgroundColor);
+	        to.setBackgroundColor(backgroundColor);
 	    if(isBold != null)
-	        nodeStyleModel.setBold(isBold);
+	        to.setBold(isBold);
 	    if(fontFamilyName != null)
-	        nodeStyleModel.setFontFamilyName(fontFamilyName);
+	        to.setFontFamilyName(fontFamilyName);
 	    if(fontSize != null)
-	        nodeStyleModel.setFontSize(fontSize);
+	        to.setFontSize(fontSize);
 	    if(isItalic != null)
-	        nodeStyleModel.setItalic(isItalic);
+	        to.setItalic(isItalic);
 	    if(getShapeConfiguration() != null)
-			nodeStyleModel.setShapeConfiguration(getShapeConfiguration());
+			to.setShapeConfiguration(getShapeConfiguration());
 	    if(nodeFormat != null)
-	            nodeStyleModel.setNodeFormat(nodeFormat);
+	            to.setNodeFormat(nodeFormat);
 	    if(nodeNumbering != null)
-	        nodeStyleModel.setNodeNumbering(nodeNumbering);
-	    if(textAlign != null)
-	    	nodeStyleModel.setTextAlign(textAlign);
-		return nodeStyleModel;
+	        to.setNodeNumbering(nodeNumbering);
+	    if(horizontalTextAlignment != null)
+	    	to.setHorizontalTextAlignment(horizontalTextAlignment);
+		return to;
     }
 
 	public Color getBackgroundColor() {
@@ -257,8 +257,8 @@ public class NodeStyleModel implements IExtension, Cloneable {
 		return isItalic;
 	}
 
-	public TextAlign getTextAlign() {
-		return textAlign;
+	public HorizontalTextAlignment getHorizontalTextAlignment() {
+		return horizontalTextAlignment;
 	}
 
 	public void setBackgroundColor(final Color color) {
@@ -305,8 +305,8 @@ public class NodeStyleModel implements IExtension, Cloneable {
 		this.setShapeConfiguration(getShapeConfiguration().withShape(shape));
 	}
 	
-	public void setTextAlign(final TextAlign textAlign) {
-		this.textAlign = textAlign;
+	public void setHorizontalTextAlignment(final HorizontalTextAlignment textAlignment) {
+		this.horizontalTextAlignment = textAlignment;
 	}
 
 	public ShapeConfigurationModel getShapeConfiguration() {
@@ -318,4 +318,5 @@ public class NodeStyleModel implements IExtension, Cloneable {
 			throw new RuntimeException("Null pointer as shapeConfiguration");
 		this.shapeConfiguration = shapeConfiguration;
 	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/filemode/FNodeStyleController.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/filemode/FNodeStyleController.java
deleted file mode 100644
index 4533213..0000000
--- a/freeplane/src/main/java/org/freeplane/features/nodestyle/filemode/FNodeStyleController.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Dimitry Polivaev
- *
- *  This file author is Dimitry Polivaev
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.features.nodestyle.filemode;
-
-import java.awt.Color;
-
-import org.freeplane.features.map.NodeModel;
-import org.freeplane.features.mode.IPropertyHandler;
-import org.freeplane.features.mode.ModeController;
-import org.freeplane.features.nodestyle.NodeStyleController;
-
-/**
- * @author Dimitry Polivaev
- * 02.01.2009
- */
-class FNodeStyleController extends NodeStyleController {
-	public FNodeStyleController(final ModeController modeController) {
-		super(modeController);
-		addColorGetter(IPropertyHandler.DEFAULT - 1, new IPropertyHandler<Color, NodeModel>() {
-			public Color getProperty(final NodeModel node, final Color currentValue) {
-				return node.isLeaf() ? Color.BLACK : Color.GRAY;
-			}
-		});
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/HorizontalTextAlignmentAction.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/HorizontalTextAlignmentAction.java
new file mode 100644
index 0000000..f4790b0
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/HorizontalTextAlignmentAction.java
@@ -0,0 +1,67 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.nodestyle.mindmapmode;
+
+import java.awt.event.ActionEvent;
+
+import org.freeplane.core.ui.AMultipleNodeAction;
+import org.freeplane.core.ui.SelectableAction;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
+
+ at SelectableAction(checkOnNodeChange = true)
+class HorizontalTextAlignmentAction extends AMultipleNodeAction {
+	private final HorizontalTextAlignment textAlignment;
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private boolean textAlignSet;
+
+	/**
+	 */
+	public HorizontalTextAlignmentAction(HorizontalTextAlignment textAlignment) {
+		super("TextAlignAction." + textAlignment);
+		this.textAlignment =textAlignment;
+	}
+
+	@Override
+	public void actionPerformed(final ActionEvent e) {
+		textAlignSet = !isHorizontalTextAlignmentSet();
+		super.actionPerformed(e);
+	}
+
+	@Override
+	protected void actionPerformed(final ActionEvent e, final NodeModel selected) {
+		((MNodeStyleController) NodeStyleController.getController()).setHorizontalTextAlignment(selected, textAlignSet ? textAlignment : null);
+	}
+
+	boolean isHorizontalTextAlignmentSet() {
+		final NodeModel node = Controller.getCurrentModeController().getMapController().getSelectedNode();
+		return textAlignment.equals(NodeStyleController.getController().getHorizontalTextAlignment(node));
+	}
+
+	@Override
+	public void setSelected() {
+		setSelected(isHorizontalTextAlignmentSet());
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/MNodeStyleController.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/MNodeStyleController.java
index fe2004b..766cdfd 100644
--- a/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/MNodeStyleController.java
+++ b/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/MNodeStyleController.java
@@ -26,16 +26,18 @@ import org.freeplane.core.ui.AMultipleNodeAction;
 import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.util.Quantity;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.map.IExtensionCopier;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.nodestyle.NodeBorderModel;
 import org.freeplane.features.nodestyle.NodeSizeModel;
 import org.freeplane.features.nodestyle.NodeStyleController;
 import org.freeplane.features.nodestyle.NodeStyleModel;
 import org.freeplane.features.nodestyle.NodeStyleModel.Shape;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
 import org.freeplane.features.nodestyle.ShapeConfigurationModel;
 import org.freeplane.features.styles.LogicalStyleKeys;
 
@@ -66,6 +68,10 @@ public class MNodeStyleController extends NodeStyleController {
 			if (fromSize != null) {
 				fromSize.copyTo(NodeSizeModel.createNodeSizeModel(to));
 			}
+			final NodeBorderModel fromBorder = from.getExtension(NodeBorderModel.class);
+			if (fromBorder != null) {
+				fromBorder.copyTo(NodeBorderModel.createNodeBorderModel(to));
+			}
 			
 		}
 
@@ -75,17 +81,19 @@ public class MNodeStyleController extends NodeStyleController {
 			}
 			from.removeExtension(NodeStyleModel.class);
 			from.removeExtension(NodeSizeModel.class);
+			from.removeExtension(NodeBorderModel.class);
 		}
 
 		public void remove(final Object key, final NodeModel from, final NodeModel which) {
+			if (!key.equals(LogicalStyleKeys.NODE_STYLE)) {
+				return;
+			}
 			removeStyleData(key, from, which);
 			removeSizeData(key, from, which);
+			removeBorderData(key, from, which);
 		}
 
 		private void removeSizeData(Object key, NodeModel from, NodeModel which) {
-			if (!key.equals(LogicalStyleKeys.NODE_STYLE)) {
-				return;
-			}
 			final NodeSizeModel whichData = which.getExtension(NodeSizeModel.class);
 			if (whichData == null) {
 				return;
@@ -102,10 +110,36 @@ public class MNodeStyleController extends NodeStyleController {
 			}
         }
 
-		private void removeStyleData(Object key, NodeModel from, NodeModel which) {
-			if (!key.equals(LogicalStyleKeys.NODE_STYLE)) {
+		private void removeBorderData(Object key, NodeModel from, NodeModel which) {
+			final NodeBorderModel whichData = which.getExtension(NodeBorderModel.class);
+			if (whichData == null) {
+				return;
+			}
+			final NodeBorderModel fromData = from.getExtension(NodeBorderModel.class);
+			if (fromData == null) {
 				return;
 			}
+			if (null != whichData.getBorderWidthMatchesEdgeWidth()) {
+				fromData.setBorderWidthMatchesEdgeWidth(null);
+			}
+			if (null != whichData.getBorderWidth()) {
+				fromData.setBorderWidth(null);
+			}
+			if (null != whichData.getBorderDashMatchesEdgeDash()) {
+				fromData.setBorderDashMatchesEdgeDash(null);
+			}
+			if (null != whichData.getBorderDash()) {
+				fromData.setBorderDash(null);
+			}
+			if (null != whichData.getBorderColorMatchesEdgeColor()) {
+				fromData.setBorderColorMatchesEdgeColor(null);
+			}
+			if (null != whichData.getBorderColor()) {
+				fromData.setBorderColor(null);
+			}
+        }
+		
+		private void removeStyleData(Object key, NodeModel from, NodeModel which) {
 			final NodeStyleModel whichStyle = (NodeStyleModel) which.getExtension(NodeStyleModel.class);
 			if (whichStyle == null) {
 				return;
@@ -126,7 +160,7 @@ public class MNodeStyleController extends NodeStyleController {
 			if (null != whichStyle.getFontSize()) {
 				fromStyle.setFontSize(null);
 			}
-			if (null != whichStyle.getShape()) {
+			if (null != whichStyle.getShapeConfiguration()) {
 				fromStyle.setShapeConfiguration(ShapeConfigurationModel.NULL_SHAPE);
 			}
 			if (null != whichStyle.getColor()) {
@@ -141,8 +175,8 @@ public class MNodeStyleController extends NodeStyleController {
 			if (null != whichStyle.getNodeNumbering()) {
 				fromStyle.setNodeNumbering(null);
 			}
-			if (null != whichStyle.getTextAlign()) {
-				fromStyle.setTextAlign(null);
+			if (null != whichStyle.getHorizontalTextAlignment()) {
+				fromStyle.setHorizontalTextAlignment(null);
 			}
        }
 
@@ -182,9 +216,9 @@ public class MNodeStyleController extends NodeStyleController {
 		modeController.addAction(new CopyFormat());
 		modeController.addAction(new PasteFormat());
 		modeController.addAction(new RemoveFormatAction());
-		modeController.addAction(new TextAlignAction(TextAlign.LEFT));
-		modeController.addAction(new TextAlignAction(TextAlign.CENTER));
-		modeController.addAction(new TextAlignAction(TextAlign.RIGHT));
+		modeController.addAction(new HorizontalTextAlignmentAction(HorizontalTextAlignment.LEFT));
+		modeController.addAction(new HorizontalTextAlignmentAction(HorizontalTextAlignment.CENTER));
+		modeController.addAction(new HorizontalTextAlignmentAction(HorizontalTextAlignment.RIGHT));
 		final AMultipleNodeAction increaseNodeFont = new AMultipleNodeAction("IncreaseNodeFontAction") {
 			private static final long serialVersionUID = 1L;
 
@@ -216,6 +250,7 @@ public class MNodeStyleController extends NodeStyleController {
 	public void copyStyle(final NodeModel source, final NodeModel target) {
 		copyStyleModel(source, target);
 		copySizeModel(source, target);
+		copyBorderModel(source, target);
 	}
 
 	protected void copyStyleModel(final NodeModel source, final NodeModel target) {
@@ -230,16 +265,29 @@ public class MNodeStyleController extends NodeStyleController {
 			setItalic(target, sourceStyleModel.isItalic());
 			setNodeFormat(target, sourceStyleModel.getNodeFormat());
 			setNodeNumbering(target, sourceStyleModel.getNodeNumbering());
-			setTextAlign(target, sourceStyleModel.getTextAlign());
+			setHorizontalTextAlignment(target, sourceStyleModel.getHorizontalTextAlignment());
 		}
     }
-	protected void copySizeModel(final NodeModel source, final NodeModel target) {
+	
+	private void copySizeModel(final NodeModel source, final NodeModel target) {
 	    final NodeSizeModel sourceSizeModel = NodeSizeModel.getModel(source);
 		if (sourceSizeModel != null) {
 			setMaxNodeWidth(target, sourceSizeModel.getMaxNodeWidth());
 			setMinNodeWidth(target, sourceSizeModel.getMinNodeWidth());
 		}
     }
+	
+	private void copyBorderModel(final NodeModel source, final NodeModel target) {
+	    final NodeBorderModel from = NodeBorderModel.getModel(source);
+		if (from != null) {
+			setBorderWidthMatchesEdgeWidth(target, from.getBorderWidthMatchesEdgeWidth());
+			setBorderWidth(target, from.getBorderWidth());
+			setBorderDashMatchesEdgeDash(target, from.getBorderDashMatchesEdgeDash());
+			setBorderDash(target, from.getBorderDash());
+			setBorderColorMatchesEdgeColor(target, from.getBorderColorMatchesEdgeColor());
+			setBorderColor(target, from.getBorderColor());
+		}
+    }
 
 	private NodeStyleModel createOwnStyleModel(final NodeModel node) {
 		{
@@ -644,21 +692,21 @@ public class MNodeStyleController extends NodeStyleController {
     }
 
 
-	public void setTextAlign(final NodeModel node, final TextAlign textAlign) {
-		final TextAlign oldTextAlign = NodeStyleModel.getTextAlign(node);
+	public void setHorizontalTextAlignment(final NodeModel node, final HorizontalTextAlignment textAlignment) {
+		final HorizontalTextAlignment oldTextAlignment = NodeStyleModel.getHorizontalTextAlignment(node);
 		final IActor actor = new IActor() {
 			public void act() {
-				NodeStyleModel.setTextAlign(node, textAlign);
+				NodeStyleModel.setHorizontalTextAlignment(node, textAlignment);
 				final MapController mapController = getModeController().getMapController();
 				mapController.nodeChanged(node);
 			}
 
 			public String getDescription() {
-				return "setMaxNodeWidth";
+				return "setHorizontalTextAlignment";
 			}
 
 			public void undo() {
-				NodeStyleModel.setTextAlign(node, oldTextAlign);
+				NodeStyleModel.setHorizontalTextAlignment(node, oldTextAlignment);
 				final MapController mapController = getModeController().getMapController();
 				mapController.nodeChanged(node);
 			}
@@ -667,4 +715,140 @@ public class MNodeStyleController extends NodeStyleController {
 		
     }
 
+
+	public void setBorderWidthMatchesEdgeWidth(final NodeModel node, final Boolean borderWidthMatchesEdgeWidth) {
+		final Boolean oldBorderWidthMatchesEdgeWidth = NodeBorderModel.getBorderWidthMatchesEdgeWidth(node);
+		final IActor actor = new IActor() {
+			public void act() {
+				NodeBorderModel.setBorderWidthMatchesEdgeWidth(node, borderWidthMatchesEdgeWidth);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+
+			public String getDescription() {
+				return "setBorderWidthMatchesEdgeWidth";
+			}
+
+			public void undo() {
+				NodeBorderModel.setBorderWidthMatchesEdgeWidth(node, oldBorderWidthMatchesEdgeWidth);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+		};
+		getModeController().execute(actor, node.getMap());
+    }
+	
+	public void setBorderDashMatchesEdgeDash(final NodeModel node, final Boolean borderDashMatchesEdgeDash) {
+		final Boolean oldBorderDashMatchesEdgeDash = NodeBorderModel.getBorderDashMatchesEdgeDash(node);
+		final IActor actor = new IActor() {
+			public void act() {
+				NodeBorderModel.setBorderDashMatchesEdgeDash(node, borderDashMatchesEdgeDash);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+
+			public String getDescription() {
+				return "setBorderDashMatchesEdgeDash";
+			}
+
+			public void undo() {
+				NodeBorderModel.setBorderDashMatchesEdgeDash(node, oldBorderDashMatchesEdgeDash);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+		};
+		getModeController().execute(actor, node.getMap());
+    }
+	
+
+	public void setBorderColorMatchesEdgeColor(final NodeModel node, final Boolean borderColorMatchesEdgeColor) {
+		final Boolean oldBorderColorMatchesEdgeColor = NodeBorderModel.getBorderColorMatchesEdgeColor(node);
+		final IActor actor = new IActor() {
+			public void act() {
+				NodeBorderModel.setBorderColorMatchesEdgeColor(node, borderColorMatchesEdgeColor);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+
+			public String getDescription() {
+				return "setBorderColorMatchesEdgeColor";
+			}
+
+			public void undo() {
+				NodeBorderModel.setBorderColorMatchesEdgeColor(node, oldBorderColorMatchesEdgeColor);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+		};
+		getModeController().execute(actor, node.getMap());
+    }
+	
+	public void setBorderWidth(final NodeModel node, final Quantity<LengthUnits> borderWidth) {
+		final Quantity<LengthUnits> oldBorderWidth = NodeBorderModel.getBorderWidth(node);
+		final IActor actor = new IActor() {
+			public void act() {
+				NodeBorderModel.setBorderWidth(node, borderWidth);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+
+			public String getDescription() {
+				return "setBorderWidth";
+			}
+
+			public void undo() {
+				NodeBorderModel.setBorderWidth(node, oldBorderWidth);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+		};
+		getModeController().execute(actor, node.getMap());
+		
+    }
+	
+	public void setBorderDash(final NodeModel node, final DashVariant borderDash) {
+		final DashVariant oldBorderDash = NodeBorderModel.getBorderDash(node);
+		final IActor actor = new IActor() {
+			public void act() {
+				NodeBorderModel.setBorderDash(node, borderDash);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+
+			public String getDescription() {
+				return "setBorderDash";
+			}
+
+			public void undo() {
+				NodeBorderModel.setBorderDash(node, oldBorderDash);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+		};
+		getModeController().execute(actor, node.getMap());
+		
+    }
+	
+	public void setBorderColor(final NodeModel node, final Color borderColor) {
+		final Color oldBorderColor = NodeBorderModel.getBorderColor(node);
+		final IActor actor = new IActor() {
+			public void act() {
+				NodeBorderModel.setBorderColor(node, borderColor);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+
+			public String getDescription() {
+				return "setBorderColor";
+			}
+
+			public void undo() {
+				NodeBorderModel.setBorderColor(node, oldBorderColor);
+				final MapController mapController = getModeController().getMapController();
+				mapController.nodeChanged(node);
+			}
+		};
+		getModeController().execute(actor, node.getMap());
+		
+    }
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/TextAlignAction.java b/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/TextAlignAction.java
deleted file mode 100644
index 07e7052..0000000
--- a/freeplane/src/main/java/org/freeplane/features/nodestyle/mindmapmode/TextAlignAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.features.nodestyle.mindmapmode;
-
-import java.awt.event.ActionEvent;
-
-import org.freeplane.core.ui.AMultipleNodeAction;
-import org.freeplane.core.ui.SelectableAction;
-import org.freeplane.features.map.NodeModel;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.features.nodestyle.NodeStyleController;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
-
- at SelectableAction(checkOnNodeChange = true)
-class TextAlignAction extends AMultipleNodeAction {
-	private final TextAlign textAlign;
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	private boolean textAlignSet;
-
-	/**
-	 */
-	public TextAlignAction(TextAlign textAlign) {
-		super("TextAlignAction." + textAlign);
-		this.textAlign =textAlign;
-	}
-
-	@Override
-	public void actionPerformed(final ActionEvent e) {
-		textAlignSet = !isTextAlignSet();
-		super.actionPerformed(e);
-	}
-
-	@Override
-	protected void actionPerformed(final ActionEvent e, final NodeModel selected) {
-		((MNodeStyleController) NodeStyleController.getController()).setTextAlign(selected, textAlignSet ? textAlign : null);
-	}
-
-	boolean isTextAlignSet() {
-		final NodeModel node = Controller.getCurrentModeController().getMapController().getSelectedNode();
-		return textAlign.equals(NodeStyleController.getController().getTextAlign(node));
-	}
-
-	@Override
-	public void setSelected() {
-		setSelected(isTextAlignSet());
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/note/NoteController.java b/freeplane/src/main/java/org/freeplane/features/note/NoteController.java
index 553baa0..d42f3f2 100644
--- a/freeplane/src/main/java/org/freeplane/features/note/NoteController.java
+++ b/freeplane/src/main/java/org/freeplane/features/note/NoteController.java
@@ -22,7 +22,7 @@ package org.freeplane.features.note;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
-import java.net.URL;
+import javax.swing.Icon;
 
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.io.WriteManager;
@@ -42,21 +42,29 @@ import org.freeplane.features.nodestyle.NodeStyleController;
 import org.freeplane.features.styles.MapStyle;
 import org.freeplane.features.styles.MapStyleModel;
 import org.freeplane.features.text.TextController;
+import org.freeplane.view.swing.map.MainView;
 
 /**
  * @author Dimitry Polivaev
  */
 public class NoteController implements IExtension {
-	private static boolean firstRun = true;
 	/**
 	 *
 	 */
 	public static final String NODE_NOTE_ICON = "accessories.plugins.NodeNoteIcon";
-	private static UIIcon noteIcon;
-	public static URL bwNoteIconUrl;
+	private static final UIIcon noteIcon= IconStoreFactory.ICON_STORE.getUIIcon("knotes.png");
+	public static final String bwNoteIconUrl;
+	public static final Icon bwNoteIcon;
+	
+	static {
+			String bwNoteIconName = "note_black_and_transp.png";
+			bwNoteIconUrl = "freeplaneresource:/images/" + bwNoteIconName;
+			bwNoteIcon = IconStoreFactory.ICON_STORE.getUIIcon(bwNoteIconName).getIcon();
+	}
 	public static final String SHOW_NOTE_ICONS = "show_note_icons";
 	private static final Integer NOTE_TOOLTIP = 9;
 	public static final String SHOW_NOTES_IN_MAP = "show_notes_in_map";
+	protected static final String SHOW_NOTE_ICON_IN_TOOLTIP = "show_note_icon_in_tooltip";
 
 	public static NoteController getController() {
 		final ModeController modeController = Controller.getCurrentModeController();
@@ -70,11 +78,6 @@ public class NoteController implements IExtension {
 	public static void install( final NoteController noteController) {
 		final ModeController modeController = Controller.getCurrentModeController();
 		modeController.addExtension(NoteController.class, noteController);
-		if (firstRun) {
-			noteIcon = IconStoreFactory.create().getUIIcon("knotes.png");
-			bwNoteIconUrl = ResourceController.getResourceController().getResource("/images/note_black_and_transp.png");
-			firstRun = false;
-		}
 	}
 
  	final private ModeController modeController;
@@ -110,20 +113,26 @@ public class NoteController implements IExtension {
 
 	private void registerNoteTooltipProvider(ModeController modeController) {
 		modeController.addToolTipProvider(NOTE_TOOLTIP, new ITooltipProvider() {
-			public String getTooltip(ModeController modeController, NodeModel node, Component view) {
+			public String getTooltip(final ModeController modeController, NodeModel node, Component view){
+				return getTooltip(modeController, node, (MainView)view);
+			}
+			private String getTooltip(final ModeController modeController, NodeModel node, MainView view) {
 				if(showNotesInMap(node.getMap()) && ! TextController.getController(modeController).isMinimized(node)){
 					return null;
 				}
 				final String noteText = NoteModel.getNoteText(node);
 				if (noteText == null)
 					return null;
-				final String rule = getNoteCSSStyle(modeController, node, true);
+				float zoom = view.getNodeView().getMap().getZoom();
+				final String rule = getNoteCSSStyle(modeController, node, zoom, true);
 				final StringBuilder tooltipBodyBegin = new StringBuilder("<body><div style=\"");
 				tooltipBodyBegin.append(rule);
 				tooltipBodyBegin.append("\">");
-				tooltipBodyBegin.append("<img src =\"");
-				tooltipBodyBegin.append(bwNoteIconUrl.toString());
-				tooltipBodyBegin.append("\">");
+				if(ResourceController.getResourceController().getBooleanProperty(SHOW_NOTE_ICON_IN_TOOLTIP)) {
+					tooltipBodyBegin.append("<img src =\"");
+					tooltipBodyBegin.append(bwNoteIconUrl.toString());
+					tooltipBodyBegin.append("\">");
+				}
 				final String tooltipText = noteText.replaceFirst("<body>", 
 					tooltipBodyBegin.toString()).replaceFirst("</body>", "</div></body>");
 				return tooltipText;
@@ -143,6 +152,11 @@ public class NoteController implements IExtension {
 				}
 				return null;
 			}
+
+			@Override
+			public boolean mustIncludeInIconRegistry() {
+				return true;
+			}
 		});
     }
 
@@ -151,7 +165,7 @@ public class NoteController implements IExtension {
 		return Boolean.parseBoolean(property);
 	}
 
-	protected String getNoteCSSStyle(ModeController modeController, NodeModel node, boolean asHtmlFragment) {
+	protected String getNoteCSSStyle(ModeController modeController, NodeModel node, float zoom, boolean asHtmlFragment) {
 		final StringBuilder rule = new StringBuilder();
 		// set default font for notes:
 		final NodeStyleController style = (NodeStyleController) Controller.getCurrentModeController().getExtension(
@@ -163,7 +177,7 @@ public class NoteController implements IExtension {
 		    final Font noteFont = style.getFont(noteStyleNode);
 		    Color noteBackground = style.getBackgroundColor(noteStyleNode);
 		    Color noteForeground = style.getColor(noteStyleNode);
-		    final int alignment = style.getTextAlign(noteStyleNode).swingConstant;
+		    final int alignment = style.getHorizontalTextAlignment(noteStyleNode).swingConstant;
 		    final CssRuleBuilder cssRuleBuilder = new CssRuleBuilder();
 		    if(asHtmlFragment)
 		    	cssRuleBuilder.withHTMLFont(noteFont);
@@ -173,7 +187,7 @@ public class NoteController implements IExtension {
 					.withBackground(noteBackground)
 					.withAlignment(alignment);
 		    if(asHtmlFragment)
-		    	cssRuleBuilder.withMaxWidthAsPt(NodeSizeModel.getMaxNodeWidth(noteStyleNode), style.getMaxWidth(node));
+		    	cssRuleBuilder.withMaxWidthAsPt(zoom, NodeSizeModel.getMaxNodeWidth(noteStyleNode), style.getMaxWidth(node));
 			rule.append(cssRuleBuilder);
 		}
 		return rule.toString();
diff --git a/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/MNoteController.java b/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/MNoteController.java
index ade3abc..a249061 100644
--- a/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/MNoteController.java
+++ b/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/MNoteController.java
@@ -44,6 +44,7 @@ import javax.swing.text.html.StyleSheet;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.link.LinkController;
 import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
@@ -57,8 +58,6 @@ import org.freeplane.features.styles.MapStyle;
 import org.freeplane.features.styles.SetBooleanMapPropertyAction;
 import org.freeplane.features.text.mindmapmode.FreeplaneToSHTMLPropertyChangeAdapter;
 import org.freeplane.features.text.mindmapmode.MTextController;
-import org.freeplane.features.url.UrlManager;
-
 import com.lightdev.app.shtm.SHTMLEditorPane;
 import com.lightdev.app.shtm.SHTMLPanel;
 
@@ -266,7 +265,7 @@ public class MNoteController extends NoteController {
 			public void actionPerformed(final ActionEvent pE) {
 				try {
 					String uriText = pE.getActionCommand();
-					UrlManager.getController().loadURL(new URI(uriText));
+					LinkController.getController().loadURI(noteManager.getNode(), new URI(uriText));
 				}
 				catch (final Exception e) {
 					LogUtils.severe(e);
@@ -298,7 +297,7 @@ public class MNoteController extends NoteController {
 	    styleSheet.removeStyle("p");
 	    // set default font for notes:
 	    final ModeController modeController = Controller.getCurrentModeController();
-	    String noteCssRule = getNoteCSSStyle(modeController, node, false);
+	    String noteCssRule = getNoteCSSStyle(modeController, node, 1f, false);
 		String bodyRule = new StringBuilder( "body {").append(noteCssRule).append("}\n").toString();
 		styleSheet.addRule(bodyRule);
 	    if (ResourceController.getResourceController().getBooleanProperty(
diff --git a/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteManager.java b/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteManager.java
index 3d86542..aa5c936 100644
--- a/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteManager.java
+++ b/freeplane/src/main/java/org/freeplane/features/note/mindmapmode/NoteManager.java
@@ -144,4 +144,8 @@ final class NoteManager implements INodeSelectionListener, IMapSelectionListener
 	@Override
 	public void beforeMapChange(MapModel oldMap, MapModel newMap) {
 	}
+
+	NodeModel getNode() {
+		return node;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java
new file mode 100644
index 0000000..83929f8
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionBoxController.java
@@ -0,0 +1,243 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.ComboBoxEditor;
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
+
+import org.freeplane.core.resources.IFreeplanePropertyListener;
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.components.JAutoScrollBarPane;
+import org.freeplane.core.ui.components.JComboBoxWithBorder;
+import org.freeplane.core.ui.textchanger.TranslatedElementFactory;
+import org.freeplane.core.util.TextUtils;
+
+class CollectionBoxController <T extends NamedElement<T>> {
+	private static final String PRESENTATION_MAX_DROP_BOX_ROW_COUNT_PROPERTY = "presentation.maxDropBoxRowCount";
+	private NamedElementCollection<T> collection;
+	private JComboBox<Stringifyed<T>> comboBoxCollectionNames;
+	private final JComponent[] components;
+	private final JComponent[] editingComponents;
+	private final JButton btnMoveUp;
+	private final JButton btnMoveDown;
+	private final JButton btnMove;
+	private final JButton btnNewElement;
+	private final JButton btnCopy;
+	private final JButton btnDeleteElement;
+	private final CollectionChangeListener<T> collectionChangeListener;
+	private JComponent collectionComponent;
+	private JLabel lblElementCounter;
+	
+	public JComponent createCollectionBox() {
+		collectionComponent = Box.createVerticalBox();
+		final Box names = Box.createHorizontalBox();
+		names.add(lblElementCounter);
+		names.add(comboBoxCollectionNames);
+		collectionComponent.add(names);
+		Box collectionButtons = Box.createHorizontalBox();
+		collectionButtons.setBorder(BorderFactory.createEmptyBorder(0, lblElementCounter.getPreferredSize().width + 2, 0, 0));
+		collectionButtons.add(btnNewElement);
+		collectionButtons.add(btnDeleteElement);
+		collectionButtons.add(btnMoveUp);
+		collectionButtons.add(btnMoveDown);                       
+		collectionButtons.add(btnMove);
+		collectionButtons.add(btnCopy);
+		collectionButtons.add(Box.createHorizontalGlue());
+		collectionComponent.add(collectionButtons);
+		return collectionComponent;
+	}
+
+	public CollectionBoxController(final String elementName) {
+		comboBoxCollectionNames = new JComboBoxWithBorder<Stringifyed<T>>();
+		comboBoxCollectionNames.setEditable(false);
+		Dimension comboBoxPreferredSize = comboBoxCollectionNames.getPreferredSize();
+		comboBoxCollectionNames.setMaximumSize(new Dimension(Integer.MAX_VALUE, comboBoxPreferredSize.height));
+		final ResourceController resourceController = ResourceController.getResourceController();
+		comboBoxCollectionNames.setMaximumRowCount(resourceController.getIntProperty(PRESENTATION_MAX_DROP_BOX_ROW_COUNT_PROPERTY, 9));
+		resourceController.addPropertyChangeListener(new IFreeplanePropertyListener() {
+			
+			@Override
+			public void propertyChanged(String propertyName, String newValue, String oldValue) {
+				if(PRESENTATION_MAX_DROP_BOX_ROW_COUNT_PROPERTY.equals(propertyName))
+					comboBoxCollectionNames.setMaximumRowCount(resourceController.getIntProperty(PRESENTATION_MAX_DROP_BOX_ROW_COUNT_PROPERTY, 9));
+			}
+		});
+		lblElementCounter = new JLabel("XXX/XXX ");
+		lblElementCounter.setHorizontalAlignment(SwingConstants.CENTER);
+		lblElementCounter.setPreferredSize(lblElementCounter.getPreferredSize());
+
+		btnNewElement = createNewElementButton(elementName);
+		btnDeleteElement = createDeleteElementButton(elementName);
+		btnMoveUp = createMoveUpButton(elementName);
+		btnMoveDown = createMoveDownButton(elementName);
+		btnMove = createMoveButton(elementName);
+		btnCopy = createCopyButton(elementName);
+
+		components = new JComponent[]{comboBoxCollectionNames, lblElementCounter, btnNewElement, btnDeleteElement, btnMoveUp, btnMoveDown, btnMove, btnCopy};
+		editingComponents = new JComponent[] { btnNewElement, btnDeleteElement, btnMoveUp, btnMoveDown, btnMove, btnCopy };
+		disableUiElements();
+		collectionChangeListener = new CollectionChangeListener<T>() {
+			@Override
+			public void onCollectionChange(CollectionChangedEvent<T> event) {
+				if(event.eventType != CollectionChangedEvent.EventType.SELECTION_CHANGED) {
+					if(btnNewElement.isEnabled())
+						enableUiElements();
+					updateElementCounterLabel();
+				}
+			}
+		};
+	}
+	
+	public void setCollection(NamedElementCollection<T> newCollection) {
+		if(collection == newCollection)
+			return;
+		if(collection != null)
+			collection.removeCollectionChangeListener(collectionChangeListener);
+		this.collection = newCollection;
+		if(newCollection == null){
+			disableUiElements();
+		}
+		else{
+			final ComboBoxModel<Stringifyed<T>> elements = newCollection.getElements();
+			comboBoxCollectionNames.setModel(elements);
+			enableUiElements();
+			updateElementCounterLabel();
+			collection.addCollectionChangeListener(collectionChangeListener);
+		}
+	}
+
+	private void updateElementCounterLabel() {
+		final int collectionSize = collection.getSize();
+		final int currentElementIndex = collection.getCurrentElementIndex();
+		lblElementCounter.setText((currentElementIndex >= 0 ? Integer.toString(currentElementIndex + 1) + "/" + Integer.toString(collectionSize): "-/-") + " ");
+	}
+
+	private void enableUiElements() {
+		final int collectionSize = collection.getSize();
+		final int currentElementIndex = collection.getCurrentElementIndex();
+		comboBoxCollectionNames.setEnabled(true);
+		lblElementCounter.setEnabled(true);
+		comboBoxCollectionNames.setEditable(collectionSize > 0);
+		btnNewElement.setEnabled(true);
+		btnDeleteElement.setEnabled(collectionSize > 0);
+		btnMoveUp.setEnabled(currentElementIndex > 0);
+		btnMoveDown.setEnabled(currentElementIndex >= 0 && currentElementIndex < collectionSize-1);
+		btnMove.setEnabled(collectionSize > 1);
+		btnCopy.setEnabled(collectionSize > 0);
+	}
+
+	private void disableUiElements() {
+		comboBoxCollectionNames.setModel(new DefaultComboBoxModel<Stringifyed<T>>());
+		lblElementCounter.setText("-/- ");
+		for(JComponent c : components)
+			c.setEnabled(false);
+	}
+
+	private JButton createMoveButton(final String elementName) {
+		JButton btnMove = TranslatedElementFactory.createButtonWithIcon(elementName + ".move.icon", "collection.move");
+		btnMove.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				Vector<String> items = new Vector<>(collection.getSize());
+				for(int i = 1; i <= collection.getSize(); i++){
+					items.addElement(i + ": " + collection.getElement(i-1).getName());
+				}
+				final ComboBoxModel<String> elements = new DefaultComboBoxModel<>(items);
+				JList<String> targets = new JList<>(elements);
+				targets.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+				final String title = TextUtils.getText("collection.moveTo");
+				if (JOptionPane.showConfirmDialog(collectionComponent, new JAutoScrollBarPane(targets), title, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE) 
+						== JOptionPane.OK_OPTION)
+					UndoableNamedElementCollection.of(collection).moveCurrentElementTo(targets.getSelectedIndex());
+			}
+		});
+		return btnMove;
+	}
+	private JButton createMoveDownButton(final String elementName) {
+		JButton btnMoveDown = TranslatedElementFactory.createButtonWithIcon(elementName + ".down.icon", "collection.down");
+		btnMoveDown.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableNamedElementCollection.of(collection).moveCurrentElementDown();
+			}
+		});
+		return btnMoveDown;
+	}
+	private JButton createMoveUpButton(final String elementName) {
+		JButton btnMoveUp = TranslatedElementFactory.createButtonWithIcon(elementName + ".up.icon", "collection.up");
+		btnMoveUp.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableNamedElementCollection.of(collection).moveCurrentElementUp();
+			}
+		});
+		return btnMoveUp;
+	}
+	private JButton createDeleteElementButton(final String elementName) {
+		JButton btnDeleteElement = TranslatedElementFactory.createButtonWithIcon(elementName + ".delete.icon", "collection.delete");
+		btnDeleteElement.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableNamedElementCollection.of(collection).removeCurrentElement();
+			}
+		});
+		return btnDeleteElement;
+	}
+	private JButton createNewElementButton(final String elementName) {
+		final JButton btnNewElement = TranslatedElementFactory.createButtonWithIcon(elementName + ".new.icon", "collection.new." + elementName);
+		btnNewElement.addActionListener(new ActionListener() {
+			
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final String text = TextUtils.getText("collection.new." + elementName);
+				UndoableNamedElementCollection.of(collection).add(text + " " + (collection.getSize() + 1));
+				final ComboBoxEditor editor = comboBoxCollectionNames.getEditor();
+				editor.selectAll();
+				editor.getEditorComponent().requestFocusInWindow();
+			}
+		});
+		return btnNewElement;
+	}
+
+	private JButton createCopyButton(final String elementName) {
+		final JButton btnCopyElement = TranslatedElementFactory.createButtonWithIcon(elementName + ".copy.icon", "collection.copy." + elementName);
+		btnCopyElement.addActionListener(new ActionListener() {
+			
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableNamedElementCollection.of(collection).copyCurrentElement();
+				final ComboBoxEditor editor = comboBoxCollectionNames.getEditor();
+				editor.selectAll();
+				editor.getEditorComponent().requestFocusInWindow();
+			}
+		});
+		return btnCopyElement;
+	}
+
+	void disableEditing() {
+		for (JComponent c : editingComponents)
+			c.setEnabled(false);
+	}
+
+	void enableEditing() {
+		if (collection != null)
+			enableUiElements();
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionChangeListener.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionChangeListener.java
new file mode 100644
index 0000000..e1ffff2
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionChangeListener.java
@@ -0,0 +1,5 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public interface CollectionChangeListener<T extends NamedElement<T>> {
+	void onCollectionChange(CollectionChangedEvent<T> event);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionChangedEvent.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionChangedEvent.java
new file mode 100644
index 0000000..99d9c20
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/CollectionChangedEvent.java
@@ -0,0 +1,19 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public class CollectionChangedEvent<T extends NamedElement<T>> {
+	public enum EventType {SELECTION_CHANGED, SELECTION_INDEX_CHANGED, COLLECTION_SIZE_CHANGED;
+
+		public <T extends NamedElement<T>> CollectionChangedEvent<T> of(NamedElementCollection<T> collection) {
+			return new CollectionChangedEvent<>(this, collection);
+		}
+	}
+
+	public final EventType eventType;
+	public final NamedElementCollection<T> collection;
+	public CollectionChangedEvent(EventType eventType, NamedElementCollection<T> collection) {
+		super();
+		this.eventType = eventType;
+		this.collection = collection;
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java
new file mode 100644
index 0000000..bd13eba
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/EscapeKeyEventDispatcher.java
@@ -0,0 +1,26 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.awt.KeyEventDispatcher;
+import java.awt.event.KeyEvent;
+
+class EscapeKeyEventDispatcher implements KeyEventDispatcher {
+	private final PresentationState state;
+	public EscapeKeyEventDispatcher(PresentationState state) {
+		super();
+		this.state = state;
+	}
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent e) {
+		if(e.getModifiers() != 0)
+			return false;
+		switch (e.getKeyCode()) {
+		case KeyEvent.VK_ESCAPE:
+				e.consume();
+				if(e.getID() == KeyEvent.KEY_PRESSED)
+					state.stopPresentation();
+				return true;
+		default:
+			return false;
+		}
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/MapPresentations.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/MapPresentations.java
new file mode 100644
index 0000000..26aeda4
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/MapPresentations.java
@@ -0,0 +1,18 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import org.freeplane.core.extension.IExtension;
+import org.freeplane.features.mode.MapExtensions;
+
+public class MapPresentations implements IExtension{
+	static {
+		MapExtensions.registerMapExtension(MapPresentations.class);
+	}
+	
+	public final NamedElementCollection<Presentation> presentations;
+
+	public MapPresentations(NamedElementFactory<Presentation> factory) {
+		super();
+		this.presentations = new NamedElementCollection<>(factory);
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElement.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElement.java
new file mode 100644
index 0000000..a714dbc
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElement.java
@@ -0,0 +1,8 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public interface NamedElement<T extends NamedElement<T>> {
+	String getName();
+	void setName(String name);
+	T create(String name);
+	T saveAs(String name);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java
new file mode 100644
index 0000000..b3ffb0f
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementCollection.java
@@ -0,0 +1,179 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.COLLECTION_SIZE_CHANGED;
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.SELECTION_CHANGED;
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.SELECTION_INDEX_CHANGED;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+
+import org.freeplane.core.util.TextUtils;
+
+public class NamedElementCollection<T extends NamedElement<T>> implements Iterable<T>{
+	final private DefaultComboBoxModel<Stringifyed<T>> elements;
+	private int currentIndex;
+	private ArrayList<CollectionChangeListener<T>> collectionChangeListeners;
+	private boolean moveInProgress;
+	private NamedElementFactory<T> factory;
+
+	public NamedElementCollection(NamedElementFactory<T> factory) {
+		super();
+		this.factory = factory;
+		this.elements =  new DefaultComboBoxModel<>();
+		elements.addListDataListener(new ListDataListener() {
+
+			@Override
+			public void intervalRemoved(ListDataEvent e) {
+			}
+			
+			@Override
+			public void intervalAdded(ListDataEvent e) {
+			}
+			
+			@Override
+			public void contentsChanged(ListDataEvent e) {
+				final int index = e.getIndex0();
+				if (index == -1 && e.getIndex1() == index && ! moveInProgress){
+					final int newIndex = elements.getIndexOf(elements.getSelectedItem());
+					if(newIndex != -1) {
+						currentIndex = newIndex;
+						fireCollectionChangeEvent(SELECTION_INDEX_CHANGED);
+						fireCollectionChangeEvent(SELECTION_CHANGED);
+					}
+				}
+			}
+		});
+		currentIndex = -1;
+		collectionChangeListeners = new ArrayList<>();
+	}
+
+	public ComboBoxModel<Stringifyed<T>> getElements() {
+		return elements;
+	}
+
+	public void add(String name) {
+			final T currentElement = getCurrentElement();
+			final T newInstance = currentElement != null ? factory.create(currentElement, name) : factory.create(name);
+			add(newInstance);
+	}
+	
+	public void add(T element) {
+		final int newElementIndex = currentIndex + 1;
+		final Stringifyed<T> anObject = new Stringifyed<>(element);
+		elements.insertElementAt(anObject, newElementIndex);
+		elements.setSelectedItem(anObject);
+		selectCurrentElement(newElementIndex);
+		fireCollectionChangeEvent(COLLECTION_SIZE_CHANGED);
+	}
+
+	public void removeCurrentElement() {
+		if(currentIndex >= 0) {
+			elements.removeElementAt(currentIndex);
+			selectCurrentElement(Math.min(currentIndex, elements.getSize() - 1));
+			fireCollectionChangeEvent(COLLECTION_SIZE_CHANGED);
+		}
+	}
+
+	public void selectCurrentElement(int index) {
+		if(currentIndex != index) {
+			currentIndex = index;
+			final Stringifyed<T> newSelecteditem = index == -1  ? null : elements.getElementAt(index);
+			if(newSelecteditem != elements.getSelectedItem()) {
+				elements.setSelectedItem(newSelecteditem);
+			}
+			else { 
+				fireCollectionChangeEvent(SELECTION_INDEX_CHANGED);
+				fireCollectionChangeEvent(SELECTION_CHANGED);
+			}
+		}
+	}
+
+	private void fireCollectionChangeEvent(CollectionChangedEvent.EventType eventType) {
+		for (CollectionChangeListener<T> selectionChangeListener : collectionChangeListeners)
+			selectionChangeListener.onCollectionChange(eventType.of(this));
+	}
+
+	public int getSize() {
+		return elements.getSize();
+	}
+
+	public T getCurrentElement() {
+		return currentIndex >= 0 ? elements.getElementAt(currentIndex).element : null;
+	}
+
+	public void moveCurrentElementUp() {
+		moveCurrentElementTo(currentIndex - 1);
+	}
+
+	public void moveCurrentElementDown() {
+		moveCurrentElementTo(currentIndex + 1);
+	}
+	
+	public void moveCurrentElementTo(int newElementIndex) {
+		if(canMoveCurrentElementTo(newElementIndex)) {
+			final Stringifyed<T> currentElement = elements.getElementAt(currentIndex);
+			moveInProgress = true;
+			try {
+				elements.removeElementAt(currentIndex);
+				elements.insertElementAt(currentElement, newElementIndex);
+				currentIndex = newElementIndex;
+				elements.setSelectedItem(currentElement);
+			} finally {
+				moveInProgress = false;
+			}
+			fireCollectionChangeEvent(SELECTION_INDEX_CHANGED);
+		}
+	}
+
+	public boolean canMoveCurrentElementTo(int newElementIndex) {
+		return newElementIndex >= 0 && newElementIndex < getSize() && newElementIndex != currentIndex;
+	}
+
+	public void addCollectionChangeListener(CollectionChangeListener<T> selectionChangeListener) {
+		this.collectionChangeListeners.add(selectionChangeListener);
+	}
+
+	public void removeCollectionChangeListener(CollectionChangeListener<T> selectionChangeListener) {
+		this.collectionChangeListeners.remove(selectionChangeListener);
+	}
+
+	public int getCurrentElementIndex() {
+		return currentIndex;
+	}
+
+	public T getElement(int i) {
+		return elements.getElementAt(i).element;
+	}
+
+	@Override
+	public Iterator<T> iterator() {
+		return new Iterator<T>() {
+			private int index = 0;
+			@Override
+			public boolean hasNext() {
+				return index < getSize();
+			}
+
+			@Override
+			public T next() {
+				if(hasNext())
+					return getElement(index++);
+				else
+					throw new NoSuchElementException();
+			}
+		};
+	}
+
+	public void copyCurrentElement() {
+		final T currentElement = getCurrentElement();
+		String newName = TextUtils.format("copy_name", currentElement.getName());
+		final T newInstance = currentElement.saveAs(newName);
+		add(newInstance);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementFactory.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementFactory.java
new file mode 100644
index 0000000..a6526a9
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NamedElementFactory.java
@@ -0,0 +1,6 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public interface NamedElementFactory<T extends NamedElement<T>> {
+	T create(String name);
+	T create(T prototype, String newName);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java
new file mode 100644
index 0000000..95d0e11
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationKeyEventDispatcher.java
@@ -0,0 +1,42 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.awt.KeyEventDispatcher;
+import java.awt.event.KeyEvent;
+
+class NavigationKeyEventDispatcher implements KeyEventDispatcher {
+	private final PresentationState state;
+	public NavigationKeyEventDispatcher(PresentationState state) {
+		super();
+		this.state = state;
+	}
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent e) {
+		if(e.getModifiers() != 0)
+			return false;
+		switch (e.getKeyCode()) {
+		case KeyEvent.VK_HOME:
+			e.consume();
+			if(e.getID() == KeyEvent.KEY_PRESSED)
+				state.showFirstSlide();
+			return true;
+		case KeyEvent.VK_UP:
+				e.consume();
+				if(e.getID() == KeyEvent.KEY_PRESSED)
+					state.showPreviousSlide();
+				return true;
+		case KeyEvent.VK_DOWN:
+			e.consume();
+			if(e.getID() == KeyEvent.KEY_PRESSED)
+				state.showNextSlide();
+			return true;
+		case KeyEvent.VK_END:
+			e.consume();
+			if(e.getID() == KeyEvent.KEY_PRESSED)
+				state.showLastSlide();
+			return true;
+		default:
+			 return false;
+		}
+		
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationPanelController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationPanelController.java
new file mode 100644
index 0000000..98cb466
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/NavigationPanelController.java
@@ -0,0 +1,290 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+
+import javax.swing.Action;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.core.ui.EnabledAction;
+import org.freeplane.core.ui.SelectableAction;
+import org.freeplane.core.ui.textchanger.TranslatedElementFactory;
+import org.freeplane.features.mode.ModeController;
+
+class NavigationPanelController {
+	
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class StartPresentationOrShowNextSlideAction extends AFreeplaneAction {
+		private final PresentationState presentationState;
+
+		public StartPresentationOrShowNextSlideAction(PresentationState presentationState) {
+			super("StartPresentationOrShowNextSlideAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			if(presentationState.isPresentationRunning()) { 
+					presentationState.showNextSlide();
+			}
+			else if (presentationState.canShowCurrentSlide())
+				presentationState.showPresentation();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class StopPresentationAction extends AFreeplaneAction {
+		private PresentationState presentationState;
+
+		public StopPresentationAction(PresentationState presentationState) {
+			super("StopPresentationAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			if (presentationState.isPresentationRunning())
+				presentationState.stopPresentation();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class ShowNextSlideAction extends AFreeplaneAction {
+		private final PresentationState presentationState;
+
+		public ShowNextSlideAction(PresentationState presentationState) {
+			super("ShowNextSlideAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+				presentationState.showNextSlide();
+		}
+		
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+	
+	@SuppressWarnings("serial")
+	@SelectableAction
+	@EnabledAction
+	static private class StartPresentationAction extends AFreeplaneAction {
+		private PresentationState presentationState;
+
+		public StartPresentationAction(PresentationState presentationState) {
+			super("StartPresentationAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			if (! presentationState.isPresentationRunning() && presentationState.canShowCurrentSlide())
+				presentationState.showPresentation();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+
+
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class ShowPreviousSlideAction extends AFreeplaneAction {
+		private PresentationState presentationState;
+
+		public ShowPreviousSlideAction(PresentationState presentationState) {
+			super("ShowPreviousSlideAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+				presentationState.showPreviousSlide();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+
+
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class ShowFirstSlideAction extends AFreeplaneAction {
+		private PresentationState presentationState;
+
+		public ShowFirstSlideAction(PresentationState presentationState) {
+			super("ShowFirstSlideAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+				presentationState.showFirstSlide();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+	
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class ShowFirstSlideAndStartPresentationAction extends AFreeplaneAction {
+		private PresentationState presentationState;
+
+		public ShowFirstSlideAndStartPresentationAction(PresentationState presentationState) {
+			super("ShowFirstSlideAndStartPresentationAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			presentationState.showFirstSlide();
+			if(! presentationState.isPresentationRunning() && presentationState.canShowCurrentSlide())
+				presentationState.showPresentation();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+	
+	@SuppressWarnings("serial")
+	@EnabledAction
+	static private class ShowLastSlideAction extends AFreeplaneAction {
+		private PresentationState presentationState;
+
+		public ShowLastSlideAction(PresentationState presentationState) {
+			super("ShowLastSlideAction");
+			this.presentationState = presentationState;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+				presentationState.showLastSlide();
+		}
+
+		@Override
+		public void afterMapChange(final Object newMap) {
+		}
+	}
+	
+	private final Action[] actions;
+	
+	private final PresentationState presentationState;
+	private final AFreeplaneAction showNextSlideAction;
+	private final AFreeplaneAction showPreviousSlideAction;
+	private final AFreeplaneAction startPresentationOrShowNextSlideAction;
+
+	private final AFreeplaneAction showFirstSlideAction;
+	private final AFreeplaneAction showLastSlideAction;
+	private final AFreeplaneAction showFirstSlideAndStartPresentationAction;
+
+	private final AFreeplaneAction startPresentationAction;
+	private final StopPresentationAction stopPresentationAction;
+
+	NavigationPanelController(final PresentationState presentationState){
+		this.presentationState = presentationState;
+		startPresentationOrShowNextSlideAction = new StartPresentationOrShowNextSlideAction(presentationState);
+		stopPresentationAction = new StopPresentationAction(presentationState);
+		showPreviousSlideAction = new ShowPreviousSlideAction(presentationState);
+		startPresentationAction = new StartPresentationAction(presentationState);
+		showNextSlideAction = new ShowNextSlideAction(presentationState);
+		showFirstSlideAction = new ShowFirstSlideAction(presentationState);
+		showLastSlideAction = new ShowLastSlideAction(presentationState);
+		showFirstSlideAndStartPresentationAction = new ShowFirstSlideAndStartPresentationAction(presentationState);
+		actions = new Action[]{startPresentationOrShowNextSlideAction, stopPresentationAction, startPresentationAction, showNextSlideAction, showNextSlideAction,
+				showFirstSlideAction, showLastSlideAction, showFirstSlideAndStartPresentationAction};
+		PresentationStateChangeListener presentationStateListener = new PresentationStateChangeListener() {
+			@Override
+			public void onPresentationStateChange(PresentationStateChangeEvent presentationStateChangeEvent) {
+				updateUi();
+			}
+		};
+		presentationState.addPresentationStateListener(presentationStateListener);
+		disableUi();
+	}
+
+	public void setPresentation(Presentation presentation) {
+		updateUi();
+	}
+
+	private void updateUi() {
+		boolean isPresentationRunning = presentationState.isPresentationRunning();
+		boolean canShowCurrentSlide = presentationState.canShowCurrentSlide();
+		boolean canShowPreviousSlide = presentationState.canShowPreviousSlide();
+		boolean canShowNextSlide = presentationState.canShowNextSlide();
+		startPresentationOrShowNextSlideAction.setEnabled(! isPresentationRunning && canShowCurrentSlide || canShowNextSlide);
+		startPresentationAction.setEnabled(canShowCurrentSlide && ! isPresentationRunning);
+		stopPresentationAction.setEnabled(isPresentationRunning);
+		showPreviousSlideAction.setEnabled(canShowPreviousSlide);
+		showNextSlideAction.setEnabled(canShowNextSlide);
+		boolean canShowFirstSlide = presentationState.canShowFirstSlide();
+		boolean canShowLastSlide = presentationState.canShowLastSlide();
+		showFirstSlideAndStartPresentationAction.setEnabled(! isPresentationRunning || canShowFirstSlide);
+		showFirstSlideAction.setEnabled(canShowFirstSlide);
+		showLastSlideAction.setEnabled(canShowLastSlide);
+	}
+
+	private void disableUi() {
+		for(Action a : actions)
+			a.setEnabled(false);
+	}
+
+	JComponent createNavigationBox() {
+		JButton btnPresent = TranslatedElementFactory.createButtonWithIcon(startPresentationAction, "StartPresentationAction.icon", "slide.present");
+		JButton btnStop = TranslatedElementFactory.createButtonWithIcon(stopPresentationAction, "StopPresentationAction.icon", "slide.stop");
+		JButton btnFirst = TranslatedElementFactory.createButtonWithIcon(showFirstSlideAction, "ShowFirstSlideAction.icon", "slide.first");
+		JButton btnPrevious = TranslatedElementFactory.createButtonWithIcon(showPreviousSlideAction, "ShowPreviousSlideAction.icon", "slide.previous");
+		JButton btnNext = TranslatedElementFactory.createButtonWithIcon(showNextSlideAction, "ShowNextSlideAction.icon", "slide.next");
+		JButton btnLast = TranslatedElementFactory.createButtonWithIcon(showLastSlideAction, "ShowLastSlideAction.icon", "slide.last");
+		JPanel slideButtons = new JPanel(new GridLayout(2, 4));
+		Box slideBox = Box.createHorizontalBox();
+		TranslatedElementFactory.createTitledBorder(slideBox, "slide.presentation");
+		slideButtons.add(new JPanel());
+		slideButtons.add(btnPresent);
+		slideButtons.add(btnStop);
+		slideButtons.add(new JPanel());
+		slideButtons.add(btnFirst);
+		slideButtons.add(btnPrevious);
+		slideButtons.add(btnNext);
+		slideButtons.add(btnLast);
+		slideButtons.setAlignmentX(Box.CENTER_ALIGNMENT);
+		slideButtons.setMaximumSize(slideButtons.getPreferredSize());
+		slideBox.add(Box.createHorizontalGlue());
+		slideBox.add(slideButtons);
+		slideBox.add(Box.createHorizontalGlue());
+		return slideBox;
+	}
+
+	void registerActions(ModeController modeController) {
+		modeController.addAction(startPresentationOrShowNextSlideAction);
+		modeController.addAction(showFirstSlideAndStartPresentationAction);
+		modeController.addAction(startPresentationAction);
+		modeController.addAction(stopPresentationAction);
+		modeController.addAction(showFirstSlideAction);
+		modeController.addAction(showNextSlideAction);
+		modeController.addAction(showPreviousSlideAction);
+		modeController.addAction(showLastSlideAction);
+	}
+	
+}
+
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Presentation.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Presentation.java
new file mode 100644
index 0000000..9e8587c
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Presentation.java
@@ -0,0 +1,34 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public class Presentation implements NamedElement<Presentation>{
+	private String name;
+	public final NamedElementCollection<Slide> slides;
+	private final NamedElementFactory<Slide> slideFactory;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Presentation(String name, NamedElementFactory<Slide> slideFactory) {
+		super();
+		this.slideFactory = slideFactory;
+		this.name = name;
+		slides = new NamedElementCollection<>(slideFactory);
+	}
+	
+	public Presentation create(String name) {
+		return new Presentation(name, slideFactory);
+	}
+	
+	public Presentation saveAs(String name) {
+		final Presentation presentation = new Presentation(name, slideFactory);
+		for(Slide slide : slides)
+			presentation.slides.add(slide.saveAs(slide.getName()));
+		presentation.slides.selectCurrentElement(slides.getCurrentElementIndex());
+		return presentation;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationAutomation.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationAutomation.java
new file mode 100644
index 0000000..c32b9ce
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationAutomation.java
@@ -0,0 +1,65 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import javax.swing.JComponent;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.ui.FrameController;
+import org.freeplane.view.swing.map.MapView;
+
+class PresentationAutomation implements PresentationStateChangeListener{
+
+	static final String SWITCH_TO_FULL_SCREEN_PROPERTY = "presentation.switchToFullScreen";
+	static final String SWITCH_TO_SPOTLIGHT_PROPERTY = "presentation.switchToSpotlight";
+	private boolean isPresentationRunning;
+	private final PresentationKeyEventDispatcher[] dispatchers;
+	
+
+	PresentationAutomation(PresentationState state, PresentationKeyEventDispatcher... dispatchers) {
+		super();
+		this.isPresentationRunning = false;
+		this.dispatchers = dispatchers;
+	}
+
+	@Override
+	public void onPresentationStateChange(PresentationStateChangeEvent presentationStateChangeEvent) {
+		if (presentationStateChangeEvent.eventType == PresentationStateChangeEvent.EventType.PLAYING_STATE_CHANGED) {
+			isPresentationRunning = presentationStateChangeEvent.presentationState.isPresentationRunning();
+			updateDispatcherState();
+			updateFullScreenMode();
+			updateSpotlight();
+		}
+	}
+
+	private void updateFullScreenMode() {
+		if(ResourceController.getResourceController().getBooleanProperty(SWITCH_TO_FULL_SCREEN_PROPERTY)){
+			final FrameController viewController = (FrameController) Controller.getCurrentController().getViewController();
+			viewController.setFullScreen(isPresentationRunning);
+
+		}
+	}
+	
+	private void updateSpotlight() {
+		if(ResourceController.getResourceController().getBooleanProperty(SWITCH_TO_SPOTLIGHT_PROPERTY)){
+			final JComponent mapViewComponent = getMapViewComponent();
+			if(mapViewComponent != null) {
+				mapViewComponent.putClientProperty(MapView.SPOTLIGHT_ENABLED, isPresentationRunning);
+			}
+		}
+	}
+
+	private JComponent getMapViewComponent() {
+		final JComponent mapViewComponent = (JComponent) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+		return mapViewComponent;
+	}
+
+	private void updateDispatcherState() {
+		for(PresentationKeyEventDispatcher dispatcher : dispatchers) {
+			if(isPresentationRunning)
+				dispatcher.activate();
+			else
+				dispatcher.deactivate();
+		}
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationBuilder.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationBuilder.java
new file mode 100644
index 0000000..f79defa
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationBuilder.java
@@ -0,0 +1,258 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.CHANGES_ZOOM;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.NAME;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.*;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.NODE_ID;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.NODE_ON_SLIDE;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.PRESENTATION;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.SHOWS_ANCESTORS;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.SHOWS_DESCENDANTS;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.SHOWS_ONLY_SPECIFIC_NODES;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.SLIDE;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.SLIDE_CONDITION;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.TRUE;
+import static org.freeplane.features.presentations.mindmapmode.PresentationBuilder.ZOOM;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.io.IElementDOMHandler;
+import org.freeplane.core.io.IExtensionElementWriter;
+import org.freeplane.core.io.ITreeWriter;
+import org.freeplane.features.filter.FilterController;
+import org.freeplane.features.filter.condition.ASelectableCondition;
+import org.freeplane.features.filter.condition.ConditionFactory;
+import org.freeplane.features.map.MapController;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.IMapSelection.NodePosition;
+import org.freeplane.n3.nanoxml.XMLElement;
+
+class PresentationBuilder {
+
+	static final String PRESENTATIONS = "presentations";
+	static final String NODE_ON_SLIDE = "NodeOnSlide";
+	static final String NODES_ON_SLIDE = "NodesOnSlide";
+	static final String FOLDED_NODES = "FoldedNodes";
+	static final String SLIDE_CONDITION = "SlideCondition";
+	static final String ZOOM = "zoom";
+	static final String CENTERED_NODE_ID = "centeredNodeId";
+	static final String PLACED_NODE_ID = "placedNodeId";
+	static final String PLACED_NODE_POSITION = "placedNodePosition";
+	static final String CHANGES_ZOOM = "changesZoom";
+	static final String SHOWS_ONLY_SPECIFIC_NODES = "showsOnlySpecificNodes";
+	static final String SHOWS_DESCENDANTS = "showsDescendants";
+	static final String TRUE = "true";
+	static final String SHOWS_ANCESTORS = "showsAncestors";
+	static final String NAME = "NAME";
+	static final String SLIDE = "slide";
+	static final String PRESENTATION = "presentation";
+	static final String NODE_ID = "nodeId";
+
+	void register(MapController mapController, final PresentationController presentationController) {
+		mapController.getReadManager().addElementHandler("hook", new IElementDOMHandler() {
+			private final ConditionFactory conditionFactory = FilterController.getCurrentFilterController()
+			    .getConditionFactory();
+
+			@Override
+			public Object createElement(Object parent, String tag, XMLElement attributes) {
+				if (attributes == null) {
+					return null;
+				}
+				if (!PRESENTATIONS.equals(attributes.getAttribute("NAME", null))) {
+					return null;
+				}
+				return parent;
+			}
+
+			@Override
+			public void endElement(Object parent, String tag, Object element, XMLElement dom) {
+				final NodeModel node = (NodeModel) parent;
+				final MapModel map = node.getMap();
+				final NamedElementFactory<Slide> slideFactory = presentationController.getSlideFactory(map);
+				MapPresentations mapPresentationExtension = presentationController.getPresentations(map);
+				NamedElementCollection<Presentation> presentations = mapPresentationExtension.presentations;
+				Enumeration<XMLElement> xmlPresentations = dom.enumerateChildren();
+				while (xmlPresentations.hasMoreElements()) {
+					XMLElement xmlPresentation = xmlPresentations.nextElement();
+					presentations.add(xmlPresentation.getAttribute(NAME, "noname"));
+					Enumeration<XMLElement> xmlSlides = xmlPresentation.enumerateChildren();
+					NamedElementCollection<Slide> slides = presentations.getCurrentElement().slides;
+					while (xmlSlides.hasMoreElements()) {
+						XMLElement xmlSlide = xmlSlides.nextElement();
+						final String name = xmlSlide.getAttribute(NAME, "noname");
+						Slide s = slideFactory.create(name);
+						Slide slide = applySlideAttributes(xmlSlide, s);
+						slides.add(slide);
+					}
+					if (slides.getSize() > 1)
+						slides.selectCurrentElement(0);
+				}
+				if (presentations.getSize() > 1)
+					presentations.selectCurrentElement(0);
+				node.addExtension(mapPresentationExtension);
+			}
+
+			Slide applySlideAttributes(XMLElement xmlSlide, Slide s) {
+				s.setShowsAncestors(toBoolean(xmlSlide, SHOWS_ANCESTORS));
+				s.setShowsDescendants(toBoolean(xmlSlide, SHOWS_DESCENDANTS));
+				s.setShowsOnlySpecificNodes(toBoolean(xmlSlide, SHOWS_ONLY_SPECIFIC_NODES));
+				s.setChangesZoom(toBoolean(xmlSlide, CHANGES_ZOOM));
+				final String centeredNodeId = toString(xmlSlide, CENTERED_NODE_ID);
+				if(centeredNodeId != null) {
+					s.setPlacedNodeId(centeredNodeId);
+				}
+				final String placedNodeId = toString(xmlSlide, PLACED_NODE_ID);
+				if(placedNodeId != null) {
+					s.setPlacedNodeId(placedNodeId);
+				}
+				final String nodePosition = xmlSlide.getAttribute(PLACED_NODE_POSITION, NodePosition.CENTER.name());
+				s.setPlacedNodePosition(NodePosition.valueOf(nodePosition));
+				s.setZoom(toFloat(xmlSlide, ZOOM));
+				Enumeration<XMLElement> childAttributes = xmlSlide.enumerateChildren();
+				while(childAttributes.hasMoreElements()) {
+					XMLElement xmlElement = childAttributes.nextElement();
+					if (xmlElement.getName().equals(NODES_ON_SLIDE)) {
+						Set<String> ids = loadSpecificNodeIds(xmlElement);
+						s.setSelectedNodeIds(ids);
+					}
+					else if (xmlElement.getName().equals(FOLDED_NODES)) {
+						Set<String> ids = loadSpecificNodeIds(xmlElement);
+						s.setFoldedNodeIDs(ids);
+					}
+					else if (xmlElement.getName().equals(SLIDE_CONDITION)) {
+						ASelectableCondition condition = loadFilterCondition(xmlElement);
+						s.setFilterCondition(condition);
+					}
+				}
+				return s;
+			}
+
+			private Set<String> loadSpecificNodeIds(XMLElement xmlNodeIds) {
+				LinkedHashSet<String> nodeIds = new LinkedHashSet<>();
+				Enumeration<XMLElement> nodesEnumeration = xmlNodeIds.enumerateChildren();
+				while(nodesEnumeration.hasMoreElements()){
+					XMLElement nodeIdXml = nodesEnumeration.nextElement();
+					if(nodeIdXml.getName().equals(NODE_ON_SLIDE)) {
+						String id = nodeIdXml.getAttribute(NODE_ID, null);
+						if (id != null)
+							nodeIds.add(id);
+					}
+				}
+				return nodeIds;
+			}
+
+			private ASelectableCondition loadFilterCondition(XMLElement xmlElement) {
+				return conditionFactory.loadCondition(xmlElement.getChildAtIndex(0));
+			}
+			
+			private float toFloat(XMLElement element, String attribute) {
+				return Float.parseFloat(element.getAttribute(attribute, "1f"));
+			}
+
+			private boolean toBoolean(XMLElement element, String attribute) {
+				return Boolean.parseBoolean(element.getAttribute(attribute, ""));
+			}
+			
+			private String toString(XMLElement element, String attribute) {
+				return element.getAttribute(attribute, null);
+			}
+			
+		});
+
+		mapController.getWriteManager().addExtensionElementWriter(MapPresentations.class,
+		    new IExtensionElementWriter() {
+			    @Override
+			    public void writeContent(ITreeWriter writer, Object element, IExtension extension) throws IOException {
+				    new PresentationWriter(((NodeModel) element).getMap()).writeContent(writer, extension);
+			    }
+		    });
+	}
+}
+
+class PresentationWriter {
+	private static final String HOOK = "hook";
+	private MapModel map;
+
+	public PresentationWriter(MapModel map) {
+		this.map = map;
+	}
+
+	void writeContent(ITreeWriter writer, IExtension extension) throws IOException {
+		MapPresentations mapPresentations = (MapPresentations) extension;
+		NamedElementCollection<Presentation> presentations = mapPresentations.presentations;
+		if (presentations.getSize() > 0) {
+			XMLElement xmlPresentations = new XMLElement(HOOK);
+			xmlPresentations.setAttribute(NAME, PresentationBuilder.PRESENTATIONS);
+			for (int i = 0; i < presentations.getSize(); i++) {
+				Presentation p = presentations.getElement(i);
+				writePresentation(xmlPresentations, p);
+			}
+			writer.addElement(null, xmlPresentations);
+		}
+	}
+
+	private void writePresentation(XMLElement xmlPresentations, Presentation p) {
+		XMLElement xmlPresentation = xmlPresentations.createElement(PRESENTATION);
+		xmlPresentation.setAttribute(NAME, p.getName());
+		for (int i = 0; i < p.slides.getSize(); i++)
+			writeSlide(xmlPresentation, p.slides.getElement(i));
+		xmlPresentations.addChild(xmlPresentation);
+	}
+
+	private void writeSlide(XMLElement xmlPresentation, Slide s) {
+		XMLElement xmlSlide = xmlPresentation.createElement(SLIDE);
+		xmlPresentation.addChild(xmlSlide);
+		xmlSlide.setAttribute(NAME, s.getName());
+		if (s.showsAncestors())
+			xmlSlide.setAttribute(SHOWS_ANCESTORS, TRUE);
+		if (s.showsDescendants())
+			xmlSlide.setAttribute(SHOWS_DESCENDANTS, TRUE);
+		if (s.showsOnlySpecificNodes())
+			xmlSlide.setAttribute(SHOWS_ONLY_SPECIFIC_NODES, TRUE);
+		if (s.changesZoom())
+			xmlSlide.setAttribute(CHANGES_ZOOM, TRUE);
+		final String placedNodeId = s.getPlacedNodeId();
+		if (placedNodeId != null){
+			xmlSlide.setAttribute(PLACED_NODE_ID, placedNodeId);
+		}
+		final NodePosition placedNodePosition = s.getPlacedNodePosition();
+		if (placedNodePosition != NodePosition.CENTER){
+			xmlSlide.setAttribute(PLACED_NODE_POSITION, placedNodePosition.name());
+		}
+		float zoom = s.getZoom();
+		if (zoom != 1f)
+			xmlSlide.setAttribute(ZOOM, Float.toString(zoom));
+		ASelectableCondition filterCondition = s.getFilterCondition();
+		if (filterCondition != null) {
+			XMLElement xmlCondition = new XMLElement(SLIDE_CONDITION);
+			filterCondition.toXml(xmlCondition);
+			xmlSlide.addChild(xmlCondition);
+		}
+		XMLElement xmlNodes = new XMLElement(NODES_ON_SLIDE);
+		for (String nodeId : s.getSelectedNodeIds()) {
+			if (map.getNodeForID(nodeId) != null) {
+				XMLElement xmlNode = new XMLElement(NODE_ON_SLIDE);
+				xmlNode.setAttribute(NODE_ID, nodeId);
+				xmlNodes.addChild(xmlNode);
+			}
+		}
+		if (xmlNodes.hasChildren())
+			xmlSlide.addChild(xmlNodes);
+		if(s.foldsNodes()) {
+			XMLElement xmlFoldedNodes = new XMLElement(FOLDED_NODES);
+			for (String nodeId : s.getFoldedNodeIds()) {
+				if (map.getNodeForID(nodeId) != null) {
+					XMLElement xmlNode = new XMLElement(NODE_ON_SLIDE);
+					xmlNode.setAttribute(NODE_ID, nodeId);
+					xmlFoldedNodes.addChild(xmlNode);
+				}
+			}
+			xmlSlide.addChild(xmlFoldedNodes);
+		}
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationController.java
new file mode 100644
index 0000000..eb3ba8f
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationController.java
@@ -0,0 +1,232 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.COLLECTION_SIZE_CHANGED;
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.SELECTION_CHANGED;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.KeyEventDispatcher;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+
+import javax.swing.JTabbedPane;
+
+import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.resources.IFreeplanePropertyListener;
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.components.JAutoScrollBarPane;
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.highlight.HighlightController;
+import org.freeplane.features.highlight.NodeHighlighter;
+import org.freeplane.features.map.IMapSelectionListener;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+
+public class PresentationController implements IExtension{
+	private static final float FOLDED_NODE_DOT_WIDTH = 3f * UITools.FONT_SCALE_FACTOR;
+	private static final Color NODE_HIGHLIGHTING_COLOR = Color.GREEN.brighter();
+	static final String PROCESS_NAVIGATION_KEYS_PROPERTY = "presentation.processesNavigationKeys";
+	static final String PROCESS_ESCAPE_KEY_PROPERTY = "presentation.processesEscapeKey";
+	
+
+	private static float[] FOLDED_NODE_DASH = new float[]{FOLDED_NODE_DOT_WIDTH/2, 2*FOLDED_NODE_DOT_WIDTH};
+	private static BasicStroke FOLDED_NODE_STROKE = new BasicStroke(FOLDED_NODE_DOT_WIDTH, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER, 1f, FOLDED_NODE_DASH, 0f);
+	private final PresentationState presentationState;
+	private final PresentationEditorController presentationEditorController;
+	ModeController modeController;
+
+	public static void install(final ModeController modeController) {
+		final PresentationController presentationController = new PresentationController(modeController);
+		modeController.addExtension(PresentationController.class, presentationController);
+		presentationController.registerActions();
+		presentationController.addMapSelectionListener();
+		new PresentationBuilder().register(modeController.getMapController(), presentationController);
+		HighlightController highlightController = modeController.getController().getExtension(HighlightController.class);
+		final PresentationState presentationState = presentationController.presentationState;
+		new PresentationPngExporter.ActionInstaller().installActions(modeController, presentationState);
+		final JTabbedPane tabs = (JTabbedPane) modeController.getUserInputListenerFactory().getToolBar("/format").getComponent(1);
+		tabs.add("Presentations", presentationController.createPanel());
+		highlightController.addNodeHighlighter(new NodeHighlighter() {
+			
+			@Override
+			public boolean isNodeHighlighted(NodeModel node, boolean isPrinting) {
+				return !isPrinting && presentationState.shouldHighlightNodeContainedOnSlide(node);
+			}
+			
+			@Override
+			public void configure(Graphics2D g, boolean isPrinting) {
+				g.setColor(NODE_HIGHLIGHTING_COLOR);
+			}
+
+		});
+		highlightController.addNodeHighlighter(new NodeHighlighter() {
+			
+			@Override
+			public boolean isNodeHighlighted(NodeModel node, boolean isPrinting) {
+				return !isPrinting && presentationState.shouldHighlightNodeFoldedOnSlide(node);
+			}
+			
+			@Override
+			public void configure(Graphics2D g, boolean isPrinting) {
+				g.setColor(NODE_HIGHLIGHTING_COLOR);
+				g.setStroke(FOLDED_NODE_STROKE);
+			}
+
+		});
+		
+		KeyEventDispatcher navigationKeyEventDispatcher = new NavigationKeyEventDispatcher(presentationState);
+		KeyEventDispatcher escapeKeyEventDispatcher = new EscapeKeyEventDispatcher(presentationState);
+		final PresentationAutomation presentationKeyHandler = new PresentationAutomation(presentationState, 
+				PresentationKeyEventDispatcher.of(navigationKeyEventDispatcher, PROCESS_NAVIGATION_KEYS_PROPERTY),
+				PresentationKeyEventDispatcher.of(escapeKeyEventDispatcher, PROCESS_ESCAPE_KEY_PROPERTY));
+		presentationState.addPresentationStateListener(presentationKeyHandler);
+	}
+
+	private void registerActions() {
+		presentationEditorController.registerActions(modeController);
+	}
+
+	private PresentationController(ModeController modeController) {
+		this.modeController = modeController;
+		presentationState = new PresentationState();
+		final ResourceController resourceController = ResourceController.getResourceController();
+		boolean combinesAllPresentations = resourceController.getBooleanProperty("presentation.combineAll");
+		resourceController.addPropertyChangeListener(new IFreeplanePropertyListener() {
+			
+			@Override
+			public void propertyChanged(String propertyName, String newValue, String oldValue) {
+				if("presentation.combineAll".equals(propertyName))
+					presentationState.setCombinesAllPresentations(Boolean.parseBoolean(newValue));
+			}
+		});
+		presentationState.setCombinesAllPresentations(combinesAllPresentations);
+		presentationEditorController = new PresentationEditorController(presentationState);
+		presentationState.addPresentationStateListener(new PresentationStateChangeListener() {
+			
+			@Override
+			public void onPresentationStateChange(PresentationStateChangeEvent presentationStateChangeEvent) {
+				repaintMap();
+			}
+		});
+	}
+
+	private void addMapSelectionListener() {
+		IMapSelectionListener mapSelectionListener = new IMapSelectionListener() {
+			
+			@Override
+			public void beforeMapChange(MapModel oldMap, MapModel newMap) {
+			}
+			
+			@Override
+			public void afterMapChange(MapModel oldMap, MapModel newMap) {
+				presentationState.stopPresentation();
+				if(newMap != null && Controller.getCurrentModeController() == modeController)
+					presentationEditorController.setPresentations(getPresentations(newMap).presentations);
+				else
+					presentationEditorController.setPresentations(null);
+			}
+
+		};
+		modeController.getController().getMapViewManager().addMapSelectionListener(mapSelectionListener);
+	}
+	public MapPresentations getPresentations(final MapModel map) {
+		final NodeModel rootNode = map.getRootNode();
+		MapPresentations mapPresentations = rootNode.getExtension(MapPresentations.class);
+		if(mapPresentations == null) {
+			mapPresentations = new MapPresentations(getPresentationFactory(map));
+			final CollectionChangeListener<Presentation> presentationCollectionChangeListener = new CollectionChangeListener<Presentation>() {
+				
+				@Override
+				public void onCollectionChange(CollectionChangedEvent<Presentation> event) {
+					if(event.eventType == COLLECTION_SIZE_CHANGED)
+						modeController.getMapController().setSaved(map, false);
+				}
+			};
+			mapPresentations.presentations.addCollectionChangeListener(presentationCollectionChangeListener);
+			rootNode.addExtension(mapPresentations);
+		}
+		return mapPresentations;
+	}
+	
+	NamedElementFactory<Presentation> getPresentationFactory(final MapModel map) {
+		final NamedElementFactory<Slide> slideFactory = getSlideFactory(map);
+		
+		final CollectionChangeListener<Slide> slideCollectionChangeListener = new CollectionChangeListener<Slide>() {
+			
+			@Override
+			public void onCollectionChange(CollectionChangedEvent<Slide> event) {
+				if(event.eventType == COLLECTION_SIZE_CHANGED)
+					modeController.getMapController().setSaved(map, false);
+				else if(event.eventType == SELECTION_CHANGED)
+					presentationState.changeSlide();
+			}
+		};
+		final NamedElementFactory<Presentation> presentationFactory = new NamedElementFactory<Presentation>() {
+			
+			@Override
+			public Presentation create(Presentation prototype, String newName) {
+				final Presentation presentation = prototype.create(newName);
+				presentation.slides.addCollectionChangeListener(slideCollectionChangeListener);
+				return presentation;
+			}
+			
+			@Override
+			public Presentation create(String name) {
+				final Presentation presentation = new Presentation(name, slideFactory);
+				presentation.slides.addCollectionChangeListener(slideCollectionChangeListener);
+				return presentation;
+			}
+		};
+		return presentationFactory;
+	}
+
+	NamedElementFactory<Slide> getSlideFactory(final MapModel map) {
+		final NamedElementFactory<Slide> slideFactory = new NamedElementFactory<Slide>() {
+			final SlideChangeListener slideChangeListener = new SlideChangeListener() {
+				@Override
+				public void onSlideModelChange(SlideChangeEvent changeEvent) {
+					modeController.getMapController().setSaved(map, false);
+					presentationState.changeSlide();
+				}
+			};
+			
+			@Override
+			public Slide create(Slide prototype, String newName) {
+				final Slide slide = prototype.create(newName);
+				slide.addSlideChangeListener(slideChangeListener);
+				return slide;
+			}
+			
+			@Override
+			public Slide create(String name) {
+				final Slide slide = new Slide(name);
+				slide.addSlideChangeListener(slideChangeListener);
+				return slide;
+			}
+		};
+		return slideFactory;
+	}
+
+	private Component createPanel() {
+		final Component presentationEditor = presentationEditorController.createPanel(modeController);
+		presentationEditor.addHierarchyListener(new HierarchyListener() {
+			@Override
+			public void hierarchyChanged(HierarchyEvent e) {
+				if( 0 != (e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED))
+					presentationState.setHighlightsNodes(e.getComponent().isShowing());
+				
+			}
+		});
+		return new JAutoScrollBarPane(presentationEditor);
+	}
+
+	private void repaintMap() {
+		final Component mapViewComponent = Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+		if(mapViewComponent != null)
+			mapViewComponent.repaint();
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationEditorController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationEditorController.java
new file mode 100644
index 0000000..1a1394c
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationEditorController.java
@@ -0,0 +1,146 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+import org.freeplane.core.resources.components.OptionPanel;
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.core.ui.textchanger.TranslatedElementFactory;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.presentations.mindmapmode.PresentationStateChangeEvent.EventType;
+
+public class PresentationEditorController {
+	private final CollectionBoxController<Presentation> presentationPanelController;
+	private final CollectionBoxController<Slide> slidePanelController;
+	private final SlideEditorController slideEditorController;
+	private final NavigationPanelController navigationPanelController;
+	private NamedElementCollection<Presentation> presentations;
+	private CollectionChangeListener<Presentation> presentationChangeListener;
+
+	public PresentationEditorController(final PresentationState presentationState) {
+		presentationPanelController = new CollectionBoxController<>("presentation");
+		slidePanelController = new CollectionBoxController<Slide>("slide");
+		slideEditorController = new SlideEditorController(presentationState);
+		presentationState.addPresentationStateListener(new PresentationStateChangeListener() {
+			@Override
+			public void onPresentationStateChange(PresentationStateChangeEvent presentationStateChangeEvent) {
+				if (presentationStateChangeEvent.eventType == EventType.PLAYING_STATE_CHANGED) {
+					if (presentationStateChangeEvent.presentationState.isPresentationRunning()) {
+						presentationPanelController.disableEditing();
+						slidePanelController.disableEditing();
+					}
+					else {
+						presentationPanelController.enableEditing();
+						slidePanelController.enableEditing();
+					}
+				}
+			}
+		});
+		navigationPanelController = new NavigationPanelController(presentationState);
+		final CollectionChangeListener<Slide> slideChangeListener = new CollectionChangeListener<Slide>() {
+			
+			private Slide slide;
+
+			@Override
+			public void onCollectionChange(CollectionChangedEvent<Slide> event) {
+				slide = event.collection.getCurrentElement();
+				slideEditorController.setSlide(slide);
+			}
+		};
+		presentationChangeListener = new CollectionChangeListener<Presentation>() {
+			
+			private NamedElementCollection<Slide> slides;
+
+			@Override
+			public void onCollectionChange(CollectionChangedEvent<Presentation> event) {
+				if(slides != null)
+					slides.removeCollectionChangeListener(slideChangeListener);
+				Presentation presentation = event.collection != null ? event.collection.getCurrentElement() : null;
+				if(presentation != null) {
+					slides = presentation.slides;
+					slides.addCollectionChangeListener(slideChangeListener);
+					slideEditorController.setSlide(slides.getCurrentElement());
+				} else {
+					slides = null;
+					slideEditorController.setSlide(null);
+				}
+				presentationState.changePresentation(event);
+				slidePanelController.setCollection(slides);
+				navigationPanelController.setPresentation(presentation);
+			}
+		};
+	}
+
+	public void setPresentations(NamedElementCollection<Presentation> newPresentations) {
+		if(presentations != null)
+			presentations.removeCollectionChangeListener(presentationChangeListener);
+		presentations = newPresentations;
+		presentationPanelController.setCollection(presentations);
+		if (presentations != null) {
+			Presentation presentation = presentations.getCurrentElement();
+			if (presentation != null) {
+				slidePanelController.setCollection(presentation.slides);
+				slideEditorController.setSlide(presentation.slides.getCurrentElement());
+			}
+			presentations.addCollectionChangeListener(presentationChangeListener);
+		}
+		presentationChangeListener.onCollectionChange(CollectionChangedEvent.EventType.SELECTION_CHANGED.of(presentations));
+	}
+
+	Component createPanel(ModeController modeController) {
+		Box panel = Box.createVerticalBox();
+		final JComponent presentationBox = presentationPanelController.createCollectionBox();
+		TranslatedElementFactory.createTitledBorder(presentationBox, "slide.presentations");
+		panel.add(presentationBox);
+		final JComponent slideBox = slidePanelController.createCollectionBox();
+		TranslatedElementFactory.createTitledBorder(slideBox, "slide.slides");
+		panel.add(slideBox);
+		JComponent content = slideEditorController.createSlideContentBox();
+		panel.add(content);
+		JComponent navigation = navigationPanelController.createNavigationBox();
+		panel.add(navigation);
+		
+		if(modeController != null){
+			JComponent controlBox = createActionPanel(modeController);
+			panel.add(controlBox);
+		}
+		return panel;
+	}
+
+	private JComponent createActionPanel(ModeController modeController) {
+		AFreeplaneAction exportPresentationAction = modeController.getAction("ExportPresentationAction");
+		AFreeplaneAction exportAllPresentationsAction = modeController.getAction("ExportAllPresentationsAction");
+		
+		JPanel controlButtons = new JPanel(new GridLayout(3, 1));
+		
+		JButton btnExportPresentation = new JButton(exportPresentationAction);
+		btnExportPresentation.setAlignmentX(JButton.CENTER_ALIGNMENT);
+		controlButtons.add(btnExportPresentation);
+
+		JButton btnExportAllPresentations = new JButton(exportAllPresentationsAction);
+		btnExportAllPresentations.setAlignmentX(JButton.CENTER_ALIGNMENT);
+		controlButtons.add(btnExportAllPresentations);
+		
+		AFreeplaneAction configureAction = modeController.getAction("PropertyAction");
+		JButton btnConfigure = new JButton(configureAction);
+		btnConfigure.setActionCommand(OptionPanel.OPTION_PANEL_RESOURCE_PREFIX + "Presentation");
+		btnConfigure.setAlignmentX(JButton.CENTER_ALIGNMENT);
+		controlButtons.add(btnConfigure);
+		
+		final Dimension maximumSize = new Dimension(controlButtons.getPreferredSize());
+		maximumSize.width = Integer.MAX_VALUE;
+		controlButtons.setMaximumSize(maximumSize);
+		return controlButtons;
+	}
+
+	void registerActions(ModeController modeController) {
+		navigationPanelController.registerActions(modeController);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java
new file mode 100644
index 0000000..9593ce0
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationKeyEventDispatcher.java
@@ -0,0 +1,50 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.awt.KeyEventDispatcher;
+import java.awt.KeyboardFocusManager;
+import java.awt.event.KeyEvent;
+
+import org.freeplane.core.resources.IFreeplanePropertyListener;
+import org.freeplane.core.resources.ResourceController;
+
+class PresentationKeyEventDispatcher implements KeyEventDispatcher, IFreeplanePropertyListener {
+	private final KeyEventDispatcher delegate;
+	private final String propertyName;
+	public PresentationKeyEventDispatcher(String propertyName, KeyEventDispatcher delegate, boolean processKeys) {
+		super();
+		this.propertyName = propertyName;
+		this.delegate = delegate;
+		isPresentationRunning = false;
+		this.processKeys = processKeys;
+	}
+	private boolean isPresentationRunning;
+	private boolean processKeys;
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent e) {
+		if(! (isPresentationRunning && processKeys))
+			return false;
+		return delegate.dispatchKeyEvent(e);
+	}
+	public void activate() {
+		isPresentationRunning = true;
+	}
+	public void deactivate() {
+		isPresentationRunning = false;
+	}
+	@Override
+	public void propertyChanged(String propertyName, String newValue, String oldValue) {
+		if(this.propertyName.equals(propertyName)){
+			processKeys = Boolean.parseBoolean(newValue);
+		}
+	}
+	
+	static PresentationKeyEventDispatcher of(KeyEventDispatcher upDownKeyEventDispatcher, String propertyName) {
+		ResourceController resourceController = ResourceController.getResourceController();
+		final boolean processKeys = ResourceController.getResourceController().getBooleanProperty(propertyName);
+		final PresentationKeyEventDispatcher presentationKeyEventDispatcher = new PresentationKeyEventDispatcher(propertyName, upDownKeyEventDispatcher, processKeys);
+		resourceController.addPropertyChangeListener(presentationKeyEventDispatcher);
+		KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(presentationKeyEventDispatcher);
+		resourceController.addPropertyChangeListener(presentationKeyEventDispatcher);
+		return presentationKeyEventDispatcher;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationPngExporter.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationPngExporter.java
new file mode 100644
index 0000000..08f51e0
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationPngExporter.java
@@ -0,0 +1,223 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.freeplane.features.presentations.mindmapmode.PresentationAutomation.SWITCH_TO_FULL_SCREEN_PROPERTY;
+
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.List;
+
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.core.util.FileUtils;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.export.mindmapmode.ExportToImage;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.url.UrlManager;
+import org.freeplane.view.swing.map.MapView;
+
+class PresentationPngExporter {
+	
+	static void exportPresentation(PresentationState presentationState) {
+		final PresentationPngExporterFactory presentationPngExporterFactory = new PresentationPngExporterFactory(presentationState);
+		final PresentationPngExporter exporter = presentationPngExporterFactory.exporter;
+		if(exporter != null) {
+			exporter.exportSinglePresentation();
+		}
+	}
+	
+	static void exportPresentations(PresentationState presentationState) {
+		final PresentationPngExporterFactory presentationPngExporterFactory = new PresentationPngExporterFactory(presentationState);
+		final PresentationPngExporter exporter = presentationPngExporterFactory.exporter;
+		if(exporter != null) {
+			exporter.exportAllPresentations();
+		}
+		
+	}
+	
+	static class ActionInstaller {
+		public void installActions(ModeController modeController, PresentationState state){
+			modeController.addAction(new ExportAllPresentationsAction(state));
+			modeController.addAction(new ExportPresentationAction(state));
+		}
+	}
+	
+	@SuppressWarnings("serial")
+	private static class ExportAllPresentationsAction extends AFreeplaneAction{
+
+		private final PresentationState state;
+
+		public ExportAllPresentationsAction(PresentationState state) {
+			super("ExportAllPresentationsAction");
+			this.state = state;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			PresentationPngExporter.exportPresentations(state);
+		}
+		
+	}
+
+	@SuppressWarnings("serial")
+	private static class ExportPresentationAction extends AFreeplaneAction{
+
+		private final PresentationState state;
+
+		public ExportPresentationAction(PresentationState state) {
+			super("ExportPresentationAction");
+			this.state = state;
+		}
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			PresentationPngExporter.exportPresentation(state);
+		}
+		
+	}
+	
+	private static class PresentationPngExporterFactory{
+
+		private NamedElementCollection<Presentation> presentations;
+		private PresentationPngExporter exporter;
+
+		public PresentationPngExporterFactory(PresentationState presentationState) {
+			final PresentationController presentationController = Controller.getCurrentModeController().getExtension(PresentationController.class);
+			MapModel map = Controller.getCurrentController().getMap();
+			if(map == null)
+				return;
+			presentations = presentationController.getPresentations(map).presentations;
+			if(presentations.getSize() == 0)
+				return;
+			File file = map.getFile();
+			final String name = ResourceController.getResourceController().getProperty("presentation.exportDirectory");
+			final String validName = FileUtils.validFileNameOf(name);
+			final File presentationExportDirectory = new File (validName.isEmpty() ? "exportDirectory" : validName);
+
+			if (file == null  && ! presentationExportDirectory.isAbsolute()) {
+				JOptionPane.showMessageDialog(Controller.getCurrentController().getViewController().getCurrentRootComponent(),
+						TextUtils.getText("map_not_saved"), "Freeplane", JOptionPane.WARNING_MESSAGE);
+				return;
+			}
+			final File exportDirectory =
+					presentationExportDirectory.isAbsolute() ? presentationExportDirectory :
+						new File(file.getAbsoluteFile().getParentFile(), presentationExportDirectory.getPath());
+
+			exporter = new PresentationPngExporter(presentationState, exportDirectory);
+		}
+		
+	}
+	
+	private final File exportDirectory;
+	private final PresentationState presentationState;
+	private final float zoom;
+	private final NodeModel[] selection;
+	private boolean presentationSlowMotionEnabled;
+	private boolean spotlightEnabledForExport;
+	private final JComponent mapViewComponent;
+	private float presentationZoomFactor;
+
+	private PresentationPngExporter(PresentationState presentationState, File exportDirectory) {
+		this.presentationState = presentationState;
+		this.exportDirectory = exportDirectory;
+		this.zoom = Controller.getCurrentController().getMapViewManager().getZoom();
+		final List<NodeModel> selection = Controller.getCurrentController().getSelection().getOrderedSelection();
+		this.selection = selection.toArray(new NodeModel[selection.size()]);
+		mapViewComponent = (JComponent) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+	}
+	
+	private void exportAllPresentations() {
+		prepareExport();
+		NamedElementCollection<Presentation> presentations = presentationState.getPresentations();
+		for(int i = 0; i < presentations.getSize(); i++)
+	    	exportPresentation(presentations.getElement(i));
+		restorePreviousPresentation();
+		UrlManager.getController().loadURL(exportDirectory.toURI());
+	}
+
+	private void prepareExport() {
+		presentationSlowMotionEnabled = ResourceController.getResourceController().getBooleanProperty(Slide.PRESENTATION_SLOW_MOTION_KEY, false);
+		if (presentationState.isPresentationRunning())
+			presentationZoomFactor = presentationState.getPresentationZoomFactor();
+		else if(presentationState.usesMapZoom())
+			presentationZoomFactor = Controller.getCurrentController().getMapViewManager().getZoom();
+		else
+			presentationZoomFactor = 1f;
+		ResourceController.getResourceController().setProperty(Slide.PRESENTATION_SLOW_MOTION_KEY, false);
+		if(ResourceController.getResourceController().getBooleanProperty(PresentationAutomation.SWITCH_TO_SPOTLIGHT_PROPERTY)) {
+			if (! Boolean.TRUE.equals(mapViewComponent.getClientProperty(MapView.SPOTLIGHT_ENABLED))) {
+					mapViewComponent.putClientProperty(MapView.SPOTLIGHT_ENABLED, true);
+					spotlightEnabledForExport = true;
+			}
+		}
+	}
+	
+
+	private void exportSinglePresentation() {
+		prepareExport();
+		NamedElementCollection<Presentation> presentations = presentationState.getPresentations();
+		exportPresentation(presentations.getCurrentElement());
+		restorePreviousPresentation();
+		UrlManager.getController().loadURL(exportDirectory.toURI());
+	}
+
+	private void restorePreviousPresentation() {
+		presentationState.restore();
+		presentationZoomFactor = 1f;
+		final IMapSelection selectionController = Controller.getCurrentController().getSelection();
+		selectionController.replaceSelection(selection);
+		if(! presentationState.isPresentationRunning())
+			Controller.getCurrentController().getMapViewManager().setZoom(zoom);
+		ResourceController.getResourceController().setProperty(Slide.PRESENTATION_SLOW_MOTION_KEY, presentationSlowMotionEnabled);
+		if(spotlightEnabledForExport)
+			mapViewComponent.putClientProperty(MapView.SPOTLIGHT_ENABLED, null);
+		selectionController.scrollNodeToVisible(selectionController.getSelected());
+	}
+
+	public void exportPresentation(Presentation p) {
+		final String validName = FileUtils.validFileNameOf(p.getName());
+		if(validName.isEmpty())
+			return;
+		exportDirectory.mkdir();
+		if(! exportDirectory.isDirectory())
+			return;
+		File presentationDirectory = new File(exportDirectory, validName);
+		presentationDirectory.mkdir();
+		if(! exportDirectory.isDirectory())
+			return;
+		NamedElementCollection<Slide> slides = p.slides;
+        for(int i = 0; i < slides.getSize(); i++)
+        	exportSlide(presentationDirectory, slides.getElement(i));
+	}
+
+	private void exportSlide(File presentationDirectory, Slide slide) {
+		final NodeModel placedNode = slide.getCurrentPlacedNode();
+		if(placedNode != null)
+			slide.apply(presentationZoomFactor);
+		else
+			slide.apply(1f);
+		mapViewComponent.validate();
+		mapViewComponent.setSize(mapViewComponent.getPreferredSize());
+		File exportFile = new File(presentationDirectory, FileUtils.validFileNameOf(slide.getName()) + ".png");
+		final ExportToImage exporter = ExportToImage.toPNG();
+		final Controller controller = Controller.getCurrentController();
+		final MapModel map = controller.getMap();
+		if(placedNode != null) {
+			final Dimension slideSize;
+			if(ResourceController.getResourceController().getBooleanProperty(SWITCH_TO_FULL_SCREEN_PROPERTY))
+				slideSize = mapViewComponent.getGraphicsConfiguration().getBounds().getSize();
+			else
+				slideSize = SwingUtilities.getWindowAncestor(mapViewComponent).getSize();
+			exporter.export(map, slideSize, placedNode, slide.getPlacedNodePosition(), exportFile);
+		} else
+			exporter.export(map, exportFile);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationState.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationState.java
new file mode 100644
index 0000000..d052302
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationState.java
@@ -0,0 +1,253 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.freeplane.features.presentations.mindmapmode.PresentationStateChangeEvent.EventType.PLAYING_STATE_CHANGED;
+import static org.freeplane.features.presentations.mindmapmode.PresentationStateChangeEvent.EventType.SLIDE_CHANGED;
+
+import java.util.ArrayList;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.presentations.mindmapmode.PresentationStateChangeEvent.EventType;
+
+public class PresentationState {
+	private static final String USES_PRESENTATION_ZOOM_PROPERTY = "presentation.zoom";
+	private NamedElementCollection<Presentation> presentations;
+	private Presentation currentPresentation;
+	private final ArrayList<PresentationStateChangeListener> presentationStateChangeListeners;
+	private Slide currentSlide;
+	private boolean highlightsNodes;
+	private boolean combinesAllPresentations;
+	private float zoomFactor;
+	
+	protected void setCombinesAllPresentations(boolean combinesAllPresentations) {
+		if(this.combinesAllPresentations != combinesAllPresentations){
+			this.combinesAllPresentations = combinesAllPresentations;
+			if(presentations != null)
+				firePresentationStateChangedEvent(EventType.COLLECTION_SIZE_CHANGED);
+		}
+	}
+
+	public PresentationState() {
+		super();
+		this.combinesAllPresentations = false;
+		this.currentPresentation = null;
+		this.presentationStateChangeListeners = new ArrayList<>();
+		this.zoomFactor = 1f;
+	}
+	
+	public void changePresentation(CollectionChangedEvent<Presentation> event) {
+		presentations = event.collection;
+		Presentation presentation = presentations != null ? presentations.getCurrentElement() : null;
+		if(currentPresentation != presentation){
+			currentPresentation = presentation;
+			if(presentation == null)
+				stopPresentation();
+			firePresentationStateChangedEvent(SLIDE_CHANGED);
+			if(isPresentationRunning())
+				showPresentation();
+		}
+	}
+
+	public void showPresentation() {
+		final boolean isPresentationAlreadyRunning = isPresentationRunning();
+		Slide newSlide = currentPresentation.slides.getCurrentElement();
+		if (currentSlide != newSlide) {
+			currentSlide = newSlide;
+			firePresentationStateChangedEvent(isPresentationAlreadyRunning ? SLIDE_CHANGED : PLAYING_STATE_CHANGED);
+		}		
+		if (currentSlide != null) {
+			if(! isPresentationAlreadyRunning){
+				zoomFactor = Controller.getCurrentController().getMapViewManager().getZoom();
+			}
+			currentSlide.apply(getPresentationZoomFactor());
+		}
+	}
+
+	float getPresentationZoomFactor() {
+		return usesMapZoom() ? zoomFactor : 1f;
+	}
+
+	boolean usesMapZoom() {
+		return ResourceController.getResourceController().getBooleanProperty(USES_PRESENTATION_ZOOM_PROPERTY);
+	}
+
+	public void stopPresentation() {
+		if (currentSlide != null) {
+			currentSlide = null;
+			firePresentationStateChangedEvent(PLAYING_STATE_CHANGED);
+			Slide.ALL_NODES.apply(1f);
+			if(usesMapZoom())
+				Controller.getCurrentController().getMapViewManager().setZoom(zoomFactor);
+			zoomFactor = 1f;
+		}
+	}
+	
+	public void addPresentationStateListener(PresentationStateChangeListener presentationStateChangeListener) {
+		this.presentationStateChangeListeners.add(presentationStateChangeListener);
+	}
+
+	public void removePresentationStateListener(PresentationStateChangeListener presentationStateChangeListener) {
+		this.presentationStateChangeListeners.remove(presentationStateChangeListener);
+	}
+
+	private void firePresentationStateChangedEvent(EventType eventType) {
+		for (PresentationStateChangeListener presentationStateChangeListener : presentationStateChangeListeners)
+			presentationStateChangeListener.onPresentationStateChange(eventType.of(this));
+	}
+
+	public boolean isPresentationRunning() {
+		return currentSlide != null;
+	}
+
+	public void showNextSlide() {
+		if(currentPresentationHasNextSlide()) {
+			NamedElementCollection<Slide> slides = currentPresentation.slides;
+			final int currentElementIndex = slides.getCurrentElementIndex();
+			slides.selectCurrentElement(currentElementIndex + 1);
+		} else if (combinesAllPresentations()) {
+			final int followingNotEmptyPresentationIndex = findFollowingNotEmptyPresentationIndex();
+			if (followingNotEmptyPresentationIndex != -1) {
+				presentations.selectCurrentElement(followingNotEmptyPresentationIndex);
+				showFirstSlide();
+			}
+		}
+	}
+
+	public void showLastSlide() {
+		if(canShowNextSlide()) {
+			NamedElementCollection<Slide> slides = currentPresentation.slides;
+			slides.selectCurrentElement(slides.getSize() - 1);
+		}
+	}
+
+	public void showPreviousSlide() {
+		if(currentPresentationHasPreviousSlide()) {
+			NamedElementCollection<Slide> slides = currentPresentation.slides;
+			final int currentElementIndex = slides.getCurrentElementIndex();
+			slides.selectCurrentElement(currentElementIndex - 1);
+		} else if (combinesAllPresentations()) {
+			final int previousNotEmptyPresentationIndex = findPreviousNotEmptyPresentationIndex();
+			if (previousNotEmptyPresentationIndex != -1) {
+				presentations.selectCurrentElement(previousNotEmptyPresentationIndex);
+				showLastSlide();
+			}
+		}
+	}
+
+	public void showFirstSlide() {
+		if(canShowPreviousSlide()) {
+			NamedElementCollection<Slide> slides = currentPresentation.slides;
+			slides.selectCurrentElement(0);
+		}
+	}
+
+	public boolean currentPresentationHasNextSlide() {
+		if (currentPresentation == null)
+			return false;
+		NamedElementCollection<Slide> slides = currentPresentation.slides;
+		return slides.getSize() != 0 && slides.getCurrentElementIndex() < slides.getSize() - 1;
+	}
+
+	public boolean canShowCurrentSlide() {
+		if (currentPresentation == null)
+			return false;
+		NamedElementCollection<Slide> slides = currentPresentation.slides;
+		return slides.getCurrentElement() != null;
+	}
+
+	public boolean currentPresentationHasPreviousSlide() {
+		if (currentPresentation == null)
+			return false;
+		NamedElementCollection<Slide> slides = currentPresentation.slides;
+		return slides.getCurrentElementIndex() > 0;
+	}
+
+
+	public boolean canShowPreviousSlide() {
+		return currentPresentationHasPreviousSlide() || combinesAllPresentations() && anyPreviousPresentationIsNotEmpty();
+	}
+
+	private boolean anyPreviousPresentationIsNotEmpty() {
+		return findPreviousNotEmptyPresentationIndex() != -1;
+	}
+
+	private boolean anyFollowingPresentationIsNotEmpty() {
+		return findFollowingNotEmptyPresentationIndex() != -1;
+	}
+
+	private int findPreviousNotEmptyPresentationIndex() {
+		if(currentPresentation == null)
+			return -1;
+		final int currentPresentationIndex = presentations.getCurrentElementIndex();
+		for (int i = currentPresentationIndex - 1; i >= 0 ; i--) {
+			if(presentations.getElement(i).slides.getSize() > 0)
+				return i;
+		}
+		return -1;
+	}
+
+	private int findFollowingNotEmptyPresentationIndex() {
+		if(currentPresentation == null)
+			return -1;
+		final int currentPresentationIndex = presentations.getCurrentElementIndex();
+		for (int i = currentPresentationIndex + 1; i < presentations.getSize(); i++) {
+			if(presentations.getElement(i).slides.getSize() > 0)
+				return i;
+		}
+		return -1;
+	}
+	private boolean combinesAllPresentations() {
+		return combinesAllPresentations;
+	}
+
+	public boolean canShowFirstSlide() {
+		return currentPresentationHasPreviousSlide();
+	}
+
+	public boolean canShowNextSlide() {
+		return currentPresentationHasNextSlide() || combinesAllPresentations() && anyFollowingPresentationIsNotEmpty();
+	}
+
+	public boolean canShowLastSlide() {
+		return currentPresentationHasNextSlide();
+	}
+
+	void changeSlide() {
+		if(isPresentationRunning())
+			showPresentation();
+		else
+			firePresentationStateChangedEvent(SLIDE_CHANGED);
+	}
+
+	public boolean shouldHighlightNodeContainedOnSlide(NodeModel node) {
+		return  ! isPresentationRunning() && highlightsNodes && canShowCurrentSlide() && currentPresentation.slides.getCurrentElement().isNodeVisible(node);
+	}
+	
+	public boolean shouldHighlightNodeFoldedOnSlide(NodeModel node) {
+		return ! isPresentationRunning() && highlightsNodes && canShowCurrentSlide() && currentPresentation.slides.getCurrentElement().isNodeFolded(node);
+	}
+
+	public boolean highlightsNodes() {
+		return highlightsNodes;
+	}
+
+	public void setHighlightsNodes(boolean highlightsNodes) {
+		if(this.highlightsNodes != highlightsNodes) {
+			this.highlightsNodes = highlightsNodes;
+			firePresentationStateChangedEvent(SLIDE_CHANGED);
+		}
+	}
+
+	public void restore() {
+		if(isPresentationRunning())
+			currentSlide.apply(zoomFactor);
+		else
+			Slide.ALL_NODES.apply(1f);
+	}
+
+	NamedElementCollection<Presentation> getPresentations() {
+		return presentations;
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationStateChangeEvent.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationStateChangeEvent.java
new file mode 100644
index 0000000..bc137b3
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationStateChangeEvent.java
@@ -0,0 +1,22 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+
+public class PresentationStateChangeEvent {
+	
+	enum EventType{
+		SLIDE_CHANGED, HIGNLIGHTING_CHANGED, PLAYING_STATE_CHANGED, COLLECTION_SIZE_CHANGED;
+		public PresentationStateChangeEvent of(PresentationState state){
+			return new PresentationStateChangeEvent(this, state);
+		}
+	}
+	
+	public final PresentationState presentationState;
+	public final EventType eventType;
+
+	public PresentationStateChangeEvent(EventType eventType, PresentationState presentationState) {
+		super();
+		this.eventType = eventType;
+		this.presentationState = presentationState;
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationStateChangeListener.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationStateChangeListener.java
new file mode 100644
index 0000000..0fa1c07
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/PresentationStateChangeListener.java
@@ -0,0 +1,7 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public interface PresentationStateChangeListener {
+
+	void onPresentationStateChange(PresentationStateChangeEvent presentationStateChangeEvent);
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Slide.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Slide.java
new file mode 100644
index 0000000..278708b
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Slide.java
@@ -0,0 +1,479 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.features.filter.Filter;
+import org.freeplane.features.filter.condition.ASelectableCondition;
+import org.freeplane.features.filter.condition.DisjunctConditions;
+import org.freeplane.features.filter.condition.ICondition;
+import org.freeplane.features.filter.condition.SelectedViewSnapshotCondition;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.IMapSelection.NodePosition;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.ui.IMapViewManager;
+
+public class Slide implements NamedElement<Slide>{
+	static final String PRESENTATION_SLOW_MOTION_KEY = "presentation.slowMotion";
+	public static final Slide ALL_NODES = new Slide("All nodes");
+	private static final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+	private String name;
+	private boolean changesZoom;
+	private String placedNodeId;
+	private NodePosition placedNodePosition;
+	private float zoom;
+	private boolean showsOnlySpecificNodes;
+	private boolean showsAncestors;
+	private boolean showsDescendants;
+	private ASelectableCondition filterCondition;
+	private Set<String> selectedNodeIds;
+	private Set<String> foldedNodeIds;
+	private final ArrayList<SlideChangeListener> slideChangeListeners;
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public Slide create(String name) {
+		return new Slide(name, new LinkedHashSet<String>(), placedNodeId != null ? "" : null, placedNodePosition,
+		    changesZoom, zoom, showsOnlySpecificNodes, showsAncestors, showsDescendants, null);
+	}
+
+
+	@Override
+	public Slide saveAs(String name) {
+		return new Slide(name, new LinkedHashSet<String>(selectedNodeIds), placedNodeId, placedNodePosition,
+			    changesZoom, zoom, showsOnlySpecificNodes, showsAncestors, showsDescendants, filterCondition);
+	}
+	
+	public Slide(String name){
+		this(name, new LinkedHashSet<String>(), null, NodePosition.CENTER, false, 1f, false, false, false, null);
+	}
+	
+	private Slide(String name, Set<String> selectedNodeIds, String centeredNodeId, NodePosition placedNodePosition,
+	                  boolean changeZoom,
+			float zoom, boolean showOnlySpecificNodes, boolean showAncestors, boolean showDescendants,
+			ASelectableCondition filterCondition) {
+		super();
+		this.name = name;
+		this.selectedNodeIds = selectedNodeIds;
+		this.placedNodeId = centeredNodeId;
+		this.placedNodePosition = placedNodePosition;
+		this.changesZoom = changeZoom;
+		this.zoom = zoom;
+		this.showsOnlySpecificNodes = showOnlySpecificNodes;
+		this.showsAncestors = showAncestors;
+		this.showsDescendants = showDescendants;
+		this.filterCondition = filterCondition;
+		slideChangeListeners = new ArrayList<>();
+		foldedNodeIds = null;
+	}
+
+	public Set<String> getSelectedNodeIds() {
+		return selectedNodeIds;
+	}
+
+	public void setSelectedNodeIds(Set<String> selectedNodeIds) {
+		if(this.selectedNodeIds != selectedNodeIds){
+			this.selectedNodeIds = new LinkedHashSet<>(selectedNodeIds);
+			fireSlideChangeEvent();
+		}
+	}
+
+	public void addSelectedNodeIds(Collection<String> selectedNodeIds) {
+		if (this.selectedNodeIds.addAll(selectedNodeIds)) {
+			fireSlideChangeEvent();
+		}
+	}
+
+	public void removeSelectedNodeIds(Collection<String> selectedNodeIds) {
+		if (this.selectedNodeIds.removeAll(selectedNodeIds)) {
+			fireSlideChangeEvent();
+		}
+	}
+	
+	public Set<String> getFoldedNodeIds() {
+		return foldedNodeIds;
+	}
+	
+	public boolean isNodeFolded(NodeModel node) {
+		return foldsNodes() &&  foldedNodeIds.contains(node.getID());
+	}
+	
+	public boolean foldsNodes(){
+		return foldedNodeIds != null;
+	}
+	
+	public void unsetFoldsNodes(){
+		if(foldedNodeIds != null){
+			foldedNodeIds = null;
+			fireSlideChangeEvent();
+		}
+	}
+	
+	public Collection<String> getCurrentFoldedNodeIds(){
+		return createNodeIterator().getCurrentFoldedNodeIds();
+	}
+	
+	public void setFoldedNodeIDs(Collection<String> foldedNodeIds) {
+		if(this.foldedNodeIds != foldedNodeIds){
+			this.foldedNodeIds = new LinkedHashSet<>(foldedNodeIds);
+			fireSlideChangeEvent();
+		}
+	}
+	
+	private class NodeIterator {
+		
+		private Filter filter;
+		
+		public Set<String> getCurrentFoldedNodeIds(){
+			filter = calculateFilterResults();
+			Set<String> foldedNodeIds = calculateCurrentFoldedNodeIds();
+			filter = null;
+			return foldedNodeIds;
+		}
+
+		private Set<String> calculateCurrentFoldedNodeIds() {
+			MapModel map = getMap();
+			HashSet<String> nodeIds = new HashSet<>();
+			addCurrentFoldedNodeIds(map.getRootNode(), nodeIds);
+			return nodeIds;
+		}
+
+		private Filter calculateFilterResults() {
+			MapModel map = getMap();
+			final ICondition condition = getEffectiveFilterCondition();
+			Filter filter = Filter.createOneTimeFilter(condition, true, showsDescendants, false);
+			filter.calculateFilterResults(map);
+			return filter;
+		}
+		
+		private void addCurrentFoldedNodeIds(NodeModel node, HashSet<String> nodeIds) {
+			if(isFoldedOnCurrentView(node)){
+				if(filter.isVisible(node))
+					nodeIds.add(node.getID());
+				return;
+			}
+			else if(filter.isVisible(node))
+				for(NodeModel child : node.getChildren())
+					addCurrentFoldedNodeIds(child, nodeIds);
+		}
+
+		public void foldNodes() {
+			if(foldsNodes()) {
+				filter = new Filter(getEffectiveFilterCondition(), true, showsDescendants, false);
+				foldNodes(getMap().getRootNode());
+				filter = null;
+			}
+		}
+
+		private void foldNodes(NodeModel node) {
+			if(filter.isVisible(node)) {
+				if(foldedNodeIds.contains(node.getID())) {
+					setFoldedOnCurrentView(node, true);
+					return;
+				}
+				mapViewManager.setFoldedOnCurrentView(node, false);
+				for(NodeModel child : node.getChildren())
+					foldNodes(child);
+			}
+		}
+
+	}
+	
+	public boolean isNodeVisible(NodeModel node) {
+		return selectedNodeIds.contains(node.getID());
+	}
+
+	public String getPlacedNodeId() {
+		return placedNodeId;
+	}
+
+	public void setPlacedNodeId(String placedNodeId) {
+		if(this.placedNodeId != placedNodeId) {
+			this.placedNodeId = placedNodeId;
+			fireSlideChangeEvent();
+		}
+	}
+	
+	public NodePosition getPlacedNodePosition() {
+		return placedNodePosition;
+	}
+
+	public void setPlacedNodePosition(NodePosition placedNodePosition) {
+		if(this.placedNodePosition != placedNodePosition) {
+			this.placedNodePosition = Objects.requireNonNull(placedNodePosition);
+			fireSlideChangeEvent();
+		}
+	}
+
+	public boolean changesZoom() {
+		return changesZoom;
+	}
+
+	public void setChangesZoom(boolean changeZoom) {
+		if(this.changesZoom != changeZoom) {
+			this.changesZoom = changeZoom;
+			fireSlideChangeEvent();
+		}
+	}
+
+	public float getZoom() {
+		return zoom;
+	}
+
+	public void setZoom(float zoom) {
+		if(this.zoom != zoom) {
+			this.zoom = zoom;
+			fireSlideChangeEvent();
+		}
+	}
+
+	public boolean showsOnlySpecificNodes() {
+		return showsOnlySpecificNodes;
+	}
+
+	public void setShowsOnlySpecificNodes(boolean showOnlySpecificNodes) {
+		if(this.showsOnlySpecificNodes != showOnlySpecificNodes) {
+			this.showsOnlySpecificNodes = showOnlySpecificNodes;
+			fireSlideChangeEvent();
+		}
+	}
+
+	public boolean showsAncestors() {
+		return showsAncestors;
+	}
+
+	public void setShowsAncestors(boolean showAncestors) {
+		if(this.showsAncestors != showAncestors) {
+			this.showsAncestors = showAncestors;
+			fireSlideChangeEvent();
+		}
+	}
+
+	public boolean showsDescendants() {
+		return showsDescendants;
+	}
+
+	public void setShowsDescendants(boolean showDescendants) {
+		if(this.showsDescendants != showDescendants) {
+			this.showsDescendants = showDescendants;
+			fireSlideChangeEvent();
+		}
+	}
+
+	public ASelectableCondition getFilterCondition() {
+		return filterCondition;
+	}
+
+	public void setFilterCondition(ASelectableCondition filterCondition) {
+		if(this.filterCondition != filterCondition) {
+			this.filterCondition = filterCondition;
+			fireSlideChangeEvent();
+		}
+	}
+
+	public void addSlideChangeListener(SlideChangeListener slideChangeListener) {
+		this.slideChangeListeners.add(slideChangeListener);
+	}
+
+	public void removeSlideChangeListener(SlideChangeListener slideChangeListener) {
+		this.slideChangeListeners.remove(slideChangeListener);
+	}
+	
+	private void fireSlideChangeEvent() {
+		for (SlideChangeListener slideChangeListener : slideChangeListeners)
+			slideChangeListener.onSlideModelChange(SlideChangeEvent.of(this));
+	}
+
+	void replaceCurrentSelection() {
+		ArrayList<NodeModel> selectedNodes = getSelectedNodes(true);
+		if (!selectedNodes.isEmpty()) {
+			NodeModel[] nodes = selectedNodes.toArray(new NodeModel[] {});
+			for (NodeModel node : nodes)
+				displayOnCurrentView(node);
+			Controller.getCurrentController().getSelection().replaceSelection(nodes);
+		}
+	}
+
+	private ArrayList<NodeModel> getSelectedNodes(boolean onlyVisible) {
+		MapModel map = getMap();
+		ArrayList<NodeModel> selectedNodes = new ArrayList<>(selectedNodeIds.size());
+		for (String id : selectedNodeIds) {
+			NodeModel node = map.getNodeForID(id);
+			if (node != null && (!onlyVisible || node.isVisible()))
+				selectedNodes.add(node);
+		}
+		return selectedNodes;
+	}
+
+	void apply(float zoomFactor) {
+		applyFilter();
+		applySelection();
+		foldNodes();
+		applyZoom(zoomFactor);
+		placeSelectedNode();
+		scrollMapToSelectedNode();
+	}
+
+	private void scrollMapToSelectedNode() {
+		if(placedNodeId == null){
+			final Controller controller = Controller.getCurrentController();
+			final IMapSelection selection = controller.getSelection();
+			if(selection != null) {
+				final NodeModel selected = selection.getSelected();
+				controller.getMapViewManager().scrollNodeToVisible(selected);
+			}
+		}
+	}
+
+
+	public NodeIterator createNodeIterator() {
+		return new NodeIterator();
+	} 
+	
+	private void foldNodes() {
+		createNodeIterator().foldNodes();
+	}
+
+	private void applyZoom(float zoomFactor) {
+		if (changesZoom)
+			Controller.getCurrentController().getMapViewManager().setZoom(zoom * zoomFactor);
+	}
+	
+	private boolean displaysAllSlideNodes() {
+		return ResourceController.getResourceController().getBooleanProperty("presentation.slideDisplaysAllNodes");
+	}
+
+
+	private void applySelection() {
+		if (selectedNodeIds.isEmpty())
+			return;
+		ArrayList<NodeModel> selectedNodes = getSelectedNodes(true);
+		final boolean displaysAllSlideNodes = displaysAllSlideNodes();
+		final boolean selectsAllVisibleNodes = displaysAllSlideNodes && showsOnlySpecificNodes && mapViewManager.isSpotlightEnabled();
+		final boolean replacesSelectionBySelectedNodes = ! (selectsAllVisibleNodes || showsOnlySpecificNodes || selectedNodes.isEmpty());
+		if(! replacesSelectionBySelectedNodes && ! foldsNodes() && displaysAllSlideNodes){
+			for (NodeModel node : selectedNodes) {
+				displayOnCurrentView(node);
+				if(showsDescendants)
+					displayDescendantsOnCurrentView(node);
+			}
+		}
+
+		final IMapSelection selection = Controller.getCurrentController().getSelection();
+		if (replacesSelectionBySelectedNodes) {
+			NodeModel[] nodes = selectedNodes.toArray(new NodeModel[] {});
+			selection.replaceSelection(nodes);
+		}
+		if (showsOnlySpecificNodes) {
+			final NodeModel firstNode = selectedNodes.get(0);
+			selection.selectAsTheOnlyOneSelected(firstNode);
+		} 
+		if(selectsAllVisibleNodes){
+			if(showsAncestors) {
+				final NodeModel rootNode = selection.getSelected().getMap().getRootNode();
+				selection.selectBranch(rootNode, true);
+			} else for(NodeModel node :selectedNodes)
+				selection.selectBranch(node, true);
+		}
+	}
+
+	private void displayDescendantsOnCurrentView(NodeModel node) {
+		mapViewManager.setFoldedOnCurrentView(node, false);
+		for(NodeModel child : node.getChildren()) {
+			displayDescendantsOnCurrentView(child);
+		}
+	}
+
+	private void placeSelectedNode() {
+		if (placedNodeId != null) {
+			NodeModel placedNode = getCurrentPlacedNode();
+			final IMapSelection selection = Controller.getCurrentController().getSelection();
+			if(placedNode != null && placedNode != selection.getSelected()) {
+				displayOnCurrentView(placedNode);
+			}
+			final boolean slowMotion = ResourceController.getResourceController().getBooleanProperty(PRESENTATION_SLOW_MOTION_KEY, false);
+			if(slowMotion)
+				selection.slowlyMoveNodeTo(placedNode, placedNodePosition);
+			else
+				selection.moveNodeTo(placedNode, placedNodePosition);
+		}
+	}
+
+	public NodeModel getCurrentPlacedNode() {
+		if (placedNodeId != null) {
+			MapModel map = getMap();
+			NodeModel currentPlacedNode = map.getNodeForID(placedNodeId);
+			final IMapSelection selection = Controller.getCurrentController().getSelection();
+			if(currentPlacedNode != null && currentPlacedNode.hasVisibleContent()) {
+				return currentPlacedNode;
+			} else {
+				return selection.getSelected();
+			}
+		}
+		else
+			return null;
+
+	}
+
+	private MapModel getMap() {
+		return Controller.getCurrentController().getMap();
+	}
+
+	private void applyFilter() {
+		MapModel map = getMap();
+		final ICondition condition = getEffectiveFilterCondition();
+		new Filter(condition, showsAncestors, showsDescendants, false).applyFilter(this, map, false);
+	}
+
+	public ICondition getEffectiveFilterCondition() {
+		final ICondition  condition;
+		if(showsOnlySpecificNodes && filterCondition != null){
+			SelectedViewSnapshotCondition selectedViewSnapshotCondition = getFilterConditionForSelectedNodes();
+			condition = new DisjunctConditions(selectedViewSnapshotCondition, filterCondition);
+		}
+		else if (showsOnlySpecificNodes && filterCondition == null) {
+			condition = getFilterConditionForSelectedNodes();
+		}
+		else if (!showsOnlySpecificNodes && filterCondition != null) {
+			condition = filterCondition;
+		}
+		else{
+			condition = null;
+		}
+		return condition;
+	}
+
+	private SelectedViewSnapshotCondition getFilterConditionForSelectedNodes() {
+		ArrayList<NodeModel> selectedNodes = getSelectedNodes(false);
+		SelectedViewSnapshotCondition selectedViewSnapshotCondition = new SelectedViewSnapshotCondition(selectedNodes);
+		return selectedViewSnapshotCondition;
+	}
+
+	private boolean isFoldedOnCurrentView(NodeModel node) {
+		return mapViewManager.isFoldedOnCurrentView(node);
+	}
+
+	private void displayOnCurrentView(NodeModel node) {
+		mapViewManager.displayOnCurrentView(node);
+	}
+
+	private void setFoldedOnCurrentView(NodeModel node, boolean folded) {
+		mapViewManager.setFoldedOnCurrentView(node, folded);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideChangeEvent.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideChangeEvent.java
new file mode 100644
index 0000000..cc4c41d
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideChangeEvent.java
@@ -0,0 +1,15 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public class SlideChangeEvent {
+	public final Slide slideModel;
+
+	public SlideChangeEvent(Slide slideModel) {
+		super();
+		this.slideModel = slideModel;
+	}
+
+	public static SlideChangeEvent of(Slide slideModel) {
+		return new SlideChangeEvent(slideModel);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideChangeListener.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideChangeListener.java
new file mode 100644
index 0000000..f5f8183
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideChangeListener.java
@@ -0,0 +1,5 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public interface SlideChangeListener {
+	void onSlideModelChange(SlideChangeEvent changeEvent);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java
new file mode 100644
index 0000000..90bb6db
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/SlideEditorController.java
@@ -0,0 +1,459 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.freeplane.core.ui.textchanger.TranslatedElementFactory.createButtonWithIcon;
+import static org.freeplane.core.ui.textchanger.TranslatedElementFactory.createCheckBox;
+import static org.freeplane.core.ui.textchanger.TranslatedElementFactory.createToggleButtonWithIconAndLabel;
+import static org.freeplane.features.presentations.mindmapmode.PresentationStateChangeEvent.EventType.PLAYING_STATE_CHANGED;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JToggleButton;
+
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.core.ui.textchanger.TranslatedElementFactory;
+import org.freeplane.features.filter.FilterComposerDialog;
+import org.freeplane.features.filter.condition.ASelectableCondition;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.IMapSelection.NodePosition;
+import org.freeplane.features.mode.Controller;
+
+class SlideEditorController{
+	
+	private Slide slide;
+	
+	private final JButton btnSelectNodes;
+	private final JButton btnSetSelectedNodes;
+	private final JButton btnAddSelectedNodes;
+	private final JButton btnRemoveSelectedNodes;
+	private final JToggleButton tglBtnPlaceSelectedNode;
+	private final JToggleButton btnAtCenter;
+	private final JToggleButton btnOnTheLeft;
+	private final JToggleButton btnOnTheRight;
+	private final JToggleButton tglbtnChangeZoom;
+	private final JLabel lblZoomFactor;
+	private final JCheckBox checkBoxShowOnlySelectedNodes;
+	private final JCheckBox checkBoxShowAncestors;
+	private final JCheckBox checkBoxShowDescendants;
+	private final JToggleButton tglbtnSetFilter;
+	private final JComponent filterConditionComponentBox;
+	private final JToggleButton tglbtnSetFoldingState;
+	
+	private final JComponent[] allButtons;
+	private final JComponent[] filterRelatedButtons;
+
+	private final SlideChangeListener slideChangeListener;
+
+	private final JComponent filterNotSetLabel;
+
+	private final PresentationState presentationState;
+
+	
+	@SuppressWarnings("serial")
+	public SlideEditorController(PresentationState presentationState) {
+		this.presentationState = presentationState;
+		presentationState.addPresentationStateListener(new PresentationStateChangeListener() {
+			
+			@Override
+			public void onPresentationStateChange(PresentationStateChangeEvent presentationStateChangeEvent) {
+				if(presentationStateChangeEvent.eventType == PLAYING_STATE_CHANGED)
+					updateUI();
+			}
+		});
+		btnSetSelectedNodes = createSetSelectedNodeButton();
+		btnAddSelectedNodes = createAddSelectedNodeButton();
+		btnRemoveSelectedNodes = createRemoveSelectedNodeButton();
+		btnSelectNodes = createSelectNodesButton();
+		tglBtnPlaceSelectedNode = createPlacesSelectedNodeToggleButton();
+		nodePositions = new ButtonGroup();
+		btnOnTheLeft = createNodePositionToggleButton("slide.on_the_left", NodePosition.WEST);
+		btnAtCenter = createNodePositionToggleButton("slide.at_center", NodePosition.CENTER);
+		btnOnTheRight = createNodePositionToggleButton("slide.on_the_right", NodePosition.EAST);
+		positionButtons = new JToggleButton[]{btnOnTheLeft, btnAtCenter, btnOnTheRight};
+		tglbtnChangeZoom = createSetZoomToggleButton();
+		lblZoomFactor = new JLabel("100 %");
+		lblZoomFactor.setPreferredSize(lblZoomFactor.getPreferredSize());
+		checkBoxShowOnlySelectedNodes = createOnlySelectedNodesCheckBox();
+		checkBoxShowAncestors = createShowAncestorsCheckBox();
+		checkBoxShowDescendants = createShowDescendantsCheckBox();
+		tglbtnSetFilter = createSetFilterToggleButton();
+		final int minimumHeight = (int) (60 * UITools.FONT_SCALE_FACTOR);
+		filterConditionComponentBox = new Box(BoxLayout.X_AXIS){
+
+			@Override
+			public Dimension getPreferredSize() {
+				final Dimension preferredSize = super.getPreferredSize();
+				final Dimension minimumSize = getMinimumSize();
+				return new Dimension(Math.max(minimumSize.width, preferredSize.width), Math.max(preferredSize.height, minimumSize.height));
+			}
+			@Override
+			public Dimension getMaximumSize() {
+				return getPreferredSize();
+			}
+			
+		};
+		filterConditionComponentBox.setMinimumSize(new Dimension(1, minimumHeight));
+		
+		tglbtnSetFoldingState = createSetFoldingStateToggleButton();
+		
+		allButtons = new JComponent[] { btnSelectNodes, btnSetSelectedNodes, btnAddSelectedNodes,
+		        btnRemoveSelectedNodes, tglBtnPlaceSelectedNode,
+		        tglbtnChangeZoom, lblZoomFactor, 
+		        checkBoxShowOnlySelectedNodes, checkBoxShowAncestors, checkBoxShowDescendants, tglbtnSetFilter, 
+		        tglbtnSetFoldingState};
+		filterRelatedButtons = new JComponent[]{checkBoxShowAncestors, checkBoxShowDescendants};
+		slideChangeListener = new SlideChangeListener() {
+			
+			@Override
+			public void onSlideModelChange(SlideChangeEvent changeEvent) {
+				updateUI();
+			}
+		};
+		filterNotSetLabel = TranslatedElementFactory.createLabel("slide.nofilter");
+		filterNotSetLabel.setEnabled(false);
+		filterNotSetLabel.setForeground(Color.DARK_GRAY);
+		disableUI();
+	}
+
+	private JToggleButton createNodePositionToggleButton(String key, final NodePosition position) {
+		final JToggleButton btn = TranslatedElementFactory.createToggleButtonWithIcon(key + ".icon", key + ".tooltip");
+		btn.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableSlide.of(slide).setPlacedNodePosition(position);
+			}
+		});
+		nodePositions.add(btn);
+		return btn;
+	}
+	
+	private JButton createSetSelectedNodeButton() {
+		JButton btnSetSelectedNode = createButtonWithIcon("SetSlideContent.icon", "slide.set.tooltip");
+		btnSetSelectedNode.setAlignmentX(Component.CENTER_ALIGNMENT);
+		btnSetSelectedNode.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final List<String> selection = Controller.getCurrentController().getSelection().getOrderedSelectionIds();
+				UndoableSlide.of(slide).setSelectedNodeIds(new LinkedHashSet<>(selection));
+			}
+		});
+
+		return btnSetSelectedNode;
+	}
+
+	private JButton createAddSelectedNodeButton() {
+		JButton btnSetSelectedNode = createButtonWithIcon("AddSlideContent.icon", "slide.add.tooltip");
+		btnSetSelectedNode.setAlignmentX(Component.CENTER_ALIGNMENT);
+		btnSetSelectedNode.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final List<String> selection = Controller.getCurrentController().getSelection()
+				    .getOrderedSelectionIds();
+				UndoableSlide.of(slide).addSelectedNodeIds(selection);
+			}
+		});
+		return btnSetSelectedNode;
+	}
+
+	private JButton createRemoveSelectedNodeButton() {
+		JButton btnSetSelectedNode = createButtonWithIcon("RemoveSlideContent.icon", "slide.remove.tooltip");
+		btnSetSelectedNode.setAlignmentX(Component.CENTER_ALIGNMENT);
+		btnSetSelectedNode.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final List<String> selection = Controller.getCurrentController().getSelection()
+				    .getOrderedSelectionIds();
+				UndoableSlide.of(slide).removeSelectedNodeIds(selection);
+			}
+		});
+		return btnSetSelectedNode;
+	}
+
+	private JToggleButton createSetZoomToggleButton() {
+		final JToggleButton btnSetsZoom = createToggleButtonWithIconAndLabel("SetZoomSlideContent.icon", "slide.setzoom");
+		btnSetsZoom.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final boolean changesZoom = ! slide.changesZoom();
+				UndoableSlide.of(slide).setChangesZoom(changesZoom);
+				if(changesZoom) {
+					UndoableSlide.of(slide).setZoom(Controller.getCurrentController().getMapViewManager().getZoom());
+				}
+			}
+		});
+		return btnSetsZoom;
+	}
+	private JToggleButton createPlacesSelectedNodeToggleButton() {
+		final JToggleButton checkBoxOnlySpecificNodes = createToggleButtonWithIconAndLabel("PlaceSelectedNodeOnSlide.icon", "slide.placenode");
+		checkBoxOnlySpecificNodes.setAlignmentX(Component.CENTER_ALIGNMENT);
+		checkBoxOnlySpecificNodes.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				final String centeredNodeId = slide.getPlacedNodeId();
+				final IMapSelection selection = Controller.getCurrentController().getSelection();
+				if(centeredNodeId == null) {
+					final NodeModel selected = selection.getSelected();
+					if(selected != null) {
+						UndoableSlide.of(slide).setPlacedNodeId(selected.getID());
+						setNodePlacementControlsEnabled(true, slide.getPlacedNodePosition());
+					} else {
+						UndoableSlide.of(slide).setPlacedNodeId(null);
+						setNodePlacementControlsEnabled(false, slide.getPlacedNodePosition());
+					}
+				} else {
+					UndoableSlide.of(slide).setPlacedNodeId(null);
+					setNodePlacementControlsEnabled(false, slide.getPlacedNodePosition());
+					final MapModel map = Controller.getCurrentController().getMap();
+					final NodeModel node = map.getNodeForID(centeredNodeId);
+					if(node != null)
+						selection.selectAsTheOnlyOneSelected(node);
+				}
+				checkBoxOnlySpecificNodes.setSelected(slide.getPlacedNodeId() != null);
+			}
+		});
+		return checkBoxOnlySpecificNodes;
+	}
+
+	private JCheckBox createOnlySelectedNodesCheckBox() {
+		final JCheckBox checkBoxOnlySpecificNodes = createCheckBox("slide.showonlyselected");
+		checkBoxOnlySpecificNodes.setAlignmentX(Component.CENTER_ALIGNMENT);
+		checkBoxOnlySpecificNodes.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableSlide.of(slide).setShowsOnlySpecificNodes(! slide.showsOnlySpecificNodes());
+			}
+		});
+		return checkBoxOnlySpecificNodes;
+	}
+
+	private JCheckBox createShowAncestorsCheckBox() {
+				
+		final JCheckBox checkBoxShowAncestors = createCheckBox("slide.showancestors");
+		checkBoxShowAncestors.setAlignmentX(Component.CENTER_ALIGNMENT);
+		checkBoxShowAncestors.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableSlide.of(slide).setShowsAncestors(! slide.showsAncestors());
+			}
+		});
+		return checkBoxShowAncestors;
+	}
+
+	private JCheckBox createShowDescendantsCheckBox() {
+		final JCheckBox checkBoxShowDescendants = createCheckBox("slide.descendants");
+		checkBoxShowDescendants.setAlignmentX(Component.CENTER_ALIGNMENT);
+		checkBoxShowDescendants.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				UndoableSlide.of(slide).setShowsDescendants(! slide.showsDescendants());
+			}
+		});
+		return checkBoxShowDescendants;
+	}
+
+
+	
+	private FilterComposerDialog filterComposerDialog = null;
+
+	private final ButtonGroup nodePositions;
+	private final JToggleButton[] positionButtons;
+	
+	private JToggleButton createSetFilterToggleButton() {
+		final JToggleButton tglbtnSetFilter = createToggleButtonWithIconAndLabel("SetFilterSlideContent.icon", "slide.setfilter");
+		tglbtnSetFilter.setAlignmentX(Component.CENTER_ALIGNMENT);
+		tglbtnSetFilter.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if( filterComposerDialog == null)
+					filterComposerDialog = new FilterComposerDialog();
+				ASelectableCondition oldCondition = slide.getFilterCondition();
+				if(oldCondition != null) {
+					filterComposerDialog.addCondition(oldCondition);
+					filterComposerDialog.setSelectedItem(oldCondition);
+					UndoableSlide.of(slide).setFilterCondition(null);
+				} else {
+					filterComposerDialog.show();
+					List<ASelectableCondition> conditions = filterComposerDialog.getConditions();
+					if(filterComposerDialog.isSuccess()) {
+						ASelectableCondition newCondition = conditions.isEmpty() ? null : conditions.get(0);
+						UndoableSlide.of(slide).setFilterCondition(newCondition);
+					}
+				}
+			    tglbtnSetFilter.setSelected(slide.getFilterCondition() != null);
+			    
+			}
+		});
+		return tglbtnSetFilter;
+	}
+
+	private JButton createSelectNodesButton() {
+		JButton btnHighlightSlideContent = createButtonWithIcon("SelectSlideContent.icon", "slide.select.tooltip");
+		btnHighlightSlideContent.setAlignmentX(Component.CENTER_ALIGNMENT);
+		btnHighlightSlideContent.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				slide.replaceCurrentSelection();
+			}
+		});
+		return btnHighlightSlideContent;
+	}
+	private JToggleButton createSetFoldingStateToggleButton() {
+		JToggleButton tglbtnSetFilter = createToggleButtonWithIconAndLabel("SetFoldingSlideContent.icon", "slide.setfoldingstate");
+		tglbtnSetFilter.setAlignmentX(Component.CENTER_ALIGNMENT);
+		tglbtnSetFilter.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if(! slide.foldsNodes())
+					UndoableSlide.of(slide).setCurrentFoldedNodeIDs();
+				else
+					UndoableSlide.of(slide).unsetFoldsNodes();
+			}
+		});
+		return tglbtnSetFilter;
+	}
+
+
+	Box createSlideContentBox() {
+		
+		Box content = Box.createVerticalBox();
+		content.setName("!!!!");
+		
+		Box selectionBox = Box.createHorizontalBox();
+		selectionBox.add(btnSetSelectedNodes);
+		selectionBox.add(btnAddSelectedNodes);
+		selectionBox.add(btnRemoveSelectedNodes);
+		selectionBox.add(btnSelectNodes);
+		content.add(selectionBox);
+		final int gap = tglBtnPlaceSelectedNode.getPreferredSize().height / 2;
+		content.add(Box.createVerticalStrut(gap));
+		content.add(tglBtnPlaceSelectedNode);
+		Box positionBox = Box.createHorizontalBox();
+		positionBox.add(btnOnTheLeft);
+		positionBox.add(btnAtCenter);
+		positionBox.add(btnOnTheRight);
+		content.add(positionBox);
+		content.add(Box.createVerticalStrut(gap));
+		Box zoomBox = Box.createHorizontalBox();
+		zoomBox.add(tglbtnChangeZoom);
+		zoomBox.add(lblZoomFactor);
+		content.add(zoomBox);
+		content.add(checkBoxShowOnlySelectedNodes);
+		content.add(checkBoxShowAncestors);
+		content.add(checkBoxShowDescendants);
+		content.add(tglbtnSetFilter);
+		content.add(filterConditionComponentBox);
+		filterConditionComponentBox.setAlignmentX(Box.CENTER_ALIGNMENT);
+		TranslatedElementFactory.createTitledBorder(filterConditionComponentBox, "slide.filter");
+		
+		content.add(tglbtnSetFoldingState);
+
+		Box contentWithMargins = Box.createHorizontalBox();
+		TranslatedElementFactory.createTitledBorder(contentWithMargins, "slide.content");
+		contentWithMargins.add(Box.createHorizontalGlue());
+		contentWithMargins.add(content);
+		contentWithMargins.add(Box.createHorizontalGlue());
+		return contentWithMargins;
+	}
+
+
+	public void setSlide(Slide newSlide) {
+		if(slide != null)
+			slide.removeSlideChangeListener(slideChangeListener);
+		this.slide = newSlide;
+		updateUI();
+		if(newSlide != null){
+			slide.addSlideChangeListener(slideChangeListener);
+		}
+	}
+
+
+	private void disableUI() {
+		for(JComponent c : allButtons)
+			c.setEnabled(false);
+		setNodePlacementControlsEnabled(false, null);
+		updateFilter();
+	}
+
+
+	private void updateUI() {
+		if (slide == null) {
+			disableUI();
+			checkBoxShowOnlySelectedNodes.setSelected(false);
+			tglBtnPlaceSelectedNode.setSelected(false);
+			tglbtnChangeZoom.setSelected(false);
+			lblZoomFactor.setText("");
+			checkBoxShowOnlySelectedNodes.setSelected(false);
+			checkBoxShowAncestors.setSelected(false);
+			checkBoxShowDescendants.setSelected(false);
+			checkBoxShowAncestors.setSelected(false);
+			tglbtnSetFilter.setSelected(false);
+		} else {
+			for(JComponent c : allButtons)
+				c.setEnabled(true);
+			final boolean showsOnlySpecificNodes = slide.showsOnlySpecificNodes();
+			checkBoxShowOnlySelectedNodes.setSelected(showsOnlySpecificNodes);
+			final boolean placesSelectedNode = slide.getPlacedNodeId() != null;
+			tglBtnPlaceSelectedNode.setSelected(placesSelectedNode);
+			setNodePlacementControlsEnabled(placesSelectedNode, slide.getPlacedNodePosition());
+			final ASelectableCondition filterCondition = slide.getFilterCondition();
+			if (! presentationState.isPresentationRunning())
+				for(JComponent c : filterRelatedButtons)
+					c.setEnabled(showsOnlySpecificNodes || filterCondition != null);
+			final boolean changesZoom = slide.changesZoom();
+			tglbtnChangeZoom.setSelected(changesZoom);
+			lblZoomFactor.setText(changesZoom ? Math.round(slide.getZoom() * 100) + "%" : "");
+			checkBoxShowOnlySelectedNodes.setSelected(showsOnlySpecificNodes);
+			checkBoxShowAncestors.setSelected(slide.showsAncestors());
+			checkBoxShowDescendants.setSelected(slide.showsDescendants());
+			checkBoxShowAncestors.setSelected(slide.showsAncestors());
+			tglbtnSetFilter.setSelected(filterCondition != null);
+			tglbtnSetFoldingState.setSelected(slide.foldsNodes());
+		}
+		updateFilter();
+	}
+
+	private void updateFilter() {
+		removeFilterComponent();
+		final ASelectableCondition filterCondition = slide != null ? slide.getFilterCondition() : null;
+		if(filterCondition != null) {
+			final JComponent component = filterCondition.createGraphicComponent();
+			filterConditionComponentBox.add(component);
+		}
+		else{
+			filterConditionComponentBox.add(filterNotSetLabel);
+		}
+		filterConditionComponentBox.revalidate();
+	}
+
+	private void removeFilterComponent() {
+		while(filterConditionComponentBox.getComponentCount() > 0)
+			filterConditionComponentBox.remove(0);
+	}
+
+	private void setNodePlacementControlsEnabled(boolean placesSelectedNode, NodePosition nodePosition) {
+		for(JToggleButton btn : positionButtons)
+			btn.setEnabled(placesSelectedNode);
+		if(placesSelectedNode)
+			positionButtons[nodePosition.ordinal()].setSelected(true);
+		else
+			nodePositions.clearSelection();
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Stringifyed.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Stringifyed.java
new file mode 100644
index 0000000..337d3c3
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/Stringifyed.java
@@ -0,0 +1,19 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+public class Stringifyed<T extends NamedElement>{
+	public final T element;
+
+	public Stringifyed(T element) {
+		this.element = element;
+	}
+
+	@Override
+	public String toString() {
+		return element.getName();
+	}
+	
+	public Stringifyed<T> valueOf(String newName){
+		element.setName(newName);
+		return this;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/UndoableNamedElementCollection.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/UndoableNamedElementCollection.java
new file mode 100644
index 0000000..fa87e30
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/UndoableNamedElementCollection.java
@@ -0,0 +1,154 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import org.freeplane.core.undo.IActor;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+
+public class UndoableNamedElementCollection<T extends NamedElement<T>> {
+	final private ModeController controller;
+	final private MapModel mapModel;
+	final private NamedElementCollection<T> collection;
+	
+	public static <T extends NamedElement<T>> UndoableNamedElementCollection<T> of(NamedElementCollection<T> collection){
+		return new UndoableNamedElementCollection<>(Controller.getCurrentModeController(), Controller.getCurrentController().getMap(), collection);
+	}
+	
+	public UndoableNamedElementCollection(ModeController controller, MapModel mapModel,
+			NamedElementCollection<T> collection) {
+		super();
+		this.controller = controller;
+		this.mapModel = mapModel;
+		this.collection = collection;
+	}
+	public void add(final String name) {
+		final int currentElementIndex = collection.getCurrentElementIndex();
+		IActor actor = new IActor() {
+			@Override
+			public String getDescription() {
+				return "add";
+			}
+
+			@Override
+			public void act() {
+				collection.selectCurrentElement(currentElementIndex);
+				collection.add(name);
+			}
+			
+			@Override
+			public void undo() {
+				collection.selectCurrentElement(currentElementIndex + 1);
+				collection.removeCurrentElement();
+				collection.selectCurrentElement(currentElementIndex);
+			}
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void add(final T element) {
+		final int currentElementIndex = collection.getCurrentElementIndex();
+		IActor actor = new IActor() {
+			@Override
+			public String getDescription() {
+				return "add";
+			}
+
+			@Override
+			public void act() {
+				collection.selectCurrentElement(currentElementIndex);
+				collection.add(element);
+			}
+			
+			@Override
+			public void undo() {
+				collection.selectCurrentElement(currentElementIndex + 1);
+				collection.removeCurrentElement();
+				collection.selectCurrentElement(currentElementIndex);
+			}
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void removeCurrentElement() {
+		final int currentElementIndex = collection.getCurrentElementIndex();
+		final T removedElement = collection.getCurrentElement();
+		IActor actor = new IActor() {
+			@Override
+			public String getDescription() {
+				return "removeCurrentElement";
+			}
+
+			@Override
+			public void act() {
+				collection.selectCurrentElement(currentElementIndex);
+				collection.removeCurrentElement();
+			}
+			
+			@Override
+			public void undo() {
+				collection.selectCurrentElement(currentElementIndex - 1);
+				collection.add(removedElement);
+			}
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void moveCurrentElementUp() {
+		moveCurrentElementTo(collection.getCurrentElementIndex() - 1);
+	}
+	
+	public void moveCurrentElementDown() {
+		moveCurrentElementTo(collection.getCurrentElementIndex() + 1);
+	}
+
+	public void moveCurrentElementTo(final int newElementIndex) {
+		if(! collection.canMoveCurrentElementTo(newElementIndex))
+			return;
+		final int oldElementIndex = collection.getCurrentElementIndex();
+		IActor actor = new IActor() {
+			@Override
+			public String getDescription() {
+				return "moveCurrentElementTo";
+			}
+
+			@Override
+			public void act() {
+				collection.selectCurrentElement(oldElementIndex);
+				collection.moveCurrentElementTo(newElementIndex);
+			}
+			
+			@Override
+			public void undo() {
+				collection.selectCurrentElement(newElementIndex);
+				collection.moveCurrentElementTo(oldElementIndex);
+			}
+		};
+		controller.execute(actor, mapModel);
+	}
+
+	public void copyCurrentElement() {
+		final int currentElementIndex = collection.getCurrentElementIndex();
+		IActor actor = new IActor() {
+			@Override
+			public String getDescription() {
+				return "copy";
+			}
+
+			@Override
+			public void act() {
+				collection.selectCurrentElement(currentElementIndex);
+				collection.copyCurrentElement();
+			}
+			
+			@Override
+			public void undo() {
+				collection.selectCurrentElement(currentElementIndex + 1);
+				collection.removeCurrentElement();
+				collection.selectCurrentElement(currentElementIndex);
+			}
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/UndoableSlide.java b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/UndoableSlide.java
new file mode 100644
index 0000000..d4e6128
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/presentations/mindmapmode/UndoableSlide.java
@@ -0,0 +1,389 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.freeplane.core.undo.IActor;
+import org.freeplane.features.filter.condition.ASelectableCondition;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.IMapSelection.NodePosition;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+
+class UndoableSlide {
+	final private ModeController controller;
+	final private MapModel mapModel;
+	final private Slide slide;
+	
+	public static UndoableSlide of(Slide slide){
+		return new UndoableSlide(Controller.getCurrentModeController(), Controller.getCurrentController().getMap(), slide);
+	}
+
+	public UndoableSlide(ModeController controller, MapModel mapModel, Slide slide) {
+		super();
+		this.controller = controller;
+		this.mapModel = mapModel;
+		this.slide = slide;
+	}
+	public void setName(final String name) {
+		final String oldName = slide.getName();
+		if(name.equals(oldName))
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setName";
+			}
+			
+			@Override
+			public void act() {
+				slide.setName(name);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setName(oldName);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	public void setSelectedNodeIds(final Set<String> selectedNodeIds) {
+		final Set<String> oldSelectedNodeIds = slide.getSelectedNodeIds();
+		if(selectedNodeIds.equals(oldSelectedNodeIds))
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setSelectedNodeIds";
+			}
+			
+			@Override
+			public void act() {
+				slide.setSelectedNodeIds(selectedNodeIds);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setSelectedNodeIds(oldSelectedNodeIds);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void addSelectedNodeIds(final Collection<String> selectedNodeIds) {
+		final Set<String> newSelectedNodeIds = new HashSet<>(selectedNodeIds);
+		newSelectedNodeIds.removeAll(slide.getSelectedNodeIds());
+		
+		if(newSelectedNodeIds.isEmpty())
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "addSelectedNodeIds";
+			}
+			
+			@Override
+			public void act() {
+				slide.addSelectedNodeIds(newSelectedNodeIds);
+			}
+			
+			@Override
+			public void undo() {
+				slide.removeSelectedNodeIds(newSelectedNodeIds);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void removeSelectedNodeIds(final Collection<String> selectedNodeIds) {
+		final Set<String> removedNodeIds = new HashSet<>(selectedNodeIds);
+		removedNodeIds.retainAll(slide.getSelectedNodeIds());
+		
+		if(removedNodeIds.isEmpty())
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "removeSelectedNodeIds";
+			}
+			
+			@Override
+			public void act() {
+				slide.removeSelectedNodeIds(removedNodeIds);
+			}
+			
+			@Override
+			public void undo() {
+				slide.addSelectedNodeIds(removedNodeIds);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	
+	public void setPlacedNodeId(final String placedNodeId) {
+		final String oldPlacedNodeId = slide.getPlacedNodeId();
+		if(placedNodeId == oldPlacedNodeId ||placedNodeId != null && placedNodeId.equals(oldPlacedNodeId))
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setPlacedNodeId";
+			}
+			
+			@Override
+			public void act() {
+				slide.setPlacedNodeId(placedNodeId);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setPlacedNodeId(oldPlacedNodeId);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+
+	public void setPlacedNodePosition(final NodePosition placedNodePosition) {
+		final NodePosition oldPlacedNodePosition = slide.getPlacedNodePosition();
+		if(oldPlacedNodePosition == placedNodePosition)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setPlacesNodeAtMargin";
+			}
+			
+			@Override
+			public void act() {
+				slide.setPlacedNodePosition(placedNodePosition);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setPlacedNodePosition(oldPlacedNodePosition);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+    public void setChangesZoom(final boolean changeZoom) {
+		final boolean oldChangesZoom = slide.changesZoom();
+		if(changeZoom == oldChangesZoom)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setChangesZoom";
+			}
+			
+			@Override
+			public void act() {
+				slide.setChangesZoom(changeZoom);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setChangesZoom(oldChangesZoom);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void setZoom(final float zoom) {
+		final float oldZoom = slide.getZoom();
+		if(zoom == oldZoom)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setChangesZoom";
+			}
+			
+			@Override
+			public void act() {
+				slide.setZoom(zoom);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setZoom(oldZoom);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void setShowsOnlySpecificNodes(final boolean showOnlySpecificNodes) {
+		final boolean oldShowsOnlySpecificNodes = slide.showsOnlySpecificNodes();
+		if(showOnlySpecificNodes == oldShowsOnlySpecificNodes)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setShowsOnlySpecificNodes";
+			}
+			
+			@Override
+			public void act() {
+				slide.setShowsOnlySpecificNodes(showOnlySpecificNodes);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setShowsOnlySpecificNodes(oldShowsOnlySpecificNodes);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void setShowsAncestors(final boolean showAncestors) {
+		final boolean oldShowsAncestors = slide.showsAncestors();
+		if(showAncestors == oldShowsAncestors)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setShowsAncestors";
+			}
+			
+			@Override
+			public void act() {
+				slide.setShowsAncestors(showAncestors);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setShowsAncestors(oldShowsAncestors);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void setShowsDescendants(final boolean showDescendants) {
+		final boolean oldShowsDescendants = slide.showsDescendants();
+		if(showDescendants == oldShowsDescendants)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setShowsDescendants";
+			}
+			
+			@Override
+			public void act() {
+				slide.setShowsDescendants(showDescendants);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setShowsDescendants(oldShowsDescendants);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+	
+	public void setFilterCondition(final ASelectableCondition filterCondition) {
+		final ASelectableCondition oldFilterCondition = slide.getFilterCondition();
+		if(filterCondition == oldFilterCondition)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setFilterCondition";
+			}
+			
+			@Override
+			public void act() {
+				slide.setFilterCondition(filterCondition);
+			}
+			
+			@Override
+			public void undo() {
+				slide.setFilterCondition(oldFilterCondition);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+
+	public void setCurrentFoldedNodeIDs() {
+		final Collection<String> currentFoldedNodeIds = slide.getCurrentFoldedNodeIds();
+		final Set<String> oldFoldedNodeIds = slide.getFoldedNodeIds();
+		final boolean foldedNodes = slide.foldsNodes();
+		if(currentFoldedNodeIds == oldFoldedNodeIds && foldedNodes)
+			return;
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "setCurrentFoldedNodeIDs";
+			}
+			
+			@Override
+			public void act() {
+				slide.setFoldedNodeIDs(currentFoldedNodeIds);
+			}
+			
+			@Override
+			public void undo() {
+				if(foldedNodes)
+					slide.setFoldedNodeIDs(oldFoldedNodeIds);
+				else
+					slide.unsetFoldsNodes();
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+
+	public void unsetFoldsNodes() {
+		final boolean foldedNodes = slide.foldsNodes();
+		if(! foldedNodes)
+			return;
+		final Set<String> oldFoldedNodeIds = slide.getFoldedNodeIds();
+		IActor actor = new IActor() {
+			
+			@Override
+			public String getDescription() {
+				return "unsetFoldsNodes";
+			}
+			
+			@Override
+			public void act() {
+				slide.unsetFoldsNodes();
+			}
+			
+			@Override
+			public void undo() {
+				slide.setFoldedNodeIDs(oldFoldedNodeIds);
+			}
+			
+		};
+		controller.execute(actor, mapModel);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/print/PreviewDialog.java b/freeplane/src/main/java/org/freeplane/features/print/PreviewDialog.java
index 0e71491..b05ccd7 100644
--- a/freeplane/src/main/java/org/freeplane/features/print/PreviewDialog.java
+++ b/freeplane/src/main/java/org/freeplane/features/print/PreviewDialog.java
@@ -91,7 +91,7 @@ class PreviewDialog extends JDialog implements ActionListener {
 	private JButton getButton(final String name, final String iconName, final AbstractAction action) {
 		JButton result = null;
 		ImageIcon icon = null;
-		final URL imageURL = ResourceController.getResourceController().getResource("/images/" + iconName);
+		final URL imageURL = ResourceController.getResourceController().getIconResource("/images/" + iconName);
 		if (imageURL != null) {
 			icon = new ImageIcon(imageURL);
 		}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/AutomaticLayoutController.java b/freeplane/src/main/java/org/freeplane/features/styles/AutomaticLayoutController.java
index 40bc416..af8ac14 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/AutomaticLayoutController.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/AutomaticLayoutController.java
@@ -34,7 +34,6 @@ import org.freeplane.n3.nanoxml.XMLElement;
 
 @NodeHookDescriptor(hookName = "accessories/plugins/AutomaticLayout.properties")
 public class AutomaticLayoutController extends PersistentNodeHook implements IExtension{
-	private static final int FIRST_CYCLIC_STYLE_LEVEL = 1;
 	private static final String AUTOMATIC_LAYOUT_LEVEL = "AutomaticLayout.level,";
 	private static final String AUTOMATIC_LAYOUT_LEVEL_ROOT = "AutomaticLayout.level.root";
 
@@ -66,10 +65,10 @@ public class AutomaticLayoutController extends PersistentNodeHook implements IEx
 		if(layout == null || node.isLeaf() && ! layout.applyToLeaves)
 			return null;
 		final int depth = node.depth();
-		return getStyle(node.getMap(), depth, false);
+		return getStyle(node.getMap(), depth);
 	}
 
-	public IStyle getStyle(final MapModel map, final int depth, boolean cyclic) {
+	public IStyle getStyle(final MapModel map, final int depth) {
 		final MapStyleModel extension = MapStyleModel.getExtension(map);
 		final String name = depth == 0 ? AUTOMATIC_LAYOUT_LEVEL_ROOT : AUTOMATIC_LAYOUT_LEVEL + depth;
 		final TranslatedObject styleKey = TranslatedObject.format(name);
@@ -77,24 +76,12 @@ public class AutomaticLayoutController extends PersistentNodeHook implements IEx
 		if (extension.getStyleNode(style) != null) {
 			return style;
 		}
-		if(! cyclic)
-			return null;
-		
-		final TranslatedObject rootKey = TranslatedObject.format(AUTOMATIC_LAYOUT_LEVEL_ROOT);
-		final IStyle rootStyle = StyleFactory.create(rootKey);
-		NodeModel rootStyleNode = extension.getStyleNode(rootStyle);
-		if(rootStyleNode == null)
-			return null;
-		final NodeModel automaticStylesParentNode = rootStyleNode.getParentNode();
-		final int cycledLevelStyleCount = automaticStylesParentNode.getChildCount() - FIRST_CYCLIC_STYLE_LEVEL;
-		if(cycledLevelStyleCount <= 0)
-			return null;
 		else
-			return getStyle(map, FIRST_CYCLIC_STYLE_LEVEL + ((depth - FIRST_CYCLIC_STYLE_LEVEL) % cycledLevelStyleCount), false);
+			return null;
 	}
 	
-	public NodeModel getStyleNode(MapModel map, int depth, boolean cyclic) {
-		IStyle style = getStyle(map, depth, cyclic);
+	public NodeModel getStyleNode(MapModel map, int depth) {
+		IStyle style = getStyle(map, depth);
 		if(style != null){
 			final MapStyleModel extension = MapStyleModel.getExtension(map);
 			return extension.getStyleNode(style);
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/ConditionPredicate.java b/freeplane/src/main/java/org/freeplane/features/styles/ConditionPredicate.java
new file mode 100644
index 0000000..248bd6f
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/ConditionPredicate.java
@@ -0,0 +1,7 @@
+package org.freeplane.features.styles;
+
+import org.freeplane.features.filter.condition.ICondition;
+
+public interface ConditionPredicate {
+	boolean test(ICondition condition);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleChecker.java b/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleChecker.java
new file mode 100644
index 0000000..dd36479
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleChecker.java
@@ -0,0 +1,18 @@
+package org.freeplane.features.styles;
+
+public class ConditionalStyleChecker {
+	private ConditionalStyleModel[] conditionalStyleModels;
+	ConditionalStyleChecker(ConditionalStyleModel... conditionalStyleModels){
+		this.conditionalStyleModels = conditionalStyleModels;
+	}
+	public boolean dependOnCondition(ConditionPredicate predicate ) {
+		for(ConditionalStyleModel m : conditionalStyleModels){
+			if(m != null){
+				if(m.dependOnCondition(predicate))
+					return true;
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleModel.java b/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleModel.java
index e9bde7b..c3f0e0d 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleModel.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/ConditionalStyleModel.java
@@ -12,11 +12,12 @@ import javax.swing.table.TableModel;
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.filter.condition.ASelectableCondition;
+import org.freeplane.features.filter.condition.ICombinedCondition;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
 public class ConditionalStyleModel implements IExtension, Iterable<ConditionalStyleModel.Item>{
-	public class Item{
+	public static class Item{
 		private ASelectableCondition condition;
 		private IStyle style;
 		private boolean isActive;
@@ -77,6 +78,25 @@ public class ConditionalStyleModel implements IExtension, Iterable<ConditionalSt
 				condition.toXml(itemElement);
 
 		}
+
+		boolean dependOnCondition(ConditionPredicate predicate) {
+			if (isActive())
+				return dependOnConditionRecursively(condition, predicate);
+			else
+				return false;
+		}
+
+		private boolean dependOnConditionRecursively(ASelectableCondition condition, ConditionPredicate predicate) {
+			if(condition instanceof ICombinedCondition){
+				final Collection<ASelectableCondition> conditions = ((ICombinedCondition)condition).split();
+				for(ASelectableCondition c : conditions)
+					if(dependOnConditionRecursively(c, predicate))
+						return true;
+				return false;
+			}
+			else
+				return  predicate.test(condition);
+		}
 		
 	}
 	private ArrayList<Item> styles;
@@ -103,7 +123,7 @@ public class ConditionalStyleModel implements IExtension, Iterable<ConditionalSt
 			Collection<IStyle> matchingStyles = new LinkedHashSet<IStyle>();
 			for(Item item : styles){
 				final ASelectableCondition condition = item.getCondition();
-				if( item.isActive() && (condition == null || condition.checkNode(node))){
+				if( item.isActive() && (condition == null || condition.checkNodeInFormulaContext(node))){
 					matchingStyles.add(item.style);
 					if(item.isLast()){
 						break;
@@ -274,4 +294,12 @@ public class ConditionalStyleModel implements IExtension, Iterable<ConditionalSt
 		final ConditionalStyleModel conditionalStyleModel = new ConditionalStyleModel(this);
 		return conditionalStyleModel;
 	}
+
+	boolean dependOnCondition(ConditionPredicate predicate) {
+		for(Item item : styles){
+			if(item.dependOnCondition(predicate))
+				return true;
+		}
+		return false;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/LogicalStyleController.java b/freeplane/src/main/java/org/freeplane/features/styles/LogicalStyleController.java
index bbd204d..0f9e0a1 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/LogicalStyleController.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/LogicalStyleController.java
@@ -390,4 +390,9 @@ public class LogicalStyleController implements IExtension {
 	public String getMapStyleNames(NodeModel node, String separator) {
 		return getStyleNames(getConditionalMapStyles(node), separator);
     }
+
+	public ConditionalStyleChecker conditionalStylesOf(NodeModel node) {
+		final MapStyleModel styleModel = MapStyleModel.getExtension(node.getMap());
+		return new ConditionalStyleChecker(styleModel.getConditionalStyleModel(), node.getExtension(ConditionalStyleModel.class));
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/MapStyle.java b/freeplane/src/main/java/org/freeplane/features/styles/MapStyle.java
index 11591f0..b457d05 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/MapStyle.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/MapStyle.java
@@ -36,8 +36,8 @@ import org.freeplane.core.io.IElementDOMHandler;
 import org.freeplane.core.io.IElementHandler;
 import org.freeplane.core.io.IExtensionElementWriter;
 import org.freeplane.core.io.ITreeWriter;
-import org.freeplane.core.resources.TranslatedObject;
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.resources.TranslatedObject;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.undo.IUndoHandler;
@@ -154,7 +154,6 @@ public class MapStyle extends PersistentNodeHook implements IExtension, IMapLife
 			);
 
 		}
-		modeController.getMapController().addMapLifeCycleListener(this);
 		final MapController mapController = modeController.getMapController();
 		mapController.addMapLifeCycleListener(this);
 	}
@@ -164,12 +163,12 @@ public class MapStyle extends PersistentNodeHook implements IExtension, IMapLife
 		        throws IOException {
 			final MapStyleModel mapStyleModel = (MapStyleModel) extension;
 			final MapModel styleMap = mapStyleModel.getStyleMap();
-			final String el = System.getProperty("line.separator");
 			if (styleMap == null) {
 				return;
 			}
 			final MapWriter mapWriter = Controller.getCurrentModeController().getMapController().getMapWriter();
 			final StringWriter sw = new StringWriter();
+			final String el = System.getProperty("line.separator");
 			sw.append(el);
 			sw.append("<map_styles>");
 			sw.append(el);
@@ -394,7 +393,8 @@ public class MapStyle extends PersistentNodeHook implements IExtension, IMapLife
 		final IExtension oldStyleModel = targetMap.getRootNode().removeExtension(MapStyleModel.class);
 		final ModeController modeController = Controller.getCurrentModeController();
 		final UrlManager urlManager = modeController.getExtension(UrlManager.class);
-		urlManager.loadCatchExceptions(source, styleMapContainer);
+		if (! urlManager.loadCatchExceptions(source, styleMapContainer))
+			return;
 		onCreate(styleMapContainer);
 		moveStyle(styleMapContainer, targetMap, true);
 		modeController.getExtension(AutomaticLayoutController.class).moveExtension(modeController, styleMapContainer, targetMap);
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapPropertyAction.java b/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapPropertyAction.java
index 635c092..8a3a5d0 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapPropertyAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapPropertyAction.java
@@ -45,6 +45,7 @@ public class SetBooleanMapPropertyAction extends AFreeplaneAction{
 	    	TextUtils.getRawText("OptionPanel." + propertyName),
 	    	null);
 	    this.propertyName = propertyName;
+	    setIcon(propertyName + ".icon");
 	    setTooltip(getTooltipKey());
     }
 
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapViewPropertyAction.java b/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapViewPropertyAction.java
new file mode 100644
index 0000000..1721be9
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/SetBooleanMapViewPropertyAction.java
@@ -0,0 +1,95 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2011 dimitry
+ *
+ *  This file author is dimitry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JComponent;
+
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.core.ui.EnabledAction;
+import org.freeplane.core.ui.SelectableAction;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.mode.Controller;
+
+/**
+ * @author Dimitry Polivaev
+ * Mar 2, 2017
+ */
+ at SuppressWarnings("serial")
+ at SelectableAction(checkOnPopup = true)
+ at EnabledAction(checkOnNodeChange = true)
+public class SetBooleanMapViewPropertyAction extends AFreeplaneAction{
+
+	private String propertyName;
+	public SetBooleanMapViewPropertyAction(String propertyName) {
+	    super("SetBooleanMapViewPropertyAction." + propertyName, 
+	    	TextUtils.getRawText("OptionPanel." + propertyName),
+	    	null);
+	    this.propertyName = propertyName;
+	    setIcon(propertyName + ".icon");
+	    setTooltip(getTooltipKey());
+    }
+
+	public void actionPerformed(ActionEvent e) {
+		final JComponent mapViewComponent = getMapViewComponent();
+		if(mapViewComponent != null) {
+			final Boolean value = Boolean.TRUE.equals(mapViewComponent.getClientProperty(propertyName));
+			boolean newValue = ! value.booleanValue();
+			mapViewComponent.putClientProperty(propertyName, newValue);
+			setSelected(newValue);
+		}
+    }
+
+	private JComponent getMapViewComponent() {
+		final JComponent mapViewComponent = (JComponent) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+		return mapViewComponent;
+	}
+
+	@Override
+	public String getTextKey() {
+		return "OptionPanel." + propertyName;
+	}
+
+	@Override
+	public String getTooltipKey() {
+		return getTextKey() + ".tooltip";
+	}
+	
+	@Override
+	public void setSelected() {
+		try {
+			final JComponent mapViewComponent = getMapViewComponent();
+			if(mapViewComponent != null) {
+				final Boolean value = Boolean.TRUE.equals(mapViewComponent.getClientProperty(propertyName));
+				setSelected(value);
+				return;
+			}
+		}
+		catch (Exception e) {
+		}
+		setSelected(false);
+	}
+	
+	public void setEnabled() {
+		setEnabled(getMapViewComponent() != null);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/AManageConditionalStylesAction.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/AManageConditionalStylesAction.java
index d991da2..a3d2e3e 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/AManageConditionalStylesAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/AManageConditionalStylesAction.java
@@ -16,6 +16,7 @@ import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.LabelAndMnemonicSetter;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.filter.FilterComposerDialog;
 import org.freeplane.features.filter.condition.ASelectableCondition;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.styles.ConditionalStyleModel;
@@ -70,9 +71,15 @@ abstract public class AManageConditionalStylesAction extends AFreeplaneAction {
 				if(selectedRow == -1){
 					return;
 				}
+				final FilterComposerDialog filterComposerDialog = new FilterComposerDialog();
+				filterComposerDialog.addCondition(null);
+				filterComposerDialog.setConditionRenderer(ConditionalStyleTable.createConditionRenderer());
+				for(int i = 0; i < conditionalStyleTable.getRowCount(); i++){
+					final ASelectableCondition condition = (ASelectableCondition)conditionalStyleTable.getValueAt(i, 1);
+					filterComposerDialog.addCondition(condition);
+				}
 				final ASelectableCondition value = (ASelectableCondition) conditionalStyleTable.getValueAt(selectedRow, 1);
-				final MLogicalStyleController styleController = MLogicalStyleController.getController();
-				final ASelectableCondition newCondition = styleController.editCondition(value);
+				final ASelectableCondition newCondition = filterComposerDialog.editCondition(value);
 				conditionalStyleTable.setValueAt(newCondition, selectedRow, 1);
 			}
 		});
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ConditionalStyleTable.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ConditionalStyleTable.java
index f70ad46..0152d51 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ConditionalStyleTable.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/ConditionalStyleTable.java
@@ -20,6 +20,7 @@ import javax.swing.table.TableModel;
 
 import org.freeplane.core.ui.components.JComboBoxWithBorder;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.filter.FilterComposerDialog;
 import org.freeplane.features.filter.condition.ASelectableCondition;
 import org.freeplane.features.filter.condition.DefaultConditionRenderer;
 import org.freeplane.features.styles.IStyle;
@@ -58,8 +59,14 @@ class ConditionalStyleTable extends JTable {
 		public Component getTableCellEditorComponent(final JTable table, final Object value, boolean isSelected, int row, int column) {
 			btn.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-				    final MLogicalStyleController styleController = MLogicalStyleController.getController();
-					cellEditorValue = styleController.editCondition((ASelectableCondition) value);
+					final FilterComposerDialog filterComposerDialog = new FilterComposerDialog();
+					filterComposerDialog.addCondition(null);
+					filterComposerDialog.setConditionRenderer(ConditionalStyleTable.createConditionRenderer());
+					for(int i = 0; i < table.getRowCount(); i++){
+						final ASelectableCondition condition = (ASelectableCondition)table.getValueAt(i, 1);
+						filterComposerDialog.addCondition(condition);
+					}
+					cellEditorValue = filterComposerDialog.editCondition((ASelectableCondition) value);
 				    btn.removeActionListener(this);
 				    fireEditingStopped();
 				}
@@ -89,7 +96,7 @@ class ConditionalStyleTable extends JTable {
 	    setAutoResizeMode(JTable.AUTO_RESIZE_OFF); 
 //	    setSelectionBackground(DefaultConditionRenderer.SELECTED_BACKGROUND);
 	    setRowHeight(20);
-		conditionRenderer = new DefaultConditionRenderer(TextUtils.getText("always"), true);
+		conditionRenderer = createConditionRenderer();
 		columnModel.getColumn(1).setCellRenderer(conditionRenderer);
 		columnModel.getColumn(1).setCellEditor(new ConditionEditor());
 		final JComboBox styleBox = new JComboBoxWithBorder();
@@ -119,6 +126,10 @@ class ConditionalStyleTable extends JTable {
 		columnModel.getColumn(2).setCellRenderer(new DefaultStyleRenderer());
     }
 
+	static DefaultConditionRenderer  createConditionRenderer() {
+		return new DefaultConditionRenderer(TextUtils.getText("always"), true);
+	}
+
 	public MapStyleModel getStyles() {
 	    return styleModel;
     }
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/FilterComposerDialog.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/FilterComposerDialog.java
deleted file mode 100644
index 51d4f4a..0000000
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/FilterComposerDialog.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.freeplane.features.styles.mindmapmode;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.DefaultComboBoxModel;
-import org.freeplane.core.util.TextUtils;
-import org.freeplane.features.filter.AFilterComposerDialog;
-import org.freeplane.features.filter.condition.ASelectableCondition;
-
- at SuppressWarnings("serial")
-class FilterComposerDialog extends AFilterComposerDialog{
-
-	public FilterComposerDialog() {
-        super(TextUtils.getText("filter_dialog"), true);
-        conditions = new LinkedList<ASelectableCondition>();
-    }
-
-	protected DefaultComboBoxModel createModel() {
-		conditions.clear();
-		initializeModel();
-		return model;
-    }
-
-	protected void initializeModel() {
-	    if(model == null){
-			model = new DefaultComboBoxModel();
-		}
-    }
-	
-	protected boolean applyModel(DefaultComboBoxModel model, int[] selectedIndices) {
-		if(selectedIndices.length != 1 && ! acceptMultipleConditions){
-			return false;
-		}
-		conditions.clear();
-		this.model = model;
-		for(int i : selectedIndices){
-			conditions.add((ASelectableCondition) model.getElementAt(i));
-		}
-	    return true;
-    }
-			
-	final private List<ASelectableCondition> conditions ;
-	private DefaultComboBoxModel model;
-	private boolean acceptMultipleConditions;
-
-	public List<ASelectableCondition> getConditions() {
-    	return conditions;
-    }
-
-	public void acceptMultipleConditions(boolean acceptMultipleConditions) {
-	    this.acceptMultipleConditions = acceptMultipleConditions;
-    }
-
-	public void addCondition(ASelectableCondition value) {
-		initializeModel();
-		if (model.getIndexOf(value) == -1){
-			model.addElement(value);
-		}
-		setSelectedItem(value);
-    }
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MLogicalStyleController.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MLogicalStyleController.java
index 4f0b01a..96497fc 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MLogicalStyleController.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MLogicalStyleController.java
@@ -196,7 +196,6 @@ public class MLogicalStyleController extends LogicalStyleController {
 
 // 	private final ModeController modeController;
 	final private List<AssignStyleAction> actions;
-	private FilterComposerDialog filterComposerDialog;
 
 	public MLogicalStyleController(ModeController modeController) {
 		super(modeController);
@@ -520,26 +519,6 @@ public class MLogicalStyleController extends LogicalStyleController {
 			}
 		};
 	}
-
-	public FilterComposerDialog getFilterComposerDialog() {
-		if(filterComposerDialog == null){
-			filterComposerDialog = new FilterComposerDialog();
-			Controller.getCurrentController().getMapViewManager().addMapSelectionListener(filterComposerDialog);
-		}
-		return filterComposerDialog;
-    }
-	
-	public ASelectableCondition editCondition(ASelectableCondition value) {
-	    final FilterComposerDialog filterComposerDialog = getFilterComposerDialog();
-	    filterComposerDialog.acceptMultipleConditions(true);
-	    if(value != null)
-	    	filterComposerDialog.addCondition(value);
-	    filterComposerDialog.show();
-	    List<ASelectableCondition> conditions = filterComposerDialog.getConditions();
-	    if(filterComposerDialog.isSuccess())
-	    	return conditions.isEmpty() ? null : conditions.get(0);
-	    return value;
-    }
     
 
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java
index cb382e5..184179d 100644
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/MUIFactory.java
@@ -26,14 +26,12 @@ import java.util.Collection;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
-import javax.swing.JLabel;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.ui.FixedBasicComboBoxEditor;
 import org.freeplane.core.ui.components.JComboBoxWithBorder;
-import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.map.IMapChangeListener;
 import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.map.IMapSelectionListener;
@@ -191,14 +189,15 @@ public class MUIFactory implements INodeSelectionListener, INodeChangeListener,
 
 	public Container createStyleBox() {
 		final JComboBox stylesBox = new JComboBoxWithBorder(styles);
+		stylesBox.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXXX");
 		stylesBox.setRenderer(new ComboBoxRendererWithTooltip(stylesBox));
 		return stylesBox;
 	}
 
 	public Container createSizeBox() {
 		final JComboBox sizeBox = new JComboBoxWithBorder(size);
-		final Dimension preferredSize = sizeBox.getPreferredSize();
-		sizeBox.setPreferredSize(new Dimension(50, preferredSize.height));
+		sizeBox.setPrototypeDisplayValue("88888");
+		sizeBox.setPreferredSize(sizeBox.getPreferredSize());
 		sizeBox.setEditor(new FixedBasicComboBoxEditor());
 		sizeBox.setEditable(true);
 		return sizeBox;
@@ -206,11 +205,8 @@ public class MUIFactory implements INodeSelectionListener, INodeChangeListener,
 
 	public Container createFontBox() {
 		final JComboBox fontsBox = new JComboBoxWithBorder();
-		fontsBox.setMaximumRowCount(9);
 		fontsBox.setRenderer(new ComboBoxRendererWithTooltip(fontsBox));
 		final Dimension preferredSize = fontsBox.getPreferredSize();
-		preferredSize.width = Math.round(150 * UITools.FONT_SCALE_FACTOR);
-		fontsBox.setPreferredSize(preferredSize);
 		fontsBox.setModel(fonts);
 		return fontsBox;
 	}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
deleted file mode 100644
index 156996d..0000000
--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
+++ /dev/null
@@ -1,1213 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.features.styles.mindmapmode;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.HeadlessException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Vector;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.plaf.basic.BasicButtonUI;
-
-import org.freeplane.core.extension.IExtension;
-import org.freeplane.core.resources.ResourceController;
-import org.freeplane.core.resources.TranslatedObject;
-import org.freeplane.core.resources.components.BooleanProperty;
-import org.freeplane.core.resources.components.ColorProperty;
-import org.freeplane.core.resources.components.ComboProperty;
-import org.freeplane.core.resources.components.FontProperty;
-import org.freeplane.core.resources.components.IPropertyControl;
-import org.freeplane.core.resources.components.NextColumnProperty;
-import org.freeplane.core.resources.components.NextLineProperty;
-import org.freeplane.core.resources.components.NumberProperty;
-import org.freeplane.core.resources.components.QuantityProperty;
-import org.freeplane.core.resources.components.SeparatorProperty;
-import org.freeplane.core.ui.AFreeplaneAction;
-import org.freeplane.core.ui.LengthUnits;
-import org.freeplane.core.ui.components.JComboBoxWithBorder;
-import org.freeplane.core.ui.components.UITools;
-import org.freeplane.core.ui.textchanger.TranslatedElement;
-import org.freeplane.core.util.ColorUtils;
-import org.freeplane.core.util.HtmlUtils;
-import org.freeplane.core.util.Quantity;
-import org.freeplane.core.util.TextUtils;
-import org.freeplane.features.cloud.CloudController;
-import org.freeplane.features.cloud.CloudModel;
-import org.freeplane.features.cloud.mindmapmode.MCloudController;
-import org.freeplane.features.edge.AutomaticEdgeColor;
-import org.freeplane.features.edge.AutomaticEdgeColorHook;
-import org.freeplane.features.edge.EdgeController;
-import org.freeplane.features.edge.EdgeModel;
-import org.freeplane.features.edge.EdgeStyle;
-import org.freeplane.features.edge.mindmapmode.MEdgeController;
-import org.freeplane.features.format.FormatController;
-import org.freeplane.features.format.IFormattedObject;
-import org.freeplane.features.format.PatternFormat;
-import org.freeplane.features.link.LinkController;
-import org.freeplane.features.link.NodeLinks;
-import org.freeplane.features.link.mindmapmode.MLinkController;
-import org.freeplane.features.map.AMapChangeListenerAdapter;
-import org.freeplane.features.map.IMapSelection;
-import org.freeplane.features.map.INodeChangeListener;
-import org.freeplane.features.map.INodeSelectionListener;
-import org.freeplane.features.map.MapChangeEvent;
-import org.freeplane.features.map.MapController;
-import org.freeplane.features.map.MapModel;
-import org.freeplane.features.map.NodeChangeEvent;
-import org.freeplane.features.map.NodeModel;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.features.mode.ModeController;
-import org.freeplane.features.nodelocation.LocationController;
-import org.freeplane.features.nodelocation.LocationModel;
-import org.freeplane.features.nodelocation.mindmapmode.MLocationController;
-import org.freeplane.features.nodestyle.NodeSizeModel;
-import org.freeplane.features.nodestyle.NodeStyleController;
-import org.freeplane.features.nodestyle.NodeStyleModel;
-import org.freeplane.features.nodestyle.NodeStyleModel.Shape;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
-import org.freeplane.features.nodestyle.ShapeConfigurationModel;
-import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
-import org.freeplane.features.styles.AutomaticLayout;
-import org.freeplane.features.styles.AutomaticLayoutController;
-import org.freeplane.features.styles.IStyle;
-import org.freeplane.features.styles.LogicalStyleController;
-import org.freeplane.features.styles.LogicalStyleModel;
-import org.freeplane.features.styles.MapStyle;
-import org.freeplane.features.text.TextController;
-import org.freeplane.features.ui.IMapViewChangeListener;
-import org.freeplane.features.ui.IMapViewManager;
-
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.Paddings;
-import com.jgoodies.forms.layout.FormLayout;
-
-public class StyleEditorPanel extends JPanel {
-	private static final int FONT_SIZE = Math.round(UITools.FONT_SCALE_FACTOR * 8);
-	private static final TranslatedObject AUTOMATIC_LAYOUT_DISABLED = new TranslatedObject("automatic_layout_disabled");
-
-	private class BgColorChangeListener extends ChangeListener {
-		public BgColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-					.getCurrentModeController().getExtension(
-							NodeStyleController.class);
-			styleController.setBackgroundColor(node, enabled ? mNodeBackgroundColor.getColorValue() : null);
-		}
-	}
-
-	private class NodeShapeChangeListener extends ChangeListener {
-		public NodeShapeChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(
-					NodeStyleController.class);
-			if(enabled){
-				styleController.setShapeConfiguration(node, ShapeConfigurationModel.NULL_SHAPE
-						.withShape(NodeStyleModel.Shape.valueOf(mNodeShape.getValue()))
-						.withHorizontalMargin(mShapeHorizontalMargin.getQuantifiedValue())
-						.withVerticalMargin(mShapeVerticalMargin.getQuantifiedValue())
-						.withUniform(mUniformShape.getBooleanValue())
-						);
-			}
-			else
-				styleController.setShapeConfiguration(node, ShapeConfigurationModel.NULL_SHAPE);
-			final Shape shape = styleController.getShape(node);
-			enableShapeConfigurationProperties(enabled, shape);
-		}
-	}
-
-	private class ColorChangeListener extends ChangeListener {
-		public ColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(
-					NodeStyleController.class);
-			styleController.setColor(node, enabled ? mNodeColor.getColorValue() : null);
-		}
-	}
-
-	private class FontBoldChangeListener extends ChangeListener {
-		public FontBoldChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(
-					NodeStyleController.class);
-			styleController.setBold(node, enabled ? mNodeFontBold.getBooleanValue() : null);
-		}
-	}
-
-	private class FontItalicChangeListener extends ChangeListener {
-		public FontItalicChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(
-					NodeStyleController.class);
-			styleController.setItalic(node, enabled ? mNodeFontItalic.getBooleanValue() : null);
-		}
-	}
-
-	private class FontHyperlinkChangeListener extends ChangeListener {
-		public FontHyperlinkChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MLinkController styleController = (MLinkController) Controller
-			.getCurrentModeController().getExtension(
-				LinkController.class);
-			styleController.setFormatNodeAsHyperlink(node, enabled ? mNodeFontHyperlink.getBooleanValue() : null);
-		}
-	}
-
-	private class FontSizeChangeListener extends ChangeListener {
-		public FontSizeChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(
-					NodeStyleController.class);
-			try {
-	            styleController.setFontSize(node, enabled ? Integer.valueOf(mNodeFontSize.getValue()) : null);
-            }
-            catch (NumberFormatException e) {
-            }
-		}
-	}
-
-	private class FontNameChangeListener extends ChangeListener {
-		public FontNameChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(
-					NodeStyleController.class);
-			styleController.setFontFamily(node, enabled ? mNodeFontName.getValue() : null);
-		}
-	}
-
-	private class EdgeColorChangeListener extends ChangeListener {
-		public EdgeColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MEdgeController edgeController = (MEdgeController) MEdgeController.getController();
-			edgeController.setColor(node, enabled ? mEdgeColor.getColorValue() : null);
-		}
-	}
-
-	private class EdgeStyleChangeListener extends ChangeListener {
-		public EdgeStyleChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node,
-				final PropertyChangeEvent evt) {
-			final MEdgeController styleController = (MEdgeController) Controller
-					.getCurrentModeController().getExtension(
-							EdgeController.class);
-			styleController.setStyle(node, enabled ? EdgeStyle.getStyle(mEdgeStyle.getValue()) : null);
-		}
-	}
-	private class TextAlignmentChangeListener extends ChangeListener {
-		public TextAlignmentChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node,
-				final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-					.getCurrentModeController().getExtension(NodeStyleController.class);
-			styleController.setTextAlign(node, enabled ? TextAlign.valueOf(mNodeTextAlignment.getValue()) : null);
-		}
-	}
-	
-	
-
-	private class EdgeWidthChangeListener extends ChangeListener {
-		public EdgeWidthChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MEdgeController styleController = (MEdgeController) Controller
-			.getCurrentModeController().getExtension(
-					EdgeController.class);
-			styleController.setWidth(node, enabled ? Integer.parseInt(mEdgeWidth.getValue()): EdgeModel.DEFAULT_WIDTH);
-		}
-	}
-
-	private class MaxNodeWidthChangeListener extends ChangeListener {
-		public MaxNodeWidthChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(NodeStyleController.class);
-			styleController.setMaxNodeWidth(node, enabled ? mMaxNodeWidth.getQuantifiedValue(): null);
-		}
-	}
-
-	private class MinNodeWidthChangeListener extends ChangeListener {
-		public MinNodeWidthChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller
-			.getCurrentModeController().getExtension(NodeStyleController.class);
-			styleController.setMinNodeWidth(node, enabled ? mMinNodeWidth.getQuantifiedValue(): null);
-		}
-	}
-	private class ChildDistanceChangeListener extends ChangeListener {
-		public ChildDistanceChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MLocationController locationController = (MLocationController) Controller.getCurrentModeController().getExtension(LocationController.class);
-			locationController.setMinimalDistanceBetweenChildren(node, enabled ? mChildDistance.getQuantifiedValue(): LocationModel.DEFAULT_VGAP);
-		}
-	}
-	
-	private class CloudColorChangeListener extends ChangeListener {
-		public CloudColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node,
-				final PropertyChangeEvent evt) {
-			final MCloudController styleController = (MCloudController) Controller
-					.getCurrentModeController().getExtension(
-							CloudController.class);
-			if (enabled) {
-				styleController.setColor(node, mCloudColor.getColorValue());
-			}
-			else {
-				styleController.setCloud(node, false);
-			}
-		}
-	}
-
-	private class CloudShapeChangeListener extends ChangeListener {
-		public CloudShapeChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node,
-				final PropertyChangeEvent evt) {
-			final MCloudController styleController = (MCloudController) Controller
-					.getCurrentModeController().getExtension(
-						CloudController.class);
-			if (enabled) {
-				styleController.setShape(node, CloudModel.Shape.valueOf(mCloudShape.getValue()));
-			}
-			else {
-				styleController.setCloud(node, false);
-			}
-		}
-	}
-
-	private class NodeNumberingChangeListener extends ChangeListener {
-		public NodeNumberingChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller.getCurrentModeController()
-			    .getExtension(NodeStyleController.class);
-			styleController.setNodeNumbering(node, enabled ? mNodeNumbering.getBooleanValue() : null);
-		}
-	}
-	
-	private class NodeFormatChangeListener extends ChangeListener {
-		public NodeFormatChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
-			super(mSet, mProperty);
-		}
-
-		@Override
-		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
-			final MNodeStyleController styleController = (MNodeStyleController) Controller.getCurrentModeController()
-			    .getExtension(NodeStyleController.class);
-			styleController.setNodeFormat(node, enabled ? mNodeFormat.getSelectedPattern() : null);
-		}
-	}
-
-	private class StyleChangeListener implements PropertyChangeListener{
-
-		public StyleChangeListener() {
-        }
-
-		public void propertyChange(PropertyChangeEvent evt) {
-			if(internalChange){
-				return;
-			}
-			BooleanProperty isSet = (BooleanProperty) evt.getSource();
-			final MLogicalStyleController styleController = (MLogicalStyleController) LogicalStyleController.getController();
-			if(isSet.getBooleanValue()){
-				styleController.setStyle((IStyle) uiFactory.getStyles().getSelectedItem());
-			}
-			else{
-				styleController.setStyle(null);
-			}
-        }
-		
-	}
-	private abstract class ChangeListener implements PropertyChangeListener {
-		final private Collection<IPropertyControl> properties;
-		final private BooleanProperty mSet;
-
-		public ChangeListener(final BooleanProperty mSet, final IPropertyControl... properties) {
-			super();
-			this.mSet = mSet;
-			this.properties = Arrays.asList(properties);
-		}
-
-		abstract void applyValue(final boolean enabled, NodeModel node, PropertyChangeEvent evt);
-
-		public void propertyChange(final PropertyChangeEvent evt) {
-			if (internalChange) {
-				return;
-			}
-			final boolean enabled;
-			if (evt.getSource().equals(mSet)) {
-				enabled = mSet.getBooleanValue();
-			}
-			else {
-				assert properties.contains(evt.getSource());
-				enabled = true;
-			}
-			final IMapSelection selection = Controller.getCurrentController().getSelection();
-			final Collection<NodeModel> nodes = selection.getSelection();
-			if (enabled )
-				internalChange = true;
-			for (final NodeModel node : nodes) {
-				applyValue(enabled, node, evt);
-			}
-			if (enabled  && ! mSet.getBooleanValue())
-				mSet.setValue(true);
-			internalChange = false;
-			setStyle(selection.getSelected());
-		}
-	}
-
-	private static final String CLOUD_COLOR = "cloudcolor";
-	private static final String EDGE_COLOR = "edgecolor";
-	private static final String EDGE_STYLE = "edgestyle";
-	private static final String CLOUD_SHAPE = "cloudshape";
-	private static final String[] EDGE_STYLES = enumStrings(EdgeStyle.class, EdgeStyle.values().length - 1);
-	private static final String[] CLOUD_SHAPES = StyleEditorPanel.enumStrings(CloudModel.Shape.class);
-	private static final String EDGE_WIDTH = "edgewidth";
-//	private static final String ICON = "icon";
-	private static final String NODE_BACKGROUND_COLOR = "nodebackgroundcolor";
-	private static final String NODE_COLOR = "nodecolor";
-	private static final String NODE_FONT_BOLD = "nodefontbold";
-	private static final String NODE_FONT_ITALIC = "nodefontitalic";
-	private static final String NODE_FONT_HYPERLINK = "nodefonthyperlink";
-	private static final String NODE_FONT_NAME = "nodefontname";
-	private static final String NODE_FONT_SIZE = "nodefontsize";
-	private static final String NODE_NUMBERING = "nodenumbering";
-	private static final String NODE_SHAPE = "nodeshape";
-	private static final String NODE_TEXT_COLOR = "standardnodetextcolor";
-	private static final String NODE_FORMAT = "nodeformat";
-	private static final String TEXT_ALIGNMENT = "textalignment";
-	private static final String[] TEXT_ALIGNMENTS = StyleEditorPanel.enumStrings(TextAlign.class);
-	/**
-	* 
-	*/
-	private static final long serialVersionUID = 1L;
-	private static final String SET_RESOURCE = "set_property_text";
-	private static final String MAX_TEXT_WIDTH = "max_node_width";
-	private static final String MIN_NODE_WIDTH = "min_node_width";
-	private static final String VERTICAL_CHILD_GAP = "vertical_child_gap";
-	private static final String SHAPE_HORIZONTAL_MARGIN = "shape_horizontal_margin";
-	private static final String SHAPE_VERTICAL_MARGIN = "shape_vertical_margin";
-	private static final String UNIFORM_SHAPE = "uniform_shape";
-	
-	
-	private  static <U extends Enum<U>> String[] enumStrings(Class<U> enumerationClass, int length) {
-		final U[] enumConstants = enumerationClass.getEnumConstants();
-		final String[] strings = new String[length];
-		for (int i = 0; i < length; i++) {
-			strings[i] = enumConstants[i].toString();
-		}
-		return strings;
-	}
-
-	private  static <U extends Enum<U>> String[] enumStrings(Class<U> enumerationClass) {
-		return enumStrings(enumerationClass, enumerationClass.getEnumConstants().length);
-	}
-
-	private boolean internalChange;
-	private ColorProperty mCloudColor;
-	private ComboProperty mCloudShape;
-	private List<IPropertyControl> mControls;
-	private ColorProperty mEdgeColor;
-	private ComboProperty mEdgeStyle;
-	private NumberProperty mEdgeWidth;
-// 	private final ModeController mMindMapController;
-	private ColorProperty mNodeBackgroundColor;
-	private ColorProperty mNodeColor;
-	private BooleanProperty mNodeFontBold;
-	private BooleanProperty mNodeFontItalic;
-	private BooleanProperty mNodeFontHyperlink;
-	private FontProperty mNodeFontName;
-	private ComboProperty mNodeFontSize;
-	private BooleanProperty mNodeNumbering;
-	private ComboProperty mNodeShape;
-	private QuantityProperty<LengthUnits> mShapeHorizontalMargin;
-	private QuantityProperty<LengthUnits> mShapeVerticalMargin;
-	private BooleanProperty mUniformShape;
-	private EditablePatternComboProperty mNodeFormat;
-	private QuantityProperty<LengthUnits> mMaxNodeWidth;
-	private QuantityProperty<LengthUnits> mMinNodeWidth;
-	private QuantityProperty<LengthUnits> mChildDistance;
-	private ComboProperty mNodeTextAlignment;
-
-	
-	private BooleanProperty mSetCloud;
-	private BooleanProperty mSetEdgeColor;
-	private BooleanProperty mSetEdgeStyle;
-	private BooleanProperty mSetEdgeWidth;
-	private BooleanProperty mSetNodeBackgroundColor;
-	private BooleanProperty mSetNodeColor;
-	private BooleanProperty mSetNodeFontBold;
-	private BooleanProperty mSetNodeFontItalic;
-	private BooleanProperty mSetNodeFontHyperlink;
-	private BooleanProperty mSetNodeFontName;
-	private BooleanProperty mSetNodeFontSize;
-	private BooleanProperty mSetNodeNumbering;
-	private BooleanProperty mSetNodeShape;
-	private BooleanProperty mSetNodeFormat;
-	private BooleanProperty mSetStyle;
-	private BooleanProperty mSetMaxNodeWidth;
-	private BooleanProperty mSetMinNodeWidth;
-	private BooleanProperty mSetChildDistance;
-	private BooleanProperty mSetNodeTextAlignment;
-	
-	
-	private final boolean addStyleBox;
-	private final MUIFactory uiFactory;
-	private final ModeController modeController;
-	private JButton mNodeStyleButton;
-	private JButton mMapStyleButton;
-
-	/**
-	 * @throws HeadlessException
-	 */
-	public StyleEditorPanel(final ModeController modeController, final MUIFactory uiFactory,
-	                        final boolean addStyleBox) throws HeadlessException {
-		super();
-		this.modeController = modeController;
-		this.addStyleBox = addStyleBox;
-		this.uiFactory = uiFactory;
-		addHierarchyListener(new HierarchyListener() {
-			
-			public void hierarchyChanged(HierarchyEvent e) {
-				if(isDisplayable()){
-					removeHierarchyListener(this);
-					init();
-				}
-			}
-		});
-	}
-
-	private void addBgColorControl(final List<IPropertyControl> controls) {
-		mSetNodeBackgroundColor = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeBackgroundColor);
-		mNodeBackgroundColor = new ColorProperty(StyleEditorPanel.NODE_BACKGROUND_COLOR, ResourceController
-		    .getResourceController().getDefaultProperty(NODE_BACKGROUND_COLOR));
-		controls.add(mNodeBackgroundColor);
-		final BgColorChangeListener listener = new BgColorChangeListener(mSetNodeBackgroundColor, mNodeBackgroundColor);
-		mSetNodeBackgroundColor.addPropertyChangeListener(listener);
-		mNodeBackgroundColor.addPropertyChangeListener(listener);
-	}
-
-    private void addFormatControl(final List<IPropertyControl> controls) {
-        mSetNodeFormat = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-        controls.add(mSetNodeFormat);
-        mNodeFormat = new EditablePatternComboProperty(StyleEditorPanel.NODE_FORMAT,
-            PatternFormat.getIdentityPatternFormat(), FormatController.getController().getAllFormats());
-        controls.add(mNodeFormat);
-        final NodeFormatChangeListener listener = new NodeFormatChangeListener(mSetNodeFormat, mNodeFormat);
-        mSetNodeFormat.addPropertyChangeListener(listener);
-        mNodeFormat.addPropertyChangeListener(listener);
-    }
-	
-	private void addNodeNumberingControl(final List<IPropertyControl> controls) {
-		mSetNodeNumbering = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeNumbering);
-		mNodeNumbering = new BooleanProperty(StyleEditorPanel.NODE_NUMBERING);
-		controls.add(mNodeNumbering);
-		final NodeNumberingChangeListener listener = new NodeNumberingChangeListener(mSetNodeNumbering, mNodeNumbering);
-		mSetNodeNumbering.addPropertyChangeListener(listener);
-		mNodeNumbering.addPropertyChangeListener(listener);
-	}
-
-	private void addCloudColorControl(final List<IPropertyControl> controls) {
-		mSetCloud = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetCloud);
-		mCloudColor = new ColorProperty(StyleEditorPanel.CLOUD_COLOR, ResourceController.getResourceController()
-		    .getDefaultProperty(CloudController.RESOURCES_CLOUD_COLOR));
-		controls.add(mCloudColor);
-		final CloudColorChangeListener listener = new CloudColorChangeListener(mSetCloud, mCloudColor);
-		mSetCloud.addPropertyChangeListener(listener);
-		mCloudColor.addPropertyChangeListener(listener);
-	}
-
-	private void addColorControl(final List<IPropertyControl> controls) {
-		mSetNodeColor = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeColor);
-		mNodeColor = new ColorProperty(StyleEditorPanel.NODE_COLOR, ResourceController.getResourceController()
-		    .getDefaultProperty(NODE_TEXT_COLOR));
-		controls.add(mNodeColor);
-		final ColorChangeListener listener = new ColorChangeListener(mSetNodeColor, mNodeColor);
-		mSetNodeColor.addPropertyChangeListener(listener);
-		mNodeColor.addPropertyChangeListener(listener);
-	}
-
-	private void addEdgeColorControl(final List<IPropertyControl> controls) {
-		mSetEdgeColor = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetEdgeColor);
-		mEdgeColor = new ColorProperty(StyleEditorPanel.EDGE_COLOR, ColorUtils.colorToString(EdgeController.STANDARD_EDGE_COLOR));
-		controls.add(mEdgeColor);
-		final EdgeColorChangeListener listener = new EdgeColorChangeListener(mSetEdgeColor, mEdgeColor);
-		mSetEdgeColor.addPropertyChangeListener(listener);
-		mEdgeColor.addPropertyChangeListener(listener);
-	}
-
-	private void addEdgeStyleControl(final List<IPropertyControl> controls) {
-		mSetEdgeStyle = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetEdgeStyle);
-		mEdgeStyle = new ComboProperty(StyleEditorPanel.EDGE_STYLE, EDGE_STYLES);
-		controls.add(mEdgeStyle);
-		final EdgeStyleChangeListener listener = new EdgeStyleChangeListener(mSetEdgeStyle, mEdgeStyle);
-		mSetEdgeStyle.addPropertyChangeListener(listener);
-		mEdgeStyle.addPropertyChangeListener(listener);
-	}
-
-	private void addCloudShapeControl(final List<IPropertyControl> controls) {
-		mCloudShape = new ComboProperty(StyleEditorPanel.CLOUD_SHAPE, CLOUD_SHAPES);
-		controls.add(mCloudShape);
-		final CloudShapeChangeListener listener = new CloudShapeChangeListener(mSetCloud, mCloudShape);
-		mSetCloud.addPropertyChangeListener(listener);
-		mCloudShape.addPropertyChangeListener(listener);
-	}
-
-	private void addEdgeWidthControl(final List<IPropertyControl> controls) {
-		mSetEdgeWidth = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetEdgeWidth);
-		mEdgeWidth = new NumberProperty(StyleEditorPanel.EDGE_WIDTH, 0, 100, 1);
-		controls.add(mEdgeWidth);
-		final EdgeWidthChangeListener listener = new EdgeWidthChangeListener(mSetEdgeWidth, mEdgeWidth);
-		mSetEdgeWidth.addPropertyChangeListener(listener);
-		mEdgeWidth.addPropertyChangeListener(listener);
-	}
-
-	private void addMaxNodeWidthControl(final List<IPropertyControl> controls) {
-		mSetMaxNodeWidth = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetMaxNodeWidth);
-		mMaxNodeWidth = new QuantityProperty<LengthUnits>(StyleEditorPanel.MAX_TEXT_WIDTH, 0, 100000, 0.1, LengthUnits.px);
-		controls.add(mMaxNodeWidth);
-		final MaxNodeWidthChangeListener listener = new MaxNodeWidthChangeListener(mSetMaxNodeWidth, mMaxNodeWidth);
-		mSetMaxNodeWidth.addPropertyChangeListener(listener);
-		mMaxNodeWidth.addPropertyChangeListener(listener);
-	}
-
-	private void addMinNodeWidthControl(final List<IPropertyControl> controls) {
-		mSetMinNodeWidth = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetMinNodeWidth);
-		mMinNodeWidth = new QuantityProperty<LengthUnits>(StyleEditorPanel.MIN_NODE_WIDTH, 0, 100000, 0.1, LengthUnits.px);
-		controls.add(mMinNodeWidth);
-		final MinNodeWidthChangeListener listener = new MinNodeWidthChangeListener(mSetMinNodeWidth, mMinNodeWidth);
-		mSetMinNodeWidth.addPropertyChangeListener(listener);
-		mMinNodeWidth.addPropertyChangeListener(listener);
-	}
-
-	private void addChildDistanceControl(final List<IPropertyControl> controls) {
-		mSetChildDistance = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetChildDistance);
-		mChildDistance = new  QuantityProperty<LengthUnits>(StyleEditorPanel.VERTICAL_CHILD_GAP, 0, 1000, 0.1, LengthUnits.px);
-		controls.add(mChildDistance);
-		final ChildDistanceChangeListener listener = new ChildDistanceChangeListener(mSetChildDistance, mChildDistance);
-		mSetChildDistance.addPropertyChangeListener(listener);
-		mChildDistance.addPropertyChangeListener(listener);
-	}
-
-	private void addFontBoldControl(final List<IPropertyControl> controls) {
-		mSetNodeFontBold = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeFontBold);
-		mNodeFontBold = new BooleanProperty(StyleEditorPanel.NODE_FONT_BOLD);
-		controls.add(mNodeFontBold);
-		final FontBoldChangeListener listener = new FontBoldChangeListener(mSetNodeFontBold, mNodeFontBold);
-		mSetNodeFontBold.addPropertyChangeListener(listener);
-		mNodeFontBold.addPropertyChangeListener(listener);
-	}
-
-	private void addFontItalicControl(final List<IPropertyControl> controls) {
-		mSetNodeFontItalic = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeFontItalic);
-		mNodeFontItalic = new BooleanProperty(StyleEditorPanel.NODE_FONT_ITALIC);
-		controls.add(mNodeFontItalic);
-		final FontItalicChangeListener listener = new FontItalicChangeListener(mSetNodeFontItalic, mNodeFontItalic);
-		mSetNodeFontItalic.addPropertyChangeListener(listener);
-		mNodeFontItalic.addPropertyChangeListener(listener);
-	}
-
-	private void addFontHyperlinkControl(final List<IPropertyControl> controls) {
-		mSetNodeFontHyperlink = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeFontHyperlink);
-		mNodeFontHyperlink = new BooleanProperty(StyleEditorPanel.NODE_FONT_HYPERLINK);
-		controls.add(mNodeFontHyperlink);
-		final FontHyperlinkChangeListener listener = new FontHyperlinkChangeListener(mSetNodeFontHyperlink, mNodeFontHyperlink);
-		mSetNodeFontHyperlink.addPropertyChangeListener(listener);
-		mNodeFontHyperlink.addPropertyChangeListener(listener);
-	}
-
-	private void addFontNameControl(final List<IPropertyControl> controls) {
-		mSetNodeFontName = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeFontName);
-		mNodeFontName = new FontProperty(StyleEditorPanel.NODE_FONT_NAME);
-		controls.add(mNodeFontName);
-		final FontNameChangeListener listener = new FontNameChangeListener(mSetNodeFontName, mNodeFontName);
-		mSetNodeFontName.addPropertyChangeListener(listener);
-		mNodeFontName.addPropertyChangeListener(listener);
-	}
-
-	private void addFontSizeControl(final List<IPropertyControl> controls) {
-		mSetNodeFontSize = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeFontSize);
-		final List<String> sizesVector = new ArrayList<String>(Arrays.asList(MUIFactory.FONT_SIZES));
-		mNodeFontSize = new ComboProperty(StyleEditorPanel.NODE_FONT_SIZE, sizesVector, sizesVector);
-		mNodeFontSize.setEditable(true);
-		controls.add(mNodeFontSize);
-		final FontSizeChangeListener listener = new FontSizeChangeListener(mSetNodeFontSize, mNodeFontSize);
-		mSetNodeFontSize.addPropertyChangeListener(listener);
-		mNodeFontSize.addPropertyChangeListener(listener);
-	}
-
-	private void addNodeShapeControls(final List<IPropertyControl> controls) {
-		mSetNodeShape = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeShape);
-		mNodeShape = new ComboProperty(StyleEditorPanel.NODE_SHAPE, enumStrings(NodeStyleModel.Shape.class));
-		controls.add(mNodeShape);
-		controls.add(new NextColumnProperty(2));
-		mShapeHorizontalMargin = new QuantityProperty<LengthUnits>(StyleEditorPanel.SHAPE_HORIZONTAL_MARGIN, 0, 1000, 0.1, LengthUnits.pt);
-		controls.add(mShapeHorizontalMargin);
-		controls.add(new NextColumnProperty(2));
-		mShapeVerticalMargin = new QuantityProperty<LengthUnits>(StyleEditorPanel.SHAPE_VERTICAL_MARGIN, 0, 1000, 0.1, LengthUnits.pt);
-		controls.add(mShapeVerticalMargin);
-		controls.add(new NextColumnProperty(2));
-		mUniformShape = new BooleanProperty(StyleEditorPanel.UNIFORM_SHAPE);
-		controls.add(mUniformShape);
-		final NodeShapeChangeListener listener = new NodeShapeChangeListener(mSetNodeShape, mNodeShape, mShapeHorizontalMargin, mShapeVerticalMargin, mUniformShape);
-		mSetNodeShape.addPropertyChangeListener(listener);
-		mNodeShape.addPropertyChangeListener(listener);
-		mShapeHorizontalMargin.addPropertyChangeListener(listener);
-		mShapeVerticalMargin.addPropertyChangeListener(listener);
-		mUniformShape.addPropertyChangeListener(listener);
-	}
-
-	private void addNodeTextAlignmentControl(final List<IPropertyControl> controls) {
-		mSetNodeTextAlignment = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		controls.add(mSetNodeTextAlignment);
-		final Vector<String> possibleTranslations = new Vector<String>(TEXT_ALIGNMENTS.length);
-		for (int i = 0; i < TEXT_ALIGNMENTS.length; i++) {
-			possibleTranslations.add(TextUtils.getText("TextAlignAction." + TEXT_ALIGNMENTS[i] + ".text"));
-		}
-		Vector<String> translations = possibleTranslations;
-		mNodeTextAlignment = new ComboProperty(StyleEditorPanel.TEXT_ALIGNMENT, Arrays.asList(TEXT_ALIGNMENTS), translations);
-		controls.add(mNodeTextAlignment);
-		final TextAlignmentChangeListener listener = new TextAlignmentChangeListener(mSetNodeTextAlignment, mNodeTextAlignment);
-		mSetNodeTextAlignment.addPropertyChangeListener(listener);
-		mNodeTextAlignment.addPropertyChangeListener(listener);
-	}
-
-	private List<IPropertyControl> getControls() {
-		final List<IPropertyControl> controls = new ArrayList<IPropertyControl>();
-		controls.add(new SeparatorProperty("OptionPanel.separator.NodeColors"));
-		addColorControl(controls);
-		addBgColorControl(controls);
-		controls.add(new SeparatorProperty("OptionPanel.separator.NodeText"));
-		addFormatControl(controls);
-		addNodeNumberingControl(controls);
-		controls.add(new SeparatorProperty("OptionPanel.separator.NodeShape"));
-		addNodeShapeControls(controls);
-		addMinNodeWidthControl(controls);
-		addMaxNodeWidthControl(controls);
-		addChildDistanceControl(controls);
-		controls.add(new NextLineProperty());
-		controls.add(new SeparatorProperty("OptionPanel.separator.NodeFont"));
-		addFontNameControl(controls);
-		addFontSizeControl(controls);
-		addFontBoldControl(controls);
-		addFontItalicControl(controls);
-		addNodeTextAlignmentControl(controls);
-		addFontHyperlinkControl(controls);
-		controls.add(new NextLineProperty());
-		controls.add(new SeparatorProperty("OptionPanel.separator.EdgeControls"));
-		addEdgeWidthControl(controls);
-		addEdgeStyleControl(controls);
-		addEdgeColorControl(controls);
-		controls.add(new NextLineProperty());
-		controls.add(new SeparatorProperty("OptionPanel.separator.CloudControls"));
-		addCloudColorControl(controls);
-		controls.add(new NextLineProperty());
-		controls.add(new NextColumnProperty(2));
-		addCloudShapeControl(controls);
-		return controls;
-	}
-	
-	
-	/**
-	 * Creates all controls and adds them to the frame.
-	 * @param modeController 
-	 */
-	private void init() {
-		if(mControls != null)
-			return;
-		final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
-		final FormLayout rightLayout = new FormLayout(form, "");
-		final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
-		rightBuilder.border(Paddings.DLU2);
-		new SeparatorProperty("OptionPanel.separator.NodeStyle").layout(rightBuilder);
-		if (addStyleBox) {
-			addAutomaticLayout(rightBuilder);
-			addStyleBox(rightBuilder);
-		}
-		mNodeStyleButton = addStyleButton(rightBuilder, "actual_node_styles", modeController.getAction(ManageNodeConditionalStylesAction.NAME));
-		if (addStyleBox) {
-			mMapStyleButton = addStyleButton(rightBuilder, "actual_map_styles", modeController.getAction(ManageMapConditionalStylesAction.NAME));
-		}
-		mControls = getControls();
-		for (final IPropertyControl control : mControls) {
-			control.layout(rightBuilder);
-		}
-		add(rightBuilder.getPanel(), BorderLayout.CENTER);
-		addListeners();
-		setFont(this, FONT_SIZE);
-	}
-
-	private JButton addStyleButton(DefaultFormBuilder rightBuilder, String label, AFreeplaneAction action) {
-	    final JButton button = new JButton(){
-			private static final long serialVersionUID = 1L;
-			{
-				setUI(BasicButtonUI.createUI(this));
-				
-			}
-		};
-	    button.addActionListener(action);
-	    button.setHorizontalAlignment(SwingConstants.LEFT);
-	    final String labelText = TextUtils.getText(label);
-	    UITools.addTitledBorder(button, labelText, FONT_SIZE);
-		TranslatedElement.BORDER.setKey(button, label);
-	    rightBuilder.append(button, rightBuilder.getColumnCount());
-		rightBuilder.nextLine();
-		return button;
-    }
-
-	private void addStyleBox(final DefaultFormBuilder rightBuilder) {
-	    mStyleBox = uiFactory.createStyleBox();
-	    mSetStyle = new BooleanProperty(StyleEditorPanel.SET_RESOURCE);
-		final StyleChangeListener listener = new StyleChangeListener();
-		mSetStyle.addPropertyChangeListener(listener);
-		mSetStyle.layout(rightBuilder);
-	    rightBuilder.append(new JLabel(TextUtils.getText("style")));
-	    rightBuilder.append(mStyleBox);
-	    rightBuilder.nextLine();
-    }
-
-	private JComboBox mAutomaticLayoutComboBox;
-	private JComboBox mAutomaticEdgeColorComboBox;
-	private Container mStyleBox;
-	private void addAutomaticLayout(final DefaultFormBuilder rightBuilder) {
-		{
-		if(mAutomaticLayoutComboBox == null){
-			 TranslatedObject[] automaticLayoutTypes = TranslatedObject.fromEnum(AutomaticLayout.class);
-			 mAutomaticLayoutComboBox = new JComboBoxWithBorder(automaticLayoutTypes);
-			 DefaultComboBoxModel automaticLayoutComboBoxModel = (DefaultComboBoxModel) mAutomaticLayoutComboBox.getModel();
-			 automaticLayoutComboBoxModel.addElement(AUTOMATIC_LAYOUT_DISABLED);
-			 automaticLayoutComboBoxModel.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
-			 mAutomaticLayoutComboBox.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					if(internalChange)
-						return;
-					final ModeController modeController = Controller.getCurrentModeController();
-					AutomaticLayoutController al = modeController.getExtension(AutomaticLayoutController.class);
-					TranslatedObject selectedItem = (TranslatedObject)mAutomaticLayoutComboBox.getSelectedItem();
-					al.undoableDeactivateHook(Controller.getCurrentController().getMap().getRootNode());
-					if(!selectedItem.equals(AUTOMATIC_LAYOUT_DISABLED)){
-						al.undoableActivateHook(Controller.getCurrentController().getMap().getRootNode(), (AutomaticLayout) selectedItem.getObject());
-					}
-				}
-			});
-		}
-	    appendLabeledComponent(rightBuilder, "AutomaticLayoutAction.text", mAutomaticLayoutComboBox);
-		}
-		{
-			
-			if(mAutomaticEdgeColorComboBox == null){
-	 			 TranslatedObject[] automaticLayoutTypes = TranslatedObject.fromEnum(AutomaticEdgeColor.class.getSimpleName() + "." , AutomaticEdgeColor.Rule.class);
-	 			 mAutomaticEdgeColorComboBox = new JComboBoxWithBorder(automaticLayoutTypes);
-				 DefaultComboBoxModel automaticEdgeColorComboBoxModel = (DefaultComboBoxModel) mAutomaticEdgeColorComboBox.getModel();
-				 automaticEdgeColorComboBoxModel.addElement(AUTOMATIC_LAYOUT_DISABLED);
-				 automaticEdgeColorComboBoxModel.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
-				 mAutomaticEdgeColorComboBox.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						if(internalChange)
-							return;
-						final ModeController modeController = Controller.getCurrentModeController();
-						AutomaticEdgeColorHook hook = modeController.getExtension(AutomaticEdgeColorHook.class);
-						TranslatedObject selectedItem = (TranslatedObject)mAutomaticEdgeColorComboBox.getSelectedItem();
-						final MapModel map = Controller.getCurrentController().getMap();
-						final AutomaticEdgeColor oldExtension = (AutomaticEdgeColor) hook.getMapHook(map);
-						final int colorCount = oldExtension == null ? 0 : oldExtension.getColorCounter();
-						final NodeModel rootNode = map.getRootNode();
-						hook.undoableDeactivateHook(rootNode);
-						if(!selectedItem.equals(AUTOMATIC_LAYOUT_DISABLED)){
-						final AutomaticEdgeColor newExtension = new  AutomaticEdgeColor((AutomaticEdgeColor.Rule) selectedItem.getObject(), colorCount);
-							hook.undoableActivateHook(rootNode, newExtension);
-						}
-					}
-				});
-			}
-			appendLabeledComponent(rightBuilder, "AutomaticEdgeColorHookAction.text", mAutomaticEdgeColorComboBox);
-		}
-	}
-
-	private void appendLabeledComponent(final DefaultFormBuilder rightBuilder, String labelKey, Component component) {
-		final String text = TextUtils.getText(labelKey);
-	    final JLabel label = new JLabel(text);
-		TranslatedElement.TEXT.setKey(label, labelKey);
-		rightBuilder.append(label, 5);
-	    rightBuilder.append(component);
-	    rightBuilder.nextLine();
-	}
-
-	private void setFont(Container c, float size) {
-		c.setFont(c.getFont().deriveFont(size));
-		for(int i = 0; i < c.getComponentCount(); i++){
-			setFont((Container) c.getComponent(i), size);
-		}
-    }
-
-	public void setStyle( final NodeModel node) {
-		if (internalChange) {
-			return;
-		}
-		internalChange = true;
-		try {
-			final LogicalStyleController logicalStyleController = LogicalStyleController.getController();
-			if(addStyleBox){
-				final boolean isStyleSet = LogicalStyleModel.getStyle(node) != null;
-				mSetStyle.setValue(isStyleSet);
-				setStyleList(mMapStyleButton, logicalStyleController.getMapStyleNames(node, "\n"));
-			}
-			setStyleList(mNodeStyleButton, logicalStyleController.getNodeStyleNames(node, "\n"));
-			final NodeStyleController styleController = NodeStyleController.getController();
-			{
-				final Color nodeColor = NodeStyleModel.getColor(node);
-				final Color viewNodeColor = styleController.getColor(node);
-				mSetNodeColor.setValue(nodeColor != null);
-				mNodeColor.setColorValue(viewNodeColor);
-			}
-			{
-				final Color color = NodeStyleModel.getBackgroundColor(node);
-				final Color viewColor = styleController.getBackgroundColor(node);
-				mSetNodeBackgroundColor.setValue(color != null);
-				mNodeBackgroundColor.setColorValue(viewColor != null ? viewColor : Controller.getCurrentController()
-				    .getMapViewManager().getBackgroundColor(node));
-			}
-			{
-				final NodeStyleModel.Shape shape = NodeStyleModel.getShape(node);
-				ShapeConfigurationModel viewShape = styleController.getShapeConfiguration(node);
-				final boolean enabled = shape != null;
-				mSetNodeShape.setValue(enabled);
-				mNodeShape.setValue(viewShape.getShape().toString());
-				enableShapeConfigurationProperties(enabled, shape);
-				mShapeHorizontalMargin.setQuantifiedValue(viewShape.getHorizontalMargin());
-				mShapeVerticalMargin.setQuantifiedValue(viewShape.getVerticalMargin());
-				mUniformShape.setValue(viewShape.isUniform());
-			}
-			final NodeSizeModel nodeSizeModel = NodeSizeModel.getModel(node);
-			{
-				final Quantity<LengthUnits> width = nodeSizeModel != null ? nodeSizeModel.getMaxNodeWidth() : null;
-				final Quantity<LengthUnits> viewWidth = styleController.getMaxWidth(node);
-				mSetMaxNodeWidth.setValue(width != null);
-				mMaxNodeWidth.setQuantifiedValue(viewWidth);
-			}
-			{
-				final Quantity<LengthUnits> width = nodeSizeModel != null ? nodeSizeModel.getMinNodeWidth() : null;
-				final Quantity<LengthUnits> viewWidth = styleController.getMinWidth(node);
-				mSetMinNodeWidth.setValue(width != null);
-				mMinNodeWidth.setQuantifiedValue(viewWidth);
-			}
-			{
-				final LocationModel locationModel = LocationModel.getModel(node);
-				final LocationController locationController = modeController.getExtension(LocationController.class);
-				final Quantity<LengthUnits> gap = locationModel.getVGap();
-				final Quantity<LengthUnits> viewGap = locationController.getMinimalDistanceBetweenChildren(node);
-				mSetChildDistance.setValue(gap != LocationModel.DEFAULT_VGAP);
-				mChildDistance.setQuantifiedValue(viewGap);
-			}
-			
-			final EdgeController edgeController = EdgeController.getController();
-			final EdgeModel edgeModel = EdgeModel.getModel(node);
-			{
-				final Color edgeColor = edgeModel != null ? edgeModel.getColor() : null;
-				final Color viewColor = edgeController.getColor(node);
-				mSetEdgeColor.setValue(edgeColor != null);
-				mEdgeColor.setColorValue(viewColor);
-			}
-			{
-				final EdgeStyle style = edgeModel != null ? edgeModel.getStyle() : null;
-				final EdgeStyle viewStyle = edgeController.getStyle(node);
-				mSetEdgeStyle.setValue(style != null);
-				mEdgeStyle.setValue(viewStyle.toString());
-			}
-			{
-				final int width = edgeModel != null ? edgeModel.getWidth() : EdgeModel.DEFAULT_WIDTH;
-				final int viewWidth = edgeController.getWidth(node);
-				mSetEdgeWidth.setValue(width != EdgeModel.DEFAULT_WIDTH);
-				mEdgeWidth.setValue(Integer.toString(viewWidth));
-			}
-			{
-				final CloudController cloudController = CloudController.getController();
-				final CloudModel cloudModel = CloudModel.getModel(node);
-				final Color viewCloudColor = cloudController.getColor(node);
-				mSetCloud.setValue(cloudModel != null);
-				mCloudColor.setColorValue(viewCloudColor);
-
-				final CloudModel.Shape viewCloudShape = cloudController.getShape(node);
-				mCloudShape.setValue(viewCloudShape != null ? viewCloudShape.toString() : CloudModel.Shape.ARC.toString());
-			}
-			{
-				final String fontFamilyName = NodeStyleModel.getFontFamilyName(node);
-				final String viewFontFamilyName = styleController.getFontFamilyName(node);
-				mSetNodeFontName.setValue(fontFamilyName != null);
-				mNodeFontName.setValue(viewFontFamilyName);
-			}
-			{
-				final Integer fontSize = NodeStyleModel.getFontSize(node);
-				final Integer viewfontSize = styleController.getFontSize(node);
-				mSetNodeFontSize.setValue(fontSize != null);
-				mNodeFontSize.setValue(viewfontSize.toString());
-			}
-			{
-				final Boolean bold = NodeStyleModel.isBold(node);
-				final Boolean viewbold = styleController.isBold(node);
-				mSetNodeFontBold.setValue(bold != null);
-				mNodeFontBold.setValue(viewbold);
-			}
-			{
-				final Boolean italic = NodeStyleModel.isItalic(node);
-				final Boolean viewitalic = styleController.isItalic(node);
-				mSetNodeFontItalic.setValue(italic != null);
-				mNodeFontItalic.setValue(viewitalic);
-			}
-			{
-				final TextAlign style = NodeStyleModel.getTextAlign(node);
-				final TextAlign viewStyle = styleController.getTextAlign(node);
-				mSetNodeTextAlignment.setValue(style != null);
-				mNodeTextAlignment.setValue(viewStyle.toString());
-			}
-			{
-				final Boolean hyperlink = NodeLinks.formatNodeAsHyperlink(node);
-				final Boolean viewhyperlink = LinkController.getController().formatNodeAsHyperlink(node);
-				mSetNodeFontHyperlink.setValue(hyperlink != null);
-				mNodeFontHyperlink.setValue(viewhyperlink);
-			}
-			{
-				final Boolean nodeNumbering = NodeStyleModel.getNodeNumbering(node);
-				final Boolean viewNodeNumbering = styleController.getNodeNumbering(node);
-				mSetNodeNumbering.setValue(nodeNumbering != null);
-				mNodeNumbering.setValue(viewNodeNumbering);
-			}
-			{
-				String nodeFormat = NodeStyleModel.getNodeFormat(node);
-				String viewNodeFormat = TextController.getController().getNodeFormat(node);
-				mSetNodeFormat.setValue(nodeFormat != null);
-				if (viewNodeFormat == null && node.getUserObject() instanceof IFormattedObject)
-					viewNodeFormat = ((IFormattedObject)node.getUserObject()).getPattern();
-				mNodeFormat.setValue(viewNodeFormat);
-			}
-			if(mAutomaticLayoutComboBox != null){
-				final ModeController modeController = Controller.getCurrentModeController();
-				AutomaticLayoutController al = modeController.getExtension(AutomaticLayoutController.class);
-				IExtension extension = al.getExtension(node);
-				if(extension == null)
-					mAutomaticLayoutComboBox.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
-				else
-					mAutomaticLayoutComboBox.setSelectedIndex(((AutomaticLayout)extension).ordinal());
-			}
-			if(mAutomaticEdgeColorComboBox != null){
-				final ModeController modeController = Controller.getCurrentModeController();
-				AutomaticEdgeColorHook al = (AutomaticEdgeColorHook) modeController.getExtension(AutomaticEdgeColorHook.class);
-				final AutomaticEdgeColor extension = (AutomaticEdgeColor) al.getExtension(node);
-				if(extension == null)
-					mAutomaticEdgeColorComboBox.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
-				else
-					mAutomaticEdgeColorComboBox.setSelectedIndex(extension.rule.ordinal());
-			}
-		}
-		finally {
-			internalChange = false;
-		}
-	}
-
-	private void setStyleList(JButton btn, String styles) {
-		if("".equals(styles)){
-			btn.setToolTipText(null);
-			btn.setText(" ");
-			return;
-		}
-		btn.setToolTipText(HtmlUtils.plainToHTML(styles));
-		final String text = styles.replaceAll("\n", ", ");
-		btn.setText(text);
-    }
-
-	private void addListeners() {
-		final Controller controller = Controller.getCurrentController();
-		final ModeController modeController = Controller.getCurrentModeController();
-		final MapController mapController = modeController.getMapController();
-		mapController.addNodeSelectionListener(new INodeSelectionListener() {
-			public void onSelect(final NodeModel node) {
-				final IMapSelection selection = controller.getSelection();
-				if (selection == null) {
-					return;
-				}
-				if (selection.size() == 1) {
-					setStyle(node);
-				}
-			}
-
-			public void onDeselect(final NodeModel node) {
-			}
-		});
-		mapController.addNodeChangeListener(new INodeChangeListener() {
-			public void nodeChanged(final NodeChangeEvent event) {
-				final IMapSelection selection = controller.getSelection();
-				if (selection == null) {
-					return;
-				}
-				final NodeModel node = event.getNode();
-				if (selection.getSelected().equals(node)) {
-					setStyle(node);
-				}
-			}
-		});
-		mapController.addMapChangeListener(new AMapChangeListenerAdapter() {
-
-			@Override
-            public void mapChanged(MapChangeEvent event) {
-				if(! MapStyle.MAP_STYLES.equals(event.getProperty()))
-					return;
-				final IMapSelection selection = controller.getSelection();
-				if (selection == null) {
-					return;
-				}
-				final NodeModel node = selection.getSelected();
-				setStyle(node);
-            }
-			
-		});
-		final IMapViewManager mapViewManager = controller.getMapViewManager();
-		mapViewManager.addMapViewChangeListener(new IMapViewChangeListener() {
-			public void beforeViewChange(final Component oldView, final Component newView) {
-			}
-
-			public void afterViewCreated(final Component mapView) {
-			}
-
-			public void afterViewClose(final Component oldView) {
-			}
-
-			public void afterViewChange(final Component oldView, final Component newView) {
-				final Container panel = (Container) getComponent(0);
-				for (int i = 0; i < panel.getComponentCount(); i++) {
-					panel.getComponent(i).setEnabled(newView != null);
-				}
-			}
-		});
-	}
-
-	private void enableShapeConfigurationProperties(final boolean enabled, final Shape shape) {
-		final boolean enableConfigurationProperties = enabled && shape.hasConfiguration;
-		mShapeHorizontalMargin.setEnabled(enableConfigurationProperties);
-		mShapeVerticalMargin.setEnabled(enableConfigurationProperties);
-		mUniformShape.setEnabled(enableConfigurationProperties);
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderColorAndColorMatchesEdgeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderColorAndColorMatchesEdgeControlGroup.java
new file mode 100644
index 0000000..69b9e9a
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderColorAndColorMatchesEdgeControlGroup.java
@@ -0,0 +1,146 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ColorProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.util.ColorUtils;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeBorderModel;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 17, 2016
+ */
+public class BorderColorAndColorMatchesEdgeControlGroup implements ControlGroup {
+	private static final String BORDER_COLOR_MATCHES_EDGE_COLOR = "border_color_matches_edge_color";
+	private static final String BORDER_COLOR = "border_color";
+	
+	private BooleanProperty mSetBorderColor;
+	private ColorProperty mBorderColor;
+
+	private BooleanProperty mSetBorderColorMatchesEdgeColor;
+	private BooleanProperty mBorderColorMatchesEdgeColor;
+	
+	private BorderColorListener borderColorListener;
+	private BorderColorMatchesEdgeColorListener borderColorMatchesEdgeColorChangeListener;
+	
+	private class BorderColorListener extends ControlGroupChangeListener {
+		public BorderColorListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setBorderColor(node, enabled ? mBorderColor.getColorValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final NodeBorderModel nodeBorderModel = NodeBorderModel.getModel(node);
+			final Color color = nodeBorderModel != null ? nodeBorderModel.getBorderColor() : null;
+			final Color viewColor = styleController.getBorderColor(node);
+			mSetBorderColor.setValue(color != null);
+			mBorderColor.setColorValue(viewColor);
+			enableOrDisableBorderColorControls();
+		}
+	}
+	
+	private class BorderColorMatchesEdgeColorListener extends ControlGroupChangeListener {
+		public BorderColorMatchesEdgeColorListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setBorderColorMatchesEdgeColor(node, enabled ? mBorderColorMatchesEdgeColor.getBooleanValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final NodeBorderModel nodeBorderModel = NodeBorderModel.getModel(node);
+			final Boolean match = nodeBorderModel != null ? nodeBorderModel.getBorderColorMatchesEdgeColor() : null;
+			final Boolean viewMatch = styleController.getBorderColorMatchesEdgeColor(node);
+			mSetBorderColorMatchesEdgeColor.setValue(match != null);
+			mBorderColorMatchesEdgeColor.setValue(viewMatch);
+		}
+	}
+	
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		addBorderColorMatchesEdgeColorControl(formBuilder);
+		addBorderColorControl(formBuilder);
+	}
+	
+	private void addBorderColorControl(DefaultFormBuilder formBuilder) {
+		mSetBorderColor = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mBorderColor = new ColorProperty(BORDER_COLOR, ColorUtils.colorToString(EdgeController.STANDARD_EDGE_COLOR));
+		borderColorListener = new BorderColorListener(mSetBorderColor, mBorderColor);
+		mSetBorderColor.addPropertyChangeListener(borderColorListener);
+		mBorderColor.addPropertyChangeListener(borderColorListener);
+		mSetBorderColor.layout(formBuilder);
+		mBorderColor.layout(formBuilder);
+	}
+	
+	public void addBorderColorMatchesEdgeColorControl(DefaultFormBuilder formBuilder) {
+		mSetBorderColorMatchesEdgeColor = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mBorderColorMatchesEdgeColor = new BooleanProperty(BORDER_COLOR_MATCHES_EDGE_COLOR);
+		borderColorMatchesEdgeColorChangeListener = new BorderColorMatchesEdgeColorListener(mSetBorderColorMatchesEdgeColor, mBorderColorMatchesEdgeColor);
+		mSetBorderColorMatchesEdgeColor.addPropertyChangeListener(borderColorMatchesEdgeColorChangeListener);
+		mBorderColorMatchesEdgeColor.addPropertyChangeListener(borderColorMatchesEdgeColorChangeListener);
+		mBorderColorMatchesEdgeColor.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				enableOrDisableBorderColorControls();
+			}
+		});
+		
+		mSetBorderColorMatchesEdgeColor.layout(formBuilder);
+		mBorderColorMatchesEdgeColor.layout(formBuilder);
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		borderColorListener.setStyle(node);
+		borderColorMatchesEdgeColorChangeListener.setStyle(node);
+	}
+
+	private void enableOrDisableBorderColorControls() {
+		final boolean borderColorCanBeSet = ! mBorderColorMatchesEdgeColor.getBooleanValue();
+		mSetBorderColor.setEnabled(borderColorCanBeSet);
+		mBorderColor.setEnabled(borderColorCanBeSet);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderDashAndDashMatchesEdgeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderDashAndDashMatchesEdgeControlGroup.java
new file mode 100644
index 0000000..cdd726b
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderDashAndDashMatchesEdgeControlGroup.java
@@ -0,0 +1,145 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.DashVariant;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeBorderModel;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 17, 2016
+ */
+public class BorderDashAndDashMatchesEdgeControlGroup implements ControlGroup {
+	private static final String BORDER_DASH_MATCHES_EDGE_DASH = "border_dash_matches_edge_dash";
+	private static final String BORDER_DASH = "border_dash";
+
+	private BooleanProperty mSetBorderDash;
+	private ComboProperty mBorderDash;
+
+	private BooleanProperty mSetBorderDashMatchesEdgeDash;
+	private BooleanProperty mBorderDashMatchesEdgeDash;
+	
+	private BorderDashListener borderDashListener;
+	private BorderDashMatchesEdgeDashListener borderDashMatchesEdgeDashChangeListener;
+	
+	private class BorderDashListener extends ControlGroupChangeListener {
+		public BorderDashListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setBorderDash(node, enabled ? DashVariant.valueOf(mBorderDash.getValue()): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeBorderModel nodeBorderModel = NodeBorderModel.getModel(node);
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final DashVariant dash = nodeBorderModel != null ? nodeBorderModel.getBorderDash() : null;
+			final DashVariant viewDash = styleController.getBorderDash(node);
+			mSetBorderDash.setValue(dash != null);
+			mBorderDash.setValue(viewDash.name());
+			enableOrDisableBorderDashControls();
+		}
+	}
+	
+	private class BorderDashMatchesEdgeDashListener extends ControlGroupChangeListener {
+		public BorderDashMatchesEdgeDashListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setBorderDashMatchesEdgeDash(node, enabled ? mBorderDashMatchesEdgeDash.getBooleanValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeBorderModel nodeBorderModel = NodeBorderModel.getModel(node);
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Boolean match = nodeBorderModel != null ? nodeBorderModel.getBorderDashMatchesEdgeDash() : null;
+			final Boolean viewMatch = styleController.getBorderDashMatchesEdgeDash(node);
+			mSetBorderDashMatchesEdgeDash.setValue(match != null);
+			mBorderDashMatchesEdgeDash.setValue(viewMatch);
+			
+		}
+	}
+	
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		addBorderDashMatchesEdgeDashControl(formBuilder);
+		addBorderDashControl(formBuilder);
+	}
+	
+	private void addBorderDashControl(DefaultFormBuilder formBuilder) {
+		mSetBorderDash = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mBorderDash = ComboProperty.of(BORDER_DASH, DashVariant.class);
+		borderDashListener = new BorderDashListener(mSetBorderDash, mBorderDash);
+		mSetBorderDash.addPropertyChangeListener(borderDashListener);
+		mBorderDash.addPropertyChangeListener(borderDashListener);
+		mSetBorderDash.layout(formBuilder);
+		mBorderDash.layout(formBuilder);
+	}
+	
+	public void addBorderDashMatchesEdgeDashControl(DefaultFormBuilder formBuilder) {
+		mSetBorderDashMatchesEdgeDash = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mBorderDashMatchesEdgeDash = new BooleanProperty(BORDER_DASH_MATCHES_EDGE_DASH);
+		borderDashMatchesEdgeDashChangeListener = new BorderDashMatchesEdgeDashListener(mSetBorderDashMatchesEdgeDash, mBorderDashMatchesEdgeDash);
+		mSetBorderDashMatchesEdgeDash.addPropertyChangeListener(borderDashMatchesEdgeDashChangeListener);
+		mBorderDashMatchesEdgeDash.addPropertyChangeListener(borderDashMatchesEdgeDashChangeListener);
+		mBorderDashMatchesEdgeDash.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				enableOrDisableBorderDashControls();
+			}
+		});
+		mSetBorderDashMatchesEdgeDash.layout(formBuilder);
+		mBorderDashMatchesEdgeDash.layout(formBuilder);
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		borderDashListener.setStyle(node);
+		borderDashMatchesEdgeDashChangeListener.setStyle(node);
+	}
+
+	private void enableOrDisableBorderDashControls() {
+		final boolean borderDashCanBeSet = ! mBorderDashMatchesEdgeDash.getBooleanValue();
+		mSetBorderDash.setEnabled(borderDashCanBeSet);
+		mBorderDash.setEnabled(borderDashCanBeSet);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderWidthAndBorderWidthMatchesEdgeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderWidthAndBorderWidthMatchesEdgeControlGroup.java
new file mode 100644
index 0000000..f66adb2
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/BorderWidthAndBorderWidthMatchesEdgeControlGroup.java
@@ -0,0 +1,146 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.QuantityProperty;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeBorderModel;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class BorderWidthAndBorderWidthMatchesEdgeControlGroup implements ControlGroup {
+	private static final String BORDER_WIDTH_MATCHES_EDGE_WIDTH = "border_width_matches_edge_width";
+	private static final String BORDER_WIDTH = "border_width";
+	
+	private BooleanProperty mSetBorderWidthMatchesEdgeWidth;
+	private BooleanProperty mBorderWidthMatchesEdgeWidth;
+
+	private BooleanProperty mSetBorderWidth;
+	private QuantityProperty<LengthUnits> mBorderWidth;
+
+	private BorderWidthMatchesEdgeWidthListener borderWidthMatchesEdgeChangeListener;
+	private BorderWidthListener borderWidthListener;
+	
+	private class BorderWidthMatchesEdgeWidthListener extends ControlGroupChangeListener {
+		public BorderWidthMatchesEdgeWidthListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setBorderWidthMatchesEdgeWidth(node, enabled ? mBorderWidthMatchesEdgeWidth.getBooleanValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final NodeBorderModel nodeBorderModel = NodeBorderModel.getModel(node);
+			final Boolean match = nodeBorderModel != null ? nodeBorderModel.getBorderWidthMatchesEdgeWidth() : null;
+			final Boolean viewMatch = styleController.getBorderWidthMatchesEdgeWidth(node);
+			mSetBorderWidthMatchesEdgeWidth.setValue(match != null);
+			mBorderWidthMatchesEdgeWidth.setValue(viewMatch);
+		}
+	}
+	
+	private class BorderWidthListener extends ControlGroupChangeListener {
+		public BorderWidthListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setBorderWidth(node, enabled ? mBorderWidth.getQuantifiedValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final NodeBorderModel nodeBorderModel = NodeBorderModel.getModel(node);
+			final Quantity<LengthUnits> width = nodeBorderModel != null ? nodeBorderModel.getBorderWidth() : null;
+			final Quantity<LengthUnits> viewWidth = styleController.getBorderWidth(node);
+			mSetBorderWidth.setValue(width != null);
+			mBorderWidth.setQuantifiedValue(viewWidth);
+			enableOrDisableBorderWidthControls();
+		}
+	}
+	
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		addBorderWidthControl(formBuilder);
+		addBorderWidthMatchesEdgeWidthControl(formBuilder);
+	}
+	
+	private void addBorderWidthControl(DefaultFormBuilder formBuilder) {
+		mSetBorderWidth = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mBorderWidth = new QuantityProperty<LengthUnits>(BORDER_WIDTH, 0, 100000, 0.1, LengthUnits.px);
+		borderWidthListener = new BorderWidthListener(mSetBorderWidth, mBorderWidth);
+		mSetBorderWidth.addPropertyChangeListener(borderWidthListener);
+		mBorderWidth.addPropertyChangeListener(borderWidthListener);
+		mSetBorderWidth.layout(formBuilder);
+		mBorderWidth.layout(formBuilder);
+	}
+	
+	public void addBorderWidthMatchesEdgeWidthControl(DefaultFormBuilder formBuilder) {
+		mSetBorderWidthMatchesEdgeWidth = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mBorderWidthMatchesEdgeWidth = new BooleanProperty(BORDER_WIDTH_MATCHES_EDGE_WIDTH);
+		borderWidthMatchesEdgeChangeListener = new BorderWidthMatchesEdgeWidthListener(mSetBorderWidthMatchesEdgeWidth, mBorderWidthMatchesEdgeWidth);
+		mSetBorderWidthMatchesEdgeWidth.addPropertyChangeListener(borderWidthMatchesEdgeChangeListener);
+		mBorderWidthMatchesEdgeWidth.addPropertyChangeListener(borderWidthMatchesEdgeChangeListener);
+		
+		mBorderWidthMatchesEdgeWidth.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				enableOrDisableBorderWidthControls();
+			}
+		});
+		mSetBorderWidthMatchesEdgeWidth.layout(formBuilder);
+		mBorderWidthMatchesEdgeWidth.layout(formBuilder);
+	}
+
+	public void enableOrDisableBorderWidthControls() {
+		final boolean borderWidthCanBeSet = ! mBorderWidthMatchesEdgeWidth.getBooleanValue();
+		mSetBorderWidth.setEnabled(borderWidthCanBeSet);
+		mBorderWidth.setEnabled(borderWidthCanBeSet);
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		borderWidthListener.setStyle(node);
+		borderWidthMatchesEdgeChangeListener.setStyle(node);
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java
new file mode 100644
index 0000000..ad08da4
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ChildDistanceControlGroup.java
@@ -0,0 +1,88 @@
+/*
+ *  Freeplane - Maxd map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.QuantityProperty;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.nodelocation.LocationController;
+import org.freeplane.features.nodelocation.LocationModel;
+import org.freeplane.features.nodelocation.mindmapmode.MLocationController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class ChildDistanceControlGroup implements ControlGroup {
+	private static final String VERTICAL_CHILD_GAP = "vertical_child_gap";
+
+	private BooleanProperty mSetChildDistance;
+	private QuantityProperty<LengthUnits> mChildDistance;
+
+	private ChildDistanceChangeListener propertyChangeListener;
+
+	private class ChildDistanceChangeListener extends ControlGroupChangeListener {
+		public ChildDistanceChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MLocationController locationController = (MLocationController) Controller.getCurrentModeController().getExtension(LocationController.class);
+			locationController.setMinimalDistanceBetweenChildren(node, enabled ? mChildDistance.getQuantifiedValue(): LocationModel.DEFAULT_VGAP);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final ModeController modeController = Controller.getCurrentModeController();
+			final LocationModel locationModel = LocationModel.getModel(node);
+			final LocationController locationController = modeController.getExtension(LocationController.class);
+			final Quantity<LengthUnits> gap = locationModel.getVGap();
+			final Quantity<LengthUnits> viewGap = locationController.getMinimalDistanceBetweenChildren(node);
+			mSetChildDistance.setValue(gap != LocationModel.DEFAULT_VGAP);
+			mChildDistance.setQuantifiedValue(viewGap);
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetChildDistance = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mChildDistance = new  QuantityProperty<LengthUnits>(VERTICAL_CHILD_GAP, 0, 1000, 0.1, LengthUnits.px);
+		propertyChangeListener = new ChildDistanceChangeListener(mSetChildDistance, mChildDistance);
+		mSetChildDistance.addPropertyChangeListener(propertyChangeListener);
+		mChildDistance.addPropertyChangeListener(propertyChangeListener);
+		mSetChildDistance.layout(formBuilder);
+		mChildDistance.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/CloudColorShapeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/CloudColorShapeControlGroup.java
new file mode 100644
index 0000000..5c7b3f6
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/CloudColorShapeControlGroup.java
@@ -0,0 +1,132 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.IFreeplanePropertyListener;
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ColorProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.NextColumnProperty;
+import org.freeplane.core.resources.components.NextLineProperty;
+import org.freeplane.features.cloud.CloudController;
+import org.freeplane.features.cloud.CloudModel;
+import org.freeplane.features.cloud.mindmapmode.MCloudController;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+
+/**
+ * @author Joe Berry
+ * Dec 17, 2016
+ */
+public class CloudColorShapeControlGroup implements ControlGroup {
+	private static final String CLOUD_COLOR = "cloudcolor";
+	private static final String CLOUD_SHAPE = "cloudshape";
+
+	final private BooleanProperty mSetCloud;
+	final private ColorProperty mCloudColor;
+	final private ComboProperty mCloudShape;
+	final private CloudColorChangeListener mPropertyListener;
+	
+	public CloudColorShapeControlGroup() {
+		mSetCloud = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mCloudColor = new ColorProperty(CLOUD_COLOR, ResourceController.getResourceController()
+		    .getDefaultProperty(CloudController.RESOURCES_CLOUD_COLOR));
+		mCloudShape = ComboProperty.of(CLOUD_SHAPE, CloudModel.Shape.class);
+		mPropertyListener = new CloudColorChangeListener(mSetCloud, mCloudColor, mCloudShape);
+		mSetCloud.addPropertyChangeListener(mPropertyListener);
+		mCloudColor.addPropertyChangeListener(mPropertyListener);
+		ResourceController.getResourceController().addPropertyChangeListener(new IFreeplanePropertyListener() {
+			
+			@Override
+			public void propertyChanged(String propertyName, String newValue, String oldValue) {
+				if(propertyName.equals(CloudController.RESOURCES_CLOUD_COLOR) || propertyName.equals(CloudController.RESOURCES_CLOUD_SHAPE)) {
+					final IMapSelection selection = Controller.getCurrentController().getSelection();
+					if(selection != null) {
+						final NodeModel selected = selection.getSelected();
+						mPropertyListener.setStyle(selected);
+					}
+				}
+			}
+		});
+	}
+
+	private class CloudColorChangeListener extends ControlGroupChangeListener {
+		public CloudColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty1, final IPropertyControl mProperty2) {
+			super(mSet, mProperty1, mProperty2);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MCloudController styleController = (MCloudController) Controller
+					.getCurrentModeController().getExtension(
+							CloudController.class);
+			if (enabled) {
+				styleController.setColor(node, mCloudColor.getColorValue());
+				styleController.setShape(node, CloudModel.Shape.valueOf(mCloudShape.getValue()));
+			}
+			else {
+				styleController.setCloud(node, false);
+			}
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final CloudController cloudController = CloudController.getController();
+			final CloudModel cloudModel = CloudModel.getModel(node);
+			final Color viewCloudColor = cloudController.getColor(node);
+			mSetCloud.setValue(cloudModel != null);
+			mCloudColor.setColorValue(viewCloudColor);
+			final CloudModel.Shape viewCloudShape = cloudController.getShape(node);
+			mCloudShape.setValue(viewCloudShape.name());
+		}
+	}
+	
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		addCloudColorControl(formBuilder);
+		new NextLineProperty().layout(formBuilder);
+		new NextColumnProperty(2).layout(formBuilder);
+		addCloudShapeControl(formBuilder);
+	}
+	
+	private void addCloudColorControl(DefaultFormBuilder formBuilder) {
+		mSetCloud.layout(formBuilder);
+		mCloudColor.layout(formBuilder);
+	}
+
+	private void addCloudShapeControl(DefaultFormBuilder formBuilder) {
+		mCloudShape.addPropertyChangeListener(mPropertyListener);
+		mCloudShape.layout(formBuilder);
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		mPropertyListener.setStyle(node);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java
new file mode 100644
index 0000000..9268e71
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroup.java
@@ -0,0 +1,34 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import org.freeplane.features.map.NodeModel;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+interface ControlGroup{
+	String SET_RESOURCE = "set_property_text";
+	public void setStyle(NodeModel node);
+	void addControlGroup(DefaultFormBuilder formBuilder);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java
new file mode 100644
index 0000000..5e70623
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/ControlGroupChangeListener.java
@@ -0,0 +1,89 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+abstract class ControlGroupChangeListener implements PropertyChangeListener {
+	final private Collection<IPropertyControl> properties;
+	final private BooleanProperty mSet;
+	protected boolean internalChange;
+
+	public ControlGroupChangeListener(final BooleanProperty mSet, final IPropertyControl... properties) {
+		super();
+		this.mSet = mSet;
+		this.properties = Arrays.asList(properties);
+	}
+
+	abstract void applyValue(final boolean enabled, NodeModel node, PropertyChangeEvent evt);
+
+	public void propertyChange(final PropertyChangeEvent evt) {
+		if (internalChange) {
+			return;
+		}
+		final boolean enabled;
+		if (evt.getSource().equals(mSet)) {
+			enabled = mSet.getBooleanValue();
+		}
+		else {
+			assert properties.contains(evt.getSource());
+			enabled = true;
+		}
+		final IMapSelection selection = Controller.getCurrentController().getSelection();
+		final Collection<NodeModel> nodes = selection.getSelection();
+		if (enabled )
+			internalChange = true;
+		for (final NodeModel node : nodes) {
+			applyValue(enabled, node, evt);
+		}
+		if (enabled  && ! mSet.getBooleanValue())
+			mSet.setValue(true);
+		internalChange = false;
+		setStyle(selection.getSelected());
+	}
+	
+	void setStyle(NodeModel node) {
+		if (internalChange) {
+			return;
+		}
+		internalChange = true;
+		try {
+			setStyleOnExternalChange(node);
+		}
+		finally {
+			internalChange = false;
+		}
+
+	}
+	abstract void setStyleOnExternalChange(NodeModel node);
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java
new file mode 100644
index 0000000..c5eee2f
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeColorControlGroup.java
@@ -0,0 +1,83 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ColorProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.util.ColorUtils;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.edge.EdgeModel;
+import org.freeplane.features.edge.mindmapmode.MEdgeController;
+import org.freeplane.features.map.NodeModel;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class EdgeColorControlGroup implements ControlGroup {
+	private static final String EDGE_COLOR = "edgecolor";
+
+	private BooleanProperty mSetEdgeColor;
+	private ColorProperty mEdgeColor;
+	private EdgeColorChangeListener propertyChangeListener;
+
+	private class EdgeColorChangeListener extends ControlGroupChangeListener {
+		public EdgeColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MEdgeController edgeController = (MEdgeController) MEdgeController.getController();
+			edgeController.setColor(node, enabled ? mEdgeColor.getColorValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final EdgeModel edgeModel = EdgeModel.getModel(node);
+			final EdgeController edgeController = EdgeController.getController();
+			{
+				final Color edgeColor = edgeModel != null ? edgeModel.getColor() : null;
+				final Color viewColor = edgeController.getColor(node);
+				mSetEdgeColor.setValue(edgeColor != null);
+				mEdgeColor.setColorValue(viewColor);
+			}
+		}
+	}
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetEdgeColor = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mEdgeColor = new ColorProperty(EdgeColorControlGroup.EDGE_COLOR, ColorUtils.colorToString(EdgeController.STANDARD_EDGE_COLOR));
+		propertyChangeListener = new EdgeColorChangeListener(mSetEdgeColor, mEdgeColor);
+		mSetEdgeColor.addPropertyChangeListener(propertyChangeListener);
+		mEdgeColor.addPropertyChangeListener(propertyChangeListener);
+		mSetEdgeColor.layout(formBuilder);;
+		mEdgeColor.layout(formBuilder);;
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeDashControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeDashControlGroup.java
new file mode 100644
index 0000000..dfbed2e
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeDashControlGroup.java
@@ -0,0 +1,88 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.DashVariant;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.edge.EdgeModel;
+import org.freeplane.features.edge.mindmapmode.MEdgeController;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class EdgeDashControlGroup implements ControlGroup {
+	private static final String EDGE_DASH = "edgedash";
+
+	private BooleanProperty mSetEdgeDash;
+	private ComboProperty mEdgeDash;
+	private EdgeDashChangeListener propertyChangeListener;
+	
+	private class EdgeDashChangeListener extends ControlGroupChangeListener {
+		public EdgeDashChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MEdgeController styleController = (MEdgeController) Controller
+			.getCurrentModeController().getExtension(
+					EdgeController.class);
+			styleController.setDash(node, enabled ? DashVariant.valueOf(mEdgeDash.getValue()): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final EdgeController edgeController = EdgeController.getController();
+			final EdgeModel edgeModel = EdgeModel.getModel(node);
+			{
+				final DashVariant dash = edgeModel != null ? edgeModel.getDash() : null;
+				final DashVariant viewDash = edgeController.getDash(node);
+				mSetEdgeDash.setValue(dash != null);
+				mEdgeDash.setValue(viewDash.name());
+			}
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetEdgeDash = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mEdgeDash = ComboProperty.of(EDGE_DASH, DashVariant.class);
+		propertyChangeListener = new EdgeDashChangeListener(mSetEdgeDash, mEdgeDash);
+		mSetEdgeDash.addPropertyChangeListener(propertyChangeListener);
+		mEdgeDash.addPropertyChangeListener(propertyChangeListener);
+		mSetEdgeDash.layout(formBuilder);
+		mEdgeDash.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeStyleControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeStyleControlGroup.java
new file mode 100644
index 0000000..3af468d
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeStyleControlGroup.java
@@ -0,0 +1,91 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.edge.EdgeModel;
+import org.freeplane.features.edge.EdgeStyle;
+import org.freeplane.features.edge.mindmapmode.MEdgeController;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class EdgeStyleControlGroup implements ControlGroup {
+	private static final String EDGE_STYLE = "edgestyle";
+	private static final String[] EDGE_STYLES = EnumToStringMapper.getStringValuesOf(EdgeStyle.class, EdgeStyle.values().length - 1);
+
+	private BooleanProperty mSetEdgeStyle;
+	private ComboProperty mEdgeStyle;
+	private EdgeStyleChangeListener propertyChangeListener;
+	
+	private class EdgeStyleChangeListener extends ControlGroupChangeListener {
+		public EdgeStyleChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node,
+				final PropertyChangeEvent evt) {
+			final MEdgeController styleController = (MEdgeController) Controller
+					.getCurrentModeController().getExtension(
+							EdgeController.class);
+			styleController.setStyle(node, enabled ? EdgeStyle.getStyle(mEdgeStyle.getValue()) : null);
+		}
+		
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final EdgeController edgeController = EdgeController.getController();
+			final EdgeModel edgeModel = EdgeModel.getModel(node);
+			{
+				final EdgeStyle style = edgeModel != null ? edgeModel.getStyle() : null;
+				final EdgeStyle viewStyle = edgeController.getStyle(node);
+				mSetEdgeStyle.setValue(style != null);
+				mEdgeStyle.setValue(viewStyle.toString());
+			}
+		}
+	}
+	
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetEdgeStyle = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mEdgeStyle = new ComboProperty(EDGE_STYLE, EDGE_STYLES);
+		propertyChangeListener = new EdgeStyleChangeListener(mSetEdgeStyle, mEdgeStyle);
+		mSetEdgeStyle.addPropertyChangeListener(propertyChangeListener);
+		mEdgeStyle.addPropertyChangeListener(propertyChangeListener);
+		mSetEdgeStyle.layout(formBuilder);
+		mEdgeStyle.layout(formBuilder);
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeWidthControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeWidthControlGroup.java
new file mode 100644
index 0000000..8398419
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EdgeWidthControlGroup.java
@@ -0,0 +1,87 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.NumberProperty;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.edge.EdgeModel;
+import org.freeplane.features.edge.mindmapmode.MEdgeController;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class EdgeWidthControlGroup implements ControlGroup {
+	private static final String EDGE_WIDTH = "edgewidth";
+
+	private BooleanProperty mSetEdgeWidth;
+	private NumberProperty mEdgeWidth;
+	private EdgeWidthChangeListener propertyChangeListener;
+	
+	private class EdgeWidthChangeListener extends ControlGroupChangeListener {
+		public EdgeWidthChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MEdgeController styleController = (MEdgeController) Controller
+			.getCurrentModeController().getExtension(
+					EdgeController.class);
+			styleController.setWidth(node, enabled ? Integer.parseInt(mEdgeWidth.getValue()): EdgeModel.DEFAULT_WIDTH);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final EdgeController edgeController = EdgeController.getController();
+			final EdgeModel edgeModel = EdgeModel.getModel(node);
+			{
+				final int width = edgeModel != null ? edgeModel.getWidth() : EdgeModel.DEFAULT_WIDTH;
+				final int viewWidth = edgeController.getWidth(node);
+				mSetEdgeWidth.setValue(width != EdgeModel.DEFAULT_WIDTH);
+				mEdgeWidth.setValue(Integer.toString(viewWidth));
+			}
+		}
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetEdgeWidth = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mEdgeWidth = new NumberProperty(EDGE_WIDTH, 0, 100, 1);
+		propertyChangeListener = new EdgeWidthChangeListener(mSetEdgeWidth, mEdgeWidth);
+		mSetEdgeWidth.addPropertyChangeListener(propertyChangeListener);
+		mEdgeWidth.addPropertyChangeListener(propertyChangeListener);
+		mSetEdgeWidth.layout(formBuilder);
+		mEdgeWidth.layout(formBuilder);
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EnumToStringMapper.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EnumToStringMapper.java
new file mode 100644
index 0000000..31f1080
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/EnumToStringMapper.java
@@ -0,0 +1,43 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class EnumToStringMapper {
+
+	private EnumToStringMapper() {}
+	
+	public static <U extends Enum<U>> String[] getStringValuesOf(Class<U> enumerationClass) {
+		return getStringValuesOf(enumerationClass, enumerationClass.getEnumConstants().length);
+	}
+
+	public static <U extends Enum<U>> String[] getStringValuesOf(Class<U> enumerationClass, int length) {
+		final U[] enumConstants = enumerationClass.getEnumConstants();
+		final String[] strings = new String[length];
+		for (int i = 0; i < length; i++) {
+			strings[i] = enumConstants[i].toString();
+		}
+		return strings;
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontBoldControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontBoldControlGroup.java
new file mode 100644
index 0000000..78b0352
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontBoldControlGroup.java
@@ -0,0 +1,83 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class FontBoldControlGroup implements ControlGroup {
+	private static final String NODE_FONT_BOLD = "nodefontbold";
+
+	private BooleanProperty mSetNodeFontBold;
+	private BooleanProperty mNodeFontBold;
+	private FontBoldChangeListener propertyChangeListener;
+	
+	private class FontBoldChangeListener extends ControlGroupChangeListener {
+		public FontBoldChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(
+					NodeStyleController.class);
+			styleController.setBold(node, enabled ? mNodeFontBold.getBooleanValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Boolean bold = NodeStyleModel.isBold(node);
+			final Boolean viewbold = styleController.isBold(node);
+			mSetNodeFontBold.setValue(bold != null);
+			mNodeFontBold.setValue(viewbold);
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeFontBold = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeFontBold = new BooleanProperty(NODE_FONT_BOLD);
+		propertyChangeListener = new FontBoldChangeListener(mSetNodeFontBold, mNodeFontBold);
+		mSetNodeFontBold.addPropertyChangeListener(propertyChangeListener);
+		mNodeFontBold.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeFontBold.layout(formBuilder);
+		mNodeFontBold.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontItalicControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontItalicControlGroup.java
new file mode 100644
index 0000000..e48797e
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontItalicControlGroup.java
@@ -0,0 +1,84 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class FontItalicControlGroup implements ControlGroup {
+	private static final String NODE_FONT_ITALIC = "nodefontitalic";
+
+	private BooleanProperty mSetNodeFontItalic;
+	private BooleanProperty mNodeFontItalic;
+
+	private FontItalicChangeListener propertyChangeListener;
+	
+	private class FontItalicChangeListener extends ControlGroupChangeListener {
+		public FontItalicChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(
+					NodeStyleController.class);
+			styleController.setItalic(node, enabled ? mNodeFontItalic.getBooleanValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Boolean italic = NodeStyleModel.isItalic(node);
+			final Boolean viewitalic = styleController.isItalic(node);
+			mSetNodeFontItalic.setValue(italic != null);
+			mNodeFontItalic.setValue(viewitalic);
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeFontItalic = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeFontItalic = new BooleanProperty(NODE_FONT_ITALIC);
+		propertyChangeListener = new FontItalicChangeListener(mSetNodeFontItalic, mNodeFontItalic);
+		mSetNodeFontItalic.addPropertyChangeListener(propertyChangeListener);
+		mNodeFontItalic.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeFontItalic.layout(formBuilder);
+		mNodeFontItalic.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontNameControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontNameControlGroup.java
new file mode 100644
index 0000000..9487917
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontNameControlGroup.java
@@ -0,0 +1,85 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.FontProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class FontNameControlGroup implements ControlGroup {
+	private static final String NODE_FONT_NAME = "nodefontname";
+
+	private BooleanProperty mSetNodeFontName;
+	private FontProperty mNodeFontName;
+
+	private FontNameChangeListener propertyChangeListener;
+	
+	private class FontNameChangeListener extends ControlGroupChangeListener {
+		public FontNameChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(
+					NodeStyleController.class);
+			styleController.setFontFamily(node, enabled ? mNodeFontName.getValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final String fontFamilyName = NodeStyleModel.getFontFamilyName(node);
+			final String viewFontFamilyName = styleController.getFontFamilyName(node);
+			mSetNodeFontName.setValue(fontFamilyName != null);
+			mNodeFontName.setValue(viewFontFamilyName);
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeFontName = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeFontName = new FontProperty(NODE_FONT_NAME);
+		propertyChangeListener = new FontNameChangeListener(mSetNodeFontName, mNodeFontName);
+		mSetNodeFontName.addPropertyChangeListener(propertyChangeListener);
+		mNodeFontName.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeFontName.layout(formBuilder);
+		mNodeFontName.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontSizeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontSizeControlGroup.java
new file mode 100644
index 0000000..0ca5af7
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FontSizeControlGroup.java
@@ -0,0 +1,95 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+import org.freeplane.features.styles.mindmapmode.MUIFactory;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class FontSizeControlGroup implements ControlGroup {
+	private static final String NODE_FONT_SIZE = "nodefontsize";
+
+	private BooleanProperty mSetNodeFontSize;
+	private ComboProperty mNodeFontSize;
+
+	private FontSizeChangeListener propertyChangeListener;
+	
+	private class FontSizeChangeListener extends ControlGroupChangeListener {
+		public FontSizeChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(
+					NodeStyleController.class);
+			try {
+	            styleController.setFontSize(node, enabled ? Integer.valueOf(mNodeFontSize.getValue()) : null);
+            }
+            catch (NumberFormatException e) {
+            }
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Integer fontSize = NodeStyleModel.getFontSize(node);
+			final Integer viewfontSize = styleController.getFontSize(node);
+			mSetNodeFontSize.setValue(fontSize != null);
+			mNodeFontSize.setValue(viewfontSize.toString());
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeFontSize = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		final List<String> sizesVector = new ArrayList<String>(Arrays.asList(MUIFactory.FONT_SIZES));
+		mNodeFontSize = new ComboProperty(NODE_FONT_SIZE, sizesVector, sizesVector);
+		mNodeFontSize.setEditable(true);
+		propertyChangeListener = new FontSizeChangeListener(mSetNodeFontSize, mNodeFontSize);
+		mSetNodeFontSize.addPropertyChangeListener(propertyChangeListener);
+		mNodeFontSize.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeFontSize.layout(formBuilder);
+		mNodeFontSize.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FormatControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FormatControlGroup.java
new file mode 100644
index 0000000..f9e4b34
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/FormatControlGroup.java
@@ -0,0 +1,90 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.format.FormatController;
+import org.freeplane.features.format.IFormattedObject;
+import org.freeplane.features.format.PatternFormat;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+import org.freeplane.features.styles.mindmapmode.EditablePatternComboProperty;
+import org.freeplane.features.text.TextController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class FormatControlGroup implements ControlGroup {
+	private static final String NODE_FORMAT = "nodeformat";
+
+	private BooleanProperty mSetNodeFormat;
+	private EditablePatternComboProperty mNodeFormat;
+	
+	private NodeFormatChangeListener propertyChangeListener;
+	
+	private class NodeFormatChangeListener extends ControlGroupChangeListener {
+		public NodeFormatChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller.getCurrentModeController()
+				    .getExtension(NodeStyleController.class);
+				styleController.setNodeFormat(node, enabled ? mNodeFormat.getSelectedPattern() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			String nodeFormat = NodeStyleModel.getNodeFormat(node);
+			String viewNodeFormat = TextController.getController().getNodeFormat(node);
+			mSetNodeFormat.setValue(nodeFormat != null);
+			if (viewNodeFormat == null && node.getUserObject() instanceof IFormattedObject)
+				viewNodeFormat = ((IFormattedObject)node.getUserObject()).getPattern();
+			mNodeFormat.setValue(viewNodeFormat);
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+        mSetNodeFormat = new BooleanProperty(ControlGroup.SET_RESOURCE);
+        mNodeFormat = new EditablePatternComboProperty(NODE_FORMAT,
+            PatternFormat.getIdentityPatternFormat(), FormatController.getController().getAllFormats());
+        propertyChangeListener = new NodeFormatChangeListener(mSetNodeFormat, mNodeFormat);
+        mSetNodeFormat.addPropertyChangeListener(propertyChangeListener);
+        mNodeFormat.addPropertyChangeListener(propertyChangeListener);
+        mSetNodeFormat.layout(formBuilder);
+        mNodeFormat.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java
new file mode 100644
index 0000000..b3ae93c
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/GroupSeparator.java
@@ -0,0 +1,47 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import org.freeplane.core.resources.components.SeparatorProperty;
+import org.freeplane.features.map.NodeModel;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 13, 2016
+ */
+public class GroupSeparator implements ControlGroup {
+	final String labelKey;
+
+	public GroupSeparator(String labelKey) {
+		this.labelKey = labelKey;
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		// intentionally left blank
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		new SeparatorProperty(labelKey).layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java
new file mode 100644
index 0000000..b31de75
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/IconSizeControlGroup.java
@@ -0,0 +1,54 @@
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.QuantityProperty;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.icon.IconController;
+import org.freeplane.features.icon.mindmapmode.MIconController;
+import org.freeplane.features.map.NodeModel;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+class IconSizeControlGroup implements ControlGroup{
+	private class IconSizeChangeListener extends ControlGroupChangeListener{
+
+		public IconSizeChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+		@Override
+		public void applyValue(boolean enabled, NodeModel node, PropertyChangeEvent evt) {
+			final MIconController iconController = (MIconController) IconController.getController();
+			iconController.changeIconSize(node, enabled ? mIconSize.getQuantifiedValue() : null);
+		}
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final Quantity<LengthUnits> iconSize = node.getSharedData().getIcons().getIconSize();
+			final Quantity<LengthUnits> viewedIconSize = IconController.getController().getIconSize(node);
+			mSetIconSize.setValue(iconSize != null);
+			mIconSize.setQuantifiedValue(viewedIconSize);
+		}
+		
+	}
+	private static final String ICON_SIZE = "icon_size";
+	private QuantityProperty<LengthUnits> mIconSize;
+	private BooleanProperty mSetIconSize;
+	private IconSizeChangeListener propertyChangeListener;
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+			mSetIconSize = new BooleanProperty(SET_RESOURCE);
+			mIconSize = new QuantityProperty<LengthUnits>(ICON_SIZE, 0, 256, 4, LengthUnits.px);
+			propertyChangeListener = new IconSizeChangeListener(mSetIconSize, mIconSize);
+			mSetIconSize.addPropertyChangeListener(propertyChangeListener);
+			mIconSize.addPropertyChangeListener(propertyChangeListener);
+			mSetIconSize.layout(formBuilder);
+			mIconSize.layout(formBuilder);
+	}
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java
new file mode 100644
index 0000000..95c8f2f
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MaxNodeWidthControlGroup.java
@@ -0,0 +1,85 @@
+/*
+ *  Freeplane - Maxd map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.QuantityProperty;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeSizeModel;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class MaxNodeWidthControlGroup implements ControlGroup {
+	private static final String MAX_NODE_WIDTH = "max_node_width";
+
+	private BooleanProperty mSetMaxNodeWidth;
+	private QuantityProperty<LengthUnits> mMaxNodeWidth;
+	private MaxNodeWidthChangeListener propertyChangeListener;
+
+	private class MaxNodeWidthChangeListener extends ControlGroupChangeListener {
+		public MaxNodeWidthChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setMaxNodeWidth(node, enabled ? mMaxNodeWidth.getQuantifiedValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeSizeModel nodeSizeModel = NodeSizeModel.getModel(node);
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Quantity<LengthUnits> width = nodeSizeModel != null ? nodeSizeModel.getMaxNodeWidth() : null;
+			final Quantity<LengthUnits> viewWidth = styleController.getMaxWidth(node);
+			mSetMaxNodeWidth.setValue(width != null);
+			mMaxNodeWidth.setQuantifiedValue(viewWidth);
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetMaxNodeWidth = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mMaxNodeWidth = new QuantityProperty<LengthUnits>(MAX_NODE_WIDTH, 0, 100000, 0.1, LengthUnits.px);
+		propertyChangeListener = new MaxNodeWidthChangeListener(mSetMaxNodeWidth, mMaxNodeWidth);
+		mSetMaxNodeWidth.addPropertyChangeListener(propertyChangeListener);
+		mMaxNodeWidth.addPropertyChangeListener(propertyChangeListener);
+		mSetMaxNodeWidth.layout(formBuilder);
+		mMaxNodeWidth.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java
new file mode 100644
index 0000000..5b58455
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/MinNodeWidthControlGroup.java
@@ -0,0 +1,85 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.QuantityProperty;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.core.util.Quantity;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeSizeModel;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class MinNodeWidthControlGroup implements ControlGroup {
+	private static final String MIN_NODE_WIDTH = "min_node_width";
+
+	private BooleanProperty mSetMinNodeWidth;
+	private QuantityProperty<LengthUnits> mMinNodeWidth;
+	private MinNodeWidthChangeListener propertyChangeListener;
+
+	private class MinNodeWidthChangeListener extends ControlGroupChangeListener {
+		public MinNodeWidthChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setMinNodeWidth(node, enabled ? mMinNodeWidth.getQuantifiedValue(): null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeSizeModel nodeSizeModel = NodeSizeModel.getModel(node);
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Quantity<LengthUnits> width = nodeSizeModel != null ? nodeSizeModel.getMinNodeWidth() : null;
+			final Quantity<LengthUnits> viewWidth = styleController.getMinWidth(node);
+			mSetMinNodeWidth.setValue(width != null);
+			mMinNodeWidth.setQuantifiedValue(viewWidth);
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetMinNodeWidth = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mMinNodeWidth = new QuantityProperty<LengthUnits>(MIN_NODE_WIDTH, 0, 100000, 0.1, LengthUnits.px);
+		propertyChangeListener = new MinNodeWidthChangeListener(mSetMinNodeWidth, mMinNodeWidth);
+		mSetMinNodeWidth.addPropertyChangeListener(propertyChangeListener);
+		mMinNodeWidth.addPropertyChangeListener(propertyChangeListener);
+		mSetMinNodeWidth.layout(formBuilder);
+		mMinNodeWidth.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java
new file mode 100644
index 0000000..83140c3
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextColumnControlGroup.java
@@ -0,0 +1,47 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import org.freeplane.core.resources.components.NextColumnProperty;
+import org.freeplane.features.map.NodeModel;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 13, 2016
+ */
+public class NextColumnControlGroup implements ControlGroup {
+	final int columns;
+
+	public NextColumnControlGroup(int columns) {
+		this.columns = columns;
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		// intentionally left blank
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		new NextColumnProperty(columns).layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java
new file mode 100644
index 0000000..a6fd6ed
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NextLineControlGroup.java
@@ -0,0 +1,45 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import org.freeplane.core.resources.components.NextLineProperty;
+import org.freeplane.features.map.NodeModel;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 13, 2016
+ */
+public class NextLineControlGroup implements ControlGroup {
+
+	public NextLineControlGroup() {
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		// intentionally left blank
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		new NextLineProperty().layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeBackgroundColorControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeBackgroundColorControlGroup.java
new file mode 100644
index 0000000..0828366
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeBackgroundColorControlGroup.java
@@ -0,0 +1,90 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ColorProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class NodeBackgroundColorControlGroup implements ControlGroup {
+	private static final String NODE_BACKGROUND_COLOR = "nodebackgroundcolor";
+
+	private BooleanProperty mSetNodeBackgroundColor;
+	private ColorProperty mNodeBackgroundColor;
+	private BgColorChangeListener propertyChangeListener;
+	
+	private class BgColorChangeListener extends ControlGroupChangeListener {
+		public BgColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+					.getCurrentModeController().getExtension(
+							NodeStyleController.class);
+			styleController.setBackgroundColor(node, enabled ? mNodeBackgroundColor.getColorValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Color color = NodeStyleModel.getBackgroundColor(node);
+			final Color viewColor = styleController.getBackgroundColor(node);
+			mSetNodeBackgroundColor.setValue(color != null);
+			mNodeBackgroundColor.setColorValue(viewColor != null ? viewColor : Controller.getCurrentController()
+			    .getMapViewManager().getBackgroundColor(node));
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeBackgroundColor = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeBackgroundColor = new ColorProperty(NODE_BACKGROUND_COLOR, ResourceController
+		    .getResourceController().getDefaultProperty(NODE_BACKGROUND_COLOR));
+		propertyChangeListener = new BgColorChangeListener(mSetNodeBackgroundColor, mNodeBackgroundColor);
+		mSetNodeBackgroundColor.addPropertyChangeListener(propertyChangeListener);
+		mNodeBackgroundColor.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeBackgroundColor.layout(formBuilder);
+		mNodeBackgroundColor.layout(formBuilder);
+	}
+
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java
new file mode 100644
index 0000000..89d7ea1
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeColorControlGroup.java
@@ -0,0 +1,86 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ColorProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class NodeColorControlGroup implements ControlGroup {
+	private static final String NODE_COLOR = "nodecolor";
+	private static final String NODE_TEXT_COLOR = "standardnodetextcolor";
+
+	private BooleanProperty mSetNodeColor;
+	private ColorProperty mNodeColor;
+	private NodeColorChangeListener propertyChangeListener;
+
+	private class NodeColorChangeListener extends ControlGroupChangeListener {
+		public NodeColorChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(
+					NodeStyleController.class);
+			styleController.setColor(node, enabled ? mNodeColor.getColorValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Color nodeColor = NodeStyleModel.getColor(node);
+			final Color viewNodeColor = styleController.getColor(node);
+			mSetNodeColor.setValue(nodeColor != null);
+			mNodeColor.setColorValue(viewNodeColor);
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeColor = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeColor = new ColorProperty(NODE_COLOR, ResourceController.getResourceController()
+		    .getDefaultProperty(NODE_TEXT_COLOR));
+		propertyChangeListener = new NodeColorChangeListener(mSetNodeColor, mNodeColor);
+		mSetNodeColor.addPropertyChangeListener(propertyChangeListener);
+		mNodeColor.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeColor.layout(formBuilder);
+		mNodeColor.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java
new file mode 100644
index 0000000..3650659
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeFontHyperLinkControlGroup.java
@@ -0,0 +1,83 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.link.LinkController;
+import org.freeplane.features.link.NodeLinks;
+import org.freeplane.features.link.mindmapmode.MLinkController;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 18, 2016
+ */
+class NodeFontHyperLinkControlGroup implements ControlGroup {
+	private static final String NODE_FONT_HYPERLINK = "nodefonthyperlink";
+
+	private BooleanProperty mSetNodeFontHyperlink;
+	private BooleanProperty mNodeFontHyperlink;
+
+	private FontHyperlinkChangeListener propertyChangeListener;
+
+	private class FontHyperlinkChangeListener extends ControlGroupChangeListener {
+		public FontHyperlinkChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+    		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MLinkController styleController = (MLinkController) Controller
+			.getCurrentModeController().getExtension(
+				LinkController.class);
+			styleController.setFormatNodeAsHyperlink(node, enabled ? mNodeFontHyperlink.getBooleanValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final Boolean hyperlink = NodeLinks.formatNodeAsHyperlink(node);
+			final Boolean viewhyperlink = LinkController.getController().formatNodeAsHyperlink(node);
+			mSetNodeFontHyperlink.setValue(hyperlink != null);
+			mNodeFontHyperlink.setValue(viewhyperlink);
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeFontHyperlink = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeFontHyperlink = new BooleanProperty(NODE_FONT_HYPERLINK);
+		propertyChangeListener = new FontHyperlinkChangeListener(mSetNodeFontHyperlink, mNodeFontHyperlink);
+		mSetNodeFontHyperlink.addPropertyChangeListener(propertyChangeListener);
+		mNodeFontHyperlink.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeFontHyperlink.layout(formBuilder);
+		mNodeFontHyperlink.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java
new file mode 100644
index 0000000..2caa31d
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeHorizontalTextAlignmentControlGroup.java
@@ -0,0 +1,94 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+import java.util.Arrays;
+import java.util.Vector;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class NodeHorizontalTextAlignmentControlGroup implements ControlGroup {
+	private static final String TEXT_ALIGNMENT = "textalignment";
+	
+	private static final String[] TEXT_ALIGNMENTS = EnumToStringMapper.getStringValuesOf(HorizontalTextAlignment.class);
+	private BooleanProperty mSetNodeTextAlignment;
+	private ComboProperty mNodeTextAlignment;
+
+	private NodeTextAlignmentChangeListener propertyChangeListener;
+
+	private class NodeTextAlignmentChangeListener extends ControlGroupChangeListener {
+		public NodeTextAlignmentChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+					.getCurrentModeController().getExtension(NodeStyleController.class);
+			styleController.setHorizontalTextAlignment(node, enabled ? HorizontalTextAlignment.valueOf(mNodeTextAlignment.getValue()) : null);
+}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final HorizontalTextAlignment style = NodeStyleModel.getHorizontalTextAlignment(node);
+			final HorizontalTextAlignment viewStyle = styleController.getHorizontalTextAlignment(node);
+			mSetNodeTextAlignment.setValue(style != null);
+			mNodeTextAlignment.setValue(viewStyle.toString());
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeTextAlignment = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		final Vector<String> possibleTranslations = new Vector<String>(TEXT_ALIGNMENTS.length);
+		for (int i = 0; i < TEXT_ALIGNMENTS.length; i++) {
+			possibleTranslations.add(TextUtils.getText("TextAlignAction." + TEXT_ALIGNMENTS[i] + ".text"));
+		}
+		Vector<String> translations = possibleTranslations;
+		mNodeTextAlignment = new ComboProperty(TEXT_ALIGNMENT, Arrays.asList(TEXT_ALIGNMENTS), translations);
+		propertyChangeListener = new NodeTextAlignmentChangeListener(mSetNodeTextAlignment, mNodeTextAlignment);
+		mSetNodeTextAlignment.addPropertyChangeListener(propertyChangeListener);
+		mNodeTextAlignment.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeTextAlignment.layout(formBuilder);
+		mNodeTextAlignment.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeNumberingControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeNumberingControlGroup.java
new file mode 100644
index 0000000..2ec18eb
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeNumberingControlGroup.java
@@ -0,0 +1,83 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Dec 1, 2016
+ */
+public class NodeNumberingControlGroup implements ControlGroup {
+	private static final String NODE_NUMBERING = "nodenumbering";
+
+	private BooleanProperty mSetNodeNumbering;
+	private BooleanProperty mNodeNumbering;
+
+	private NodeNumberingChangeListener propertyChangeListener;
+	
+	private class NodeNumberingChangeListener extends ControlGroupChangeListener {
+		public NodeNumberingChangeListener(final BooleanProperty mSet, final IPropertyControl mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller.getCurrentModeController()
+				    .getExtension(NodeStyleController.class);
+				styleController.setNodeNumbering(node, enabled ? mNodeNumbering.getBooleanValue() : null);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final Boolean nodeNumbering = NodeStyleModel.getNodeNumbering(node);
+			final Boolean viewNodeNumbering = styleController.getNodeNumbering(node);
+			mSetNodeNumbering.setValue(nodeNumbering != null);
+			mNodeNumbering.setValue(viewNodeNumbering);
+		}
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeNumbering = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeNumbering = new BooleanProperty(NODE_NUMBERING);
+		propertyChangeListener = new NodeNumberingChangeListener(mSetNodeNumbering, mNodeNumbering);
+		mSetNodeNumbering.addPropertyChangeListener(propertyChangeListener);
+		mNodeNumbering.addPropertyChangeListener(propertyChangeListener);
+		mSetNodeNumbering.layout(formBuilder);
+		mNodeNumbering.layout(formBuilder);
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java
new file mode 100644
index 0000000..3020dd8
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/NodeShapeControlGroup.java
@@ -0,0 +1,134 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2016 jberry
+ *
+ *  This file author is jberry
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.beans.PropertyChangeEvent;
+
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.resources.components.ComboProperty;
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.NextColumnProperty;
+import org.freeplane.core.resources.components.QuantityProperty;
+import org.freeplane.core.ui.LengthUnits;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.features.nodestyle.ShapeConfigurationModel;
+import org.freeplane.features.nodestyle.NodeStyleModel.Shape;
+import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+
+/**
+ * @author Joe Berry
+ * Nov 27, 2016
+ */
+class NodeShapeControlGroup implements ControlGroup {
+	private static final String NODE_SHAPE = "nodeshape";
+	private static final String SHAPE_HORIZONTAL_MARGIN = "shape_horizontal_margin";
+	private static final String SHAPE_VERTICAL_MARGIN = "shape_vertical_margin";
+	private static final String UNIFORM_SHAPE = "uniform_shape";
+
+	private BooleanProperty mSetNodeShape;
+	private ComboProperty mNodeShape;
+	
+	private QuantityProperty<LengthUnits> mShapeHorizontalMargin;
+	private QuantityProperty<LengthUnits> mShapeVerticalMargin;
+	private BooleanProperty mUniformShape;
+
+	private NodeShapeChangeListener propertyChangeListener;
+
+	private class NodeShapeChangeListener extends ControlGroupChangeListener {
+		public NodeShapeChangeListener(final BooleanProperty mSet, final IPropertyControl... mProperty) {
+			super(mSet, mProperty);
+		}
+
+		@Override
+		void applyValue(final boolean enabled, final NodeModel node, final PropertyChangeEvent evt) {
+			final MNodeStyleController styleController = (MNodeStyleController) Controller
+			.getCurrentModeController().getExtension(
+					NodeStyleController.class);
+			if(enabled){
+				styleController.setShapeConfiguration(node, ShapeConfigurationModel.NULL_SHAPE
+						.withShape(NodeStyleModel.Shape.valueOf(mNodeShape.getValue()))
+						.withHorizontalMargin(mShapeHorizontalMargin.getQuantifiedValue())
+						.withVerticalMargin(mShapeVerticalMargin.getQuantifiedValue())
+						.withUniform(mUniformShape.getBooleanValue())
+						);
+			}
+			else {
+				styleController.setShapeConfiguration(node, ShapeConfigurationModel.NULL_SHAPE);
+			}
+			final Shape shape = styleController.getShape(node);
+			enableShapeConfigurationProperties(enabled, shape);
+		}
+
+		@Override
+		void setStyleOnExternalChange(NodeModel node) {
+			final NodeStyleController styleController = NodeStyleController.getController();
+			final NodeStyleModel.Shape shape = NodeStyleModel.getShape(node);
+			ShapeConfigurationModel viewShape = styleController.getShapeConfiguration(node);
+			final boolean enabled = shape != null;
+			mSetNodeShape.setValue(enabled);
+			mNodeShape.setValue(viewShape.getShape().toString());
+			enableShapeConfigurationProperties(enabled, shape);
+			mShapeHorizontalMargin.setQuantifiedValue(viewShape.getHorizontalMargin());
+			mShapeVerticalMargin.setQuantifiedValue(viewShape.getVerticalMargin());
+			mUniformShape.setValue(viewShape.isUniform());
+		}
+	}
+	
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		mSetNodeShape = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		mNodeShape = ComboProperty.of(NODE_SHAPE, NodeStyleModel.Shape.class);
+		mShapeHorizontalMargin = new QuantityProperty<LengthUnits>(SHAPE_HORIZONTAL_MARGIN, 0, 1000, 0.1, LengthUnits.pt);
+		mShapeVerticalMargin = new QuantityProperty<LengthUnits>(SHAPE_VERTICAL_MARGIN, 0, 1000, 0.1, LengthUnits.pt);
+		mUniformShape = new BooleanProperty(UNIFORM_SHAPE);
+		propertyChangeListener = new NodeShapeChangeListener(mSetNodeShape, mNodeShape, mShapeHorizontalMargin, mShapeVerticalMargin, mUniformShape);
+		mSetNodeShape.addPropertyChangeListener(propertyChangeListener);
+		mNodeShape.addPropertyChangeListener(propertyChangeListener);
+		mShapeHorizontalMargin.addPropertyChangeListener(propertyChangeListener);
+		mShapeVerticalMargin.addPropertyChangeListener(propertyChangeListener);
+		mUniformShape.addPropertyChangeListener(propertyChangeListener);
+		
+		mSetNodeShape.layout(formBuilder);
+		mNodeShape.layout(formBuilder);
+		new NextColumnProperty(2).layout(formBuilder);
+		mShapeHorizontalMargin.layout(formBuilder);
+		new NextColumnProperty(2).layout(formBuilder);
+		mShapeVerticalMargin.layout(formBuilder);
+		new NextColumnProperty(2).layout(formBuilder);
+		mUniformShape.layout(formBuilder);
+	}
+	
+	public void setStyle(NodeModel node) {
+		propertyChangeListener.setStyle(node);
+	}
+	
+	private void enableShapeConfigurationProperties(final boolean enabled, final Shape shape) {
+		final boolean enableConfigurationProperties = enabled && shape.hasConfiguration;
+		mShapeHorizontalMargin.setEnabled(enableConfigurationProperties);
+		mShapeVerticalMargin.setEnabled(enableConfigurationProperties);
+		mUniformShape.setEnabled(enableConfigurationProperties);
+	}
+
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java
new file mode 100644
index 0000000..b8bde18
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleControlGroup.java
@@ -0,0 +1,264 @@
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+import javax.swing.plaf.basic.BasicButtonUI;
+
+import org.freeplane.core.extension.IExtension;
+import org.freeplane.core.resources.TranslatedObject;
+import org.freeplane.core.resources.components.BooleanProperty;
+import org.freeplane.core.ui.AFreeplaneAction;
+import org.freeplane.core.ui.components.JComboBoxWithBorder;
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.core.ui.textchanger.TranslatedElement;
+import org.freeplane.core.ui.textchanger.TranslatedElementFactory;
+import org.freeplane.core.util.HtmlUtils;
+import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.edge.AutomaticEdgeColor;
+import org.freeplane.features.edge.AutomaticEdgeColorHook;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.edge.mindmapmode.MEdgeController;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.styles.AutomaticLayout;
+import org.freeplane.features.styles.AutomaticLayoutController;
+import org.freeplane.features.styles.IStyle;
+import org.freeplane.features.styles.LogicalStyleController;
+import org.freeplane.features.styles.LogicalStyleModel;
+import org.freeplane.features.styles.mindmapmode.MLogicalStyleController;
+import org.freeplane.features.styles.mindmapmode.MUIFactory;
+import org.freeplane.features.styles.mindmapmode.ManageMapConditionalStylesAction;
+import org.freeplane.features.styles.mindmapmode.ManageNodeConditionalStylesAction;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.FormSpecs;
+
+class StyleControlGroup implements ControlGroup{
+	private boolean internalChange;
+	private BooleanProperty mSetStyle;
+	private JButton mNodeStyleButton;
+	private JButton mMapStyleButton;
+	private final boolean addStyleBox;
+	private JComboBox mAutomaticLayoutComboBox;
+	private JComboBox mAutomaticEdgeColorComboBox;
+	private JButton mEditEdgeColorsBtn;
+	private Container mStyleBox;
+	
+	private final MUIFactory uiFactory;
+	private final ModeController modeController;
+	
+	private static final TranslatedObject AUTOMATIC_LAYOUT_DISABLED = new TranslatedObject("automatic_layout_disabled");
+
+	
+	private class StyleChangeListener implements PropertyChangeListener{
+
+
+		public StyleChangeListener() {
+        }
+
+		public void propertyChange(PropertyChangeEvent evt) {
+			if(internalChange){
+				return;
+			}
+			BooleanProperty isSet = (BooleanProperty) evt.getSource();
+			final MLogicalStyleController styleController = (MLogicalStyleController) LogicalStyleController.getController();
+			if(isSet.getBooleanValue()){
+				styleController.setStyle((IStyle) uiFactory.getStyles().getSelectedItem());
+			}
+			else{
+				styleController.setStyle(null);
+			}
+        }
+		
+	}
+
+	
+	public StyleControlGroup(boolean addStyleBox, MUIFactory uiFactory, ModeController modeController) {
+		super();
+		this.addStyleBox = addStyleBox;
+		this.uiFactory = uiFactory;
+		this.modeController = modeController;
+	}
+
+	@Override
+	public void setStyle(NodeModel node) {
+		internalChange = true;
+		try {
+			final LogicalStyleController logicalStyleController = LogicalStyleController.getController();
+			if(addStyleBox){
+				final boolean isStyleSet = LogicalStyleModel.getStyle(node) != null;
+				mSetStyle.setValue(isStyleSet);
+				setStyleList(mMapStyleButton, logicalStyleController.getMapStyleNames(node, "\n"));
+			}
+			setStyleList(mNodeStyleButton, logicalStyleController.getNodeStyleNames(node, "\n"));
+			if(mAutomaticLayoutComboBox != null){
+				final ModeController modeController = Controller.getCurrentModeController();
+				AutomaticLayoutController al = modeController.getExtension(AutomaticLayoutController.class);
+				IExtension extension = al.getExtension(node);
+				if(extension == null)
+					mAutomaticLayoutComboBox.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
+				else
+					mAutomaticLayoutComboBox.setSelectedIndex(((AutomaticLayout)extension).ordinal());
+			}
+			if(mAutomaticEdgeColorComboBox != null){
+				final ModeController modeController = Controller.getCurrentModeController();
+				AutomaticEdgeColorHook al = (AutomaticEdgeColorHook) modeController.getExtension(AutomaticEdgeColorHook.class);
+				final AutomaticEdgeColor extension = (AutomaticEdgeColor) al.getExtension(node);
+				if(extension == null) {
+					mAutomaticEdgeColorComboBox.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
+					mEditEdgeColorsBtn.setEnabled(false);
+				} else {
+					mAutomaticEdgeColorComboBox.setSelectedIndex(extension.rule.ordinal());
+					mEditEdgeColorsBtn.setEnabled(true);
+				}
+			}
+		}
+		finally{
+			internalChange = false;
+		}
+	}
+
+	private void setStyleList(JButton btn, String styles) {
+		if("".equals(styles)){
+			btn.setToolTipText(null);
+			btn.setText(" ");
+			return;
+		}
+		btn.setToolTipText(HtmlUtils.plainToHTML(styles));
+		final String text = styles.replaceAll("\n", ", ");
+		btn.setText(text);
+    }
+
+	@Override
+	public void addControlGroup(DefaultFormBuilder formBuilder) {
+		if (addStyleBox) {
+			addAutomaticLayout(formBuilder);
+			addStyleBox(formBuilder);
+		}
+		mNodeStyleButton = addStyleButton(formBuilder, "actual_node_styles", modeController.getAction(ManageNodeConditionalStylesAction.NAME));
+		if (addStyleBox) {
+			mMapStyleButton = addStyleButton(formBuilder, "actual_map_styles", modeController.getAction(ManageMapConditionalStylesAction.NAME));
+		}
+	}
+	
+	private JButton addStyleButton(DefaultFormBuilder formBuilder, String label, AFreeplaneAction action) {
+	    final JButton button = new JButton(){
+			private static final long serialVersionUID = 1L;
+			{
+				setUI(BasicButtonUI.createUI(this));
+				
+			}
+		};
+	    button.addActionListener(action);
+	    button.setHorizontalAlignment(SwingConstants.LEFT);
+	    final String labelText = TextUtils.getText(label);
+	    UITools.addTitledBorder(button, labelText, StyleEditorPanel.FONT_SIZE);
+		TranslatedElement.BORDER.setKey(button, label);
+	    formBuilder.append(button, formBuilder.getColumnCount());
+		formBuilder.nextLine();
+		return button;
+    }
+
+	private void addStyleBox(final DefaultFormBuilder formBuilder) {
+	    mStyleBox = uiFactory.createStyleBox();
+	    mSetStyle = new BooleanProperty(ControlGroup.SET_RESOURCE);
+		final StyleChangeListener listener = new StyleChangeListener();
+		mSetStyle.addPropertyChangeListener(listener);
+		mSetStyle.layout(formBuilder);
+		formBuilder.append(new JLabel(TextUtils.getText("style")));
+		formBuilder.append(mStyleBox);
+		formBuilder.nextLine();
+	}
+	private void addAutomaticLayout(final DefaultFormBuilder formBuilder) {
+		addStyleControls(formBuilder);
+		addEdgeColoringControls(formBuilder);
+	}
+
+	private void addStyleControls(final DefaultFormBuilder formBuilder) {
+		TranslatedObject[] automaticLayoutTypes = TranslatedObject.fromEnum(AutomaticLayout.class);
+		mAutomaticLayoutComboBox = new JComboBoxWithBorder(automaticLayoutTypes);
+		DefaultComboBoxModel automaticLayoutComboBoxModel = (DefaultComboBoxModel) mAutomaticLayoutComboBox.getModel();
+		automaticLayoutComboBoxModel.addElement(AUTOMATIC_LAYOUT_DISABLED);
+		automaticLayoutComboBoxModel.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
+		mAutomaticLayoutComboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(internalChange)
+					return;
+				final ModeController modeController = Controller.getCurrentModeController();
+				AutomaticLayoutController al = modeController.getExtension(AutomaticLayoutController.class);
+				TranslatedObject selectedItem = (TranslatedObject)mAutomaticLayoutComboBox.getSelectedItem();
+				al.undoableDeactivateHook(Controller.getCurrentController().getMap().getRootNode());
+				if(!selectedItem.equals(AUTOMATIC_LAYOUT_DISABLED)){
+					al.undoableActivateHook(Controller.getCurrentController().getMap().getRootNode(), (AutomaticLayout) selectedItem.getObject());
+				}
+			}
+		});
+		appendLabeledComponent(formBuilder, "AutomaticLayoutAction.text", mAutomaticLayoutComboBox);
+	}
+
+	private void addEdgeColoringControls(final DefaultFormBuilder formBuilder) {
+		TranslatedObject[] automaticLayoutTypes = TranslatedObject.fromEnum(AutomaticEdgeColor.class.getSimpleName() + "." , AutomaticEdgeColor.Rule.class);
+		mAutomaticEdgeColorComboBox = new JComboBoxWithBorder(automaticLayoutTypes);
+		DefaultComboBoxModel automaticEdgeColorComboBoxModel = (DefaultComboBoxModel) mAutomaticEdgeColorComboBox.getModel();
+		automaticEdgeColorComboBoxModel.addElement(AUTOMATIC_LAYOUT_DISABLED);
+		automaticEdgeColorComboBoxModel.setSelectedItem(AUTOMATIC_LAYOUT_DISABLED);
+		mAutomaticEdgeColorComboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				if(internalChange)
+					return;
+				final ModeController modeController = Controller.getCurrentModeController();
+				AutomaticEdgeColorHook hook = modeController.getExtension(AutomaticEdgeColorHook.class);
+				TranslatedObject selectedItem = (TranslatedObject)mAutomaticEdgeColorComboBox.getSelectedItem();
+				final MapModel map = Controller.getCurrentController().getMap();
+				final AutomaticEdgeColor oldExtension = (AutomaticEdgeColor) hook.getMapHook(map);
+				final int colorCount = oldExtension == null ? 0 : oldExtension.getColorCounter();
+				final NodeModel rootNode = map.getRootNode();
+				hook.undoableDeactivateHook(rootNode);
+				if(!selectedItem.equals(AUTOMATIC_LAYOUT_DISABLED)){
+					final AutomaticEdgeColor newExtension = new  AutomaticEdgeColor((AutomaticEdgeColor.Rule) selectedItem.getObject(), colorCount);
+					hook.undoableActivateHook(rootNode, newExtension);
+				}
+			}
+		});
+		appendLabeledComponent(formBuilder, "AutomaticEdgeColorHookAction.text", mAutomaticEdgeColorComboBox);
+		
+			mEditEdgeColorsBtn= TranslatedElementFactory.createButton("editEdgeColors");
+			mEditEdgeColorsBtn.addActionListener(new ActionListener() {
+				
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					final MEdgeController edgeController = (MEdgeController) modeController.getExtension(EdgeController.class);
+					edgeController.editEdgeColorConfiguration(Controller.getCurrentController().getMap());
+				}
+			});
+			formBuilder.appendLineGapRow();
+			formBuilder.nextLine();
+			formBuilder.appendRow(FormSpecs.PREF_ROWSPEC);
+			formBuilder.setColumn(1);
+			formBuilder.append(mEditEdgeColorsBtn, 7);
+			formBuilder.nextLine();
+			
+	}
+	
+	private void appendLabeledComponent(final DefaultFormBuilder formBuilder, String labelKey, Component component) {
+		final String text = TextUtils.getText(labelKey);
+	    final JLabel label = new JLabel(text);
+		TranslatedElement.TEXT.setKey(label, labelKey);
+		formBuilder.append(label, 5);
+	    formBuilder.append(component);
+	    formBuilder.nextLine();
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java
new file mode 100644
index 0000000..6da165e
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/styleeditorpanel/StyleEditorPanel.java
@@ -0,0 +1,219 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.features.styles.mindmapmode.styleeditorpanel;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.HeadlessException;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JPanel;
+
+import org.freeplane.core.resources.components.IPropertyControl;
+import org.freeplane.core.resources.components.SeparatorProperty;
+import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.map.AMapChangeListenerAdapter;
+import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.INodeChangeListener;
+import org.freeplane.features.map.INodeSelectionListener;
+import org.freeplane.features.map.MapChangeEvent;
+import org.freeplane.features.map.MapController;
+import org.freeplane.features.map.NodeChangeEvent;
+import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+import org.freeplane.features.styles.MapStyle;
+import org.freeplane.features.styles.mindmapmode.MUIFactory;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.factories.Paddings;
+import com.jgoodies.forms.layout.FormLayout;
+
+public class StyleEditorPanel extends JPanel {
+	static final float FONT_SIZE = UITools.getUIFontSize(0.8);
+
+	/**
+	* 
+	*/
+	private static final long serialVersionUID = 1L;
+	
+	private boolean internalChange;
+	ControlGroup [] controlGroups;
+	
+	/**
+	 * @throws HeadlessException
+	 */
+	public StyleEditorPanel(final ModeController modeController, final MUIFactory uiFactory,
+	                        final boolean addStyleBox) throws HeadlessException {
+		super();
+		controlGroups = createControlGroups(modeController, uiFactory, addStyleBox);
+		addHierarchyListener(new HierarchyListener() {
+			
+			public void hierarchyChanged(HierarchyEvent e) {
+				if(isDisplayable()){
+					removeHierarchyListener(this);
+					init();
+				}
+			}
+		});
+	}
+
+	private ControlGroup[] createControlGroups(ModeController modeController, MUIFactory uiFactory, boolean addStyleBox) {
+		return new ControlGroup[]{
+				new StyleControlGroup(addStyleBox, uiFactory, modeController),
+				new GroupSeparator("OptionPanel.separator.NodeColors"),
+				new NodeColorControlGroup(),
+				new NodeBackgroundColorControlGroup(),
+				new GroupSeparator("OptionPanel.separator.NodeText"),
+				new FormatControlGroup(),
+				new NodeNumberingControlGroup(),
+				new GroupSeparator("OptionPanel.separator.NodeShape"),
+				new NodeShapeControlGroup(),
+				new MinNodeWidthControlGroup(),
+				new MaxNodeWidthControlGroup(),
+				new ChildDistanceControlGroup(),
+				new GroupSeparator("OptionPanel.separator.NodeBorder"),
+				new BorderWidthAndBorderWidthMatchesEdgeControlGroup(),
+				new BorderDashAndDashMatchesEdgeControlGroup(),
+				new BorderColorAndColorMatchesEdgeControlGroup(),
+				new NextLineControlGroup(),
+				new GroupSeparator("OptionPanel.separator.NodeFont"),
+				new FontNameControlGroup(),
+				new FontSizeControlGroup(),
+				new FontBoldControlGroup(),
+				new FontItalicControlGroup(),
+				new NodeHorizontalTextAlignmentControlGroup(),
+				new NodeFontHyperLinkControlGroup(),
+				new NextLineControlGroup(),
+				new GroupSeparator("OptionPanel.separator.IconControls"),
+				new IconSizeControlGroup(),
+				new GroupSeparator("OptionPanel.separator.EdgeControls"),
+				new EdgeWidthControlGroup(),
+				new EdgeDashControlGroup(),
+				new EdgeStyleControlGroup(),
+				new EdgeColorControlGroup(),
+				new NextLineControlGroup(),
+				new GroupSeparator("OptionPanel.separator.CloudControls"),
+				new CloudColorShapeControlGroup()
+		};	}
+
+	/**
+	 * Creates all controls and adds them to the frame.
+	 * @param modeController 
+	 */
+	private void init() {
+		final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
+		final FormLayout rightLayout = new FormLayout(form, "");
+		final DefaultFormBuilder formBuilder = new DefaultFormBuilder(rightLayout);
+		formBuilder.border(Paddings.DLU2);
+		new SeparatorProperty("OptionPanel.separator.NodeStyle").layout(formBuilder);
+		final List<IPropertyControl> controls = new ArrayList<IPropertyControl>();
+		
+		for (ControlGroup controlGroup :controlGroups) {
+			controlGroup.addControlGroup(formBuilder);
+		}
+		add(formBuilder.getPanel(), BorderLayout.CENTER);
+		addListeners();
+		setFont(this, FONT_SIZE);
+	}
+
+	private void setFont(Container c, float size) {
+		c.setFont(c.getFont().deriveFont(size));
+		for(int i = 0; i < c.getComponentCount(); i++){
+			setFont((Container) c.getComponent(i), size);
+		}
+    }
+
+	public void setStyle( final NodeModel node) {
+		if (internalChange) {
+			return;
+		}
+		internalChange = true;
+		try {
+			for (int i=0; i<controlGroups.length; i++) {
+				controlGroups[i].setStyle(node);
+			}
+			
+		}
+		finally {
+			internalChange = false;
+		}
+	}
+
+	private void addListeners() {
+		final Controller controller = Controller.getCurrentController();
+		final ModeController modeController = Controller.getCurrentModeController();
+		final MapController mapController = modeController.getMapController();
+		mapController.addNodeSelectionListener(new INodeSelectionListener() {
+			public void onSelect(final NodeModel node) {
+				final IMapSelection selection = controller.getSelection();
+				if (selection == null) {
+					return;
+				}
+				if (selection.size() == 1) {
+					setComponentsEnabled(true);
+					setStyle(node);
+				}
+			}
+
+			public void setComponentsEnabled(boolean enabled) {
+				final Container panel = (Container) getComponent(0);
+				for (int i = 0; i < panel.getComponentCount(); i++) {
+					panel.getComponent(i).setEnabled(enabled);
+				}
+			}
+
+			public void onDeselect(final NodeModel node) {
+				setComponentsEnabled(false);
+			}
+		});
+		mapController.addNodeChangeListener(new INodeChangeListener() {
+			public void nodeChanged(final NodeChangeEvent event) {
+				final IMapSelection selection = controller.getSelection();
+				if (selection == null) {
+					return;
+				}
+				final NodeModel node = event.getNode();
+				if (selection.getSelected().equals(node)) {
+					setStyle(node);
+				}
+			}
+		});
+		mapController.addMapChangeListener(new AMapChangeListenerAdapter() {
+
+			@Override
+            public void mapChanged(MapChangeEvent event) {
+				if(! MapStyle.MAP_STYLES.equals(event.getProperty()))
+					return;
+				final IMapSelection selection = controller.getSelection();
+				if (selection == null) {
+					return;
+				}
+				final NodeModel node = selection.getSelected();
+				setStyle(node);
+            }
+			
+		});
+	}
+
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/text/AbstractContentTransformer.java b/freeplane/src/main/java/org/freeplane/features/text/AbstractContentTransformer.java
index d41cc25..fcc54de 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/AbstractContentTransformer.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/AbstractContentTransformer.java
@@ -28,7 +28,11 @@ public abstract class AbstractContentTransformer implements IContentTransformer
 			NodeModel node, Object transformedExtension) {
 		return null;
 	}
-	
-	
+
+	@Override
+	public boolean isFormula(TextController textController, Object content, NodeModel node,
+			Object transformedExtension) {
+		return false;
+	}
 	
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/FormatContentTransformer.java b/freeplane/src/main/java/org/freeplane/features/text/FormatContentTransformer.java
index f194ea7..6e19612 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/FormatContentTransformer.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/FormatContentTransformer.java
@@ -6,6 +6,7 @@ import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.format.PatternFormat;
 import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.SummaryNode;
 
 class FormatContentTransformer extends AbstractContentTransformer {
 	final private TextController textController;
@@ -16,7 +17,7 @@ class FormatContentTransformer extends AbstractContentTransformer {
 	}
 
 	public Object transformContent(TextController textController, Object obj, final NodeModel node, Object transformedExtension) {
-		if (obj == null || node.getUserObject() != transformedExtension)
+		if (obj == null || node == null || node.getUserObject() != transformedExtension)
 			return obj;
 		final String format = textController.getNodeFormat(node);
 		final boolean nodeNumbering = textController.getNodeNumbering(node);
@@ -43,7 +44,7 @@ class FormatContentTransformer extends AbstractContentTransformer {
 			obj = FormatController.format(obj, format);
 		if (nodeNumbering && !node.isRoot()){
 			StringBuilder builder = new StringBuilder(node.getNodeLevel(true) * 2);
-			getPathToRoot(builder, node);
+			addNumbers(builder, node);
 			builder.append(' ');
 			if (isHtml) {
 				obj = insertPrefix(obj.toString(), builder.toString());
@@ -78,15 +79,11 @@ class FormatContentTransformer extends AbstractContentTransformer {
 		return sb.toString();
     }
 
-	private void getPathToRoot(StringBuilder builder, NodeModel node) {
+	private void addNumbers(StringBuilder builder, NodeModel node) {
 		final NodeModel parentNode = node.getParentNode();
 		if(parentNode == null)
 			return;
-		if( textController.getNodeNumbering(parentNode)){
-			getPathToRoot(builder, parentNode);
-			if (builder.length() > 0)
-				builder.append('.');
-		}
+		addMajorNumbers(parentNode, builder);
 		final List<NodeModel> children = parentNode.getChildren();
 		int counter = 1;
 		for (NodeModel child : children) {
@@ -97,4 +94,18 @@ class FormatContentTransformer extends AbstractContentTransformer {
 		}
 		builder.append(counter);
 	}
+
+	private void addMajorNumbers(final NodeModel node, StringBuilder builder) {
+		if(SummaryNode.isSummaryNode(node)) {
+			final NodeModel summaryParentNode = node.getParentNode();
+			if(summaryParentNode == null)
+				return;
+			addMajorNumbers(summaryParentNode, builder);
+		} 
+		else if( textController.getNodeNumbering(node)){
+			addNumbers(builder, node);
+			if (builder.length() > 0)
+				builder.append('.');
+		}
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/IContentTransformer.java b/freeplane/src/main/java/org/freeplane/features/text/IContentTransformer.java
index 6f3e3d6..4b30466 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/IContentTransformer.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/IContentTransformer.java
@@ -7,6 +7,7 @@ import org.freeplane.features.map.NodeModel;
 public interface IContentTransformer extends Comparable<IContentTransformer> {
 
 	Object transformContent(TextController textController, Object content, NodeModel node, Object transformedExtension) throws TransformationException;
+	boolean isFormula(TextController textController, Object content, NodeModel node, Object transformedExtension);
 	Icon getIcon(TextController textController, Object content, NodeModel node, Object transformedExtension);
 
 	/** used for determining the transformer sequence when more than one transformer is present.
diff --git a/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNodeContainsCondition.java b/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNodeContainsCondition.java
index 78282a8..3536089 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNodeContainsCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/MatchCaseNodeContainsCondition.java
@@ -26,7 +26,7 @@ import org.freeplane.features.filter.condition.ConditionFactory;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
-public class MatchCaseNodeContainsCondition extends ASelectableCondition {
+public class MatchCaseNodeContainsCondition extends ASelectableCondition implements NodeItemRelation{
 	static final String NAME = "match_case_node_contains_condition";
 	static final String VALUE = "VALUE";
 	static final String MATCH_APPROXIMATELY = "MATCH_APPROXIMATELY";
@@ -90,4 +90,8 @@ public class MatchCaseNodeContainsCondition extends ASelectableCondition {
     protected String getName() {
 	    return NAME;
     }
+
+	public String getNodeItem() {
+		return nodeItem;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/NodeContainsCondition.java b/freeplane/src/main/java/org/freeplane/features/text/NodeContainsCondition.java
index 0664a43..2a5b040 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/NodeContainsCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/NodeContainsCondition.java
@@ -26,7 +26,7 @@ import org.freeplane.features.filter.condition.ConditionFactory;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
-public class NodeContainsCondition extends ASelectableCondition {
+public class NodeContainsCondition extends ASelectableCondition implements NodeItemRelation {
 	static final String NAME = "node_contains_condition";
 	static final String VALUE = "VALUE";
 	static final String MATCH_APPROXIMATELY = "MATCH_APPROXIMATELY";
@@ -91,4 +91,9 @@ public class NodeContainsCondition extends ASelectableCondition {
     protected String getName() {
 	    return NAME;
     }
+	
+	public String getNodeItem() {
+		return nodeItem;
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/NodeItemRelation.java b/freeplane/src/main/java/org/freeplane/features/text/NodeItemRelation.java
new file mode 100644
index 0000000..a14aada
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/features/text/NodeItemRelation.java
@@ -0,0 +1,5 @@
+package org.freeplane.features.text;
+
+public interface NodeItemRelation {
+	String getNodeItem();
+}
diff --git a/freeplane/src/main/java/org/freeplane/features/text/NodeMatchesRegexpCondition.java b/freeplane/src/main/java/org/freeplane/features/text/NodeMatchesRegexpCondition.java
index 698b652..9995cbb 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/NodeMatchesRegexpCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/NodeMatchesRegexpCondition.java
@@ -29,7 +29,7 @@ import org.freeplane.features.filter.condition.ConditionFactory;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
-public class NodeMatchesRegexpCondition extends ASelectableCondition {
+public class NodeMatchesRegexpCondition extends ASelectableCondition implements NodeItemRelation {
 	static final String NAME = "node_matches_regexp";
 	static final String SEARCH_PATTERN = "SEARCH_PATTERN";
 
@@ -97,4 +97,8 @@ public class NodeMatchesRegexpCondition extends ASelectableCondition {
     protected String getName() {
 	    return NAME;
     }
+	
+	public String getNodeItem() {
+		return nodeItem;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/NodeTextCompareCondition.java b/freeplane/src/main/java/org/freeplane/features/text/NodeTextCompareCondition.java
index ba0e090..d962da1 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/NodeTextCompareCondition.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/NodeTextCompareCondition.java
@@ -28,7 +28,7 @@ import org.freeplane.features.filter.condition.CompareConditionAdapter;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.n3.nanoxml.XMLElement;
 
-public class NodeTextCompareCondition extends CompareConditionAdapter {
+public class NodeTextCompareCondition extends CompareConditionAdapter implements NodeItemRelation {
 	static final String COMPARATION_RESULT = "COMPARATION_RESULT";
 	static final String NAME = "node_compare_condition";
 	static final String SUCCEED = "SUCCEED";
@@ -117,4 +117,9 @@ public class NodeTextCompareCondition extends CompareConditionAdapter {
     protected String getName() {
 	    return NAME;
     }
+	
+	public String getNodeItem() {
+		return nodeItem;
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/NodeTextConditionController.java b/freeplane/src/main/java/org/freeplane/features/text/NodeTextConditionController.java
index d867eb6..cc04b07 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/NodeTextConditionController.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/NodeTextConditionController.java
@@ -213,7 +213,7 @@ class NodeTextConditionController implements IElementaryConditionController {
 
 	private static Object transformedObject(final NodeModel node) {
 		final Object userObject = node.getUserObject();
-		return TextController.getController().getTransformedObjectNoFormattingNoThrow(userObject, node);
+		return TextController.getController().getTransformedObjectNoFormattingNoThrow(userObject, node, null);
 	}
 
 	public ListCellRenderer getValueRenderer(Object selectedProperty, TranslatedObject selectedCondition) {
diff --git a/freeplane/src/main/java/org/freeplane/features/text/TextController.java b/freeplane/src/main/java/org/freeplane/features/text/TextController.java
index 586e24a..704c2bf 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/TextController.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/TextController.java
@@ -22,7 +22,6 @@ package org.freeplane.features.text;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -47,9 +46,6 @@ import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.nodestyle.NodeSizeModel;
 import org.freeplane.features.nodestyle.NodeStyleController;
-import org.freeplane.features.nodestyle.NodeStyleModel;
-import org.freeplane.features.styles.IStyle;
-import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.styles.MapStyleModel;
 import org.freeplane.view.swing.map.MainView;
 
@@ -71,6 +67,7 @@ public class TextController implements IExtension {
 	public static final String MARK_TRANSFORMED_TEXT = "highlight_formulas";
 
 
+
 	public static boolean isMarkTransformedTextSet() {
 		return Controller.getCurrentController().getResourceController().getBooleanProperty(MARK_TRANSFORMED_TEXT);
     }
@@ -89,9 +86,8 @@ public class TextController implements IExtension {
 		    new NodeTextConditionController());
 	}
 
-	public static void install( final TextController textController) {
-		final ModeController modeController = Controller.getCurrentModeController();
-		modeController.addExtension(TextController.class, textController);
+	public void install(final ModeController modeController) {
+		modeController.addExtension(TextController.class, this);
 	}
 
 	public TextController(final ModeController modeController) {
@@ -138,7 +134,7 @@ public class TextController implements IExtension {
 		if(object instanceof String){
 			String string = (String) object;
 			if(string.length() > 0 && string.charAt(0) == '\''){
-				if(isTextFormattingDisabled(nodeModel))
+				if(nodeModel != null && extension == nodeModel.getUserObject() && isTextFormattingDisabled(nodeModel))
 					return string;
 				else
 					return string.substring(1);
@@ -161,6 +157,20 @@ public class TextController implements IExtension {
 			return object;
 	}
 	
+	public boolean isFormula(Object object, final NodeModel nodeModel, Object extension) {
+		if(object instanceof String){
+			String string = (String) object;
+			if(string.length() > 0 && string.charAt(0) == '\''){
+				return false;
+			}
+		}
+		for (IContentTransformer textTransformer : getTextTransformers()) {
+			if(textTransformer.isFormula(this, object, nodeModel, extension))
+				return true;
+		}
+		return false;
+	}
+
 	public Icon getIcon(Object object, final NodeModel nodeModel, Object extension){
 		if(object instanceof HighlightedTransformedObject){
 			return getIcon(((HighlightedTransformedObject)object).getObject(), nodeModel, extension);
@@ -178,19 +188,19 @@ public class TextController implements IExtension {
 	}
 	
 	/** returns an error message instead of a normal result if something goes wrong. */
-	public Object getTransformedObjectNoThrow(Object data, final NodeModel node, Object extension) {
+	public Object getTransformedObjectNoFormattingNoThrow(Object data, final NodeModel node, Object extension) {
 		try {
-			return getTransformedObject(data, node, extension);
+			final Object transformedObject = getTransformedObject(data, node, extension);
+			if(transformedObject  instanceof HighlightedTransformedObject)
+				return ((HighlightedTransformedObject)transformedObject).getObject();
+			else
+				return transformedObject;
 		}
 		catch (Throwable e) {
 			LogUtils.warn(e.getMessage(), e);
 			return TextUtils.format("MainView.errorUpdateText", data, e.getLocalizedMessage());
 		}
 	}
-	
-	public Object getTransformedObjectNoFormattingNoThrow(Object data, NodeModel node) {
-		return getTransformedObjectNoThrow(data, node, null);
-	}
 
 	
 	public Object getTransformedObject(NodeModel node)  throws TransformationException{
@@ -198,10 +208,9 @@ public class TextController implements IExtension {
 		return getTransformedObject(userObject, node, userObject);
 	}
 	
-
 	public Object getTransformedObjectNoThrow(NodeModel node) {
 		final Object userObject = node.getUserObject();
-		return getTransformedObjectNoThrow(userObject, node, userObject);
+		return getTransformedObjectNoFormattingNoThrow(userObject, node, userObject);
 	}
 
 	/** convenience method for getTransformedText().toString. */
@@ -211,7 +220,7 @@ public class TextController implements IExtension {
 	}
 	
 	public String getTransformedTextNoThrow(Object text, final NodeModel nodeModel, Object extension) {
-		text = getTransformedObjectNoThrow(text, nodeModel, extension);
+		text = getTransformedObjectNoFormattingNoThrow(text, nodeModel, extension);
 		return text.toString();
 	}
 
@@ -286,7 +295,10 @@ public class TextController implements IExtension {
 
 	private void registerDetailsTooltip() {
 		modeController.addToolTipProvider(DETAILS_TOOLTIP, new ITooltipProvider() {
-				public String getTooltip(ModeController modeController, NodeModel node, Component view) {
+			public String getTooltip(final ModeController modeController, NodeModel node, Component view){
+				return getTooltip(modeController, node, (MainView)view);
+			}
+			private String getTooltip(final ModeController modeController, NodeModel node, MainView view) {
 					final DetailTextModel detailText = DetailTextModel.getDetailText(node);
 					if (detailText == null || ! (detailText.isHidden() || ShortenedTextModel.isShortened(node)) ){
 						 return null;
@@ -297,7 +309,9 @@ public class TextController implements IExtension {
 			        Font detailFont = style.getFont(detailStyleNode);
 			        Color detailBackground = style.getBackgroundColor(detailStyleNode);
 			        Color detailForeground = style.getColor(detailStyleNode);
-			        final int alignment = style.getTextAlign(detailStyleNode).swingConstant;
+			        final int alignment = style.getHorizontalTextAlignment(detailStyleNode).swingConstant;
+			        
+			        float zoom = view.getNodeView().getMap().getZoom();
 					
 					final StringBuilder htmlBodyStyle = new StringBuilder("<body><div style=\"")
 							.append(new CssRuleBuilder()
@@ -305,7 +319,7 @@ public class TextController implements IExtension {
 							.withColor(detailForeground)
 							.withBackground(detailBackground)
 							.withAlignment(alignment)
-							.withMaxWidthAsPt(NodeSizeModel.getMaxNodeWidth(detailStyleNode), style.getMaxWidth(node)))
+							.withMaxWidthAsPt(zoom, NodeSizeModel.getMaxNodeWidth(detailStyleNode), style.getMaxWidth(node)))
 							.append("\">");
 					
 					String noteText= detailText.getHtml();
@@ -327,12 +341,13 @@ public class TextController implements IExtension {
 				    }
 				    final NodeStyleController style = (NodeStyleController) modeController.getExtension(NodeStyleController.class);
 				    final Font font = style.getFont(node);
+				    float zoom = view.getNodeView().getMap().getZoom();
 					final StringBuilder htmlBodyStyle = new StringBuilder("<body><div style=\"")
 							.append(new CssRuleBuilder().withHTMLFont(font)
 							.withColor(view.getForeground())
 							.withBackground(view.getNodeView().getTextBackground())
 							.withAlignment(view.getHorizontalAlignment())
-							.withMaxWidthAsPt(style.getMaxWidth(node)));
+							.withMaxWidthAsPt(zoom, style.getMaxWidth(node)));
 				    final Object data = node.getUserObject();
 				    String text;
 				    try {
@@ -370,43 +385,18 @@ public class TextController implements IExtension {
 		Controller.getCurrentModeController().getMapController().nodeChanged(node, "SHORTENER", oldState, shortened);   
 	}
 
-	public String getNodeFormat(NodeModel node) {
-		Collection<IStyle> collection = LogicalStyleController.getController(modeController).getStyles(node);
-		final MapStyleModel model = MapStyleModel.getExtension(node.getMap());
-		for(IStyle styleKey : collection){
-			final NodeModel styleNode = model.getStyleNode(styleKey);
-			if (styleNode == null) {
-				continue;
-			}
-			final String format = NodeStyleModel.getNodeFormat(styleNode);
-			if (format != null) {
-				return format;
-			}
-        } 
-		// do not return PatternFormat.IDENTITY_PATTERN if parse_data=false because that would
-		// automatically disable all IContentTransformers!
-		return PatternFormat.STANDARD_FORMAT_PATTERN;
-    }
-
 	public boolean parseData() {
         return false;
     }
 
+	public String getNodeFormat(NodeModel node) {
+		return modeController.getExtension(NodeStyleController.class).getNodeFormat(node);
+    }
+
     public boolean getNodeNumbering(NodeModel node) {
-		Collection<IStyle> collection = LogicalStyleController.getController(modeController).getStyles(node);
-		final MapStyleModel model = MapStyleModel.getExtension(node.getMap());
-		for(IStyle styleKey : collection){
-			final NodeModel styleNode = model.getStyleNode(styleKey);
-			if (styleNode == null) {
-				continue;
-			}
-			final Boolean numbering = NodeStyleModel.getNodeNumbering(styleNode);
-			if (numbering != null) {
-				return numbering;
-			}
-		}
-		return false;
+    	return modeController.getExtension(NodeStyleController.class).getNodeNumbering(node);    
     }
+    
 	public ModeController getModeController() {
     	return modeController;
     }
@@ -414,4 +404,5 @@ public class TextController implements IExtension {
 	public boolean canEdit() {
 		return false;
 	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/ConditionalContentTransformer.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/ConditionalContentTransformer.java
index 427fb9f..c5a0dd3 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/ConditionalContentTransformer.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/ConditionalContentTransformer.java
@@ -56,16 +56,31 @@ public class ConditionalContentTransformer implements IContentTransformer, IEdit
 	public Object transformContent(TextController textController,
 			Object content, NodeModel node, Object transformedExtension)
 			throws TransformationException {
-		if (ResourceController.getResourceController().getBooleanProperty(prefsConditionKey))
+		if (isTransformationActive())
 			return target.transformContent(textController, content, node, transformedExtension);
 		else
 			return content;
 	}
 
+	private boolean isTransformationActive() {
+		return ResourceController.getResourceController().getBooleanProperty(prefsConditionKey);
+	}
+	
+	
+
+	@Override
+	public boolean isFormula(TextController textController,
+			Object content, NodeModel node, Object transformedExtension) {
+			if (isTransformationActive())
+				return target.isFormula(textController, content, node, transformedExtension);
+			else
+				return false;
+	}
+
 	@Override
 	public Icon getIcon(TextController textController, Object content,
 			NodeModel node, Object transformedExtension) {
-		if (ResourceController.getResourceController().getBooleanProperty(prefsConditionKey))
+		if (isTransformationActive())
 			return target.getIcon(textController, content, node, transformedExtension);
 		else
 			return null;
@@ -83,7 +98,7 @@ public class ConditionalContentTransformer implements IContentTransformer, IEdit
 
 	@Override
 	public EditNodeBase createEditor(NodeModel nodeModel, IEditControl editControl, String text, boolean editLong) {
-		if (target instanceof IEditBaseCreator && ResourceController.getResourceController().getBooleanProperty(prefsConditionKey))
+		if (target instanceof IEditBaseCreator && isTransformationActive())
 			return ((IEditBaseCreator)target).createEditor(nodeModel, editControl, text, editLong);
 		else
 			return null;
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java
index 992f3d8..4e19c10 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/EditNodeWYSIWYG.java
@@ -48,7 +48,7 @@ import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.map.NodeModel;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
 import org.freeplane.features.spellchecker.mindmapmode.SpellCheckerController;
 
 import com.lightdev.app.shtm.SHTMLEditorPane;
@@ -193,7 +193,7 @@ public class EditNodeWYSIWYG extends EditNodeBase {
 	private Color textColor = Color.BLACK;
 	private Dimension preferredSize = PREFERRED_SIZE;
 
-	private int horizontalAlignment = TextAlign.DEFAULT.swingConstant;
+	private int horizontalAlignment = HorizontalTextAlignment.DEFAULT.swingConstant;
 
 	public String getTitle() {
     	return title;
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/MTextController.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/MTextController.java
index 33fce78..418eec7 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/MTextController.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/MTextController.java
@@ -20,6 +20,7 @@
 package org.freeplane.features.text.mindmapmode;
 
 import java.awt.Component;
+import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
@@ -40,6 +41,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JEditorPane;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -52,6 +55,7 @@ import javax.swing.text.html.HTMLEditorKit;
 
 import org.freeplane.core.resources.IFreeplanePropertyListener;
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.ExampleFileFilter;
 import org.freeplane.core.ui.IEditHandler.FirstAction;
 import org.freeplane.core.ui.components.BitmapImagePreview;
@@ -67,6 +71,7 @@ import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.filter.StringMatchingStrategy;
+import org.freeplane.features.filter.condition.ICondition;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.format.IFormattedObject;
 import org.freeplane.features.format.PatternFormat;
@@ -77,6 +82,7 @@ import org.freeplane.features.icon.mindmapmode.MIconController;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.link.NodeLinks;
 import org.freeplane.features.link.mindmapmode.MLinkController;
+import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.map.INodeChangeListener;
 import org.freeplane.features.map.INodeSelectionListener;
 import org.freeplane.features.map.MapController;
@@ -90,8 +96,11 @@ import org.freeplane.features.mode.mindmapmode.MModeController;
 import org.freeplane.features.nodestyle.NodeStyleController;
 import org.freeplane.features.nodestyle.NodeStyleModel;
 import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
+import org.freeplane.features.styles.ConditionPredicate;
+import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.text.DetailTextModel;
 import org.freeplane.features.text.IContentTransformer;
+import org.freeplane.features.text.NodeItemRelation;
 import org.freeplane.features.text.ShortenedTextModel;
 import org.freeplane.features.text.TextController;
 import org.freeplane.features.text.mindmapmode.EditNodeBase.EditedComponent;
@@ -104,7 +113,7 @@ import com.jgoodies.common.base.Objects;
 import com.lightdev.app.shtm.ActionBuilder;
 import com.lightdev.app.shtm.SHTMLPanel;
 import com.lightdev.app.shtm.SHTMLPanelImpl;
-import com.lightdev.app.shtm.TextResources;
+import com.lightdev.app.shtm.UIResources;
 
 
 /**
@@ -115,9 +124,46 @@ public class MTextController extends TextController {
 	private static final String PARSE_DATA_PROPERTY = "parse_data";
     public static final String NODE_TEXT = "NodeText";
 	private static Pattern FORMATTING_PATTERN = null;
-	private EditNodeBase mCurrentEditDialog = null;
+	private EditNodeBase mCurrentEditor = null;
 	private final Collection<IEditorPaneListener> editorPaneListeners;
 	private final EventBuffer eventQueue;
+	
+	static{
+		final UIResources defaultResources = SHTMLPanel.getResources();
+    	SHTMLPanel.setResources(new UIResources() {
+    		public String getString(final String key) {
+    			if (key.equals("approximate_search_threshold"))
+    			{
+    				return new Double(StringMatchingStrategy.APPROXIMATE_MATCHING_MINPROB).toString();
+    			}
+    			
+    			String freeplaneKey = "simplyhtml." + key;
+    			String resourceString = ResourceController.getResourceController().getText(freeplaneKey, null);
+    			if (resourceString == null) {
+    				resourceString = ResourceController.getResourceController().getProperty(freeplaneKey);
+    			}
+    			if (resourceString == null && key.equals("splashImage"))
+    				return defaultResources.getString(key);
+    			return resourceString;
+    		}
+    		
+    		public Icon getIcon(String name){
+    			String freeplaneKey = "simplyhtml." + name;
+    			final ImageIcon freeplaneIcon = ResourceController.getResourceController().getIcon(freeplaneKey);
+    			return freeplaneIcon != null ? freeplaneIcon : defaultResources.getIcon(name);
+    		}
+    	});
+		
+	}
+	
+	private static final ConditionPredicate DEPENDS_ON_PARENT = new ConditionPredicate() {
+		
+		@Override
+		public boolean test(ICondition condition) {
+			return condition instanceof NodeItemRelation && 
+					FILTER_PARENT.equals(((NodeItemRelation)condition).getNodeItem());
+		}
+	};
 
 	public static MTextController getController() {
 		return (MTextController) TextController.getController();
@@ -204,6 +250,26 @@ public class MTextController extends TextController {
 			}
 		});
 	}
+	
+	
+
+	@Override
+	public void install(final ModeController modeController) {
+		super.install(modeController);
+		modeController.getMapController().addNodeChangeListener(new INodeChangeListener() {
+			
+			@Override
+			public void nodeChanged(NodeChangeEvent event) {
+				if(event.getProperty().equals(NodeModel.NODE_TEXT)) {
+					NodeModel node = event.getNode();
+					if (LogicalStyleController.getController().conditionalStylesOf(node).dependOnCondition(DEPENDS_ON_PARENT)){
+						for (NodeModel child : node.getChildren())
+							modeController.getMapController().delayedNodeRefresh(child, NodeModel.UNKNOWN_PROPERTY, null, null);
+					}
+				}
+			}
+		});
+	}
 
 	private String[] getContent(final String text, final int pos) {
 		if (pos <= 0) {
@@ -578,7 +644,7 @@ public class MTextController extends TextController {
 			}
 			private void stop() {
 				Controller.getCurrentModeController().setBlocked(false);
-				mCurrentEditDialog = null;
+				mCurrentEditor = null;
 			}
 			public boolean canSplit() {
                 return false;
@@ -588,9 +654,9 @@ public class MTextController extends TextController {
                 return EditedComponent.DETAIL;
             }
 		};
-		mCurrentEditDialog = createEditor(nodeModel, editControl, text, false, editLong, true);
+		mCurrentEditor = createEditor(nodeModel, editControl, text, false, editLong, true);
 		final RootPaneContainer frame = (RootPaneContainer) SwingUtilities.getWindowAncestor(controller.getMapViewManager().getMapViewComponent());
-		mCurrentEditDialog.show(frame);
+		mCurrentEditor.show(frame);
     }
 
 
@@ -706,15 +772,18 @@ public class MTextController extends TextController {
 
 	public void edit(final FirstAction action, final boolean editLong) {
 		final Controller controller = Controller.getCurrentController();
-		final NodeModel selectedNode = controller.getSelection().getSelected();
-		if (selectedNode != null) {
-			if (FirstAction.EDIT_CURRENT.equals(action)) {
-				edit(selectedNode, selectedNode, false, false, editLong);
-			}
-			else if (!Controller.getCurrentModeController().isBlocked()) {
-				final int mode = FirstAction.ADD_CHILD.equals(action) ? MMapController.NEW_CHILD : MMapController.NEW_SIBLING_BEHIND;
-				((MMapController) Controller.getCurrentModeController().getMapController()).addNewNode(mode);
-			}
+		final IMapSelection selection = controller.getSelection();
+		if(selection == null)
+			return;
+		final NodeModel selectedNode = selection.getSelected();
+		if (selectedNode == null)
+			return;
+		if (FirstAction.EDIT_CURRENT.equals(action)) {
+			edit(selectedNode, selectedNode, false, false, editLong);
+		}
+		else if (!Controller.getCurrentModeController().isBlocked()) {
+			final int mode = FirstAction.ADD_CHILD.equals(action) ? MMapController.NEW_CHILD : MMapController.NEW_SIBLING_BEHIND;
+			((MMapController) Controller.getCurrentModeController().getMapController()).addNewNode(mode);
 		}
 	}
 	
@@ -766,15 +835,14 @@ public class MTextController extends TextController {
 	    }
 
 		private boolean isMenuEvent(KeyEvent e) {
-	        if(! editLong){
-	    		final String editLongKeyStrokeProperty = ResourceController.getResourceController().getProperty("acceleratorForMindMap/$EditLongAction$0", null);
-	    		if(editLongKeyStrokeProperty != null){
-	    			final KeyStroke editLongKeyStroke = UITools.getKeyStroke(editLongKeyStrokeProperty);
-	    			if(editLongKeyStroke != null){
-	    				final KeyStroke keyStroke = KeyStroke.getKeyStrokeForEvent(e);
-	    				if(editLongKeyStroke.equals(keyStroke)){
-	    					return true;
-	    				}
+			if (!editLong) {
+				AFreeplaneAction editLongAcction = modeController.getAction("EditLongAction");
+				KeyStroke accelerator = ResourceController.getResourceController().getAcceleratorManager()
+				    .getAccelerator(editLongAcction);
+				if (accelerator != null) {
+					final KeyStroke keyStroke = KeyStroke.getKeyStrokeForEvent(e);
+					if (accelerator.equals(keyStroke)) {
+						return true;
 	    			}
 	    		}
 	    	}
@@ -811,7 +879,7 @@ public class MTextController extends TextController {
 
 	public void edit(final NodeModel nodeModel, final NodeModel prevSelectedModel, final boolean isNewNode,
 	          final boolean parentFolded, final boolean editLong) {
-		if (nodeModel == null || mCurrentEditDialog != null) {
+		if (nodeModel == null || mCurrentEditor != null) {
 			return;
 		}
 		final Controller controller = Controller.getCurrentController();
@@ -845,7 +913,7 @@ public class MTextController extends TextController {
 				    }
 					final MapController mapController = Controller.getCurrentModeController().getMapController();
 					if (parentFolded) {
-						mapController.setFolded(prevSelectedModel, true);
+						mapController.fold(prevSelectedModel);
 					}
 				}
 				stop();
@@ -854,7 +922,7 @@ public class MTextController extends TextController {
 			private void stop() {
 				Controller.getCurrentModeController().setBlocked(false);
 				viewController.obtainFocusForSelected();
-				mCurrentEditDialog = null;
+				mCurrentEditor = null;
 			}
 
 			public void ok(final String text) {
@@ -883,9 +951,9 @@ public class MTextController extends TextController {
                 return EditedComponent.TEXT;
             }
 		};
-		mCurrentEditDialog = createEditor(nodeModel, editControl, nodeModel.getText(), isNewNode, editLong, true);
+		mCurrentEditor = createEditor(nodeModel, editControl, nodeModel.getText(), isNewNode, editLong, true);
 		final RootPaneContainer frame = (RootPaneContainer) UITools.getCurrentRootComponent();
-		mCurrentEditDialog.show(frame);
+		mCurrentEditor.show(frame);
 	}
 
 	private EditNodeBase createEditor(final NodeModel nodeModel, final IEditControl editControl,
@@ -919,12 +987,12 @@ public class MTextController extends TextController {
 		if(keyEventDispatcher != null){
 			keyEventDispatcher.uninstall();
 		}
-		if (mCurrentEditDialog != null) {
+		if (mCurrentEditor != null) {
 			// Ensure that setText from the edit and the next action 
 			// are parts of different transactions
-			mCurrentEditDialog.closeEdit();
+			mCurrentEditor.closeEdit();
 			modeController.forceNewTransaction();
-			mCurrentEditDialog = null;
+			mCurrentEditor = null;
 		}
 	}
 	public void addEditorPaneListener(IEditorPaneListener l){
@@ -948,20 +1016,6 @@ public class MTextController extends TextController {
 	 * @return
 	 */
 	public SHTMLPanel createSHTMLPanel(String purpose) {
-    	SHTMLPanel.setResources(new TextResources() {
-    		public String getString(String pKey) {
-    			if (pKey.equals("approximate_search_threshold"))
-    			{
-    				return new Double(StringMatchingStrategy.APPROXIMATE_MATCHING_MINPROB).toString();
-    			}
-    			pKey = "simplyhtml." + pKey;
-    			String resourceString = ResourceController.getResourceController().getText(pKey, null);
-    			if (resourceString == null) {
-    				resourceString = ResourceController.getResourceController().getProperty(pKey);
-    			}
-    			return resourceString;
-    		}
-    	});
     	com.lightdev.app.shtm.ScaledStyleSheet.FONT_SCALE_FACTOR = UITools.FONT_SCALE_FACTOR;
     	SHTMLPanel.setActionBuilder(new ActionBuilder() {
 			
@@ -971,6 +1025,11 @@ public class MTextController extends TextController {
 			}
 		});
     	final SHTMLPanel shtmlPanel = SHTMLPanel.createSHTMLPanel();
+    	final JEditorPane sourceEditorPane = shtmlPanel.getSourceEditorPane();
+    	final Font originalFont = sourceEditorPane.getFont();
+		final Font scaledFont = UITools.scale(originalFont);
+		sourceEditorPane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
+		sourceEditorPane.setFont(scaledFont);
     	shtmlPanel.setOpenHyperlinkHandler(new ActionListener(){
 
 			public void actionPerformed(ActionEvent pE) {
diff --git a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/SHTMLEditLinkAction.java b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/SHTMLEditLinkAction.java
index eecfc0b..3323f6b 100644
--- a/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/SHTMLEditLinkAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/text/mindmapmode/SHTMLEditLinkAction.java
@@ -27,7 +27,7 @@ public class SHTMLEditLinkAction extends AFreeplaneAction implements SHTMLAction
    public SHTMLEditLinkAction(final SHTMLPanelImpl panel) {
        super("SetLinkByTextFieldAction");
        this.panel = panel;
-       SHTMLPanelImpl.getActionProperties(this, "setLinkByTextField");
+       SHTMLPanelImpl.configureActionProperties(this, "setLinkByTextField");
    }
 
    public void actionPerformed(final ActionEvent ae) {
diff --git a/freeplane/src/main/java/org/freeplane/features/ui/CollapseableBoxBuilder.java b/freeplane/src/main/java/org/freeplane/features/ui/CollapseableBoxBuilder.java
index bfae3a3..3b38c55 100644
--- a/freeplane/src/main/java/org/freeplane/features/ui/CollapseableBoxBuilder.java
+++ b/freeplane/src/main/java/org/freeplane/features/ui/CollapseableBoxBuilder.java
@@ -35,7 +35,6 @@ import org.freeplane.core.ui.components.ResizerListener;
  * 01.02.2014
  */
 public class CollapseableBoxBuilder {
-	private static final int DEFAULT_SIZE = 350;
 	private final FrameController frameController;
 	private String propertyNameBase;
 	private boolean resizeable = true;
@@ -73,11 +72,10 @@ public class CollapseableBoxBuilder {
 		}
 		if(resizeable){
 			try {
-				int size = ResourceController.getResourceController().getIntProperty(sizePropertyName, DEFAULT_SIZE);
-				if(size <= 10) {
-					size = DEFAULT_SIZE;
+				int size = ResourceController.getResourceController().getIntProperty(sizePropertyName, 0);
+				if(size > 10) {
+					direction.setPreferredSize(component, size);
 				}
-				direction.setPreferredSize(component, size);
 			}
 			catch (Exception e) {
 				// blindly accept
diff --git a/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java b/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java
index 289faa6..0eb8037 100644
--- a/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java
+++ b/freeplane/src/main/java/org/freeplane/features/ui/FrameController.java
@@ -51,7 +51,6 @@ import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.ComboBoxEditor;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -60,6 +59,7 @@ import javax.swing.JPanel;
 import javax.swing.LookAndFeel;
 import javax.swing.RootPaneContainer;
 import javax.swing.Timer;
+import javax.swing.ToolTipManager;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
@@ -70,11 +70,13 @@ import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.resources.TranslatedObject;
 import org.freeplane.core.ui.FixedBasicComboBoxEditor;
 import org.freeplane.core.ui.IUserInputListenerFactory;
+import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.ui.components.ContainerComboBoxEditor;
 import org.freeplane.core.ui.components.FreeplaneMenuBar;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.ClassLoaderFactory;
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.features.format.FormattedDate;
 import org.freeplane.features.format.FormattedObject;
 import org.freeplane.features.format.ScannerController;
@@ -89,6 +91,9 @@ import org.freeplane.features.time.TimeComboBoxEditor;
  */
 abstract public class FrameController implements ViewController {
 
+	private static final Quantity<LengthUnits> ICON_SIZE = new Quantity<LengthUnits>(12, LengthUnits.pt);
+
+
 	private final class HorizontalToolbarPanel extends JPanel {
 		/**
 		 *
@@ -143,12 +148,20 @@ abstract public class FrameController implements ViewController {
 	final private JComponent toolbarPanel[];
 
 	final private String propertyKeyPrefix;
-	public static Icon textIcon;
-	public static Icon numberIcon;
-	public static Icon dateIcon;
-	public static Icon dateTimeIcon;
-	public static Icon linkIcon;
-	public static Icon localLinkIcon;
+	private static Icon textIcon;
+	private static Icon numberIcon;
+	private static Icon dateIcon;
+	private static Icon dateTimeIcon;
+	private static Icon linkIcon;
+	
+	static {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		textIcon = resourceController.getIcon("text_icon", ICON_SIZE);
+		numberIcon = resourceController.getIcon("number_icon", ICON_SIZE);
+		dateIcon = resourceController.getIcon("date_icon", ICON_SIZE);
+		dateTimeIcon = resourceController.getIcon("date_time_icon", ICON_SIZE);
+		linkIcon = resourceController.getIcon("link_icon", ICON_SIZE);
+	}
 	private final IMapViewManager mapViewManager;
 
 	public FrameController(Controller controller,  final IMapViewManager mapViewManager,
@@ -156,15 +169,6 @@ abstract public class FrameController implements ViewController {
 		super();
 		this.controller = controller;
 		this.mapViewManager = mapViewManager;
-		final ResourceController resourceController = ResourceController.getResourceController();
-		if(textIcon == null){
-			FrameController.textIcon = new ImageIcon(resourceController.getResource("/images/text.png"));
-			FrameController.numberIcon = new ImageIcon(resourceController.getResource("/images/number.png"));
-			FrameController.dateIcon = new ImageIcon(resourceController.getResource("/images/calendar_red.png"));
-			FrameController.dateTimeIcon = new ImageIcon(resourceController.getResource("/images/calendar_clock_red.png"));
-			FrameController.linkIcon = new ImageIcon(resourceController.getResource("/images/" + resourceController.getProperty("link_icon")));
-			FrameController.localLinkIcon = new ImageIcon(resourceController.getResource("/images/" + resourceController.getProperty("link_local_icon")));
-		}
 		this.propertyKeyPrefix = propertyKeyPrefix;
 		statusPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 3, 0));
 		UIComponentVisibilityDispatcher.install(this, statusPanel, "toolbarVisible");
@@ -426,12 +430,13 @@ abstract public class FrameController implements ViewController {
 		
 	}
 
-	protected void setFullScreen(final boolean fullScreen) {
+	public void setFullScreen(final boolean fullScreen) {
 		final JFrame frame = (JFrame) getCurrentRootComponent();
 		final Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
 		if (fullScreen == isFullScreenEnabled()) {
 			return;
 		}
+		ToolTipManager.sharedInstance().setEnabled(false);
 		final Controller controller = getController();
 		ResourceController.getResourceController().firePropertyChanged(FULLSCREEN_ENABLED_PROPERTY, Boolean.toString(!fullScreen),Boolean.toString(fullScreen));
 		Iterable<Window> visibleFrames = collectVisibleFrames(frame);
@@ -472,6 +477,7 @@ abstract public class FrameController implements ViewController {
 			}
 			showWindows(visibleFrames);
 		}
+		ToolTipManager.sharedInstance().setEnabled(true);
 		if(focusOwner != null)
 		    focusOwner.requestFocus();
 	}
@@ -544,6 +550,14 @@ abstract public class FrameController implements ViewController {
 		if(supportHidpi)
 			scaleDefaultUIFonts();
 
+		// Workaround for https://bugs.openjdk.java.net/browse/JDK-8134828
+		// Scrollbar thumb disappears with Nimbus L&F
+		// http://stackoverflow.com/questions/32857372/jscrollbar-dont-show-thumb-in-nimbus-lf
+
+		final Dimension minimumThumbSize = new Dimension(30, 30);
+		UIManager.getLookAndFeelDefaults().put("ScrollBar.minimumThumbSize", minimumThumbSize);
+		UIManager.put("ScrollBar.minimumThumbSize", minimumThumbSize);
+
 		// Workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7077418
 		// NullPointerException in WindowsFileChooserUI when system icons missing/invalid
 		// set FileChooserUI to MetalFileChooserUI if no JFileChooser can be created
@@ -558,6 +572,9 @@ abstract public class FrameController implements ViewController {
 			}
 		}
 		
+		// Workaround for https://bugs.openjdk.java.net/browse/JDK-8179014
+		UIManager.put("FileChooser.useSystemExtensionHiding", false); 
+		
 		final Color color = UIManager.getColor("control");
 		if(color != null && color.getAlpha() < 255)
 			UIManager.getDefaults().put("control", Color.LIGHT_GRAY);
@@ -569,11 +586,13 @@ abstract public class FrameController implements ViewController {
 		final UIDefaults uiDefaults = UIManager.getDefaults();
 		final UIDefaults lookAndFeelDefaults = UIManager.getLookAndFeel().getDefaults();
 		
+		double scalingFactor = calculateFontSizeScalingFactor();
+		
 		for (Object key : keys) {
 		    if (isFontKey(key)) {
 				Font font = uiDefaults.getFont(key);
 				if (font != null) {
-				    font = UITools.scaleFontInt(font, 0.8);
+				    font = UITools.scaleFontInt(font, scalingFactor);
 				    UIManager.put(key, font);
 				    lookAndFeelDefaults.put(key, font);
 				}
@@ -582,6 +601,27 @@ abstract public class FrameController implements ViewController {
 		}
     }
 
+	private static double calculateFontSizeScalingFactor() {
+		final int unknown = -1;
+		final int userDefinedMenuItemFontSize = ResourceController.getResourceController().getIntProperty(UITools.MENU_ITEM_FONT_SIZE_PROPERTY, unknown);
+		double scalingFactor = 0.8;
+		
+		int lookAndFeelDefaultMenuItemFontSize = 10;
+		Font uiDefaultMenuItemFont = UIManager.getDefaults().getFont("MenuItem.font");
+		if(uiDefaultMenuItemFont != null) {
+			lookAndFeelDefaultMenuItemFontSize = uiDefaultMenuItemFont.getSize();
+		}
+		
+		if(userDefinedMenuItemFontSize == unknown){
+			final long defaultMenuItemSize = Math.round(lookAndFeelDefaultMenuItemFontSize * scalingFactor);
+			ResourceController.getResourceController().setDefaultProperty(UITools.MENU_ITEM_FONT_SIZE_PROPERTY, Long.toString(defaultMenuItemSize));
+		}
+		else{
+			scalingFactor = ((double)userDefinedMenuItemFontSize) / lookAndFeelDefaultMenuItemFontSize;
+		}
+		return scalingFactor;
+	}
+
 	private static boolean isFontKey(Object key) {
 		return key != null && key.toString().toLowerCase().endsWith("font");
 	}
@@ -592,22 +632,22 @@ abstract public class FrameController implements ViewController {
 			value = ((FormattedObject) value).getObject();
 		}
 		if (value instanceof String || value instanceof StyleTranslatedObject) {
-			addStatusInfo(ResourceController.OBJECT_TYPE, null, FrameController.textIcon);
+			addStatusInfo(ResourceController.OBJECT_TYPE, null, textIcon);
 		}
 		else if (value instanceof FormattedDate) {
 			final FormattedDate fd = (FormattedDate) value;
 			if (fd.containsTime()) {
-				addStatusInfo(ResourceController.OBJECT_TYPE, null, FrameController.dateTimeIcon);
+				addStatusInfo(ResourceController.OBJECT_TYPE, null, dateTimeIcon);
 			}
 			else {
-				addStatusInfo(ResourceController.OBJECT_TYPE, null, FrameController.dateIcon);
+				addStatusInfo(ResourceController.OBJECT_TYPE, null, dateIcon);
 			}
 		}
 		else if (value instanceof Number) {
-			addStatusInfo(ResourceController.OBJECT_TYPE, null, FrameController.numberIcon);
+			addStatusInfo(ResourceController.OBJECT_TYPE, null, numberIcon);
 		}
 		else if (value instanceof URI) {
-			addStatusInfo(ResourceController.OBJECT_TYPE, null, FrameController.linkIcon);
+			addStatusInfo(ResourceController.OBJECT_TYPE, null, linkIcon);
 		}
 		else {
 			addStatusInfo(ResourceController.OBJECT_TYPE, null, null);
@@ -680,8 +720,9 @@ abstract public class FrameController implements ViewController {
 	}
 
 	public boolean quit() {
-		Controller.getCurrentController().selectMode(MModeController.MODENAME);
-		final boolean allMapsClosed = Controller.getCurrentModeController().getMapController().closeAllMaps();
+		final Controller controller = Controller.getCurrentController();
+		controller.selectMode(MModeController.MODENAME);
+		final boolean allMapsClosed = controller.closeAllMaps();
 	    if(allMapsClosed)
 	    	getController().getMapViewManager().onQuitApplication();
 	    return allMapsClosed;
diff --git a/freeplane/src/main/java/org/freeplane/features/ui/IMapViewManager.java b/freeplane/src/main/java/org/freeplane/features/ui/IMapViewManager.java
index 76939a8..65a631f 100644
--- a/freeplane/src/main/java/org/freeplane/features/ui/IMapViewManager.java
+++ b/freeplane/src/main/java/org/freeplane/features/ui/IMapViewManager.java
@@ -21,6 +21,7 @@ package org.freeplane.features.ui;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.image.RenderedImage;
@@ -32,6 +33,7 @@ import java.util.Map;
 import javax.swing.JComboBox;
 
 import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.map.IMapSelectionListener;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
@@ -81,12 +83,18 @@ public interface IMapViewManager {
 
 	public RenderedImage createImage(int dpi);
 
+	public RenderedImage createImage(final Dimension slideSize, NodeModel placedNode, NodePosition placedNodePosition, int imageResolutionInDpi);
+	
 	public Color getBackgroundColor(NodeModel node);
 
 	public Component getComponent(NodeModel node);
 	
 	public boolean isFoldedOnCurrentView(NodeModel node);
 
+	public void displayOnCurrentView(NodeModel node);
+	
+	public void setFoldedOnCurrentView(NodeModel node, boolean folded);
+
 	public Font getFont(NodeModel node);
 
 	/** @return an unmodifiable set of all display names of current opened maps. */
@@ -147,4 +155,18 @@ public interface IMapViewManager {
 
 	public void closeWithoutSaving();
 
+	public void moveFocusFromDescendantToSelection(Component ancestor);
+
+	public boolean isChildHidden(NodeModel nodeOnPath);
+
+	public boolean hasHiddenChildren(NodeModel selected);
+
+	public boolean unfoldHiddenChildren(NodeModel node);
+
+	public void hideChildren(NodeModel node);
+
+	public boolean showHiddenNode(NodeModel child);
+	
+	public boolean isSpotlightEnabled();
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/ui/UIComponentVisibilityDispatcher.java b/freeplane/src/main/java/org/freeplane/features/ui/UIComponentVisibilityDispatcher.java
index a60e5f1..098a68d 100644
--- a/freeplane/src/main/java/org/freeplane/features/ui/UIComponentVisibilityDispatcher.java
+++ b/freeplane/src/main/java/org/freeplane/features/ui/UIComponentVisibilityDispatcher.java
@@ -19,12 +19,9 @@
  */
 package org.freeplane.features.ui;
 
-import java.awt.Component;
 import java.awt.Container;
 
-import javax.swing.FocusManager;
 import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
 
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.components.OneTouchCollapseResizer;
@@ -83,13 +80,8 @@ public class UIComponentVisibilityDispatcher {
 		if(parent != null)
 			((JComponent) parent).revalidate();
 		if (!visible) {
-			Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
-			boolean toolbarLostFocus = focusOwner != null && SwingUtilities.isDescendingFrom(focusOwner, component);
-			if (toolbarLostFocus) {
-	            final Component selectedComponent = Controller.getCurrentController().getMapViewManager().getSelectedComponent();
-				if (selectedComponent != null)
-					selectedComponent.requestFocus();
-            }
+			IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+			mapViewManager.moveFocusFromDescendantToSelection(component);
 		}
 
     }
diff --git a/freeplane/src/main/java/org/freeplane/features/url/FreeplaneUriConverter.java b/freeplane/src/main/java/org/freeplane/features/url/FreeplaneUriConverter.java
index a2a88c9..981cf1c 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/FreeplaneUriConverter.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/FreeplaneUriConverter.java
@@ -48,7 +48,7 @@ public class FreeplaneUriConverter{
 	    	return new URL(UrlManager.FILE_SCHEME, uri.getHost(), uri.getPath().substring(2));
 	    }
 	    else
-	    	return new URL(scheme, uri.getHost(), uri.getPath());
+	    	return new URL(scheme, uri.getHost(), uri.getPort(), uri.getPath());
     }
 
 	public String fixPartiallyDecodedFreeplaneUriComingFromInternetExplorer(String uriCandidate) {
diff --git a/freeplane/src/main/java/org/freeplane/features/url/UrlManager.java b/freeplane/src/main/java/org/freeplane/features/url/UrlManager.java
index 6ef154c..78930d6 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/UrlManager.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/UrlManager.java
@@ -210,7 +210,12 @@ public class UrlManager implements IExtension {
 			LogUtils.warn(ex);
 		}
 		catch (final RuntimeException ex) {
-			LogUtils.severe(ex);
+			try {
+				final String urlString = url.toString();
+				LogUtils.severe("Can not load url " + urlString, ex);
+			} catch (Exception e) {
+				LogUtils.severe("Can not load url", ex);
+			}
 		}
 		finally {
 			FileUtils.silentlyClose(urlStreamReader);
diff --git a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ExportBranchAction.java b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ExportBranchAction.java
index 26f3539..c36aea0 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ExportBranchAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ExportBranchAction.java
@@ -42,6 +42,7 @@ import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.map.mindmapmode.MMapController;
 import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.MapExtensions;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.mode.PersistentNodeHook;
 import org.freeplane.features.mode.mindmapmode.MModeController;
@@ -138,35 +139,36 @@ class ExportBranchAction extends AFreeplaneAction {
 					}
 
 					public void act() {
-						existingNode.setParent(null);
 						existingNode.setFolded(false);
-						mMapController.newModel(existingNode);
 					}
 				};
 				Controller.getCurrentModeController().execute(actor, parentMap);
 			}
-			final MapModel map = existingNode.getMap();
-			IExtension[] oldExtensions = map.getRootNode().getSharedExtensions().values().toArray(new IExtension[]{});
+			mMapController.newModel(existingNode);
+			final MapModel newMap = existingNode.getMap();
+			IExtension[] oldExtensions = newMap.getRootNode().getSharedExtensions().values().toArray(new IExtension[]{});
 			for(final IExtension extension : oldExtensions){
 				final Class<? extends IExtension> clazz = extension.getClass();
-				if(PersistentNodeHook.isMapExtension(clazz)){
+				if(MapExtensions.isMapExtension(clazz)){
 					existingNode.removeExtension(clazz);
 				}
 			}
 			final Collection<IExtension> newExtensions = parentMap.getRootNode().getSharedExtensions().values();
 			for(final IExtension extension : newExtensions){
 				final Class<? extends IExtension> clazz = extension.getClass();
-				if(PersistentNodeHook.isMapExtension(clazz)){
+				if(MapExtensions.isMapExtension(clazz)){
 					existingNode.addExtension(extension);
 				}
 			}
-			((MFileManager) UrlManager.getController()).save(map, chosenFile);
+			((MFileManager) UrlManager.getController()).save(newMap, chosenFile);
 			final NodeModel newNode = mMapController.addNewNode(parent, nodePosition, existingNode.isLeft());
 			((MTextController) TextController.getController()).setNodeText(newNode, existingNode.getText());
 			modeController.undoableCopyExtensions(LogicalStyleKeys.NODE_STYLE, existingNode, newNode);
-			map.getFile();
+			newMap.getFile();
 			((MLinkController) LinkController.getController()).setLink(newNode, newUri, LinkController.LINK_ABSOLUTE);
-			map.destroy();
+			newMap.destroy();
+			existingNode.setParent(null);
+			mMapController.select(newNode);
 		}
 	}
 
diff --git a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportExplorerFavoritesAction.java b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportExplorerFavoritesAction.java
index 3df9cc5..37eb046 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportExplorerFavoritesAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportExplorerFavoritesAction.java
@@ -74,8 +74,8 @@ class ImportExplorerFavoritesAction extends AFreeplaneAction {
 
 	public boolean importExplorerFavorites(final File folder, final NodeModel target, final boolean redisplay) {
 		boolean favoritesFound = false;
-		if (folder.isDirectory()) {
-			final File[] list = folder.listFiles();
+		final File[] list = folder.listFiles();
+		if (list != null) {
 			for (int i = 0; i < list.length; i++) {
 				if (list[i].isDirectory()) {
 					final String nodeContent = list[i].getName();
diff --git a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportFolderStructureAction.java b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportFolderStructureAction.java
index 0d7af5c..b782255 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportFolderStructureAction.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/ImportFolderStructureAction.java
@@ -94,6 +94,6 @@ class ImportFolderStructureAction extends AFreeplaneAction {
 				addNode(target, list[i].getName(), list[i].toURI().toString());
 			}
 		}
-		Controller.getCurrentModeController().getMapController().setFolded(target, true);
+		Controller.getCurrentModeController().getMapController().fold(target);
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/MFileManager.java b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/MFileManager.java
index 0975bb8..d44e039 100644
--- a/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/MFileManager.java
+++ b/freeplane/src/main/java/org/freeplane/features/url/mindmapmode/MFileManager.java
@@ -43,6 +43,9 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.channels.FileLock;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -60,8 +63,8 @@ import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 
 import org.freeplane.core.extension.IExtension;
-import org.freeplane.core.resources.TranslatedObject;
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.resources.TranslatedObject;
 import org.freeplane.core.resources.components.ComboProperty;
 import org.freeplane.core.resources.components.IPropertyControl;
 import org.freeplane.core.resources.components.IPropertyControlCreator;
@@ -82,6 +85,7 @@ import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.MapWriter.Mode;
 import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.mindmapmode.DocuMapAttribute;
 import org.freeplane.features.map.mindmapmode.MMapController;
 import org.freeplane.features.map.mindmapmode.MMapModel;
 import org.freeplane.features.mode.Controller;
@@ -133,7 +137,6 @@ public class MFileManager extends UrlManager implements IMapViewChangeListener {
 	}
 
 	private static final String BACKUP_FILE_NUMBER = "backup_file_number";
-	private static final String FREEPLANE_VERSION_UPDATER_XSLT = "/xslt/freeplane_version_updater.xslt";
 	private static File singleBackupDirectory;
 
 	private File[] findFileRevisions(final File file, final File backupDir, final AlternativeFileMode mode) {
@@ -370,7 +373,7 @@ public class MFileManager extends UrlManager implements IMapViewChangeListener {
 	 */
 	private String getFileNameProposal(final MapModel map) {
 		String rootText = TextController.getController().getPlainTextContent((map.getRootNode()));
-		rootText = rootText.replaceAll("[&:/\\\\\0%$#~\\?\\*]+", "");
+		rootText = FileUtils.validFileNameOf(rootText);
 		return rootText;
 	}
 
@@ -414,6 +417,9 @@ public class MFileManager extends UrlManager implements IMapViewChangeListener {
 		if (!file.exists()) {
         	throw new FileNotFoundException(TextUtils.format("file_not_found", file.getPath()));
         }
+		if (!Files.isReadable(file.toPath())) {
+			throw new FileNotFoundException(TextUtils.format("file_not_accessible", file.getPath()));
+		}
         if (!file.canWrite()) {
         	map.setReadOnly(true);
         }
@@ -580,14 +586,20 @@ public class MFileManager extends UrlManager implements IMapViewChangeListener {
 	/**@deprecated -- use MMapIO*/
 	@Deprecated
 	public MapModel newMapFromDefaultTemplate() {
-		final File file = chosenTemplateFile();
-		if (file != null) {
-			return newMapFromTemplate(file);
-		}
-		final MapController mapController = Controller.getCurrentModeController().getMapController();
-		final MapModel map = mapController.newMap();
-		mapController.setSaved(map, true);
-		return map;
+		return AccessController.doPrivileged(new PrivilegedAction<MapModel>() {
+
+			@Override
+			public MapModel run() {
+				final File file = chosenTemplateFile();
+				if (file != null) {
+					return newMapFromTemplate(file);
+				}
+				final MapController mapController = Controller.getCurrentModeController().getMapController();
+				final MapModel map = mapController.newMap();
+				mapController.setSaved(map, true);
+				return map;
+			}
+		});
 	}
 
 	protected File chosenTemplateFile() {
@@ -663,38 +675,45 @@ public class MFileManager extends UrlManager implements IMapViewChangeListener {
 	/**@deprecated -- use MMapIO*/
 	@Deprecated
 	public MapModel newMapFromTemplate(final File startFile) {
-		final File file;
-		if (startFile == null) {
-			file = getLastCurrentDir();
-		}
-		else if (startFile.isDirectory()) {
-			final JFileChooser chooser = getFileChooser(true);
-			chooser.setCurrentDirectory(startFile);
-			final int returnVal = chooser.showOpenDialog(Controller.getCurrentController().getMapViewManager().getMapViewComponent());
-			if (returnVal != JFileChooser.APPROVE_OPTION) {
+		return AccessController.doPrivileged(new PrivilegedAction<MapModel>() {
+
+			@Override
+			public MapModel run() {
+				final File file;
+				if (startFile == null) {
+					file = getLastCurrentDir();
+				}
+				else if (startFile.isDirectory()) {
+					final JFileChooser chooser = getFileChooser(true);
+					chooser.setCurrentDirectory(startFile);
+					final int returnVal = chooser.showOpenDialog(Controller.getCurrentController().getMapViewManager().getMapViewComponent());
+					if (returnVal != JFileChooser.APPROVE_OPTION) {
+						return null;
+					}
+					file = chooser.getSelectedFile();
+				}
+				else {
+					file = startFile;
+				}
+				try {
+					final MMapController mapController = (MMapController) Controller.getCurrentModeController().getMapController();
+					mapController.newUntitledMap(Compat.fileToUrl(file));
+					final Controller controller = Controller.getCurrentController();
+					final MapModel map = controller.getMap();
+					final Object rootText = map.getRootNode().getUserObject();
+					if(rootText instanceof TranslatedObject){
+						map.getRootNode().setText(rootText.toString());
+					}
+					controller.getModeController().getMapController().setSaved(map, true);
+					return map;
+				}
+				catch (Exception e) {
+					handleLoadingException(e);
+				}
 				return null;
 			}
-			file = chooser.getSelectedFile();
-		}
-		else {
-			file = startFile;
-		}
-		try {
-			final MMapController mapController = (MMapController) Controller.getCurrentModeController().getMapController();
-			mapController.newUntitledMap(Compat.fileToUrl(file));
-			final Controller controller = Controller.getCurrentController();
-			final MapModel map = controller.getMap();
-			final Object rootText = map.getRootNode().getUserObject();
-			if(rootText instanceof TranslatedObject){
-				map.getRootNode().setText(rootText.toString());
-			}
-			controller.getModeController().getMapController().setSaved(map, true);
-			return map;
-		}
-		catch (Exception e) {
-			handleLoadingException(e);
-		}
-		return null;
+			
+		});
 	}
 
 	/**@deprecated -- use MMapIO*/
@@ -811,8 +830,14 @@ public class MFileManager extends UrlManager implements IMapViewChangeListener {
 		if (oldFile != null) {
 			oldFile = oldFile.getAbsoluteFile();
 		}
-		if (!f.getAbsoluteFile().equals(oldFile) && null != map.getExtension(BackupFlag.class)) {
-			map.removeExtension(BackupFlag.class);
+		if (!f.getAbsoluteFile().equals(oldFile)) {
+			if (null != map.getExtension(BackupFlag.class)) {
+				map.removeExtension(BackupFlag.class);
+			}
+			if (null != map.getExtension(DocuMapAttribute.class)) {
+				map.removeExtension(DocuMapAttribute.class);
+			}
+			map.setReadOnly(false);
 		}
 		if (save(map, f)) {
 			Controller.getCurrentController().getMapViewManager().updateMapViewName();
diff --git a/freeplane/src/main/java/org/freeplane/main/addons/AddOnsController.java b/freeplane/src/main/java/org/freeplane/main/addons/AddOnsController.java
index 7bbaf56..762c325 100644
--- a/freeplane/src/main/java/org/freeplane/main/addons/AddOnsController.java
+++ b/freeplane/src/main/java/org/freeplane/main/addons/AddOnsController.java
@@ -18,6 +18,7 @@ import java.util.Map.Entry;
 import javax.swing.JOptionPane;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.FileUtils;
@@ -32,7 +33,6 @@ import org.freeplane.n3.nanoxml.IXMLParser;
 import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 
 public class AddOnsController {
 	private static final String ADDONS_DIR = "addons";
@@ -66,7 +66,7 @@ public class AddOnsController {
 				return name.endsWith(".plugin.xml");
 			}
 		});
-		final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+		final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 		for (File file : addonXmlFiles) {
 			BufferedInputStream inputStream = null;
 			try {
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/AppletResourceController.java b/freeplane/src/main/java/org/freeplane/main/applet/AppletResourceController.java
index a6141c4..049fc6f 100644
--- a/freeplane/src/main/java/org/freeplane/main/applet/AppletResourceController.java
+++ b/freeplane/src/main/java/org/freeplane/main/applet/AppletResourceController.java
@@ -23,8 +23,6 @@ import java.net.URL;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import javax.swing.JApplet;
-
 import org.freeplane.core.resources.ResourceController;
 
 /**
@@ -44,7 +42,7 @@ class AppletResourceController extends ResourceController {
 		final Enumeration<?> allKeys = userProps.propertyNames();
 		while (allKeys.hasMoreElements()) {
 			final String key = (String) allKeys.nextElement();
-			setPropertyByParameter(freeplaneApplet, key);
+			freeplaneApplet.setPropertyByParameter(this, key);
 		}
 	}
 
@@ -103,13 +101,6 @@ class AppletResourceController extends ResourceController {
 		userProps.setProperty(key, value);
 	}
 
-	void setPropertyByParameter(JApplet applet, final String key) {
-		final String val = applet.getParameter(key);
-		if (val != null && val != "") {
-			userProps.setProperty(key, val);
-		}
-	}
-
 	@Override
 	public boolean isApplet() {
 		return true;
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/AppletViewController.java b/freeplane/src/main/java/org/freeplane/main/applet/AppletViewController.java
index dc95048..c3b6a98 100644
--- a/freeplane/src/main/java/org/freeplane/main/applet/AppletViewController.java
+++ b/freeplane/src/main/java/org/freeplane/main/applet/AppletViewController.java
@@ -40,7 +40,6 @@ import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.mode.Controller;
-import org.freeplane.features.mode.browsemode.BModeController;
 import org.freeplane.features.ui.FrameController;
 import org.freeplane.features.ui.IMapViewChangeListener;
 import org.freeplane.features.ui.IMapViewManager;
@@ -98,9 +97,10 @@ class AppletViewController extends FrameController implements IMapViewChangeList
 		getController().selectMode(BModeController.MODENAME);
 		String initialMapName = ResourceController.getResourceController().getProperty("browsemode_initial_map");
 		if (initialMapName != null && initialMapName.startsWith(".")) {
-			final String locationUrl = applet.getParameter("location_href");
+			String locationUrl = applet.getParameter("location_href");
 			try {
-				URI uri = new URI(locationUrl).resolve(new URI(null, null, initialMapName, null));
+				final URI codebase = locationUrl != null ?  new URI(locationUrl):applet.getCodeBase().toURI();
+				URI uri = codebase.resolve(new URI(null, null, initialMapName, null));
 				URL documentBase = new URL(uri.getScheme(), uri.getHost(),  uri.getPort(), uri.getPath());
 				initialMapName = documentBase.toString();
 			}
@@ -166,7 +166,7 @@ class AppletViewController extends FrameController implements IMapViewChangeList
 
 	@Override
 	public void openDocument(final URL doc) {
-		applet.getAppletContext().showDocument(doc, "_blank");
+		applet.showDocument(doc);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/BModeController.java b/freeplane/src/main/java/org/freeplane/main/applet/BModeController.java
new file mode 100644
index 0000000..015fe5c
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/main/applet/BModeController.java
@@ -0,0 +1,36 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.main.applet;
+
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.mode.ModeController;
+
+public class BModeController extends ModeController {
+	static public final String MODENAME = "Browse";
+
+	public BModeController(final Controller controller) {
+		super(controller);
+	}
+
+	@Override
+	public String getModeName() {
+		return BModeController.MODENAME;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/BModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/applet/BModeControllerFactory.java
new file mode 100644
index 0000000..b9d2135
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/main/applet/BModeControllerFactory.java
@@ -0,0 +1,111 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Dimitry Polivaev
+ *
+ *  This file author is Dimitry Polivaev
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.main.applet;
+
+import java.security.AccessControlException;
+
+import javax.swing.JPopupMenu;
+import javax.swing.SwingConstants;
+
+import org.freeplane.core.ui.components.FreeplaneToolBar;
+import org.freeplane.core.ui.menubuilders.generic.PhaseProcessor.Phase;
+import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.attribute.AttributeController;
+import org.freeplane.features.clipboard.ClipboardController;
+import org.freeplane.features.cloud.CloudController;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.encrypt.EncryptionController;
+import org.freeplane.features.filter.FilterController;
+import org.freeplane.features.icon.IconController;
+import org.freeplane.features.link.LinkController;
+import org.freeplane.features.map.FoldingController;
+import org.freeplane.features.map.FreeNode;
+import org.freeplane.features.map.MapController;
+import org.freeplane.features.map.SummaryNode;
+import org.freeplane.features.mapio.MapIO;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.nodelocation.LocationController;
+import org.freeplane.features.nodestyle.NodeStyleController;
+import org.freeplane.features.note.NoteController;
+import org.freeplane.features.styles.AutomaticLayoutController;
+import org.freeplane.features.styles.LogicalStyleController;
+import org.freeplane.features.styles.MapStyle;
+import org.freeplane.features.text.TextController;
+import org.freeplane.features.ui.FrameController;
+import org.freeplane.features.ui.UIComponentVisibilityDispatcher;
+import org.freeplane.features.ui.ViewController;
+import org.freeplane.features.url.UrlManager;
+import org.freeplane.view.swing.features.filepreview.ViewerController;
+import org.freeplane.view.swing.ui.UserInputListenerFactory;
+
+/**
+ * @author Dimitry Polivaev 24.11.2008
+ */
+public class BModeControllerFactory {
+	private static BModeController modeController;
+
+	static public BModeController createModeController() {
+		final Controller controller = Controller.getCurrentController();
+		modeController = new BModeController(controller);
+		final UserInputListenerFactory userInputListenerFactory = new UserInputListenerFactory(modeController);
+		modeController.setUserInputListenerFactory(userInputListenerFactory);
+		controller.addModeController(modeController);
+		controller.selectModeForBuild(modeController);
+		new MapController(modeController);
+		new IconController(modeController).install(modeController);
+		UrlManager.install(new UrlManager());
+		MapIO.install(modeController);
+		AttributeController.install(new AttributeController(modeController));
+		NodeStyleController.install(new NodeStyleController(modeController));
+		EdgeController.install(new EdgeController(modeController));
+		CloudController.install(new CloudController(modeController));
+		NoteController.install(new NoteController());
+		new TextController(modeController).install(modeController);
+		LinkController.install(new LinkController(modeController));
+		LogicalStyleController.install(new LogicalStyleController(modeController));
+		try {
+			ClipboardController.install(new ClipboardController());
+		}
+		catch (final AccessControlException e) {
+			LogUtils.warn("can not access system clipboard, clipboard controller disabled");
+		}
+		LocationController.install(new LocationController());
+		SummaryNode.install();
+		FreeNode.install();
+		MapStyle.install(true);
+		final BToolbarContributor toolbarContributor = new BToolbarContributor();
+		modeController.addUiBuilder(Phase.ACTIONS, "main_toolbar_url", toolbarContributor);
+		controller.getMapViewManager().addMapViewChangeListener(toolbarContributor);
+		userInputListenerFactory.setNodePopupMenu(new JPopupMenu());
+		final FreeplaneToolBar toolBar = new FreeplaneToolBar("main_toolbar", SwingConstants.HORIZONTAL);
+		FrameController frameController = (FrameController) controller.getViewController();
+		UIComponentVisibilityDispatcher.install(frameController, toolBar, "toolbarVisible");
+		userInputListenerFactory.addToolBar("/main_toolbar", ViewController.TOP, toolBar);
+		userInputListenerFactory.addToolBar("/filter_toolbar", FilterController.TOOLBAR_SIDE, FilterController.getController(
+		    controller).getFilterToolbar());
+		userInputListenerFactory.addToolBar("/status", ViewController.BOTTOM, controller.getViewController()
+		    .getStatusBar());
+		FoldingController.install(new FoldingController());
+		new ViewerController();
+		EncryptionController.install(new EncryptionController(modeController));
+		new AutomaticLayoutController();
+		return modeController;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/BToolbarContributor.java b/freeplane/src/main/java/org/freeplane/main/applet/BToolbarContributor.java
new file mode 100644
index 0000000..fbee9e4
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/main/applet/BToolbarContributor.java
@@ -0,0 +1,104 @@
+/*
+ *  Freeplane - mind map editor
+ *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
+ *
+ *  This file is modified by Dimitry Polivaev in 2008.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.freeplane.main.applet;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.URL;
+
+import javax.swing.JLabel;
+
+import org.freeplane.core.ui.components.PersistentEditableComboBox;
+import org.freeplane.core.ui.menubuilders.generic.Entry;
+import org.freeplane.core.ui.menubuilders.generic.EntryAccessor;
+import org.freeplane.core.ui.menubuilders.generic.EntryVisitor;
+import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.map.MapModel;
+import org.freeplane.features.mode.Controller;
+import org.freeplane.features.ui.IMapViewChangeListener;
+import org.freeplane.features.ui.IMapViewManager;
+
+class BToolbarContributor implements EntryVisitor, IMapViewChangeListener {
+	private static final String BROWSE_URL_STORAGE_KEY = "browse_url_storage";
+// 	final private ModeController modeController;
+	private PersistentEditableComboBox urlfield = null;
+
+	public BToolbarContributor() {
+		urlfield = new PersistentEditableComboBox(BROWSE_URL_STORAGE_KEY, 20);
+		urlfield.addActionListener(new ActionListener() {
+			public void actionPerformed(final ActionEvent e) {
+				final String urlText = urlfield.getText();
+				if ("".equals(urlText) || e.getActionCommand().equals("comboBoxEdited")) {
+					return;
+				}
+				try {
+					Controller.getCurrentModeController().getMapController().newMap(new URL(urlText));
+				}
+				catch (final Exception e1) {
+					LogUtils.warn(e1);
+				}
+			}
+		});
+	}
+
+	public void afterViewChange(final Component oldView, final Component newView) {
+		if (newView == null) {
+			return;
+		}
+		final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
+		mapViewManager.getModeController(newView);
+		final MapModel map = mapViewManager.getModel(newView);
+		final URL url = map.getURL();
+		if (url == null) {
+			return;
+		}
+		setURLField(url.toString());
+	}
+
+	public void afterViewClose(final Component oldView) {
+	}
+
+	public void afterViewCreated(final Component mapView) {
+	}
+
+	public void beforeViewChange(final Component oldView, final Component newView) {
+	}
+
+	private void setURLField(final String text) {
+		urlfield.setText(text);
+	}
+
+	@Override
+	public void visit(Entry target) {
+		final EntryAccessor entryAccessor = new EntryAccessor();
+		final Entry label = new Entry();
+		target.addChild(label);
+		entryAccessor.setComponent(label, new JLabel("URL:"));
+		final Entry field = new Entry();
+		target.addChild(field);
+		entryAccessor.setComponent(field, urlfield);
+	}
+
+	@Override
+	public boolean shouldSkipChildren(Entry entry) {
+		return true;
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java b/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java
index 9814df7..fdc1bf5 100644
--- a/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java
+++ b/freeplane/src/main/java/org/freeplane/main/applet/FreeplaneApplet.java
@@ -24,15 +24,20 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
+import java.awt.Desktop;
 import java.awt.EventQueue;
+import java.awt.Frame;
 import java.awt.HeadlessException;
+import java.awt.Window;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.net.URL;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import javax.swing.ImageIcon;
 import javax.swing.JApplet;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
@@ -47,19 +52,18 @@ import org.freeplane.features.filter.NextNodeAction;
 import org.freeplane.features.filter.NextPresentationItemAction;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.help.HelpController;
+import org.freeplane.features.highlight.HighlightController;
 import org.freeplane.features.icon.IconController;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapController.Direction;
 import org.freeplane.features.mode.Controller;
-import org.freeplane.features.mode.browsemode.BModeController;
 import org.freeplane.features.print.PrintController;
 import org.freeplane.features.styles.LogicalStyleFilterController;
 import org.freeplane.features.styles.MapViewLayout;
 import org.freeplane.features.text.TextController;
 import org.freeplane.features.time.TimeController;
 import org.freeplane.features.ui.FrameController;
-import org.freeplane.main.browsemode.BModeControllerFactory;
 import org.freeplane.view.swing.features.nodehistory.NodeHistory;
 import org.freeplane.view.swing.map.MapViewController;
 import org.freeplane.view.swing.map.ViewLayoutTypeAction;
@@ -67,8 +71,12 @@ import org.freeplane.view.swing.map.ViewLayoutTypeAction;
 public class FreeplaneApplet extends JApplet {
 	
 	@SuppressWarnings("serial")
-	private class GlassPane extends JComponent{
-		public GlassPane() {
+	private static class GlassPane extends JComponent{
+		private final Controller controller;
+
+
+		public GlassPane(Controller controller) {
+			this.controller = controller;
 			addMouseListener(new MouseAdapter(){});
 		}
 
@@ -94,15 +102,16 @@ public class FreeplaneApplet extends JApplet {
 		}
 	}
 	
-	private AppletResourceController appletResourceController;
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 	private AppletViewController appletViewController;
  	private Controller controller;
+	private static boolean instanceInitialized = false;
  	
  	final static Lock appletLock = new ReentrantLock();
+	private Boolean isLaunchedByJavaWebStart;
 
 	public FreeplaneApplet() throws HeadlessException {
 	    super();
@@ -115,73 +124,109 @@ public class FreeplaneApplet extends JApplet {
 	@SuppressWarnings("serial")
     @Override
 	public void init() {
-		try{
-			appletLock.lock();
-			appletResourceController = new AppletResourceController(this);
-			if (appletResourceController == null) {
-				appletResourceController = new AppletResourceController(this);
-			}
-			new ParserDelegator(){
-				{
-					setDefaultDTD();
+		configureFrame();
+		new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				try{
+					appletLock.lock();
+					AppletResourceController appletResourceController = new AppletResourceController(FreeplaneApplet.this);
+					new ParserDelegator(){
+						{
+							setDefaultDTD();
+						}
+					};
+					controller = new Controller(appletResourceController);
+					updateLookAndFeel(appletResourceController);
+					Controller.setCurrentController(controller);
+					final Container contentPane = getContentPane();
+					contentPane.setLayout(new BorderLayout());
+					MapViewController mapViewController = new MapViewController(controller);
+					appletViewController = new AppletViewController(FreeplaneApplet.this, controller, mapViewController);
+					controller.addAction(new ViewLayoutTypeAction(MapViewLayout.OUTLINE));
+					controller.addExtension(HighlightController.class, new HighlightController());
+					FilterController.install();
+					PrintController.install();
+					HelpController.install();
+					NodeHistory.install(controller);
+					FormatController.install(new FormatController());
+					ModelessAttributeController.install();
+					TextController.install();
+					MapController.install();
+
+					TimeController.install();
+					LinkController.install();
+					IconController.install();
+					FilterController.getCurrentFilterController().getConditionFactory().addConditionController(70,
+					    new LogicalStyleFilterController());
+					final BModeController browseController = BModeControllerFactory.createModeController();
+					final Set<String> emptySet = Collections.emptySet();
+					FilterController.getController(controller).loadDefaultConditions();
+					controller.addAction(new ShowSelectionAsRectangleAction());
+					controller.addAction(new NextNodeAction(Direction.FORWARD));
+					controller.addAction(new NextNodeAction(Direction.BACK));
+					controller.addAction(new NextNodeAction(Direction.FORWARD_N_FOLD));
+					controller.addAction(new NextNodeAction(Direction.BACK_N_FOLD));
+					controller.addAction(NextPresentationItemAction.createFoldingAction());
+					controller.addAction(NextPresentationItemAction.createNotFoldingAction());
+					browseController.updateMenus("/xml/appletmenu.xml", emptySet);
+					appletResourceController.getAcceleratorManager().loadAcceleratorPresets();
+
+					controller.selectMode(browseController);
+					setPropertyByParameter(appletResourceController, "browsemode_initial_map");
+					isLaunchedByJavaWebStart = isParameterTrue("launched_by_java_web_start");
+					if(isLaunchedByJavaWebStart) {
+						if(instanceInitialized)
+							throw new RuntimeException("singleAppletInstance allowed");
+						else
+							instanceInitialized = true;
+					} else
+						addGlassPane();
+					controller.getViewController().setMenubarVisible(false);
+					SwingUtilities.invokeLater(new Runnable() {
+						
+						@Override
+						public void run() {
+							appletViewController.init(controller);
+						}
+					});
 				}
-			};
-			controller = new Controller(appletResourceController);
-			updateLookAndFeel();
-			Controller.setCurrentController(controller);
-			final Container contentPane = getContentPane();
-			contentPane.setLayout(new BorderLayout());
-			MapViewController mapViewController = new MapViewController(controller);
-			appletViewController = new AppletViewController(this, controller, mapViewController);
-			controller.addAction(new ViewLayoutTypeAction(MapViewLayout.OUTLINE));
-			FilterController.install();
-			PrintController.install();
-			HelpController.install();
-			NodeHistory.install(controller);
-			FormatController.install(new FormatController());
-			ModelessAttributeController.install();
-			TextController.install();
-			MapController.install();
-
-			TimeController.install();
-			LinkController.install();
-			IconController.install();
-			FilterController.getCurrentFilterController().getConditionFactory().addConditionController(70,
-			    new LogicalStyleFilterController());
-			final BModeController browseController = BModeControllerFactory.createModeController();
-			final Set<String> emptySet = Collections.emptySet();
-			FilterController.getController(controller).loadDefaultConditions();
-			controller.addAction(new ShowSelectionAsRectangleAction());
-			controller.addAction(new NextNodeAction(Direction.FORWARD));
-			controller.addAction(new NextNodeAction(Direction.BACK));
-			controller.addAction(new NextNodeAction(Direction.FORWARD_N_FOLD));
-			controller.addAction(new NextNodeAction(Direction.BACK_N_FOLD));
-			controller.addAction(new NextPresentationItemAction());
-			browseController.updateMenus("/xml/appletmenu.xml", emptySet);
-			ResourceController.getResourceController().getAcceleratorManager().loadAcceleratorPresets();
-
-			controller.selectMode(browseController);
-			appletResourceController.setPropertyByParameter(this, "browsemode_initial_map");
-			final GlassPane glassPane = new GlassPane();
-			setGlassPane(glassPane);
-			glassPane.setVisible(true);
-			controller.getViewController().setMenubarVisible(false);
-			SwingUtilities.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					appletViewController.init(controller);
+				catch(RuntimeException e){
+					e.printStackTrace();
+					throw e;
 				}
-			});
-		}
-		catch(RuntimeException e){
-			e.printStackTrace();
-			throw e;
-		}
-		finally{
-			appletLock.unlock();
+				finally{
+					appletLock.unlock();
+				}
+			}
+		}, "Freeplane applet initialization").start();
+	}
+
+	private Boolean isParameterTrue(String name) {
+		return Boolean.valueOf(getParameter(name));
+	}
+
+	private void configureFrame() {
+		Window window = SwingUtilities.windowForComponent(this);
+		if (window instanceof Frame){
+			Frame frame = (Frame)window;
+			ImageIcon mWindowIcon;
+			mWindowIcon = new ImageIcon(getClass().getResource(
+					"/images/Freeplane_frame_icon_64x64.png"));
+			frame.setIconImage(mWindowIcon.getImage());			
+			if (!frame.isResizable()){
+				frame.setResizable(true);
+			}
 		}
 	}
 
+	private void addGlassPane() {
+		final GlassPane glassPane = new GlassPane(controller);
+		setGlassPane(glassPane);
+		glassPane.setVisible(true);
+	}
+
 	@Override
 	public void start() {
 		EventQueue.invokeLater(new Runnable() {
@@ -196,9 +241,9 @@ public class FreeplaneApplet extends JApplet {
 		super.stop();
 	}
 
-	private void updateLookAndFeel() {
+	private void updateLookAndFeel(ResourceController appletResourceController) {
 		String lookAndFeel = "";
-		appletResourceController.setPropertyByParameter(this, "lookandfeel");
+		setPropertyByParameter(appletResourceController, "lookandfeel");
 		lookAndFeel = appletResourceController.getProperty("lookandfeel");
 		FrameController.setLookAndFeel(lookAndFeel, true);
 	}
@@ -233,4 +278,22 @@ public class FreeplaneApplet extends JApplet {
 		}
 	}
 
+	void setPropertyByParameter(ResourceController resourceController, final String key) {
+		final String val = getParameter(key);
+		if (val != null && val != "") {
+			resourceController.setProperty(key, val);
+		}
+	}
+
+	public void showDocument(URL doc) {
+		if(isLaunchedByJavaWebStart && Desktop.isDesktopSupported())
+			try {
+				Desktop.getDesktop().browse(doc.toURI());
+				return;
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		getAppletContext().showDocument(doc, "_blank");
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java b/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java
index 2c89993..0529ab5 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/ApplicationResourceController.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -130,18 +129,12 @@ public class ApplicationResourceController extends ResourceController {
 	}
 
 	@Override
-	public URL getResource(final String name) {
+	public URL getResource(final String resourcePath) {
 		return AccessController.doPrivileged(new PrivilegedAction<URL>() {
 
 			@Override
 			public URL run() {
-				final String relName;
-				if (name.startsWith("/")) {
-					relName = name.substring(1);
-				}
-				else {
-					relName = name;
-				}
+				final String relName = removeSlashAtStart(resourcePath);
 				for(File directory : resourceDirectories) {
 					File fileResource = new File(directory, relName);
 					if (fileResource.exists()) {
@@ -152,11 +145,11 @@ public class ApplicationResourceController extends ResourceController {
 						}
 					}
 				}
-				URL resource = ApplicationResourceController.super.getResource(name);
+				URL resource = ApplicationResourceController.super.getResource(resourcePath);
 				if (resource != null) {
 					return resource;
 				}
-				if ("/lib/freeplaneviewer.jar".equals(name)) {
+				if ("/lib/freeplaneviewer.jar".equals(resourcePath)) {
 					final String rootDir = new File(getResourceBaseDir()).getAbsoluteFile().getParent();
 					try {
 						final File try1 = new File(rootDir + "/plugins/org.freeplane.core/lib/freeplaneviewer.jar");
@@ -178,6 +171,47 @@ public class ApplicationResourceController extends ResourceController {
 	}
 
 	@Override
+	public URL getFirstResource(final String... resourcePaths) {
+		final URL url = AccessController.doPrivileged(new PrivilegedAction<URL>() {
+			@Override
+			public URL run() {
+				for(final File directory : resourceDirectories) {
+					for(final String path : resourcePaths){
+						final String relName = removeSlashAtStart(path);
+						File fileResource = new File(directory, relName);
+						if (fileResource.exists()) {
+							try {
+								return Compat.fileToUrl(fileResource);
+							} catch (MalformedURLException e) {
+								throw new RuntimeException(e);
+							}
+						}
+					}
+				}
+				for(final String path : resourcePaths){
+					final URL url = ApplicationResourceController.super.getResource(path);
+					if(url  != null)
+						return url;
+				}
+				return null;
+			}
+		});
+		return url;
+
+	}
+
+	private String removeSlashAtStart(final String name) {
+		final String relName;
+		if (name.startsWith("/")) {
+			relName = name.substring(1);
+		}
+		else {
+			relName = name;
+		}
+		return relName;
+	}
+
+	@Override
 	public String getResourceBaseDir() {
 		return FreeplaneGUIStarter.getResourceBaseDir();
 	}
diff --git a/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java b/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java
index 0be202f..b8eea00 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/ApplicationViewController.java
@@ -400,7 +400,7 @@ class ApplicationViewController extends FrameController {
 	}
 
 	@Override
-	protected void setFullScreen(boolean fullScreen) {
+	public void setFullScreen(boolean fullScreen) {
 		super.setFullScreen(fullScreen);
 		if(fullScreen)
 			mapViewWindows.setTabAreaInvisiblePolicy((JFrame) UITools.getCurrentRootComponent());
diff --git a/freeplane/src/main/java/org/freeplane/main/application/CommandLineParser.java b/freeplane/src/main/java/org/freeplane/main/application/CommandLineParser.java
index d4b8694..c1da3e0 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/CommandLineParser.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/CommandLineParser.java
@@ -7,9 +7,7 @@ import java.util.List;
 import org.freeplane.core.util.Compat;
 
 class CommandLineParser {
-    static final String QUIT_MENU_ITEM_KEY = "MB_QuitAction";
-
-    public static class Options {
+    static class Options {
         private static final String HELP_MESSAGE = //
                 "\nUsage:\n\tfreeplane.bat [options] [file1 [file2 ...]]\n" //
                 + "\n -X<menukey>   : execute menu item with key <menukey>." //
@@ -25,47 +23,35 @@ class CommandLineParser {
         private boolean nonInteractive;
         private boolean helpRequested = false;
 
-        public void setFilesToOpen(final String[] filesToOpen) {
+        private void setFilesToOpen(final String[] filesToOpen) {
             this.filesToOpen = Arrays.asList(filesToOpen);
         }
 
-        public void setMenuItemsToExecute(final String[] menuItemsToExecute) {
-            this.menuItemsToExecute = Arrays.asList(menuItemsToExecute);
-        }
-
-        public boolean isStopAfterLaunch() {
+        boolean shouldStopAfterLaunch() {
             return stopAfterLaunch;
         }
 
-        public void setStopAfterLaunch(boolean stopAfterLaunch) {
+        private void setStopAfterLaunch(boolean stopAfterLaunch) {
             this.stopAfterLaunch = stopAfterLaunch;
         }
 
-        public List<String> getFilesToOpen() {
-            return filesToOpen;
-        }
-
-        public String[] getFilesToOpenAsArray() {
+        String[] getFilesToOpenAsArray() {
             return filesToOpen.toArray(new String[filesToOpen.size()]);
         }
 
-        public List<String> getMenuItemsToExecute() {
+        List<String> getMenuItemsToExecute() {
             return menuItemsToExecute;
         }
 
-        public String[] getMenuItemsToExecuteAsArray() {
-            return menuItemsToExecute.toArray(new String[menuItemsToExecute.size()]);
-        }
-
-        public boolean hasMenuItemsToExecute() {
+        boolean hasMenuItemsToExecute() {
             return !menuItemsToExecute.isEmpty();
         }
 
-        public void addFilesToOpen(String file) {
+        private void addFilesToOpen(String file) {
             filesToOpen.add(file);
         }
 
-        public void addMenuItemToExecute(String item) {
+        private void addMenuItemToExecute(String item) {
             menuItemsToExecute.add(item);
         }
 
@@ -74,19 +60,19 @@ class CommandLineParser {
          *   boolean nonInteractive = Boolean.parseBoolean(System.getProperty("nonInteractive"));
          * </pre>
          */
-        public void setNonInteractive(boolean b) {
+        private void setNonInteractive(boolean b) {
             nonInteractive = b;
         }
 
-        public boolean isNonInteractive() {
+        boolean isNonInteractive() {
             return nonInteractive;
         }
 
-        public boolean isHelpRequested() {
+        private boolean isHelpRequested() {
             return helpRequested;
         }
 
-        public void setHelpRequested(boolean helpRequested) {
+        private void setHelpRequested(boolean helpRequested) {
             this.helpRequested = helpRequested;
         }
 
@@ -96,12 +82,12 @@ class CommandLineParser {
                     + stopAfterLaunch + ", nonInteractive: " + nonInteractive + ")";
         }
 
-        public String getHelpMessage() {
+        private String getHelpMessage() {
             return HELP_MESSAGE;
         }
     }
 
-    public static CommandLineParser.Options parse(String[] args, boolean firstRun) {
+    static CommandLineParser.Options parse(String[] args, boolean firstRun) {
         CommandLineParser.Options result = new CommandLineParser.Options();
         if (args == null || args.length == 0 || !args[0].startsWith("-")) {
             result.setFilesToOpen(args);
@@ -168,8 +154,6 @@ class CommandLineParser {
         }
         for (; i != args.length; ++i)
             result.addFilesToOpen(args[i]);
-        if (result.stopAfterLaunch && !result.menuItemsToExecute.contains(QUIT_MENU_ITEM_KEY))
-            result.addMenuItemToExecute(QUIT_MENU_ITEM_KEY);
         if (result.isHelpRequested() && firstRun) {
             System.out.println(result.getHelpMessage());
             System.exit(0);
diff --git a/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java b/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
index e0d01a9..d47f0f0 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/FreeplaneGUIStarter.java
@@ -28,7 +28,6 @@ import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.Collections;
 import java.util.Set;
 
@@ -36,6 +35,7 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 import javax.swing.ToolTipManager;
 
 import org.dpolivaev.mnemonicsetter.MnemonicSetter;
@@ -56,6 +56,7 @@ import org.freeplane.features.filter.NextPresentationItemAction;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.format.ScannerController;
 import org.freeplane.features.help.HelpController;
+import org.freeplane.features.highlight.HighlightController;
 import org.freeplane.features.icon.IconController;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.map.MapController;
@@ -64,7 +65,6 @@ import org.freeplane.features.map.mindmapmode.MMapController;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.mode.QuitAction;
-import org.freeplane.features.mode.browsemode.BModeController;
 import org.freeplane.features.mode.filemode.FModeController;
 import org.freeplane.features.mode.mindmapmode.LoadAcceleratorPresetsAction;
 import org.freeplane.features.mode.mindmapmode.MModeController;
@@ -80,7 +80,6 @@ import org.freeplane.main.application.CommandLineParser.Options;
 import org.freeplane.main.application.survey.FreeplaneSurveyProperties;
 import org.freeplane.main.application.survey.SurveyRunner;
 import org.freeplane.main.application.survey.SurveyStarter;
-import org.freeplane.main.browsemode.BModeControllerFactory;
 import org.freeplane.main.filemode.FModeControllerFactory;
 import org.freeplane.main.mindmapmode.MModeControllerFactory;
 import org.freeplane.view.swing.features.nodehistory.NodeHistory;
@@ -165,7 +164,6 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 		try {
 			Controller controller = new Controller(applicationResourceController);
 			Controller.setCurrentController(controller);
-			Compat.macAppChanges();
 			controller.addAction(new QuitAction());
 			applicationResourceController.init();
 			LogUtils.createLogger();
@@ -191,9 +189,15 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 			viewController = new ApplicationViewController(controller, mapViewController, frame);
 			splash = new FreeplaneSplashModern(frame);
 			if (!System.getProperty("org.freeplane.nosplash", "false").equals("true")) {
-				splash.setVisible(true);
+				SwingUtilities.invokeAndWait(new Runnable() {
+					@Override
+					public void run() {
+						splash.setVisible(true);
+					}
+				});
 			}
 			mapViewController.addMapViewChangeListener(applicationResourceController.getLastOpenedList());
+			controller.addExtension(HighlightController.class, new HighlightController());
 			FilterController.install();
 			PrintController.install();
 			FormatController.install(new FormatController());
@@ -210,7 +214,8 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 			controller.addAction(new NextNodeAction(Direction.BACK));
 			controller.addAction(new NextNodeAction(Direction.FORWARD_N_FOLD));
 			controller.addAction(new NextNodeAction(Direction.BACK_N_FOLD));
-			controller.addAction(new NextPresentationItemAction());
+			controller.addAction(NextPresentationItemAction.createFoldingAction());
+			controller.addAction(NextPresentationItemAction.createNotFoldingAction());
 			controller.addAction(new ShowSelectionAsRectangleAction());
 			controller.addAction(new ViewLayoutTypeAction(MapViewLayout.OUTLINE));
 			FilterController.getCurrentFilterController().getConditionFactory().addConditionController(70,
@@ -221,6 +226,7 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 			if(freeplaneSurveyProperties.mayAskUserToFillSurveys()) {
 				controller.addApplicationLifecycleListener(new SurveyStarter(freeplaneSurveyProperties, new SurveyRunner(freeplaneSurveyProperties), Math.random()));
 			}
+			Compat.macAppChanges();
 			return controller;
 		}
 		catch (final Exception e) {
@@ -238,14 +244,12 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
 		mindMapModeController.addUiBuilder(Phase.ACTIONS, "filterConditions", FilterController
 		    .getController(controller)
 		    .getMenuBuilder(), new ChildActionEntryRemover(controller));
-		BModeControllerFactory.createModeController();
 		FModeControllerFactory.createModeController();
     }
 
 	public void buildMenus(final Controller controller, final Set<String> plugins) {
 		LoadAcceleratorPresetsAction.install(controller.getModeController(MModeController.MODENAME));
 	    buildMenus(controller, plugins, MModeController.MODENAME, "/xml/mindmapmodemenu.xml");
-	    buildMenus(controller, plugins, BModeController.MODENAME, "/xml/browsemodemenu.xml");
 	    buildMenus(controller, plugins, FModeController.MODENAME, "/xml/filemodemenu.xml");
 	    ResourceController.getResourceController().getAcceleratorManager().loadAcceleratorPresets();
     }
@@ -290,8 +294,16 @@ public class FreeplaneGUIStarter implements FreeplaneStarter {
                 catch (InterruptedException e) {
                     e.printStackTrace();
                 }
-                fireStartupFinished();
-                MenuUtils.executeMenuItems(options.getMenuItemsToExecute());
+		        
+		        UITools.executeWhenNodeHasFocus(new Runnable() {
+					@Override
+					public void run() {
+		                fireStartupFinished();
+		                MenuUtils.executeMenuItems(options.getMenuItemsToExecute());
+		                if(options.shouldStopAfterLaunch())
+		                	System.exit(0);
+					}
+				});
             }
 
 			private void focusCurrentView() {
diff --git a/freeplane/src/main/java/org/freeplane/main/application/UserPropertiesUpdater.java b/freeplane/src/main/java/org/freeplane/main/application/UserPropertiesUpdater.java
index b3393b8..a0c53e9 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/UserPropertiesUpdater.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/UserPropertiesUpdater.java
@@ -59,6 +59,9 @@ public class UserPropertiesUpdater {
 			try {
 				parentDirectory.mkdirs();
 				org.apache.commons.io.FileUtils.copyDirectory(sourceDirectory, targetDirectory);
+				final File templateDirectory = new File(targetDirectory, "templates");
+				org.apache.commons.io.FileUtils.deleteDirectory(templateDirectory);
+				templateDirectory.mkdir();
 			}
 			catch (IOException e) {
 			}
diff --git a/freeplane/src/main/java/org/freeplane/main/application/protocols/freeplaneresource/Handler.java b/freeplane/src/main/java/org/freeplane/main/application/protocols/freeplaneresource/Handler.java
index 23f9bc7..e3a7f6e 100644
--- a/freeplane/src/main/java/org/freeplane/main/application/protocols/freeplaneresource/Handler.java
+++ b/freeplane/src/main/java/org/freeplane/main/application/protocols/freeplaneresource/Handler.java
@@ -42,6 +42,8 @@ public class Handler extends URLStreamHandler {
     @Override
     public URLConnection openConnection(URL url) throws IOException {
         final URL resourceUrl = ResourceController.getResourceController().getResource(url.getPath());
+        if(resourceUrl == null)
+        	throw new IOException("Unable to connect to: " + url.toExternalForm());
         final URLConnection connection = resourceUrl.openConnection();
 		return new WrappedConnection(url, connection);
     }
diff --git a/freeplane/src/main/java/org/freeplane/main/browsemode/BModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/browsemode/BModeControllerFactory.java
deleted file mode 100644
index c6be8e2..0000000
--- a/freeplane/src/main/java/org/freeplane/main/browsemode/BModeControllerFactory.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Dimitry Polivaev
- *
- *  This file author is Dimitry Polivaev
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.main.browsemode;
-
-import java.security.AccessControlException;
-
-import javax.swing.JPopupMenu;
-import javax.swing.SwingConstants;
-
-import org.freeplane.core.ui.components.FreeplaneToolBar;
-import org.freeplane.core.ui.menubuilders.generic.PhaseProcessor.Phase;
-import org.freeplane.core.util.LogUtils;
-import org.freeplane.features.attribute.AttributeController;
-import org.freeplane.features.clipboard.ClipboardController;
-import org.freeplane.features.cloud.CloudController;
-import org.freeplane.features.edge.EdgeController;
-import org.freeplane.features.encrypt.EncryptionController;
-import org.freeplane.features.filter.FilterController;
-import org.freeplane.features.icon.IconController;
-import org.freeplane.features.link.LinkController;
-import org.freeplane.features.map.FoldingController;
-import org.freeplane.features.map.FreeNode;
-import org.freeplane.features.map.MapController;
-import org.freeplane.features.map.SummaryNode;
-import org.freeplane.features.mapio.MapIO;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.features.mode.browsemode.BModeController;
-import org.freeplane.features.nodelocation.LocationController;
-import org.freeplane.features.nodestyle.NodeStyleController;
-import org.freeplane.features.note.NoteController;
-import org.freeplane.features.styles.AutomaticLayoutController;
-import org.freeplane.features.styles.LogicalStyleController;
-import org.freeplane.features.styles.MapStyle;
-import org.freeplane.features.text.TextController;
-import org.freeplane.features.ui.FrameController;
-import org.freeplane.features.ui.UIComponentVisibilityDispatcher;
-import org.freeplane.features.ui.ViewController;
-import org.freeplane.features.url.UrlManager;
-import org.freeplane.view.swing.features.filepreview.ViewerController;
-import org.freeplane.view.swing.ui.UserInputListenerFactory;
-
-/**
- * @author Dimitry Polivaev 24.11.2008
- */
-public class BModeControllerFactory {
-	private static BModeController modeController;
-
-	static public BModeController createModeController() {
-		final Controller controller = Controller.getCurrentController();
-		modeController = new BModeController(controller);
-		final UserInputListenerFactory userInputListenerFactory = new UserInputListenerFactory(modeController);
-		modeController.setUserInputListenerFactory(userInputListenerFactory);
-		controller.addModeController(modeController);
-		controller.selectModeForBuild(modeController);
-		new MapController(modeController);
-		IconController.install(new IconController(modeController));
-		UrlManager.install(new UrlManager());
-		MapIO.install(modeController);
-		AttributeController.install(new AttributeController(modeController));
-		NodeStyleController.install(new NodeStyleController(modeController));
-		EdgeController.install(new EdgeController(modeController));
-		CloudController.install(new CloudController(modeController));
-		NoteController.install(new NoteController());
-		TextController.install(new TextController(modeController));
-		LinkController.install(new LinkController(modeController));
-		LogicalStyleController.install(new LogicalStyleController(modeController));
-		try {
-			ClipboardController.install(new ClipboardController());
-		}
-		catch (final AccessControlException e) {
-			LogUtils.warn("can not access system clipboard, clipboard controller disabled");
-		}
-		LocationController.install(new LocationController());
-		SummaryNode.install();
-		FreeNode.install();
-		MapStyle.install(true);
-		final BToolbarContributor toolbarContributor = new BToolbarContributor();
-		modeController.addUiBuilder(Phase.ACTIONS, "main_toolbar_url", toolbarContributor);
-		controller.getMapViewManager().addMapViewChangeListener(toolbarContributor);
-		userInputListenerFactory.setNodePopupMenu(new JPopupMenu());
-		final FreeplaneToolBar toolBar = new FreeplaneToolBar("main_toolbar", SwingConstants.HORIZONTAL);
-		FrameController frameController = (FrameController) controller.getViewController();
-		UIComponentVisibilityDispatcher.install(frameController, toolBar, "toolbarVisible");
-		userInputListenerFactory.addToolBar("/main_toolbar", ViewController.TOP, toolBar);
-		userInputListenerFactory.addToolBar("/filter_toolbar", FilterController.TOOLBAR_SIDE, FilterController.getController(
-		    controller).getFilterToolbar());
-		userInputListenerFactory.addToolBar("/status", ViewController.BOTTOM, controller.getViewController()
-		    .getStatusBar());
-		FoldingController.install(new FoldingController());
-		new ViewerController();
-		EncryptionController.install(new EncryptionController(modeController));
-		new AutomaticLayoutController();
-		return modeController;
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/main/browsemode/BToolbarContributor.java b/freeplane/src/main/java/org/freeplane/main/browsemode/BToolbarContributor.java
deleted file mode 100644
index 684a434..0000000
--- a/freeplane/src/main/java/org/freeplane/main/browsemode/BToolbarContributor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.main.browsemode;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.URL;
-
-import javax.swing.JLabel;
-
-import org.freeplane.core.ui.components.PersistentEditableComboBox;
-import org.freeplane.core.ui.menubuilders.generic.Entry;
-import org.freeplane.core.ui.menubuilders.generic.EntryAccessor;
-import org.freeplane.core.ui.menubuilders.generic.EntryVisitor;
-import org.freeplane.core.util.LogUtils;
-import org.freeplane.features.map.MapModel;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.features.ui.IMapViewChangeListener;
-import org.freeplane.features.ui.IMapViewManager;
-
-class BToolbarContributor implements EntryVisitor, IMapViewChangeListener {
-	private static final String BROWSE_URL_STORAGE_KEY = "browse_url_storage";
-// 	final private ModeController modeController;
-	private PersistentEditableComboBox urlfield = null;
-
-	public BToolbarContributor() {
-		urlfield = new PersistentEditableComboBox(BROWSE_URL_STORAGE_KEY, 20);
-		urlfield.addActionListener(new ActionListener() {
-			public void actionPerformed(final ActionEvent e) {
-				final String urlText = urlfield.getText();
-				if ("".equals(urlText) || e.getActionCommand().equals("comboBoxEdited")) {
-					return;
-				}
-				try {
-					Controller.getCurrentModeController().getMapController().newMap(new URL(urlText));
-				}
-				catch (final Exception e1) {
-					LogUtils.warn(e1);
-				}
-			}
-		});
-	}
-
-	public void afterViewChange(final Component oldView, final Component newView) {
-		if (newView == null) {
-			return;
-		}
-		final IMapViewManager mapViewManager = Controller.getCurrentController().getMapViewManager();
-		mapViewManager.getModeController(newView);
-		final MapModel map = mapViewManager.getModel(newView);
-		final URL url = map.getURL();
-		if (url == null) {
-			return;
-		}
-		setURLField(url.toString());
-	}
-
-	public void afterViewClose(final Component oldView) {
-	}
-
-	public void afterViewCreated(final Component mapView) {
-	}
-
-	public void beforeViewChange(final Component oldView, final Component newView) {
-	}
-
-	private void setURLField(final String text) {
-		urlfield.setText(text);
-	}
-
-	@Override
-	public void visit(Entry target) {
-		final EntryAccessor entryAccessor = new EntryAccessor();
-		final Entry label = new Entry();
-		target.addChild(label);
-		entryAccessor.setComponent(label, new JLabel("URL:"));
-		final Entry field = new Entry();
-		target.addChild(field);
-		entryAccessor.setComponent(field, urlfield);
-	}
-
-	@Override
-	public boolean shouldSkipChildren(Entry entry) {
-		return true;
-	}
-}
diff --git a/freeplane/src/main/java/org/freeplane/main/filemode/FModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/filemode/FModeControllerFactory.java
index 468b195..29e2aa5 100644
--- a/freeplane/src/main/java/org/freeplane/main/filemode/FModeControllerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/main/filemode/FModeControllerFactory.java
@@ -66,10 +66,10 @@ public class FModeControllerFactory {
 		new FMapController(modeController);
 		UrlManager.install(new UrlManager());
 		MapIO.install(modeController);
-		IconController.install(new IconController(modeController));
+		new IconController(modeController).install(modeController);
 		NodeStyleController.install(new NodeStyleController(modeController));
 		EdgeController.install(new EdgeController(modeController));
-		TextController.install(new TextController(modeController));
+		new TextController(modeController).install(modeController);
 		LinkController.install(new LinkController(modeController));
 		CloudController.install(new CloudController(modeController));
 		ClipboardController.install(new ClipboardController());
diff --git a/freeplane/src/main/java/org/freeplane/main/headlessmode/FreeplaneHeadlessStarter.java b/freeplane/src/main/java/org/freeplane/main/headlessmode/FreeplaneHeadlessStarter.java
index 7cbfd03..9348e31 100644
--- a/freeplane/src/main/java/org/freeplane/main/headlessmode/FreeplaneHeadlessStarter.java
+++ b/freeplane/src/main/java/org/freeplane/main/headlessmode/FreeplaneHeadlessStarter.java
@@ -29,6 +29,7 @@ import org.freeplane.features.filter.FilterController;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.format.ScannerController;
 import org.freeplane.features.help.HelpController;
+import org.freeplane.features.highlight.HighlightController;
 import org.freeplane.features.icon.IconController;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.map.MapController;
@@ -66,6 +67,7 @@ public class FreeplaneHeadlessStarter implements FreeplaneStarter {
 			final HeadlessMapViewController mapViewController = new HeadlessMapViewController();
 			controller.setMapViewManager(mapViewController);
 			controller.setViewController(new HeadlessUIController(controller, mapViewController, ""));
+			controller.addExtension(HighlightController.class, new HighlightController());
 			FilterController.install();
 			FormatController.install(new FormatController());
 	        final ScannerController scannerController = new ScannerController();
diff --git a/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMModeControllerFactory.java
index 54b3f71..d23a3ec 100644
--- a/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMModeControllerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMModeControllerFactory.java
@@ -32,7 +32,6 @@ import org.freeplane.features.encrypt.mindmapmode.MEncryptionController;
 import org.freeplane.features.export.mindmapmode.ExportController;
 import org.freeplane.features.export.mindmapmode.ImportMindmanagerFiles;
 import org.freeplane.features.icon.HierarchicalIcons;
-import org.freeplane.features.icon.IconController;
 import org.freeplane.features.icon.mindmapmode.MIconController;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.link.mindmapmode.MLinkController;
@@ -57,7 +56,6 @@ import org.freeplane.features.styles.AutomaticLayoutController;
 import org.freeplane.features.styles.LogicalStyleController;
 import org.freeplane.features.styles.MapStyle;
 import org.freeplane.features.styles.mindmapmode.MLogicalStyleController;
-import org.freeplane.features.text.TextController;
 import org.freeplane.features.text.mindmapmode.MTextController;
 import org.freeplane.features.time.CreationModificationPlugin;
 import org.freeplane.features.url.UrlManager;
@@ -123,13 +121,12 @@ public class HeadlessMModeControllerFactory {
 		UrlManager.install(fileManager);
 		MMapIO.install(modeController);
 		controller.getMapViewManager().addMapViewChangeListener(fileManager);
-		IconController.install(new MIconController(modeController));
+		new MIconController(modeController).install(modeController);
 		new ProgressFactory().installActions(modeController);
 		EdgeController.install(new MEdgeController(modeController));
 		CloudController.install(new MCloudController(modeController));
 		NoteController.install(new MNoteController(modeController));
-		final MTextController textController = new MTextController(modeController);
-		TextController.install(textController);
+		new MTextController(modeController).install(modeController);
 		LinkController.install(new MLinkController(modeController));
 		NodeStyleController.install(new MNodeStyleController(modeController));
 		ClipboardController.install(new MClipboardController());
diff --git a/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMapViewController.java b/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMapViewController.java
index 8ae2b42..6f340f7 100644
--- a/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMapViewController.java
+++ b/freeplane/src/main/java/org/freeplane/main/headlessmode/HeadlessMapViewController.java
@@ -22,6 +22,7 @@ package org.freeplane.main.headlessmode;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.image.RenderedImage;
@@ -41,6 +42,7 @@ import org.freeplane.features.map.IMapSelection;
 import org.freeplane.features.map.IMapSelectionListener;
 import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.ui.IMapViewChangeListener;
 import org.freeplane.features.ui.IMapViewManager;
@@ -130,6 +132,10 @@ public class HeadlessMapViewController implements IMapViewManager {
 		throw new RuntimeException("Method not implemented");
 	}
 
+	public RenderedImage createImage(final Dimension slideSize, NodeModel placedNode, NodePosition placedNodePosition, int dpi) {
+		throw new RuntimeException("Method not implemented");
+	}
+
 	public Color getBackgroundColor(NodeModel node) {
 		throw new RuntimeException("Method not implemented");
 	}
@@ -290,6 +296,51 @@ public class HeadlessMapViewController implements IMapViewManager {
 	}
 
 	@Override
+	public void setFoldedOnCurrentView(NodeModel node, boolean folded) {
+		throw new RuntimeException("Method not implemented");
+	}
+	
+	@Override
 	public void onQuitApplication() {
 	}
+
+	@Override
+	public void moveFocusFromDescendantToSelection(Component ancestor) {
+		throw new RuntimeException("Method not implemented");
+	}
+
+	@Override
+	public void displayOnCurrentView(NodeModel node) {
+		throw new RuntimeException("Method not implemented");
+	}
+
+	@Override
+	public boolean isChildHidden(NodeModel nodeOnPath) {
+		return false;
+	}
+
+	@Override
+	public boolean hasHiddenChildren(NodeModel selected) {
+		return false;
+	}
+
+	@Override
+	public boolean unfoldHiddenChildren(NodeModel node) {
+		return false;
+	}
+
+	@Override
+	public void hideChildren(NodeModel node) {
+	}
+
+	@Override
+	public boolean showHiddenNode(NodeModel child) {
+		return false;
+	}
+
+	@Override
+	public boolean isSpotlightEnabled() {
+		return false;
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java
index 47e7b92..9fece89 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/MModeControllerFactory.java
@@ -21,7 +21,6 @@ package org.freeplane.main.mindmapmode;
 
 import java.awt.Component;
 import java.awt.Container;
-import java.awt.Dimension;
 import java.awt.event.KeyEvent;
 
 import javax.swing.Box;
@@ -95,6 +94,7 @@ import org.freeplane.features.nodestyle.mindmapmode.MNodeStyleController;
 import org.freeplane.features.nodestyle.mindmapmode.RevisionPlugin;
 import org.freeplane.features.note.NoteController;
 import org.freeplane.features.note.mindmapmode.MNoteController;
+import org.freeplane.features.presentations.mindmapmode.PresentationController;
 import org.freeplane.features.spellchecker.mindmapmode.SpellCheckerController;
 import org.freeplane.features.styles.AutomaticLayoutController;
 import org.freeplane.features.styles.LogicalStyleController;
@@ -102,8 +102,7 @@ import org.freeplane.features.styles.MapStyle;
 import org.freeplane.features.styles.mindmapmode.MLogicalStyleController;
 import org.freeplane.features.styles.mindmapmode.MUIFactory;
 import org.freeplane.features.styles.mindmapmode.ShowFormatPanelAction;
-import org.freeplane.features.styles.mindmapmode.StyleEditorPanel;
-import org.freeplane.features.text.TextController;
+import org.freeplane.features.styles.mindmapmode.styleeditorpanel.StyleEditorPanel;
 import org.freeplane.features.text.mindmapmode.MTextController;
 import org.freeplane.features.text.mindmapmode.SortNodes;
 import org.freeplane.features.text.mindmapmode.SplitNode;
@@ -180,6 +179,7 @@ public class MModeControllerFactory {
 		modeController.addExtension(ReminderHook.class, new ReminderHook(modeController));
 		new AutomaticEdgeColorHook();
 		new ViewerController();
+		PresentationController.install(modeController);
 		modeController.addAction(new AddAttributeAction());
 		modeController.addAction(new RemoveFirstAttributeAction());
 		modeController.addAction(new RemoveLastAttributeAction());
@@ -227,7 +227,7 @@ public class MModeControllerFactory {
 		UrlManager.install(fileManager);
 		MMapIO.install(modeController);
 		controller.getMapViewManager().addMapViewChangeListener(fileManager);
-		IconController.install(new MIconController(modeController));
+		new MIconController(modeController).install(modeController);
 		new ProgressFactory().installActions(modeController);
 		final MapController mapController = modeController.getMapController();
 		EdgeController.install(new MEdgeController(modeController));
@@ -235,7 +235,7 @@ public class MModeControllerFactory {
 		NoteController.install(new MNoteController(modeController));
 		userInputListenerFactory.setMapMouseListener(new MMapMouseListener());
 		final MTextController textController = new MTextController(modeController);
-		TextController.install(textController);
+		textController.install(modeController);
 		LinkController.install(new MLinkController(modeController));
 		NodeStyleController.install(new MNodeStyleController(modeController));
 		ClipboardController.install(new MClipboardController());
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java
index 18bb402..2cdea48 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/UpdateCheckAction.java
@@ -57,10 +57,6 @@ class UpdateCheckAction extends AFreeplaneAction {
 	private static final long serialVersionUID = 1L;
 	private static final int ONE_DAY = 1 * 24 * 60 * 60 * 1000;
 	private static final String UPDATE_BUTTON_LOCATION = "main_toolbar_update";
-//	/**
-//	 * the url where to download the newest version
-//	 */
-//	private static final String WEB_DOWNLOAD_LOCATION_KEY = "webDownloadLocation";
 	/**
 	 * the url to check the local version against
 	 */
diff --git a/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java b/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java
index 8af70d4..9791f4b 100644
--- a/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/main/mindmapmode/stylemode/SModeControllerFactory.java
@@ -43,6 +43,7 @@ import org.freeplane.features.edge.mindmapmode.MEdgeController;
 import org.freeplane.features.filter.FilterController;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.format.ScannerController;
+import org.freeplane.features.highlight.HighlightController;
 import org.freeplane.features.icon.IconController;
 import org.freeplane.features.icon.mindmapmode.MIconController;
 import org.freeplane.features.link.LinkController;
@@ -72,7 +73,7 @@ import org.freeplane.features.styles.MapViewLayout;
 import org.freeplane.features.styles.mindmapmode.MLogicalStyleController;
 import org.freeplane.features.styles.mindmapmode.MUIFactory;
 import org.freeplane.features.styles.mindmapmode.ShowFormatPanelAction;
-import org.freeplane.features.styles.mindmapmode.StyleEditorPanel;
+import org.freeplane.features.styles.mindmapmode.styleeditorpanel.StyleEditorPanel;
 import org.freeplane.features.text.TextController;
 import org.freeplane.features.text.mindmapmode.MTextController;
 import org.freeplane.features.ui.ToggleToolbarAction;
@@ -111,6 +112,7 @@ public class SModeControllerFactory {
 		final MapViewController mapViewController = new MMapViewController(controller);
 		final DialogController viewController = new DialogController(controller, mapViewController, dialog);
 		controller.setViewController(viewController);
+		controller.addExtension(HighlightController.class, new HighlightController());
 		controller.addAction(currentController.getAction("AboutAction"));
 		FilterController.install();
 		TextController.install();
@@ -129,9 +131,9 @@ public class SModeControllerFactory {
 		modeController.setUserInputListenerFactory(userInputListenerFactory);
 		controller.addExtension(ModelessAttributeController.class, new ModelessAttributeController());
 		new MMapController(modeController);
-		TextController.install(new MTextController(modeController));
+		new MTextController(modeController).install(modeController);
 		SpellCheckerController.install(modeController);
-		IconController.install(new MIconController(modeController));
+		new MIconController(modeController).install(modeController);
 		NodeStyleController.install(new MNodeStyleController(modeController));
 		LocationController.install(new MLocationController());
 		EdgeController.install(new MEdgeController(modeController));
diff --git a/freeplane/src/main/java/org/freeplane/n3/nanoxml/XMLEntityResolver.java b/freeplane/src/main/java/org/freeplane/n3/nanoxml/XMLEntityResolver.java
index 66dc1e6..db77067 100644
--- a/freeplane/src/main/java/org/freeplane/n3/nanoxml/XMLEntityResolver.java
+++ b/freeplane/src/main/java/org/freeplane/n3/nanoxml/XMLEntityResolver.java
@@ -26,7 +26,7 @@ import java.util.Hashtable;
  * @author Marc De Scheemaecker
  * @version $Name: RELEASE_2_2_1 $, $Revision: 1.4 $
  */
-class XMLEntityResolver implements IXMLEntityResolver {
+public class XMLEntityResolver implements IXMLEntityResolver {
 	/**
 	 * The entities.
 	 */
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java
index fc41f25..d2760ca 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/BitmapViewerComponent.java
@@ -20,7 +20,6 @@
 package org.freeplane.view.swing.features.filepreview;
 
 import java.awt.Dimension;
-import java.awt.EventQueue;
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -33,8 +32,8 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.Iterator;
-import java.util.concurrent.Future;
 
+import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
@@ -43,7 +42,6 @@ import javax.swing.JComponent;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.util.LogUtils;
 
-import com.thebuzzmedia.imgscalr.AsyncScalr;
 import com.thebuzzmedia.imgscalr.Scalr;
 
 /**
@@ -65,18 +63,16 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 	private final Dimension originalSize;
 	private int imageX;
 	private int imageY;
-	private boolean processing;
 	private boolean scaleEnabled;
 	private Dimension maximumSize = null;
 	private boolean center;
 	private final static Object LOCK = new Object();
-	private ImageLoadingListener imageLoadinglistener;
+	private static boolean disabledDueToJavaBug = false;
 
 	public BitmapViewerComponent(final URI uri) throws MalformedURLException, IOException {
 		url = uri.toURL();
 		originalSize = readOriginalSize();
 		hint = Image.SCALE_SMOOTH;
-		processing = false;
 		scaleEnabled = true;
 		cachedImage = null;
 	}
@@ -134,7 +130,7 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 
 	@Override
 	protected void paintComponent(final Graphics g) {
-		if (processing || componentHasNoArea()) {
+		if (componentHasNoArea() || disabledDueToJavaBug) {
 			return;
 		}
 		if (cachedImage == null && cachedImageWeakRef != null) {
@@ -148,68 +144,57 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 				cacheFile = null;
 			}
 		}
-		if (isCachedImageValid()) {
-			g.drawImage(cachedImage, imageX, imageY, null);
-			flushImage();
-		}
-		else {
+		if (!isCachedImageValid()) {
 			final BufferedImage image = loadImageFromURL();
 			if (image == null || hasNoArea(image)) {
 				return;
 			}
-			processing = true;
-			final Future<BufferedImage> result = AsyncScalr.resize(image, Scalr.Mode.BEST_FIT_BOTH, getWidth(),
-			    getHeight());
-			AsyncScalr.getService().submit(new Runnable() {
-				public void run() {
-					BufferedImage scaledImage = null;
-					try {
-						scaledImage = result.get();
-					}
-					catch (final Exception e) {
-						LogUtils.severe(e);
-						return;
-					}
-					finally {
-						image.flush();
-					}
-					final int scaledImageHeight = scaledImage.getHeight();
-					final int scaledImageWidth = scaledImage.getWidth();
-					centerImagePosition(scaledImageWidth, scaledImageHeight);
-					cachedImage = scaledImage;
-					if (getCacheType().equals(CacheType.IC_FILE)) {
-						writeCacheFile();
-					}
-					EventQueue.invokeLater(new Runnable() {
-						public void run() {
-							processing = false;
-							if(imageLoadinglistener != null)
-								imageLoadinglistener.imageLoaded();
-							repaint();
-						}
-					});
-				}
-
-				private void centerImagePosition(final int scaledImageWidth, final int scaledImageHeight) {
-					if (center) {
-						imageX = (getWidth() - scaledImageWidth) / 2;
-						imageY = (getHeight() - scaledImageHeight) / 2;
-					}
-					else {
-						if (scaledImageWidth > getHeight()) {
-							imageX = 0;
-							imageY = (getHeight() - scaledImageHeight) / 2;
-						}
-						else {
-							imageX = (getWidth() - scaledImageWidth) / 2;
-							imageY = 0;
-						}
-					}
-				}
-			});
+			BufferedImage scaledImage = null;
+			try {
+				scaledImage = Scalr.resize(image, Scalr.Mode.BEST_FIT_BOTH, getWidth(), getHeight());
+			}
+			catch (final Exception e) {
+				LogUtils.severe(e);
+				return;
+			}
+			finally {
+				image.flush();
+			}
+			final int scaledImageHeight = scaledImage.getHeight();
+			final int scaledImageWidth = scaledImage.getWidth();
+			centerImagePosition(scaledImageWidth, scaledImageHeight);
+			cachedImage = scaledImage;
+			if (getCacheType().equals(CacheType.IC_FILE)) {
+				writeCacheFile();
+			}
+		}
+		try {
+			g.drawImage(cachedImage, imageX, imageY, null);
 		}
+		catch (ClassCastException e) {
+			LogUtils.severe("Disabled bitmap image painting due to java bug https://bugs.openjdk.java.net/browse/JDK-8160328. Modify freeplane.sh to run java with option '-Dsun.java2d.xrender=false'");
+			disabledDueToJavaBug = true;
+		}
+		flushImage();
 	}
 
+	private void centerImagePosition(final int scaledImageWidth, final int scaledImageHeight) {
+		if (center) {
+			imageX = (getWidth() - scaledImageWidth) / 2;
+			imageY = (getHeight() - scaledImageHeight) / 2;
+		}
+		else {
+			if (scaledImageWidth > getHeight()) {
+				imageX = 0;
+				imageY = (getHeight() - scaledImageHeight) / 2;
+			}
+			else {
+				imageX = (getWidth() - scaledImageWidth) / 2;
+				imageY = 0;
+			}
+		}
+	}
+	
 	private boolean componentHasNoArea() {
 		return getWidth() == 0 || getHeight() == 0;
 	}
@@ -267,11 +252,17 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 	}
 
 	private void logImageReadingException(final IOException e) {
+		if((e instanceof FileNotFoundException) || (e instanceof IIOException)) {
+			LogUtils.warn(e.getMessage());
+			return;
+		}
 		final Throwable cause = e.getCause();
-		if(! (cause instanceof FileNotFoundException))
-			LogUtils.severe(e);
-		else
+		if((cause instanceof FileNotFoundException) || (cause instanceof IIOException)) {
 			LogUtils.warn(cause.getMessage());
+			return;
+		}
+		
+		LogUtils.severe(e);
 	}
 
 	private void flushImage() {
@@ -358,9 +349,4 @@ public class BitmapViewerComponent extends JComponent implements ScalableCompone
 	public void setCenter(boolean center) {
 		this.center = center;
 	}
-
-	public void setImageLoadingListener(ImageLoadingListener listener) {
-		this.imageLoadinglistener = listener;
-	    
-    }
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ScalableComponent.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ScalableComponent.java
index 0642d15..637942c 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ScalableComponent.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ScalableComponent.java
@@ -43,6 +43,4 @@ public interface ScalableComponent {
 	void setMaximumComponentSize(Dimension size);
 
 	void setCenter(boolean center);
-	
-	void setImageLoadingListener(ImageLoadingListener listener);
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java
new file mode 100644
index 0000000..fb139e6
--- /dev/null
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerBorder.java
@@ -0,0 +1,44 @@
+package org.freeplane.view.swing.features.filepreview;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Graphics;
+
+import javax.swing.JComponent;
+import javax.swing.border.EmptyBorder;
+
+ at SuppressWarnings("serial") class ViewerBorder extends EmptyBorder {
+	private final int borderWidth;
+	private final Color borderColor;
+	ViewerBorder(int width, Color borderColor) {
+		super(0, 0, 0, 0);
+		this.borderWidth = width;
+		this.borderColor = borderColor;
+	}
+
+	@Override
+	public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+		if (c.getCursor().getType() == Cursor.SE_RESIZE_CURSOR) {
+			Color oldColor = g.getColor();
+			g.translate(x, y);
+			g.setColor(borderColor);
+			g.fillRect(0, 0, width - borderWidth, borderWidth);
+			g.fillRect(0, borderWidth, borderWidth, height - borderWidth);
+			g.fillRect(borderWidth, height - borderWidth, width - borderWidth, borderWidth);
+			g.fillRect(width - borderWidth, 0, borderWidth, height - borderWidth);
+
+			g.translate(-x, -y);
+			g.setColor(oldColor);
+		}
+	}
+
+	public static void repaintBorder(JComponent component) {
+		final int borderWidth = ((ViewerBorder)component.getBorder()).borderWidth;
+		component.paintImmediately(0, 0, component.getWidth(), borderWidth);
+		component.paintImmediately(0, component.getHeight() - borderWidth, component.getWidth(), borderWidth);
+		component.paintImmediately(0, 0, borderWidth, component.getHeight());
+		component.paintImmediately(component.getWidth() - borderWidth, 0, borderWidth, component.getHeight());
+	}
+	
+}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerController.java b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerController.java
index e65b854..f82c8a6 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerController.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/filepreview/ViewerController.java
@@ -6,6 +6,7 @@ import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.KeyboardFocusManager;
+import java.awt.Point;
 import java.awt.dnd.DropTarget;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -23,11 +24,12 @@ import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-import javax.swing.border.MatteBorder;
+import javax.swing.border.Border;
 import javax.swing.filechooser.FileFilter;
 
 import org.freeplane.core.extension.IExtension;
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.undo.IActor;
 import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
@@ -54,6 +56,8 @@ import org.freeplane.view.swing.map.NodeView;
 onceForMap = false)
 public class ViewerController extends PersistentNodeHook implements INodeViewLifeCycleListener, IExtension {
 	private static final MExternalImageDropListener DTL = new MExternalImageDropListener();
+	private static final int BORDER_SIZE = 1;
+	public static final Border VIEWER_BORDER_INSTANCE = new ViewerBorder(BORDER_SIZE, Color.BLACK);
 
 	private final class CombiFactory implements IViewerFactory {
 		private IViewerFactory factory;
@@ -123,9 +127,17 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 		}
 	}
 
+	private static final int SENSITIVE_AREA_SIZE = (int) Math.max(10, UITools.FONT_SCALE_FACTOR * 10);
 	private class MyMouseListener implements MouseListener, MouseMotionListener {
-		private boolean isActive = false;
 		private boolean sizeChanged = false;
+		private Point basePoint = null;
+		private boolean isActive() {
+			return basePoint != null;
+		}
+
+		private void setBasePoint(Point basePoint) {
+			this.basePoint = basePoint;
+		}
 
 		public void mouseClicked(final MouseEvent e) {
 			if (resetSize(e)) {
@@ -145,7 +157,7 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 			final int width = viewer.getWidth();
 			final int y = e.getY();
 			final int height = viewer.getHeight();
-			if (x < width - 4 * BORDER_SIZE || y < height - 4 * BORDER_SIZE) {
+			if (x < width - 4 || y < height - 4 ) {
 				return false;
 			}
 			final IViewerFactory factory = (IViewerFactory) viewer.getClientProperty(IViewerFactory.class);
@@ -235,7 +247,7 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 		}
 
 		public void mouseEntered(final MouseEvent e) {
-			if (isActive) {
+			if (isActive()) {
 				return;
 			}
 			final ExternalResource model = getModel(e);
@@ -253,10 +265,10 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 		}
 
 		public void mouseExited(final MouseEvent e) {
-			if (isActive) {
+			if (isActive()) {
 				return;
 			}
-			setCursor(e);
+			setCursor(e.getComponent(), Cursor.DEFAULT_CURSOR);
 		}
 
 		private void setCursor(final MouseEvent e) {
@@ -266,18 +278,24 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 			final int width = component.getWidth();
 			final int y = e.getY();
 			final int height = component.getHeight();
-			if (width - 6 * BORDER_SIZE <= x && x <= width && height - 6 * BORDER_SIZE <= y && y <= height) {
+			if (x >= 0 && x < width  && y >= 0 && y < height
+					&& (width - SENSITIVE_AREA_SIZE <= x || height - SENSITIVE_AREA_SIZE <= y )) {
 				cursorType = Cursor.SE_RESIZE_CURSOR;
 			}
 			else {
 				cursorType = Cursor.DEFAULT_CURSOR;
 			}
+			setCursor(component, cursorType);
+		}
+
+		private void setCursor(final Component component, final int cursorType) {
 			final Cursor cursor = component.getCursor();
 			if (cursor.getType() != cursorType) {
 				final Cursor predefinedCursor = cursorType == Cursor.DEFAULT_CURSOR ? null : Cursor
 				    .getPredefinedCursor(cursorType);
 				component.setCursor(predefinedCursor);
 			}
+			ViewerBorder.repaintBorder((JComponent) component);
 		}
 
 		public void mousePressed(final MouseEvent e) {
@@ -288,7 +306,8 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 				if (factory == null) {
 					return;
 				}
-				isActive = true;
+				final Point point = e.getPoint();
+				setBasePoint(new Point (component.getWidth() - point.x, component.getHeight() - point.y));
 				return;
 			}
 			else {
@@ -317,32 +336,27 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 			else {
 				imagePopupMenu.maybeShowPopup(e);
 			}
-			isActive = false;
+			setBasePoint(null);
 			setCursor(e);
 		}
 
 		public void mouseDragged(final MouseEvent e) {
-			if (!isActive) {
+			if (!isActive()) {
 				return;
 			}
-			setSize(e);
+			final JComponent component = (JComponent) e.getComponent();
+			setSize(component, basePoint.x + e.getX(), basePoint.y + e.getY());
 		}
 
-		private boolean setSize(final MouseEvent e) {
-			if (!isActive) {
-				return false;
-			}
-			final JComponent component = (JComponent) e.getComponent();
+		private void setSize(final JComponent component, int x, int y) {
 			final int cursorType = component.getCursor().getType();
 			sizeChanged = true;
 			final Dimension size;
 			switch (cursorType) {
 				case Cursor.SE_RESIZE_CURSOR:
 					final Dimension minimumSize = new Dimension(10, 10);
-					int x = e.getX() - 4 * BORDER_SIZE;
-					int y = e.getY() - 4 * BORDER_SIZE;
-					if (x <= 0 || y <= 0) {
-						return true;
+					if (x <= 2*BORDER_SIZE || y <= 2*BORDER_SIZE) {
+						return;
 					}
 					final double r = Math.sqrt(x * x + y * y);
 					final Dimension preferredSize = ((ScalableComponent) component).getOriginalSize();
@@ -353,7 +367,7 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 					y = (int) (height * r / r0);
 					final MapView mapView = (MapView) SwingUtilities.getAncestorOfClass(MapView.class, component);
 					if (x < mapView.getZoomed(minimumSize.width) || y < mapView.getZoomed(minimumSize.height)) {
-						return true;
+						return;
 					}
 					size = new Dimension(x, y);
 					((ScalableComponent) component).setDraftViewerSize(size);
@@ -361,20 +375,19 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 					break;
 				default:
 			}
-			return true;
+			return;
 		}
 
 		public void mouseMoved(final MouseEvent e) {
-			if (isActive) {
+			if (isActive()) {
 				return;
 			}
 			setCursor(e);
 		}
+
 	}
 
 	static private ExternalImagePopupMenu imagePopupMenu;
-	private static final int BORDER_SIZE = 1;
-	private static final Color BORDER_COLOR = Color.BLACK;
 	static final int VIEWER_POSITION = 5;
 	private final MyMouseListener mouseListener = new MyMouseListener();
 	final private Set<IViewerFactory> factories;
@@ -539,7 +552,7 @@ public class ViewerController extends PersistentNodeHook implements INodeViewLif
 		if (imagePopupMenu == null) {
 			imagePopupMenu = new ExternalImagePopupMenu();
 		}
-		viewer.setBorder(new MatteBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_COLOR));
+		viewer.setBorder(VIEWER_BORDER_INSTANCE);
 		final Set<NodeView> viewers = model.getViewers();
 		viewers.add(view);
 		viewer.setBounds(viewer.getX() - 5, viewer.getY() - 5, viewer.getWidth() + 15, viewer.getHeight() + 15);
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/nodehistory/NodeHistory.java b/freeplane/src/main/java/org/freeplane/view/swing/features/nodehistory/NodeHistory.java
index 565c76e..f91120e 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/nodehistory/NodeHistory.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/nodehistory/NodeHistory.java
@@ -154,7 +154,7 @@ public class NodeHistory implements IExtension {
 			newView = currentNodeHolder.getHoldMapView();
 		}
 		if (!toBeSelected.isRoot()) {
-			newView.getModeController().getMapController().setFolded(toBeSelected.getParentNode(), false);
+			newView.getModeController().getMapController().unfold(toBeSelected.getParentNode());
 		}
 		newView.getModeController().getMapController().select(toBeSelected);
 	}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/ReminderHook.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/ReminderHook.java
index e2466f7..82a6861 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/ReminderHook.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/ReminderHook.java
@@ -160,7 +160,7 @@ public class ReminderHook extends PersistentNodeHook implements IExtension {
  new ReminderConditionController());
 		createTimePanel();
 	}
-	private static final IconStore STORE = IconStoreFactory.create();
+	private static final IconStore STORE = IconStoreFactory.ICON_STORE;
 	private static UIIcon bellIcon;
 	private static UIIcon clockIcon;
 	private static UIIcon flagIcon;
@@ -187,6 +187,11 @@ public class ReminderHook extends PersistentNodeHook implements IExtension {
 				}
 				return null;
 			}
+
+			@Override
+			public boolean mustIncludeInIconRegistry() {
+				return true;
+			}
 		});
 	}
 	private UIIcon getBellIcon() {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
index 96fbb60..18dd142 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
@@ -57,6 +57,7 @@ import javax.swing.WindowConstants;
 import javax.swing.text.JTextComponent;
 
 import org.freeplane.core.resources.ResourceController;
+import org.freeplane.core.ui.components.JComboBoxWithBorder;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.ui.components.calendar.JCalendar;
 import org.freeplane.core.ui.components.calendar.JDayChooser;
@@ -454,15 +455,16 @@ class TimeManagement implements PropertyChangeListener, IMapSelectionListener {
 			final PatternFormat patternFormat = datePatterns.get(i);
 			values.add(new DateFormatComboBoxElement(patternFormat));
 			if (patternFormat.getPattern().equals(dateFormatPattern)) {
-				dateFormat = patternFormat;
 				selectedIndex = i;
 			}
 		}
-		final JComboBox dateFormatChooser = new JComboBox(values);
+		if (!datePatterns.isEmpty()){
+			dateFormat = datePatterns.get(selectedIndex);
+		}
+		final JComboBox dateFormatChooser = new JComboBoxWithBorder(values);
 		dateFormatChooser.setFocusable(false);
 		if (!datePatterns.isEmpty()){
 			dateFormatChooser.setSelectedIndex(selectedIndex);
-			dateFormat = ((DateFormatComboBoxElement) (dateFormatChooser.getSelectedItem())).getDateFormat();
 		}
 		dateFormatChooser.addItemListener(new ItemListener() {
 			public void itemStateChanged(final ItemEvent e) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java
index 98dfac4..83a46b4 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/NodeList.java
@@ -56,6 +56,7 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.Timer;
 import javax.swing.WindowConstants;
@@ -341,7 +342,7 @@ public class NodeList {
 	final private JComboBox mFilterTextSearchField;
 	private FlatNodeTableFilterModel mFlatNodeTableFilterModel;
 // 	final private ModeController modeController;
-	private JLabel mTreeLabel;
+	private JTextField mNodePath;
 	private TextRenderer textRenderer;
 	private boolean showAllNodes = false;
 	private TableSorter sorter;
@@ -657,17 +658,13 @@ public class NodeList {
 		tableConstraints.weighty = 10;
 		tableConstraints.fill = GridBagConstraints.BOTH;
 		contentPane.add(pane, tableConstraints);
-		mTreeLabel = new JLabel();
+		mNodePath = new JTextField();
+		mNodePath.setEditable(false);
 		layoutConstraints.gridy++;
 		GridBagConstraints treeConstraints = (GridBagConstraints) layoutConstraints.clone();
 		treeConstraints.fill = GridBagConstraints.BOTH;
 		@SuppressWarnings("serial")
-		JScrollPane scrollPane = new JScrollPane(mTreeLabel){
-			@Override
-			public boolean isValidateRoot() {
-				return false;
-			}
-		};
+		JScrollPane scrollPane = new JScrollPane(mNodePath, JScrollPane.VERTICAL_SCROLLBAR_NEVER, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
 		contentPane.add(scrollPane, treeConstraints);
 		final AbstractAction exportAction = new AbstractAction(TextUtils.getText("plugins/TimeManagement.xml_Export")) {
 			/**
@@ -779,12 +776,12 @@ public class NodeList {
 				}
 				final ListSelectionModel lsm = (ListSelectionModel) e.getSource();
 				if (lsm.isSelectionEmpty()) {
-					mTreeLabel.setText("");
+					mNodePath.setText("");
 					return;
 				}
 				final int selectedRow = lsm.getLeadSelectionIndex();
 				final NodeModel mindMapNode = getMindMapNode(selectedRow);
-				mTreeLabel.setText(getNodeText(mindMapNode));
+				mNodePath.setText(getNodeText(mindMapNode));
 			}
 		});
 		final String marshalled = ResourceController.getResourceController().getProperty(
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TableSorter.java b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TableSorter.java
index 0e2b1a7..04e4420 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TableSorter.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/features/time/mindmapmode/nodelist/TableSorter.java
@@ -145,8 +145,8 @@ class TableSorter extends AbstractTableModel {
 			final JTableHeader h = (JTableHeader) e.getSource();
 			final TableColumnModel columnModel = h.getColumnModel();
 			final int viewColumn = columnModel.getColumnIndexAtX(e.getX());
-			final int column = columnModel.getColumn(viewColumn).getModelIndex();
-			if (column != -1) {
+			if (viewColumn != -1) {
+				final int column = columnModel.getColumn(viewColumn).getModelIndex();
 				int status = getSortingStatus(column);
 				if (!e.isControlDown()) {
 					cancelSorting();
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java
index 4977702..b50c77b 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ArrowIcon.java
@@ -75,7 +75,7 @@ class ArrowIcon implements Icon{
 			ys[1] = ys[2] = 1 + ARROW_HEIGTH;
 		}
 		final Color oldColor = g.getColor();
-		final Color color = nodeView.getEdgeColor();
+		final Color color = nodeView.getMainView().getBorderColor();
 		g.setColor(color);
 		Graphics2D g2= (Graphics2D) g;
 		final Object renderingHint = g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/BubbleMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/BubbleMainView.java
index eb0da74..b6e9d83 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/BubbleMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/BubbleMainView.java
@@ -33,7 +33,8 @@ class BubbleMainView extends RectangleMainView {
 
 	@Override
 	protected void paintNodeShape(final Graphics2D g) {
-		g.drawRoundRect(0, 0, getWidth() - 1, getHeight() - 1, 10, 10);
+		final int zoomedEdgeWidth = (int) getPaintedBorderWidth();
+		g.drawRoundRect(zoomedEdgeWidth / 2, zoomedEdgeWidth / 2, getWidth() - zoomedEdgeWidth, getHeight() - zoomedEdgeWidth, 10, 10);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java b/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java
index c0e8e8c..29c4ad5 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/FoldingMark.java
@@ -23,7 +23,7 @@ abstract class DrawableShape implements Drawable{
 	}
 	public void draw(Graphics2D g, NodeView nodeView, Rectangle r) {
 		final Color color = g.getColor(); 
-		final Color edgeColor = nodeView.getEdgeColor();
+		final Color edgeColor = nodeView.getMainView().getBorderColor();
 		final Shape shape = getShape(r);
 		g.setColor(getFillColor(nodeView));
 		g.fill(shape);
@@ -64,8 +64,9 @@ class FoldingCircle extends DrawableEllipse{
 		super.drawShape(g, shape, r, nodeView);
 		if(nodeView.isRoot() & ! folded)
 			return;
-		if(! nodeView.getMainView().getMouseArea().equals(MouseArea.FOLDING))
-			g.setColor(nodeView.getEdgeColor());
+		final MainView mainView = nodeView.getMainView();
+		if(! mainView.getMouseArea().equals(MouseArea.FOLDING))
+			g.setColor(mainView.getBorderColor());
 		else
 			g.setColor(super.getFillColor(nodeView));
 		if(! hiddenChild)
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ForkMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ForkMainView.java
index 205e0f9..357f4b7 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ForkMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ForkMainView.java
@@ -27,7 +27,7 @@ import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Stroke;
 
-import org.freeplane.features.edge.EdgeStyle;
+import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.nodestyle.ShapeConfigurationModel;
 
 class ForkMainView extends MainView {
@@ -37,24 +37,11 @@ class ForkMainView extends MainView {
 	@Override
     public
 	Point getLeftPoint() {
-		int edgeWidth = getEdgeWidth();
+		int edgeWidth = (int)getPaintedBorderWidth();
 		final Point in = new Point(0, getHeight() - edgeWidth / 2);
 		return in;
 	}
 
-	public int getEdgeWidth() {
-	    final NodeView nodeView = getNodeView();
-	    final int edgeWidth = nodeView.getEdgeWidth();
-		final EdgeStyle style = nodeView.getEdgeStyle();
-		final int nodeLineWidth = style.getNodeLineWidth(edgeWidth);
-		if(edgeWidth == 0)
-			return nodeLineWidth;
-		else{
-			final int zoomedLineWidth = nodeView.getMap().getZoomed(nodeLineWidth);
-			return zoomedLineWidth;
-		}
-    }
-
 	@Override
 	protected int getMainViewHeightWithFoldingMark() {
 		int height = getHeight();
@@ -68,7 +55,7 @@ class ForkMainView extends MainView {
 	@Override
     public
 	Point getRightPoint() {
-		int edgeWidth = getEdgeWidth();
+		int edgeWidth = (int)getPaintedBorderWidth();
 		final Point in = new Point(getWidth() - 1, getHeight() - edgeWidth / 2);
 		return in;
 	}
@@ -88,16 +75,15 @@ class ForkMainView extends MainView {
 	@Override
 	protected void paintBackground(final Graphics2D graphics, final Color color) {
 		graphics.setColor(color);
-		graphics.fillRect(0, 0, getWidth(), getHeight() - getEdgeWidth());
+		graphics.fillRect(0, 0, getWidth(), getHeight() - (int)getPaintedBorderWidth());
 	}
 
 	@Override
 	void paintDecoration(final NodeView nodeView, final Graphics2D g) {
 		final Stroke oldStroke = g.getStroke();
-		float edgeWidth  = getEdgeWidth();
-		g.setStroke(new BasicStroke(edgeWidth, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
+		g.setStroke(UITools.createStroke(getPaintedBorderWidth(), getDash().variant, BasicStroke.JOIN_MITER));
 		final Color oldColor = g.getColor();
-		g.setColor(nodeView.getEdgeColor());
+		g.setColor(getBorderColor());
 		Point leftLinePoint = getLeftPoint();
 		g.drawLine(leftLinePoint.x, leftLinePoint.y, leftLinePoint.x + getWidth(), leftLinePoint.y);
 		g.setColor(oldColor);
@@ -114,8 +100,7 @@ class ForkMainView extends MainView {
     public Insets getInsets(Insets insets) {
     	final NodeView nodeView = getNodeView();
         int edgeWidth = nodeView.getEdgeWidth();
-        final EdgeStyle style = nodeView.getEdgeStyle();
-        edgeWidth = style.getNodeLineWidth(edgeWidth);
+        edgeWidth = Math.round(getUnzoomedBorderWidth());
 		if(insets == null)
     		insets = new Insets(0, 2, edgeWidth, 2);
     	else
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/MainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/MainView.java
index fd1d8fb..05eb4e1 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/MainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/MainView.java
@@ -40,7 +40,6 @@ import java.util.Collection;
 
 import javax.swing.Icon;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JToolTip;
 import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
@@ -55,18 +54,20 @@ import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.DashVariant;
+import org.freeplane.features.edge.EdgeController;
+import org.freeplane.features.edge.EdgeStyle;
 import org.freeplane.features.icon.IconController;
 import org.freeplane.features.icon.MindIcon;
 import org.freeplane.features.icon.UIIcon;
 import org.freeplane.features.link.LinkController;
 import org.freeplane.features.link.NodeLinks;
-import org.freeplane.features.map.HideChildSubtree;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.nodelocation.LocationModel;
 import org.freeplane.features.nodestyle.NodeStyleController;
-import org.freeplane.features.nodestyle.NodeStyleModel.TextAlign;
+import org.freeplane.features.nodestyle.NodeStyleModel.HorizontalTextAlignment;
 import org.freeplane.features.nodestyle.ShapeConfigurationModel;
 import org.freeplane.features.styles.MapViewLayout;
 import org.freeplane.features.text.HighlightedTransformedObject;
@@ -93,6 +94,10 @@ public abstract class MainView extends ZoomableLabel {
 	private MouseArea mouseArea = MouseArea.OUT;
 	final static Stroke DEF_STROKE = new BasicStroke();
 	private static final int DRAG_OVAL_WIDTH = 10;
+	private float unzoomedBorderWidth = 1f;
+	private DashVariant dash = DashVariant.DEFAULT;
+	private Color borderColor = EdgeController.STANDARD_EDGE_COLOR;
+	private Boolean borderColorMatchesEdgeColor = true;
 
 	boolean isShortened() {
     	return isShortened;
@@ -103,7 +108,7 @@ public abstract class MainView extends ZoomableLabel {
 		setHorizontalAlignment(SwingConstants.LEFT);
 		setVerticalAlignment(SwingConstants.CENTER);
 		setHorizontalTextPosition(SwingConstants.TRAILING);
-		setVerticalTextPosition(JLabel.TOP);
+		setVerticalTextPosition(SwingConstants.TOP);
 	}
 
 	protected void convertPointFromMap(final Point p) {
@@ -265,7 +270,7 @@ public abstract class MainView extends ZoomableLabel {
 			return FoldingMark.ITSELF_FOLDED;
 		}
 		for (final NodeModel child : mapController.childrenUnfolded(node)) {
-			if (child.hasVisibleContent() && child.containsExtension(HideChildSubtree.class)) {
+			if (child.hasVisibleContent() && nodeView.isChildHidden(child)) {
 				return FoldingMark.ITSELF_FOLDED;
 			}
 		}
@@ -283,11 +288,17 @@ public abstract class MainView extends ZoomableLabel {
 		paintFoldingMark(nodeView, g);
         if (isShortened()) {
         	FoldingMark.SHORTENED.draw(g, nodeView, decorationMarkBounds(nodeView, 7./3, 5./3));
-        }
-        else if (nodeView.getModel().isCloneTreeRoot())
-        	FoldingMark.CLONE.draw(g, nodeView, decorationMarkBounds(nodeView, 2, 2.5));
-        else if (nodeView.getModel().isCloneTreeNode())
-        	FoldingMark.CLONE.draw(g, nodeView, decorationMarkBounds(nodeView, 1.5, 2.5));
+        } else if (shouldPaintCloneMarker(nodeView)){
+			if (nodeView.getModel().isCloneTreeRoot())
+				FoldingMark.CLONE.draw(g, nodeView, decorationMarkBounds(nodeView, 2, 2.5));
+			else if (nodeView.getModel().isCloneTreeNode())
+				FoldingMark.CLONE.draw(g, nodeView, decorationMarkBounds(nodeView, 1.5, 2.5));
+		}
+	}
+
+	private boolean shouldPaintCloneMarker(final NodeView nodeView) {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		return resourceController.getBooleanProperty("markClones") || nodeView.isSelected() && resourceController.getBooleanProperty("markSelectedClones");
 	}
 
 	private Rectangle decorationMarkBounds(final NodeView nodeView, double widthFactor, double heightFactor) {
@@ -324,7 +335,7 @@ public abstract class MainView extends ZoomableLabel {
 			final FoldingMark foldingCircle;
 			if(markType.equals(FoldingMark.UNFOLDED)) {
 				final NodeModel node = nodeView.getModel();
-				if(mapController.hasHiddenChildren(node))
+				if(nodeView.hasHiddenChildren())
 					foldingCircle = FoldingMark.FOLDING_CIRCLE_HIDDEN_CHILD;
 				else
 					foldingCircle = FoldingMark.FOLDING_CIRCLE_UNFOLDED;
@@ -461,17 +472,21 @@ public abstract class MainView extends ZoomableLabel {
 	}
 
 	void updateIcons(final NodeView node) {
+		if(! node.getMap().showsIcons()) {
+			setIcon(null);
+			return;
+		}
 //		setHorizontalTextPosition(node.isLeft() ? SwingConstants.LEADING : SwingConstants.TRAILING);
 		final MultipleImage iconImages = new MultipleImage();
 		/* fc, 06.10.2003: images? */
 		final NodeModel model = node.getModel();
 		for (final UIIcon icon : IconController.getController().getStateIcons(model)) {
-			iconImages.addIcon(icon);
+			iconImages.addIcon(icon, model);
 		}
 		final ModeController modeController = getNodeView().getMap().getModeController();
 		final Collection<MindIcon> icons = IconController.getController(modeController).getIcons(model);
 		for (final MindIcon myIcon : icons) {
-			iconImages.addIcon(myIcon);
+			iconImages.addIcon(myIcon, model);
 		}
 		addOwnIcons(iconImages, model);
 		setIcon((iconImages.getImageCount() > 0 ? iconImages : null));
@@ -479,9 +494,9 @@ public abstract class MainView extends ZoomableLabel {
 
 	private void addOwnIcons(final MultipleImage iconImages, final NodeModel model) {
 		final URI link = NodeLinks.getLink(model);
-			final Icon icon = getNodeView().getMap().getModeController().getExtension(LinkController.class).getLinkIcon(link, model);
-			if(icon != null)
-				iconImages.addLinkIcon(icon);
+		final Icon icon = getNodeView().getMap().getModeController().getExtension(LinkController.class).getLinkIcon(link, model);
+		if(icon != null)
+			iconImages.addLinkIcon(icon, model);
 	}
 
 	void updateTextColor(final NodeView node) {
@@ -490,10 +505,10 @@ public abstract class MainView extends ZoomableLabel {
 		setForeground(color);
 	}
 	
-	void updateTextAlign(NodeView node) {
-		final TextAlign textAlign = NodeStyleController.getController(node.getMap().getModeController()).getTextAlign(node.getModel());
-		final boolean isCenteredByDefault = textAlign == TextAlign.DEFAULT && node.isRoot();
-		setHorizontalAlignment(isCenteredByDefault ? TextAlign.CENTER.swingConstant : textAlign.swingConstant);
+	void updateHorizontalTextAlignment(NodeView node) {
+		final HorizontalTextAlignment textAlignment = NodeStyleController.getController(node.getMap().getModeController()).getHorizontalTextAlignment(node.getModel());
+		final boolean isCenteredByDefault = textAlignment == HorizontalTextAlignment.DEFAULT && node.isRoot();
+		setHorizontalAlignment(isCenteredByDefault ? HorizontalTextAlignment.CENTER.swingConstant : textAlignment.swingConstant);
 	}
 
 
@@ -647,6 +662,11 @@ public abstract class MainView extends ZoomableLabel {
 			final NodeView nodeView = getNodeView();
 			if(nodeView.isRoot())
 				return false;
+			final NodeModel node = nodeView.getModel();
+			if(node.getParentNode() == null ) {
+				LogUtils.severe("Node" + node + " has lost parent");
+				return false;
+			}
 			if (MapViewLayout.OUTLINE.equals(nodeView.getMap().getLayoutType()))
 				return false;
 			final int draggingWidth = getDraggingWidth();
@@ -783,4 +803,51 @@ public abstract class MainView extends ZoomableLabel {
 	public int getSingleChildShift() {
 		return 0;
 	}
+
+	public float getUnzoomedEdgeWidth() {
+		final NodeView nodeView = getNodeView();
+		final int edgeWidth = nodeView.getEdgeWidth();
+		final EdgeStyle style = nodeView.getEdgeStyle();
+		final float nodeLineWidth = style.getNodeLineWidth(edgeWidth);
+		return nodeLineWidth;
+	}
+	
+	public float getPaintedBorderWidth() {
+		final float zoomedLineWidth = getNodeView().getMap().getZoom() * unzoomedBorderWidth;
+		return Math.max(zoomedLineWidth, 1);
+	}
+
+	public float getUnzoomedBorderWidth() {
+		return Math.max(unzoomedBorderWidth, 1);
+	}
+
+	public DashVariant getDash() {
+		return dash;
+	}
+
+	public Color getBorderColor() {
+		return borderColorMatchesEdgeColor ? getNodeView().getEdgeColor() : borderColor;
+	}
+
+	public void updateBorder(NodeView nodeView) {
+		final NodeStyleController controller = NodeStyleController.getController(nodeView.getMap().getModeController());
+		final NodeModel node = nodeView.getModel();
+		final Boolean borderWidthMatchesEdgeWidth = controller.getBorderWidthMatchesEdgeWidth(node);
+		if(borderWidthMatchesEdgeWidth)
+			unzoomedBorderWidth = getUnzoomedEdgeWidth();
+		else
+			unzoomedBorderWidth = (float) controller.getBorderWidth(node).toBaseUnits();
+		
+		final Boolean borderDashMatchesEdgeDash = controller.getBorderDashMatchesEdgeDash(node);
+		if(borderDashMatchesEdgeDash)
+			dash = nodeView.getEdgeDash();
+		else
+			dash = controller.getBorderDash(node);
+		
+		borderColorMatchesEdgeColor = controller.getBorderColorMatchesEdgeColor(node);
+		if(borderColorMatchesEdgeColor)
+			borderColor = null;
+		else
+			borderColor = controller.getBorderColor(node);
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/MapScroller.java b/freeplane/src/main/java/org/freeplane/view/swing/map/MapScroller.java
index 423ebf2..02cf704 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/MapScroller.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/MapScroller.java
@@ -10,6 +10,7 @@ import javax.swing.JViewport;
 
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.map.NodeModel;
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.ui.ViewController;
 
 class MapScroller {
@@ -92,6 +93,13 @@ class MapScroller {
 				contentLocation.y + content.getHeight() / 2 - extentSize.height
 				/ 2, extentSize.width, extentSize.height);
 		
+		final int distanceToMargin = (extentSize.width - content.getWidth()) / 2 - 10;
+		if(scrollingDirective == ScrollingDirective.SCROLL_NODE_TO_LEFT_MARGIN){
+			rect.x += distanceToMargin;
+		}
+		if(scrollingDirective == ScrollingDirective.SCROLL_NODE_TO_RIGHT_MARGIN){
+			rect.x -= distanceToMargin;
+		}
 		if(scrollingDirective == ScrollingDirective.SCROLL_TO_BEST_ROOT_POSITION){
 			final Rectangle innerBounds = map.getInnerBounds();
 			if(innerBounds.width <= extentSize.width && map.getModeController().shouldCenterCompactMaps()){
@@ -99,15 +107,14 @@ class MapScroller {
 			}
 			else {
 				NodeView root = map.getRoot();
-				if(!map.isOutlineLayoutSet()) {
+				final boolean outlineLayoutSet = map.isOutlineLayoutSet();
+				if(!outlineLayoutSet) {
 					boolean scrollToTheLeft = false;
-
 					final List<NodeModel> children = root.getModel().getChildren();
 					if(! children.isEmpty()){
 						scrollToTheLeft = true;
-						final boolean outlineLayoutSet = map.isOutlineLayoutSet();
 						for(NodeModel node :children) {
-							if(! outlineLayoutSet && node.isLeft()){
+							if(node.isLeft()){
 								scrollToTheLeft = false;
 								break;
 							}
@@ -281,4 +288,10 @@ class MapScroller {
 
 }
 
-enum ScrollingDirective {SCROLL_NODE_TO_CENTER, SCROLL_TO_BEST_ROOT_POSITION, MAKE_NODE_VISIBLE, DONE, ANCHOR}
+enum ScrollingDirective {
+	SCROLL_NODE_TO_CENTER, SCROLL_NODE_TO_LEFT_MARGIN, SCROLL_NODE_TO_RIGHT_MARGIN, SCROLL_TO_BEST_ROOT_POSITION, MAKE_NODE_VISIBLE, DONE, ANCHOR;
+	private static ScrollingDirective positionDirective[] = {SCROLL_NODE_TO_LEFT_MARGIN, SCROLL_NODE_TO_CENTER, SCROLL_NODE_TO_RIGHT_MARGIN};
+	public static ScrollingDirective of(NodePosition position) {
+		return positionDirective[position.ordinal()];
+	}
+}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java
index f17c0e6..20664a2 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/MapView.java
@@ -20,7 +20,6 @@
 package org.freeplane.view.swing.map;
 
 import java.awt.AWTKeyStroke;
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -44,6 +43,8 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.print.PageFormat;
 import java.awt.print.Printable;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -76,7 +77,9 @@ import org.freeplane.core.util.ColorUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.features.attribute.AttributeController;
 import org.freeplane.features.attribute.ModelessAttributeController;
+import org.freeplane.features.edge.EdgeColorsConfigurationFactory;
 import org.freeplane.features.filter.Filter;
+import org.freeplane.features.highlight.NodeHighlighter;
 import org.freeplane.features.link.ConnectorModel;
 import org.freeplane.features.link.ConnectorModel.Shape;
 import org.freeplane.features.link.LinkController;
@@ -107,7 +110,6 @@ import org.freeplane.features.styles.MapViewLayout;
 import org.freeplane.features.text.TextController;
 import org.freeplane.features.url.UrlManager;
 import org.freeplane.view.swing.features.filepreview.IViewerFactory;
-import org.freeplane.view.swing.features.filepreview.ImageLoadingListener;
 import org.freeplane.view.swing.features.filepreview.ScalableComponent;
 import org.freeplane.view.swing.features.filepreview.ViewerController;
 import org.freeplane.view.swing.map.link.ConnectorView;
@@ -150,12 +152,39 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 
 	private class MapSelection implements IMapSelection {
 		public void centerNode(final NodeModel node) {
+			final boolean slowScroll = false;
+			centerNode(node, slowScroll);
+		}
+
+		public void centerNodeSlowly(final NodeModel node) {
+			final boolean slowScroll = true;
+			centerNode(node, slowScroll);
+		}
+		
+		private void centerNode(final NodeModel node, final boolean slowScroll) {
 			final NodeView nodeView = getNodeView(node);
 			if (nodeView != null) {
-				mapScroller.scrollNode(nodeView, ScrollingDirective.SCROLL_NODE_TO_CENTER, false);
+				mapScroller.scrollNode(nodeView, ScrollingDirective.SCROLL_NODE_TO_CENTER, slowScroll);
 			}
 		}
 
+		public void moveNodeTo(final NodeModel node, NodePosition position) {
+			final boolean slowScroll = false;
+			moveNodeTo(node, position, slowScroll);
+		}
+
+		public void slowlyMoveNodeTo(final NodeModel node, NodePosition position) {
+			final boolean slowScroll = true;
+			moveNodeTo(node, position, slowScroll);
+		}
+		
+		private void moveNodeTo(final NodeModel node, NodePosition position, final boolean slowScroll) {
+			final NodeView nodeView = getNodeView(node);
+			if (nodeView != null) {
+				mapScroller.scrollNode(nodeView, ScrollingDirective.of(position), slowScroll);
+			}
+		}
+		
 		public NodeModel getSelected() {
 			final NodeView selected = MapView.this.getSelected();
 			return selected.getModel();
@@ -204,6 +233,8 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 
 		public void selectAsTheOnlyOneSelected(final NodeModel node) {
+			if(node.isVisible())
+				display(node);
 			final NodeView nodeView = getNodeView(node);
 			if (nodeView != null) {
 				MapView.this.selectAsTheOnlyOneSelected(nodeView);
@@ -235,6 +266,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 
 		public void toggleSelected(final NodeModel node) {
+			display(node);
 			MapView.this.toggleSelected(getNodeView(node));
 		}
 
@@ -243,13 +275,27 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
                 return;
             ArrayList<NodeView> views = new ArrayList<NodeView>(nodes.length);
             for(NodeModel node : nodes) {
-	            final NodeView nodeView = getNodeView(node);
-	            if(nodeView != null)
-	            	views.add(nodeView);
+            	if(node != null && node.isVisible()){
+            		display(node);
+            		final NodeView nodeView = getNodeView(node);
+            		if (nodeView != null) {
+            			views.add(nodeView);
+            		}
+            	}
             }
-            MapView.this.replaceSelection(views.toArray(new NodeView[]{}));
+            if(! views.isEmpty())
+            	MapView.this.replaceSelection(views.toArray(new NodeView[]{}));
         }
 
+		@Override
+		public List<String> getOrderedSelectionIds() {
+			final List<NodeModel> orderedSelection = getOrderedSelection();
+			final ArrayList<String> ids = new ArrayList<>(orderedSelection.size()); 
+			for(NodeModel node :orderedSelection)
+				ids.add(node.getID());
+			return ids;
+		}
+
 	}
 
 	private class Selection {
@@ -420,13 +466,22 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	static private IFreeplanePropertyListener propertyChangeListener;
 	public static final String RESOURCES_SELECTED_NODE_COLOR = "standardselectednodecolor";
 	public static final String RESOURCES_SELECTED_NODE_RECTANGLE_COLOR = "standardselectednoderectanglecolor";
+	private static final String SPOTLIGHT_BACKGROUND_COLOR = "spotlight_background_color";
 	private static final String PRESENTATION_DIMMER_TRANSPARENCY = "presentation_dimmer_transparency";
-	private static final String PRESENTATION_MODE_ENABLED = "presentation_mode";
+	private static final String HIDE_SINGLE_END_CONNECTORS = "hide_single_end_connectors";
+	private static final String SHOW_CONNECTORS_PROPERTY = "show_connectors";
+	private static final String SHOW_ICONS_PROPERTY = "show_icons";
+	static private final PropertyChangeListener repaintOnClientPropertyChangeListener = new PropertyChangeListener() {
+		@Override
+		public void propertyChange(PropertyChangeEvent evt) {
+			Component source = (Component) evt.getSource();
+			source.repaint();
+		}
+	};
 
 	private static final long serialVersionUID = 1L;
 	static boolean standardDrawRectangleForSelection;
 	static Color standardSelectColor;
-	private static Stroke standardSelectionStroke;
 	static Color standardSelectRectangleColor;
 	/** Used to identify a right click onto a link curve. */
 	private Vector<ILinkView> arrowLinkViews;
@@ -453,37 +508,46 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
     private int noteHorizontalAlignment;
     private Color noteForeground;
     private Color noteBackground;
-	private static boolean presentationModeEnabled;
+	private static boolean showConnectors;
+	private static boolean showIcons;
+	private static boolean hideSingleEndConnectors;
 	private boolean fitToViewport;
-	private static int transparency;
+	private static Color spotlightBackgroundColor;
 	final private ComponentAdapter backgroundImageResizer;
 	private INodeChangeListener connectorChangeListener;
-
-	public MapView(final MapModel model, final ModeController modeController) {
-		super();
-		this.model = model;
-		this.modeController = modeController;
-		mapScroller = new MapScroller(this);
-		final String name = model.getTitle();
-		setName(name);
-		if (MapView.standardSelectColor == null) {
-			final String stdcolor = ResourceController.getResourceController().getProperty(
+	public static final String SPOTLIGHT_ENABLED = "spotlight";
+	
+	static {
+		final ResourceController resourceController = ResourceController.getResourceController();
+		final String stdcolor = resourceController.getProperty(
 			    MapView.RESOURCES_SELECTED_NODE_COLOR);
 			MapView.standardSelectColor = ColorUtils.stringToColor(stdcolor);
-			final String stdtextcolor = ResourceController.getResourceController().getProperty(
+			final String stdtextcolor = resourceController.getProperty(
 			    MapView.RESOURCES_SELECTED_NODE_RECTANGLE_COLOR);
 			MapView.standardSelectRectangleColor = ColorUtils.stringToColor(stdtextcolor);
-			final String drawCircle = ResourceController.getResourceController().getProperty(
+			final String drawCircle = resourceController.getProperty(
 			    ResourceController.RESOURCE_DRAW_RECTANGLE_FOR_SELECTION);
 			MapView.standardDrawRectangleForSelection = TreeXmlReader.xmlToBoolean(drawCircle);
-			final String printOnWhite = ResourceController.getResourceController()
+			final String printOnWhite = resourceController
 			    .getProperty("printonwhitebackground");
 			MapView.printOnWhiteBackground = TreeXmlReader.xmlToBoolean(printOnWhite);
-			MapView.transparency = 255 - ResourceController.getResourceController().getIntProperty(PRESENTATION_DIMMER_TRANSPARENCY, 0x70);
-			MapView.presentationModeEnabled = ResourceController.getResourceController().getBooleanProperty(PRESENTATION_MODE_ENABLED);
+			int alpha = 255 - resourceController.getIntProperty(PRESENTATION_DIMMER_TRANSPARENCY, 0x70);
+			resourceController.setDefaultProperty(SPOTLIGHT_BACKGROUND_COLOR, ColorUtils.colorToRGBAString(new Color(0, 0, 0, alpha)));
+			spotlightBackgroundColor = resourceController.getColorProperty(SPOTLIGHT_BACKGROUND_COLOR);
+			hideSingleEndConnectors = resourceController.getBooleanProperty(HIDE_SINGLE_END_CONNECTORS);
+			showConnectors = resourceController.getBooleanProperty(SHOW_CONNECTORS_PROPERTY);
+			showIcons = resourceController.getBooleanProperty(SHOW_ICONS_PROPERTY);
 
 			createPropertyChangeListener();
-		}
+	}
+
+	public MapView(final MapModel model, final ModeController modeController) {
+		super();
+		this.model = model;
+		this.modeController = modeController;
+		mapScroller = new MapScroller(this);
+		final String name = model.getTitle();
+		setName(name);
 		this.setAutoscrolls(true);
 		this.setLayout(new MindMapLayout());
 		final NoteController noteController = NoteController.getController(getModeController());
@@ -522,6 +586,8 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 					repaint();
 			}
 		};
+		
+		addPropertyChangeListener(MapView.SPOTLIGHT_ENABLED, repaintOnClientPropertyChangeListener);
 	}
 
 	public void replaceSelection(NodeView[] views) {
@@ -587,39 +653,52 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	static private void createPropertyChangeListener() {
 		MapView.propertyChangeListener = new IFreeplanePropertyListener() {
 			public void propertyChanged(final String propertyName, final String newValue, final String oldValue) {
-				final Component mapView = Controller.getCurrentController().getMapViewManager().getMapViewComponent();
-				if (!(mapView instanceof MapView)) {
+				final Component c = Controller.getCurrentController().getMapViewManager().getMapViewComponent();
+				if (!(c instanceof MapView)) {
 					return;
 				}
+				final MapView mapView = (MapView) c;
 				if (propertyName.equals(RESOURCES_SELECTED_NODE_COLOR)) {
 					MapView.standardSelectColor = ColorUtils.stringToColor(newValue);
-					((MapView) mapView).repaintSelecteds();
+					mapView.repaintSelecteds();
 					return;
 				}
 				if (propertyName.equals(RESOURCES_SELECTED_NODE_RECTANGLE_COLOR)) {
 					MapView.standardSelectRectangleColor = ColorUtils.stringToColor(newValue);
-					((MapView) mapView).repaintSelecteds();
+					mapView.repaintSelecteds();
 					return;
 				}
 				if (propertyName.equals(ResourceController.RESOURCE_DRAW_RECTANGLE_FOR_SELECTION)) {
 					MapView.standardDrawRectangleForSelection = TreeXmlReader.xmlToBoolean(newValue);
-					((MapView) mapView).repaintSelecteds();
+					mapView.repaintSelecteds();
 					return;
 				}
 				if (propertyName.equals("printonwhitebackground")) {
 					MapView.printOnWhiteBackground = TreeXmlReader.xmlToBoolean(newValue);
 					return;
 				}
-				if (propertyName.equals(PRESENTATION_DIMMER_TRANSPARENCY)) {
-					MapView.transparency = 255 - ResourceController.getResourceController().getIntProperty(PRESENTATION_DIMMER_TRANSPARENCY, 0x70);
-					((MapView) mapView).repaint();
+				if (propertyName.equals(SPOTLIGHT_BACKGROUND_COLOR)) {
+					MapView.spotlightBackgroundColor = ColorUtils.stringToColor(newValue);
+					mapView.repaint();
+					return;
+				}
+				if (propertyName.equals(HIDE_SINGLE_END_CONNECTORS)) {
+					MapView.hideSingleEndConnectors = ResourceController.getResourceController().getBooleanProperty(HIDE_SINGLE_END_CONNECTORS);
+					mapView.repaint();
+					return;
+				}
+				if (propertyName.equals(SHOW_CONNECTORS_PROPERTY)) {
+					MapView.showConnectors = ResourceController.getResourceController().getBooleanProperty(SHOW_CONNECTORS_PROPERTY);
+					mapView.repaint();
 					return;
 				}
-				if (propertyName.equals(PRESENTATION_MODE_ENABLED)) {
-					MapView.presentationModeEnabled = ResourceController.getResourceController().getBooleanProperty(PRESENTATION_MODE_ENABLED);
-					((MapView) mapView).repaint();
+				if (propertyName.equals(SHOW_ICONS_PROPERTY)) {
+					MapView.showIcons = ResourceController.getResourceController().getBooleanProperty(SHOW_ICONS_PROPERTY);
+					mapView.updateIconsRecursively(mapView.getRoot());
+					mapView.repaint();
 					return;
 				}
+				
 			}
 		};
 		ResourceController.getResourceController().addPropertyChangeListener(MapView.propertyChangeListener);
@@ -632,7 +711,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	}
 
 	public Object detectCollision(final Point p) {
-		if (arrowLinkViews == null) {
+		if (arrowLinkViews == null && ! showConnectors) {
 			return null;
 		}
 		for (int i = 0; i < arrowLinkViews.size(); ++i) {
@@ -949,7 +1028,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 		else {
 			if (oldSelected.isFolded()) {
-				getModeController().getMapController().setFoldedAndScroll(oldModel, false);
+				getModeController().getMapController().unfold(oldModel);
 				return oldSelected;
 			}
 			newSelected = oldSelected.getPreferredVisibleChild(isOutlineLayoutSet(), true);
@@ -1022,7 +1101,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 		else {
 			if (oldSelected.isFolded()) {
-				getModeController().getMapController().setFoldedAndScroll(oldModel, false);
+				getModeController().getMapController().unfoldAndScroll(oldModel);
 				if(oldSelected.getModel().hasVisibleContent())
 					return oldSelected;
 			}
@@ -1071,9 +1150,11 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	 * focused selected node.
 	 */
 	void addSelected(final NodeView newSelected, boolean scroll) {
-		selection.add(newSelected);
-		if(scroll)
-			mapScroller.scrollNodeToVisible(newSelected);
+		if(newSelected.isContentVisible()){
+			selection.add(newSelected);
+			if(scroll)
+				mapScroller.scrollNodeToVisible(newSelected);
+		}
 	}
 
 	public void mapChanged(final MapChangeEvent event) {
@@ -1096,7 +1177,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 		if(property.equals(AttributeController.SHOW_ICON_FOR_ATTRIBUTES)
 				||property.equals(NoteController.SHOW_NOTE_ICONS))
-			updateStateIconsRecursively(getRoot());
+			updateIconsRecursively(getRoot());
 		if(property.equals(NoteController.SHOW_NOTES_IN_MAP))
 			setShowNotes();
 		if (property.equals(MapStyle.RESOURCES_BACKGROUND_IMAGE)) {
@@ -1114,6 +1195,10 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 			adjustBackgroundComponentScale();
 			repaint();
 		}
+		if(property.equals(EdgeColorsConfigurationFactory.EDGE_COLOR_CONFIGURATION_PROPERTY)){
+			getRoot().updateAll();
+			repaint();
+		}
 	}
 
 	private void loadBackgroundImage() {
@@ -1164,11 +1249,6 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 				return;
 			}
 			((ScalableComponent) backgroundComponent).setCenter(true);
-			((ScalableComponent)backgroundComponent).setImageLoadingListener(new ImageLoadingListener() {
-				public void imageLoaded() {
-					repaint();
-				}
-			});
 		}
 		catch (final FileNotFoundException e1) {
 			LogUtils.warn(e1);
@@ -1178,7 +1258,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 	}
 
-	private void updateStateIconsRecursively(NodeView node) {
+	private void updateIconsRecursively(NodeView node) {
     	final MainView mainView = node.getMainView();
     	if(mainView == null)
     		return;
@@ -1186,7 +1266,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
     	for(int i = 0; i < node.getComponentCount(); i++){
     		final Component component = node.getComponent(i);
     		if(component instanceof NodeView)
-    		updateStateIconsRecursively((NodeView) component);
+    		updateIconsRecursively((NodeView) component);
     	}
     }
 
@@ -1198,13 +1278,13 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
         detailFont = UITools.scale(style.getFont(detailStyleNode));
         detailBackground = style.getBackgroundColor(detailStyleNode);
         detailForeground = style.getColor(detailStyleNode);
-        detailHorizontalAlignment = style.getTextAlign(detailStyleNode).swingConstant;
+        detailHorizontalAlignment = style.getHorizontalTextAlignment(detailStyleNode).swingConstant;
         
         final NodeModel noteStyleNode = model.getStyleNodeSafe(MapStyleModel.NOTE_STYLE);
         noteFont = UITools.scale(style.getFont(noteStyleNode));
         noteBackground = style.getBackgroundColor(noteStyleNode);
         noteForeground = style.getColor(noteStyleNode);
-        noteHorizontalAlignment = style.getTextAlign(noteStyleNode).swingConstant;
+        noteHorizontalAlignment = style.getHorizontalTextAlignment(noteStyleNode).swingConstant;
 
     }
 
@@ -1412,10 +1492,10 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 
 	@Override
 	protected void paintChildren(final Graphics g) {
-	    final boolean paintLinksBehind = ResourceController.getResourceController().getBooleanProperty(
+	    final boolean paintConnectorsBehind = ResourceController.getResourceController().getBooleanProperty(
 	    	    "paint_connectors_behind");
 	    final PaintingMode paintModes[];
-	    if(paintLinksBehind)
+	    if(paintConnectorsBehind)
 	    	paintModes = new PaintingMode[]{
 	    		PaintingMode.CLOUDS,
 	    		PaintingMode.LINKS, PaintingMode.NODES, PaintingMode.SELECTED_NODES
@@ -1427,18 +1507,22 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	    		};
 	    Graphics2D g2 = (Graphics2D) g;
 	    paintChildren(g2, paintModes);
-	    if(presentationModeEnabled)
+	    if(isSpotlightEnabled())
 	    	paintDimmer(g2, paintModes);
 		paintSelecteds(g2);
 		highlightEditor(g2);
     }
 
+	public boolean isSpotlightEnabled() {
+		return Boolean.TRUE == getClientProperty(MapView.SPOTLIGHT_ENABLED);
+	}
+
 	private void paintChildren(Graphics2D g2, final PaintingMode[] paintModes) {
 	    for(PaintingMode paintingMode : paintModes){
 	    	this.paintingMode = paintingMode;
 			switch(paintingMode){
 	    		case LINKS:
-	    			paintLinks(g2);
+	    			paintConnectors(g2);
 	    			break;
 				default:
 					super.paintChildren(g2);
@@ -1450,7 +1534,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 	private void paintDimmer(Graphics2D g2, PaintingMode[] paintModes) {
 		final Color color = g2.getColor();
 		try{
-			Color dimmer = new Color(0, 0, 0, transparency);
+			Color dimmer = spotlightBackgroundColor;
 			g2.setColor(dimmer);
 			g2.fillRect(0, 0, getWidth(), getHeight());
 		}
@@ -1481,7 +1565,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		return paintingMode;
 	}
 
-	private void paintLinks(final Collection<NodeLinkModel> links, final Graphics2D graphics,
+	private void paintConnectors(final Collection<NodeLinkModel> links, final Graphics2D graphics,
 	                        final HashSet<ConnectorModel> alreadyPaintedLinks) {
 		final Font font = graphics.getFont();
 		try {
@@ -1501,14 +1585,13 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 					final NodeView sourceView = getNodeView(source);
 					final NodeView targetView = getNodeView(target);
 					final ILinkView arrowLink;
-					if (sourceView != null && targetView != null
-					        && (Shape.EDGE_LIKE.equals(ref.getShape()) || sourceView.getMap().getLayoutType() == MapViewLayout.OUTLINE)
-					        && source.hasVisibleContent() && target.hasVisibleContent()) {
+					final boolean areBothNodesVisible = sourceView != null && targetView != null && source.hasVisibleContent() && target.hasVisibleContent();
+					if (areBothNodesVisible && (Shape.EDGE_LIKE.equals(ref.getShape()) || sourceView.getMap().getLayoutType() == MapViewLayout.OUTLINE)) 
 						arrowLink = new EdgeLinkView(ref, getModeController(), sourceView, targetView);
-					}
-					else {
+					else if(areBothNodesVisible || ! hideSingleEndConnectors)
 						arrowLink = new ConnectorView(ref, sourceView, targetView, getBackground());
-					}
+					else
+						break;
 					arrowLink.paint(graphics);
 					arrowLinkViews.add(arrowLink);
 				}
@@ -1519,22 +1602,22 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
 	}
 
-	private void paintLinks(final Graphics2D graphics) {
+	private void paintConnectors(final Graphics2D graphics) {
 		arrowLinkViews = new Vector<ILinkView>();
 		final Object renderingHint = getModeController().getController().getMapViewManager().setEdgesRenderingHint(
 		    graphics);
 		if(MapLinks.hasLinks(model))
-			paintLinks(rootView, graphics, new HashSet<ConnectorModel>());
+			paintConnectors(rootView, graphics, new HashSet<ConnectorModel>());
 		graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, renderingHint);
 	}
 
-	private void paintLinks(final NodeView source, final Graphics2D graphics, final HashSet<ConnectorModel> alreadyPaintedLinks) {
+	private void paintConnectors(final NodeView source, final Graphics2D graphics, final HashSet<ConnectorModel> alreadyPaintedConnectors) {
 		final LinkController linkController = LinkController.getController(getModeController());
 		final NodeModel node = source.getModel();
 		final Collection<NodeLinkModel> outLinks = linkController.getLinksFrom(node);
-		paintLinks(outLinks, graphics, alreadyPaintedLinks);
+		paintConnectors(outLinks, graphics, alreadyPaintedConnectors);
 		final Collection<NodeLinkModel> inLinks = linkController.getLinksTo(node);
-		paintLinks(inLinks, graphics, alreadyPaintedLinks);
+		paintConnectors(inLinks, graphics, alreadyPaintedConnectors);
 		final int nodeViewCount = source.getComponentCount();
 		for (int i = 0; i < nodeViewCount; i++) {
 			final Component component = source.getComponent(i);
@@ -1556,7 +1639,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 					continue;
 				}
 			}
-			paintLinks(child, graphics, alreadyPaintedLinks);
+			paintConnectors(child, graphics, alreadyPaintedConnectors);
 		}
 	}
 
@@ -1567,7 +1650,7 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		final Color c = g.getColor();
 		final Stroke s = g.getStroke();
 		g.setColor(MapView.standardSelectRectangleColor);
-		final Stroke standardSelectionStroke = getStandardSelectionStroke();
+		final Stroke standardSelectionStroke = NodeHighlighter.DEFAULT_STROKE;
 		g.setStroke(standardSelectionStroke);
 		final Object renderingHint = getModeController().getController().getMapViewManager().setEdgesRenderingHint(g);
 		for (final NodeView selected : getSelection()) {
@@ -1621,14 +1704,6 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		}
     }
 
-	Stroke getStandardSelectionStroke() {
-	    if (MapView.standardSelectionStroke == null) {
-			MapView.standardSelectionStroke = new BasicStroke(2.0f);
-		}
-		final Stroke standardSelectionStroke = MapView.standardSelectionStroke;
-	    return standardSelectionStroke;
-    }
-
 	/**
 	 * Call preparePrinting() before printing and endPrinting() after printing
 	 * to minimize calculation efforts
@@ -2065,4 +2140,26 @@ public class MapView extends JPanel implements Printable, Autoscroll, IMapChange
 		mapScroller.anchorToNode(nodeView, horizontalPoint, verticalPoint);
 	}
 
+	public void display(NodeModel node) {
+		final NodeView nodeView = getNodeView(node);
+		if(nodeView != null)
+			return;
+		final NodeModel parentNode = node.getParentNode();
+		if(parentNode == null)
+			return;
+		display(parentNode);
+		final NodeView parentView = getNodeView(parentNode);
+		if(parentView == null)
+			return;
+		parentView.setFolded(false);
+	}
+
+	public boolean showsConnectors() {
+		return showConnectors;
+	}
+
+	public boolean showsIcons() {
+		return showIcons;
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewController.java b/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewController.java
index 184681e..1552287 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewController.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewController.java
@@ -21,12 +21,15 @@ package org.freeplane.view.swing.map;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.KeyboardFocusManager;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.SystemColor;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.File;
@@ -41,7 +44,9 @@ import java.util.Map;
 import java.util.Vector;
 
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.FocusManager;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
@@ -53,9 +58,11 @@ import org.freeplane.core.resources.IFreeplanePropertyListener;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.components.JComboBoxWithBorder;
 import org.freeplane.core.ui.components.UITools;
+import org.freeplane.core.ui.image.BigBufferedImage;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.map.IMapLifeCycleListener;
 import org.freeplane.features.map.IMapSelection;
+import org.freeplane.features.map.IMapSelection.NodePosition;
 import org.freeplane.features.map.IMapSelectionListener;
 import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.MapModel;
@@ -285,7 +292,7 @@ public class MapViewController implements IMapViewManager , IMapViewChangeListen
 				return true;
 			}
 			else
-				return mapController.close(map);
+				return map.close();
 			
 		}
 		map.removeMapChangeListener(mapView);
@@ -325,18 +332,63 @@ public class MapViewController implements IMapViewManager , IMapViewChangeListen
 		}
 		view.preparePrinting();
 		final Rectangle innerBounds = view.getInnerBounds();
+		return createImage(dpi, innerBounds);
+	}
+
+	public RenderedImage createImage(final Dimension slideSize, NodeModel placedNode, NodePosition placedNodePosition, int dpi) {
+		final MapView view = getMapView();
+		if (view == null) {
+			return null;
+		}
+		final NodeView placedNodeView = view.getNodeView(placedNode);
+		if (placedNodeView == null) {
+			return createImage(dpi);
+		}
 
+		view.preparePrinting();
+		final JComponent content = placedNodeView.getContent();
+		Point contentLocation = new Point();
+		UITools.convertPointToAncestor(content, contentLocation, view);
+		final Rectangle printedGraphicsBounds = new Rectangle(contentLocation.x + content.getWidth() / 2 - slideSize.width / 2, 
+				contentLocation.y + content.getHeight() / 2 - slideSize.height
+				/ 2, slideSize.width, slideSize.height);
+		
+		final int distanceToMargin = (slideSize.width - content.getWidth()) / 2 - 10;
+		if(placedNodePosition == NodePosition.WEST){
+			printedGraphicsBounds.x += distanceToMargin;
+		}
+		if(placedNodePosition == NodePosition.EAST){
+			printedGraphicsBounds.x -= distanceToMargin;
+		}
+		return createImage(dpi, printedGraphicsBounds);
+	}
+
+	public RenderedImage createImage(int dpi, final Rectangle printedArea) {
+		final MapView view = getMapView();
+		view.preparePrinting();
+		final BufferedImage myImage = printToImage(dpi, view, printedArea);
+		view.endPrinting();
+		return myImage;
+	}
+
+	private BufferedImage printToImage(int dpi, final MapView view, final Rectangle innerBounds) {
 		double scaleFactor = (double) dpi / (double) (UITools.FONT_SCALE_FACTOR * 72);
 
 		int imageWidth = (int) Math.ceil(innerBounds.width * scaleFactor);
 		int imageHeight = (int) Math.ceil(innerBounds.height * scaleFactor);
 
-		final BufferedImage myImage = (BufferedImage) view.createImage(imageWidth, imageHeight);
+		final BufferedImage myImage = BigBufferedImage.create(imageWidth, imageHeight, BufferedImage.TYPE_INT_RGB);
 		final Graphics2D g = (Graphics2D) myImage.getGraphics();
+		Color background = view.getBackground();
+        if(background == null) {
+            background = SystemColor.window;
+        }
+
+		g.setBackground(background);
+		g.clearRect(0, 0, imageWidth, imageHeight);
 		g.scale(scaleFactor, scaleFactor);
 		g.translate(-innerBounds.x, -innerBounds.y);
 		view.print(g);
-		view.endPrinting();
 		return myImage;
 	}
 
@@ -375,6 +427,23 @@ public class MapViewController implements IMapViewManager , IMapViewChangeListen
 			return node.isFolded();
 		return nodeView.isFolded();
 	}
+	
+
+	@Override
+	public void displayOnCurrentView(NodeModel node) {
+		if(selectedMapView != null)
+			selectedMapView.display(node);
+	}
+	
+	public void setFoldedOnCurrentView(NodeModel node, boolean folded){
+		if(selectedMapView == null || ! node.hasChildren())
+			return;
+		final NodeView nodeView = selectedMapView.getNodeView(node);
+		if(nodeView == null)
+			return;
+		nodeView.setFolded(folded);
+		
+	}
 
 	/* (non-Javadoc)
 	 * @see org.freeplane.core.frame.IMapViewController#getFont(org.freeplane.core.model.NodeModel)
@@ -789,7 +858,8 @@ public class MapViewController implements IMapViewManager , IMapViewChangeListen
 		return zoomValue;
 	}
 
-	private static final String[] zooms = { "25%", "50%", "75%", "100%", "150%", "200%", "300%", "400%" };
+	private static final String[] zooms = { "25%", "50%", "75%", "100%", 
+			"150%", "200%", "300%", "400%", "600%", "800%", "1200%", "1600%" , "2400%", "3200%" };
 	public void obtainFocusForSelected() {
 		SwingUtilities.invokeLater(new Runnable() {
 			public void run() {
@@ -913,4 +983,76 @@ public class MapViewController implements IMapViewManager , IMapViewChangeListen
 		ResourceController.getResourceController().setProperty("antialiasAll", (antialiasAll ? "true" : "false"));
 	}
 
+	@Override
+	public void moveFocusFromDescendantToSelection(Component ancestor) {
+		Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
+		boolean toolbarLostFocus = focusOwner != null && SwingUtilities.isDescendingFrom(focusOwner, ancestor);
+		if (toolbarLostFocus) {
+			final Component selectedComponent = getSelectedComponent();
+			if (selectedComponent != null)
+				selectedComponent.requestFocus();
+		}
+	}
+
+	@Override
+	public boolean isChildHidden(NodeModel node) {
+		if(selectedMapView == null)
+			return false;
+		final NodeModel parentNode = node.getParentNode();
+		if(parentNode == null)
+			return false;
+		final NodeView nodeView = selectedMapView.getNodeView(parentNode);
+		if(nodeView == null)
+			return false;
+		return nodeView.isChildHidden(node);
+	}
+
+	@Override
+	public boolean hasHiddenChildren(NodeModel node) {
+		if(selectedMapView == null)
+			return false;
+		final NodeView nodeView = selectedMapView.getNodeView(node);
+		if(nodeView == null)
+			return false;
+		return nodeView.hasHiddenChildren();
+	}
+
+	@Override
+	public boolean unfoldHiddenChildren(NodeModel node) {
+		if(selectedMapView == null)
+			return false;
+		final NodeView nodeView = selectedMapView.getNodeView(node);
+		if(nodeView == null)
+			return false;
+		return nodeView.unfoldHiddenChildren();
+	}
+
+	@Override
+	public void hideChildren(NodeModel node) {
+		if(selectedMapView == null)
+			return; 
+		final NodeView nodeView = selectedMapView.getNodeView(node);
+		if(nodeView == null)
+			return; 
+		nodeView.hideChildren(node);
+	}
+
+	@Override
+	public boolean showHiddenNode(NodeModel node) {
+		if(selectedMapView == null)
+			return false;
+		final NodeModel parentNode = node.getParentNode();
+		if(parentNode == null)
+			return false;
+		final NodeView nodeView = selectedMapView.getNodeView(parentNode);
+		if(nodeView == null)
+			return false;
+		return nodeView.showHiddenNode(node);
+	}
+
+	@Override
+	public boolean isSpotlightEnabled() {
+		return selectedMapView != null && selectedMapView.isSpotlightEnabled();
+	}
+
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewScrollPane.java b/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewScrollPane.java
index 54f222e..f3352b4 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewScrollPane.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/MapViewScrollPane.java
@@ -25,7 +25,6 @@ import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-
 import javax.swing.JScrollPane;
 import javax.swing.JViewport;
 import javax.swing.KeyStroke;
@@ -65,6 +64,7 @@ public class MapViewScrollPane extends JScrollPane implements IFreeplaneProperty
 					putClientProperty(ViewController.SLOW_SCROLLING, null);
 					slowSetViewPosition(p, scrollingDelay);
 				} else {
+					stopTimer();
 					super.setViewPosition(p);
 					MapView view = (MapView)getView();
 					if (view != null) {
@@ -88,10 +88,7 @@ public class MapViewScrollPane extends JScrollPane implements IFreeplaneProperty
         }
 
 		private void slowSetViewPosition(final Point p, final int delay) {
-			if(timer != null) {
-				timer.stop();
-				timer = null;
-			}
+			stopTimer();
 			final Point viewPosition = getViewPosition();
 	        int dx = p.x - viewPosition.x;
 	        int dy = p.y - viewPosition.y;
@@ -111,9 +108,18 @@ public class MapViewScrollPane extends JScrollPane implements IFreeplaneProperty
 	        timer.start();
         }
 
+		private void stopTimer() {
+			if(timer != null) {
+				timer.stop();
+				timer = null;
+			}
+		}
+
 		private int calcScrollIncrement(int dx) {
 			int v = ResourceController.getResourceController().getIntProperty("scrolling_speed");
-			final int slowDX = (int) (v  / 5.0 *  Math.sqrt(Math.abs(dx)));
+			final int absDx = Math.abs(dx);
+			final double sqrtDx = Math.sqrt(absDx);
+			final int slowDX = (int) Math.max(absDx * sqrtDx / 20, 20 * sqrtDx) * v / 100;
 			if (Math.abs(dx) > 2 && slowDX < Math.abs(dx)) {
 	            dx = slowDX * Integer.signum(dx);
             }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/NarrowHexagonMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/NarrowHexagonMainView.java
index 5f52e47..5578c4c 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/NarrowHexagonMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/NarrowHexagonMainView.java
@@ -55,7 +55,7 @@ class NarrowHexagonMainView extends VariableInsetsMainView {
 		}
 		if(getShapeConfiguration().isUniform()){
 			final Dimension prefSize = getPreferredRectangleSizeWithoutMargin(getMaximumWidth());
-			double width = (int) Math.ceil(prefSize.width + getZoom() * getMinimumHorizontalInset());
+			double width = Math.ceil(prefSize.width + getMinimumHorizontalInset());
 			width = limitWidth(width);
 			prefSize.width = (int) width;
 			prefSize.height = (int) (width * UNIFORM_HEIGHT_TO_WIDTH_RELATION);
@@ -71,21 +71,20 @@ class NarrowHexagonMainView extends VariableInsetsMainView {
 		Polygon polygon = getPaintedShape();
 		g.draw(polygon);
 	}
-
+	
 	protected Polygon getPaintedShape() {
-		final Polygon polygon;
+		double[] xCoords;
+		double[] yCoords;
 		if(getShapeConfiguration().isUniform()){
-			int[] xCoords = new int[]{getWidth() / 2, 0,  0,  getWidth() / 2, getWidth() - 1, getWidth() - 1};
-			int[] yCoords = new int[]{0,   getHeight()/4, 3 * getHeight() /4 , getHeight() - 1,      3 * getHeight() / 4, getHeight() / 4};
-			polygon = new Polygon(xCoords, yCoords, xCoords.length);
+			xCoords = new double[]{1/2f, 0,  0,  1/2f, 1, 1};
+			yCoords = new double[]{0, 1/4f, 3/4f , 1, 3/4f, 1/4f};
 		}
 		else {
-			final int zoomedVerticalInset = (int) (getHeight() * (1 - 1 / getVerticalMarginFactor() ) / 2);
-			int[] xCoords = new int[]{0,                        getWidth()/2, getWidth() -1,            getWidth() - 1,                             getWidth()/2,   0};
-			int[] yCoords = new int[]{zoomedVerticalInset, 0,            zoomedVerticalInset, getHeight() - zoomedVerticalInset - 1, getHeight() - 1,getHeight() - zoomedVerticalInset - 1};
-			polygon = new Polygon(xCoords, yCoords, xCoords.length);
+			final double zoomedVerticalInset = (1 - 1 / getVerticalMarginFactor() ) / 2;
+			xCoords = new double[]{0, 1/2f, 1, 1, 1/2f, 0};
+			yCoords = new double[]{zoomedVerticalInset, 0, zoomedVerticalInset, 1-zoomedVerticalInset, 1, 1-zoomedVerticalInset};
 		}
-		return polygon;
+		return polygonOf(xCoords, yCoords);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/NodeTooltip.java b/freeplane/src/main/java/org/freeplane/view/swing/map/NodeTooltip.java
index cc3a7c5..733c1fd 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/NodeTooltip.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/NodeTooltip.java
@@ -16,6 +16,7 @@ import java.security.AccessControlException;
 import javax.swing.JEditorPane;
 import javax.swing.JScrollPane;
 import javax.swing.JToolTip;
+import javax.swing.SwingUtilities;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
@@ -27,8 +28,8 @@ import org.freeplane.core.ui.components.html.SynchronousScaledEditorKit;
 import org.freeplane.core.util.Compat;
 import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.link.LinkController;
 import org.freeplane.features.mode.Controller;
-import org.freeplane.features.url.UrlManager;
 
 @SuppressWarnings("serial")
 public class NodeTooltip extends JToolTip {
@@ -55,7 +56,8 @@ public class NodeTooltip extends JToolTip {
 	    		final String linkURL = HtmlUtils.getURLOfExistingLink((HTMLDocument) tip.getDocument(), tip.viewToModel(ev.getPoint()));
 	    		if (linkURL != null) {
 	    			try {
-	    				UrlManager.getController().loadURL(new URI(linkURL));
+	    				NodeView nodeView = (NodeView) SwingUtilities.getAncestorOfClass(NodeView.class, getComponent());
+	    				LinkController.getController().loadURI(nodeView.getModel(), new URI(linkURL));
 	    			} catch (Exception e) {
 	    				LogUtils.warn(e);
 	    			}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/NodeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/NodeView.java
index e1baaa5..f8585b7 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/NodeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/NodeView.java
@@ -36,8 +36,11 @@ import java.awt.dnd.DropTarget;
 import java.awt.dnd.DropTargetListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
+import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.ListIterator;
+import java.util.Set;
 
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
@@ -47,6 +50,7 @@ import org.freeplane.core.ui.IUserInputListenerFactory;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.ObjectRule;
+import org.freeplane.features.DashVariant;
 import org.freeplane.features.attribute.AttributeController;
 import org.freeplane.features.attribute.NodeAttributeTableModel;
 import org.freeplane.features.cloud.CloudController;
@@ -54,14 +58,15 @@ import org.freeplane.features.cloud.CloudModel;
 import org.freeplane.features.edge.EdgeController;
 import org.freeplane.features.edge.EdgeController.Rules;
 import org.freeplane.features.edge.EdgeStyle;
-import org.freeplane.features.filter.FilterController;
+import org.freeplane.features.highlight.HighlightController;
+import org.freeplane.features.highlight.NodeHighlighter;
 import org.freeplane.features.icon.HierarchicalIcons;
 import org.freeplane.features.map.EncryptionModel;
 import org.freeplane.features.map.FreeNode;
-import org.freeplane.features.map.HideChildSubtree;
 import org.freeplane.features.map.HistoryInformationModel;
 import org.freeplane.features.map.INodeView;
 import org.freeplane.features.map.MapChangeEvent;
+import org.freeplane.features.map.MapModel;
 import org.freeplane.features.map.NodeChangeEvent;
 import org.freeplane.features.map.NodeDeletionEvent;
 import org.freeplane.features.map.NodeModel;
@@ -76,7 +81,6 @@ import org.freeplane.features.nodestyle.NodeStyleController;
 import org.freeplane.features.nodestyle.NodeStyleModel;
 import org.freeplane.features.nodestyle.NodeStyleModel.Shape;
 import org.freeplane.features.nodestyle.ShapeConfigurationModel;
-import org.freeplane.features.styles.AutomaticLayoutController;
 import org.freeplane.features.styles.MapViewLayout;
 import org.freeplane.features.text.TextController;
 import org.freeplane.view.swing.map.attribute.AttributeView;
@@ -91,6 +95,7 @@ import org.freeplane.view.swing.map.edge.EdgeViewFactory;
  * TreeCellRenderer).
  */
 public class NodeView extends JComponent implements INodeView {
+	private static final int HIGHLIGHTED_NODE_ARC_MARGIN = 4;
 	final static int ALIGN_BOTTOM = -1;
 	final static int ALIGN_CENTER = 0;
 	final static int ALIGN_TOP = 1;
@@ -129,6 +134,7 @@ public class NodeView extends JComponent implements INodeView {
 	private int topOverlap;
 	private int bottomOverlap;
 	private boolean isFolded;
+	private DashVariant edgeDash = DashVariant.DEFAULT;
 	
 	public static final int DETAIL_VIEWER_POSITION = 2;
 
@@ -788,9 +794,11 @@ public class NodeView extends JComponent implements INodeView {
 	}
 
 	void addChildViews() {
+		if(isFolded)
+			return;
 		int index = 0;
-		for (NodeModel child : getMap().getModeController().getMapController().childrenFolded(getModel())) {
-			if(child.containsExtension(HideChildSubtree.class))
+		for (NodeModel child : getMap().getModeController().getMapController().childrenUnfolded(getModel())) {
+			if(isChildHidden(child))
 				return;
 			if(getComponentCount() <= index
 					|| ! (getComponent(index) instanceof NodeView))
@@ -865,17 +873,11 @@ public class NodeView extends JComponent implements INodeView {
 			return;
 		}
 		final Object property = event.getProperty();
-		if (property == NodeChangeType.FOLDING || property == HideChildSubtree.instance || property == EncryptionModel.class) {
+		if (property == NodeChangeType.FOLDING || property == Properties.HIDDEN_CHILDREN || property == EncryptionModel.class) {
 			if(map.isSelected() || property == EncryptionModel.class && ! isFolded){
-				boolean wasFolded = isFolded;
-				isFolded = getMap().getModeController().getMapController().isFolded(model);
-				if(wasFolded != isFolded || property == HideChildSubtree.instance) {
-					treeStructureChanged();
-					getMap().selectIfSelectionIsEmpty(this);
-					Shape shape = NodeStyleController.getController(getMap().getModeController()).getShape(model);
-					if (shape.equals(NodeStyleModel.Shape.combined))
-						update();
-				}
+				boolean folded = getMap().getModeController().getMapController().isFolded(model);
+				boolean force = property ==Properties.HIDDEN_CHILDREN;
+				setFolded(folded, force);
 			}
 			if(property != EncryptionModel.class)
 				return;
@@ -889,6 +891,12 @@ public class NodeView extends JComponent implements INodeView {
 			revalidate();
 			return;
 		}
+		if (property.equals(NodeModel.NODE_ICON_SIZE))
+		{
+			mainView.updateIcons(this);
+			revalidate();
+			return;
+		}
 
 		if (property.equals(HistoryInformationModel.class)) {
 			return;
@@ -898,6 +906,23 @@ public class NodeView extends JComponent implements INodeView {
 			getParentView().numberingChanged(node.getParentNode().getIndex(node) + 1);
 	}
 
+	public void setFolded(boolean folded) {
+		setFolded(folded, false);
+		revalidate();
+	}
+	
+	private void setFolded(boolean folded, boolean force) {
+		boolean wasFolded = isFolded;
+		this.isFolded = folded;
+		if(wasFolded != isFolded || force) {
+			treeStructureChanged();
+			getMap().selectIfSelectionIsEmpty(this);
+			Shape shape = NodeStyleController.getController(getMap().getModeController()).getShape(model);
+			if (shape.equals(NodeStyleModel.Shape.combined))
+				update();
+		}
+	}
+
 	public void onNodeDeleted(NodeDeletionEvent nodeDeletionEvent) {
 		if (nodeDeletionEvent.index >= getComponentCount() - 1) {
 			return;
@@ -1141,23 +1166,30 @@ public class NodeView extends JComponent implements INodeView {
 		g.translate(origin.x, origin.y);
 		mainView.paintDecoration(this, g);
 		g.translate(-origin.x, -origin.y);
-		final FilterController filterController = FilterController.getController(getMap().getModeController().getController());
-		if(filterController.isNodeHighlighted(getModel())){
-			final Color oldColor = g.getColor();
-			final Stroke oldStroke = g.getStroke();
-			g.setColor(Color.MAGENTA);
-			g.setStroke(getMap().getStandardSelectionStroke());
-			final JComponent content = getContent();
-			Point contentLocation = content.getLocation();
-			final int arcWidth = 8;
-			g.drawRoundRect(contentLocation.x - arcWidth, contentLocation.y - arcWidth, content.getWidth() + 2 * arcWidth,
-			    content.getHeight() + 2 * arcWidth, 15, 15);
-			g.setColor(oldColor);
-			g.setStroke(oldStroke);
+		final HighlightController highlightController = getMap().getModeController().getController().getExtension(HighlightController.class);
+		final List<NodeHighlighter> highlighters = highlightController.getHighlighters(model, map.isPrinting());
+		int margin = HIGHLIGHTED_NODE_ARC_MARGIN;
+		for(NodeHighlighter highlighter : highlighters){
+			margin += HIGHLIGHTED_NODE_ARC_MARGIN;
+			highlightNode(g, highlighter, margin);
 		}
 		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, renderingHint);
 	}
 
+	public void highlightNode(final Graphics2D g, NodeHighlighter highlighter, final int arcMargin) {
+		final Color oldColor = g.getColor();
+		final Stroke oldStroke = g.getStroke();
+		g.setStroke(NodeHighlighter.DEFAULT_STROKE);
+		highlighter.configure(g, map.isPrinting());
+		final JComponent content = getContent();
+		Point contentLocation = content.getLocation();
+		final int arcWidth = 15;
+		g.drawRoundRect(contentLocation.x - arcMargin, contentLocation.y - arcMargin, content.getWidth() + 2 * arcMargin,
+		    content.getHeight() + 2 * arcMargin, arcWidth, arcWidth);
+		g.setColor(oldColor);
+		g.setStroke(oldStroke);
+	}
+
 	/**
 	 * This is a bit problematic, because getChildrenViews() only works if model
 	 * is not yet removed. (So do not _really_ delete the model before the view
@@ -1354,7 +1386,8 @@ public class NodeView extends JComponent implements INodeView {
 		mainView.setVisible(true);
 		mainView.updateTextColor(this);
 		mainView.updateFont(this);
-		mainView.updateTextAlign(this);
+		mainView.updateHorizontalTextAlignment(this);
+		mainView.updateBorder(this);
         MapView map = getMap();
 		final ModeController modeController = map.getModeController();
         final NodeStyleController nsc = NodeStyleController.getController(modeController);
@@ -1403,8 +1436,8 @@ public class NodeView extends JComponent implements INodeView {
         final EdgeController edgeController = EdgeController.getController(getMap().getModeController());
 		this.edgeStyle = edgeController.getStyle(model, false);
 		final NodeModel realNode = SummaryNode.getRealNode(model);
-		final Integer newWidth = edgeController.getWidth(realNode, false);
-		this.edgeWidth = newWidth;
+		this.edgeWidth = edgeController.getWidth(realNode, false);
+		this.edgeDash = edgeController.getDash(realNode, false);
 		final ObjectRule<Color, Rules> newColor = edgeController.getColorRule(realNode);
 		this.edgeColor = newColor;
 		final NodeModel parentNode = model.getParentNode();
@@ -1421,6 +1454,15 @@ public class NodeView extends JComponent implements INodeView {
 		return EdgeStyle.values()[0];
     }
 
+	public DashVariant getEdgeDash() {
+		if(edgeDash != null)
+		    return edgeDash;
+		final NodeView parentView = getParentView();
+		if(parentView != null)
+			return parentView.getEdgeDash();
+		return DashVariant.DEFAULT;
+    }
+	
 	public int getEdgeWidth() {
 		if(edgeWidth != null)
 		    return edgeWidth;
@@ -1447,11 +1489,11 @@ public class NodeView extends JComponent implements INodeView {
 				index = parentNode.getIndex(model) + 1;
 			else
 				index = model.getNodeLevel(false) + (model.isHiddenSummary() ? 1 : 0);
-			ModeController modeController = getMap().getModeController();
-			AutomaticLayoutController automaticLayoutController = modeController.getExtension(AutomaticLayoutController.class);
-			NodeModel styleNode = automaticLayoutController.getStyleNode(map.getModel(), index, true);
-			if(styleNode != null){
-				Color color = modeController.getExtension(EdgeController.class).getColor(styleNode);
+			final MapModel mapModel = map.getModel();
+			ModeController modeController = map.getModeController();
+			EdgeController edgeController = modeController.getExtension(EdgeController.class);
+			if(edgeController.areEdgeColorsAvailable(mapModel)){
+				Color color = edgeController.getEdgeColor(mapModel, index);
 				edgeColor.setCache(color);
 				return color;
 			}
@@ -1624,6 +1666,37 @@ public class NodeView extends JComponent implements INodeView {
 	boolean isHierarchyVisible() {
 		return getHeight() > 2 * getSpaceAround();
 	}
+	public enum Properties{HIDDEN_CHILDREN};
+	
+	boolean isChildHidden(NodeModel node) {
+		@SuppressWarnings("unchecked")
+		final Set<NodeModel> hiddenChildren = (Set<NodeModel>) getClientProperty(Properties.HIDDEN_CHILDREN);
+		return hiddenChildren != null && hiddenChildren.contains(node);
+	}
+
+	boolean hasHiddenChildren() {
+		@SuppressWarnings("unchecked")
+		final Set<NodeModel> hiddenChildren = (Set<NodeModel>) getClientProperty(Properties.HIDDEN_CHILDREN);
+		return hiddenChildren != null && ! hiddenChildren.isEmpty();
+	}
+
+	boolean unfoldHiddenChildren() {
+		final boolean hasHiddenChildren = hasHiddenChildren();
+		putClientProperty(Properties.HIDDEN_CHILDREN, null);
+		return hasHiddenChildren;
+	}
+
+	public void hideChildren(NodeModel node) {
+		final HashSet<NodeModel> set = new HashSet<>();
+		set.addAll(node.getChildren());
+		putClientProperty(Properties.HIDDEN_CHILDREN, set);
+	}
+
+	public boolean showHiddenNode(NodeModel node) {
+		@SuppressWarnings("unchecked")
+		final Set<NodeModel> hiddenChildren = (Set<NodeModel>) getClientProperty(Properties.HIDDEN_CHILDREN);
+		return hiddenChildren != null && hiddenChildren.remove(node);
+	}
 
 	
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/NodeViewFactory.java b/freeplane/src/main/java/org/freeplane/view/swing/map/NodeViewFactory.java
index 3d5e64e..27c8bff 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/NodeViewFactory.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/NodeViewFactory.java
@@ -19,18 +19,11 @@
  */
 package org.freeplane.view.swing.map;
 
-import java.awt.Color;
-import java.awt.Component;
 import java.awt.Container;
-import java.awt.Graphics;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
-import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.SwingUtilities;
-
-import org.freeplane.core.ui.ColoredIconCreator;
 import org.freeplane.core.ui.IMouseListener;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.ModeController;
@@ -167,7 +160,6 @@ class NodeViewFactory {
         newView.addChildViews();
 	}
 
-	private final Icon coloredIcon = createColoredIcon();
 	private static final IMouseListener DETAILS_MOUSE_LISTENER = new DetailsViewMouseListener();
 	private static final IMouseListener NOTE_MOUSE_LISTENER = new NoteViewMouseListener();
 
@@ -175,32 +167,11 @@ class NodeViewFactory {
 		final ZoomableLabel label = new ZoomableLabel();
 		label.addMouseListener(NOTE_MOUSE_LISTENER);
 		label.addMouseMotionListener(NOTE_MOUSE_LISTENER);
-		label.setIcon(coloredIcon);
+		label.setIcon(NoteController.bwNoteIcon);
 		label.setVerticalTextPosition(JLabel.TOP);
 		return label;
 	}
 	
-	static ColoredIconCreator coloredIconCreator = new ColoredIconCreator(NoteController.bwNoteIconUrl,  Color.BLACK);
-
-	private Icon createColoredIcon() {
-		return new Icon() {
-			public void paintIcon(Component c, Graphics g, int x, int y) {
-				NodeView nodeView = (NodeView) SwingUtilities.getAncestorOfClass(NodeView.class, c);
-				if(nodeView == null)
-					return;
-				final Color iconColor =  nodeView.getEdgeColor();
-				coloredIconCreator.createColoredIcon(iconColor).paintIcon(c, g, x, y);
-			}
-
-			public int getIconWidth() {
-				return coloredIconCreator.createColoredIcon(Color.BLACK).getIconWidth();
-			}
-
-			public int getIconHeight() {
-				return coloredIconCreator.createColoredIcon(Color.BLACK).getIconHeight();
-			}
-		};
-    }
 
 	
 	void updateNoteViewer(NodeView nodeView, int minNodeWidth, int maxNodeWidth) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/OvalMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/OvalMainView.java
index 41bf694..689f38f 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/OvalMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/OvalMainView.java
@@ -47,7 +47,8 @@ class OvalMainView extends VariableInsetsMainView {
 
 	@Override
 	protected void paintNodeShape(final Graphics2D g) {
-		g.drawOval(0, 0, getWidth() - 1, getHeight() - 1);
+		final int zoomedEdgeWidth = (int) getPaintedBorderWidth();
+		g.drawOval(zoomedEdgeWidth / 2, zoomedEdgeWidth / 2, getWidth() - zoomedEdgeWidth, getHeight() - zoomedEdgeWidth);
 	}
 
 	@Override
@@ -70,8 +71,8 @@ class OvalMainView extends VariableInsetsMainView {
 		}
 		if(getShapeConfiguration().isUniform()){
 			final Dimension prefSize = getPreferredRectangleSizeWithoutMargin(getMaximumWidth());
-			double w = prefSize.width + getZoom() * getMinimumHorizontalInset();
-			double h = prefSize.height + getZoom() * getMinimumVerticalInset();
+			double w = prefSize.width + getMinimumHorizontalInset();
+			double h = prefSize.height + getMinimumVerticalInset();
 			int diameter = (int)(Math.ceil(Math.sqrt(w * w + h * h)));
 			prefSize.width = prefSize.height = limitWidth(diameter);
 			return prefSize;
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/RectangleMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/RectangleMainView.java
index 0873a05..61202e6 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/RectangleMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/RectangleMainView.java
@@ -35,7 +35,8 @@ class RectangleMainView extends ShapedMainView {
 
 	@Override
 	protected void paintNodeShape(final Graphics2D g) {
-		g.drawRect(0, 0, getWidth() - 1, getHeight() - 1);
+		final int zoomedEdgeWidth = (int) getPaintedBorderWidth();
+		g.drawRect(zoomedEdgeWidth / 2, zoomedEdgeWidth / 2, getWidth() - zoomedEdgeWidth, getHeight() - zoomedEdgeWidth);
 	}
 
 	@Override
@@ -50,9 +51,10 @@ class RectangleMainView extends ShapedMainView {
 	}
 
 	public Insets getInsets(){
+		int edgeWidthInset = (int) (getUnzoomedBorderWidth() - 1);
     	final ShapeConfigurationModel shapeConfiguration = getShapeConfiguration();
-    	int horizontalMargin = shapeConfiguration.getHorizontalMargin().toBaseUnitsRounded();
-    	int verticalMargin = shapeConfiguration.getVerticalMargin().toBaseUnitsRounded();
+    	int horizontalMargin = shapeConfiguration.getHorizontalMargin().toBaseUnitsRounded() + edgeWidthInset;
+    	int verticalMargin = shapeConfiguration.getVerticalMargin().toBaseUnitsRounded() + edgeWidthInset;
     	return new Insets(verticalMargin, horizontalMargin, verticalMargin, horizontalMargin);
     }
     
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ShapedMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ShapedMainView.java
index 1a7fac8..46e93f9 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ShapedMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ShapedMainView.java
@@ -1,11 +1,14 @@
 package org.freeplane.view.swing.map;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.RenderingHints;
+import java.awt.Stroke;
 
+import org.freeplane.core.ui.components.UITools;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.nodestyle.ShapeConfigurationModel;
 
@@ -49,11 +52,15 @@ abstract public class ShapedMainView extends MainView {
 		final Object renderingHint = modeController.getController().getMapViewManager().setEdgesRenderingHint(g);
 		paintBackgound(g);
 		paintDragOver(g);
-		final Color edgeColor = nodeView.getEdgeColor();
-		g.setColor(edgeColor);
-		g.setStroke(MainView.DEF_STROKE);
+		final Color borderColor = getBorderColor();
+		final Color oldColor = g.getColor();
+		g.setColor(borderColor);
+		final Stroke oldStroke = g.getStroke();
+		g.setStroke(UITools.createStroke(getPaintedBorderWidth(), getDash().variant, BasicStroke.JOIN_MITER));
 		paintNodeShape(g);
 		g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, renderingHint);
+		g.setColor(oldColor);
+		g.setStroke(oldStroke);
 		super.paintComponent(g);
 	}
 	
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/VariableInsetsMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/VariableInsetsMainView.java
index 9f28e13..19fab16 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/VariableInsetsMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/VariableInsetsMainView.java
@@ -21,17 +21,18 @@ package org.freeplane.view.swing.map;
 
 import java.awt.Dimension;
 import java.awt.Insets;
+import java.awt.Polygon;
 
 import org.freeplane.features.nodestyle.ShapeConfigurationModel;
 
 abstract class VariableInsetsMainView extends ShapedMainView {
 	private static final long serialVersionUID = 1L;
-	private int zoomedVerticalInset;
-	private int zoomedHorizontalInset;
+	private double zoomedVerticalInset;
+	private double zoomedHorizontalInset;
 	
 	public VariableInsetsMainView(ShapeConfigurationModel shapeConfiguration) {
 		super(shapeConfiguration);
-        zoomedVerticalInset = zoomedHorizontalInset = getMinimumHorizontalInset();
+        zoomedVerticalInset = zoomedHorizontalInset = 0;
 	}
 	
 	protected boolean areInsetsFixed() {
@@ -45,9 +46,9 @@ abstract class VariableInsetsMainView extends ShapedMainView {
 			return super.getPreferredSize();
 		}
 		final Dimension prefSize = getPreferredRectangleSizeWithoutMargin(getMaximumWidth());
-		final double widthWithMargin = Math.max(prefSize.width*getHorizontalMarginFactor(), prefSize.width + getZoom() * getMinimumHorizontalInset());
+		final double widthWithMargin = Math.max(prefSize.width*getHorizontalMarginFactor(), prefSize.width + getMinimumHorizontalInset());
 		prefSize.width =  limitWidth((int) Math.ceil(widthWithMargin));
-		prefSize.height = (int) Math.ceil(Math.max(prefSize.height *getVerticalMarginFactor(), prefSize.height + getZoom() * getMinimumVerticalInset()));
+		prefSize.height = (int) Math.ceil(Math.max(prefSize.height *getVerticalMarginFactor(), prefSize.height + getMinimumVerticalInset()));
 		return prefSize;
 	}
 	
@@ -55,21 +56,20 @@ abstract class VariableInsetsMainView extends ShapedMainView {
 	
 	abstract protected double getHorizontalMarginFactor();
 	
-	protected int getMinimumHorizontalInset(){
-		return getShapeConfiguration().getHorizontalMargin().toBaseUnitsRounded();
+	protected double getMinimumHorizontalInset(){
+		return getShapeConfiguration().getHorizontalMargin().toBaseUnits() * getZoom() + getPaintedBorderWidth() - 1;
 	}
 
-	protected int getMinimumVerticalInset(){
-		return getShapeConfiguration().getVerticalMargin().toBaseUnitsRounded();
+	protected double getMinimumVerticalInset(){
+		return getShapeConfiguration().getVerticalMargin().toBaseUnits() * getZoom()+ getPaintedBorderWidth() - 1;
 	}
 
 	protected Dimension getPreferredRectangleSizeWithoutMargin(int maximumWidth) {
 		int scaledMaximumWidth = maximumWidth != Integer.MAX_VALUE ? (int)(maximumWidth / getHorizontalMarginFactor()) : maximumWidth;
-		final int zoomedHorizontalInsetBackup = zoomedHorizontalInset;
-		final int zoomedVerticalInsetBackup = zoomedVerticalInset;
-		final float zoom = getZoom();
-		zoomedHorizontalInset  = (int) (zoom * getMinimumHorizontalInset());
-		zoomedVerticalInset =  (int) (zoom * getMinimumVerticalInset());
+		final double zoomedHorizontalInsetBackup = zoomedHorizontalInset;
+		final double zoomedVerticalInsetBackup = zoomedVerticalInset;
+		zoomedHorizontalInset  = getMinimumHorizontalInset();
+		zoomedVerticalInset =  getMinimumVerticalInset();
 		final int oldMinimumWidth = getMinimumWidth();
 		final int oldMaximumWidth = getMaximumWidth();
 		final Dimension prefSize;
@@ -91,19 +91,11 @@ abstract class VariableInsetsMainView extends ShapedMainView {
 
 	@Override
 	public Insets getZoomedInsets() {
-		int topInset = getZoomedVerticalInset();
-		int leftInset = getZoomedHorizontalInset();
+		int topInset = (int)zoomedVerticalInset;
+		int leftInset = (int)zoomedHorizontalInset;
 		return new Insets(topInset, leftInset, topInset, leftInset);
 	}
 
-	protected int getZoomedVerticalInset() {
-		return zoomedVerticalInset;
-	}
-
-	protected int getZoomedHorizontalInset() {
-		return zoomedHorizontalInset;
-	}
-
 	@Override
 	public void setBounds(int x, int y, int width, int height) {
 		final int oldMinimumWidth = getMinimumWidth();
@@ -133,4 +125,19 @@ abstract class VariableInsetsMainView extends ShapedMainView {
 	public Insets getInsets(Insets insets) {
 		return getInsets();
 	}
+
+	protected int[] toInt(double[] relation, int offset, final int size) {
+		final int[] y = new int[relation.length];
+		for(int i = 0; i < relation.length; i++) {
+			double relation1 = relation[i];
+			y[i] = offset + (int)(size * relation1);
+		}
+		return y;
+	}
+
+	protected Polygon polygonOf(double[] xCoords, double[] yCoords) {
+		int edgeWidthOffset = (int) getPaintedBorderWidth();
+		final Polygon polygon = new Polygon(toInt(xCoords, edgeWidthOffset/2, getWidth() - edgeWidthOffset), toInt(yCoords, edgeWidthOffset/2, getHeight() - edgeWidthOffset), xCoords.length);
+		return polygon;
+	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java b/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java
index 3287c33..8c465c9 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/VerticalNodeViewLayoutStrategy.java
@@ -28,6 +28,7 @@ import javax.swing.JComponent;
 
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.map.SummaryLevels;
 import org.freeplane.features.nodelocation.LocationModel;
 
@@ -88,7 +89,8 @@ class VerticalNodeViewLayoutStrategy {
 		}
 	}
 	public void calculateLayoutData() {
-		viewLevels = new SummaryLevels(view.getModel());
+		final NodeModel node = view.getModel();
+		viewLevels = view.isFolded() ? SummaryLevels.ignoringChildNodes(node) : SummaryLevels.of(node);
 		for(boolean isLeft : viewLevels.sides)
 			calculateLayoutData(isLeft);
 		applyLayoutToChildComponents();
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/WideHexagonMainView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/WideHexagonMainView.java
index 10d6044..900fed2 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/WideHexagonMainView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/WideHexagonMainView.java
@@ -54,8 +54,8 @@ class WideHexagonMainView extends VariableInsetsMainView {
 		}
 		if(getShapeConfiguration().isUniform()) {
 			final Dimension prefSize = getPreferredRectangleSizeWithoutMargin(getMaximumWidth());
-			double w = prefSize.width + getZoom() * getMinimumHorizontalInset();
-			double h = prefSize.height + getZoom() * getMinimumVerticalInset();
+			double w = prefSize.width + getMinimumHorizontalInset();
+			double h = prefSize.height + getMinimumVerticalInset();
 			double diameter = Math.sqrt(w * w + h * h);
 			double width = limitWidth (diameter/ UNIFORM_HEIGHT_TO_WIDTH_RELATION);
 			prefSize.width = (int) Math.ceil(width);
@@ -72,21 +72,20 @@ class WideHexagonMainView extends VariableInsetsMainView {
 		Polygon polygon = getPaintedShape();
 		g.draw(polygon);
 	}
-
+	
 	protected Polygon getPaintedShape() {
-		final Polygon polygon;
-		if(getShapeConfiguration().isUniform()) {
-			int[] xCoords = new int[]{0,   getWidth()/4, 3 * getWidth() /4 , getWidth(),      3 * getWidth() / 4, getWidth() / 4};
-			int[] yCoords = new int[]{getHeight() / 2, 0,  0,  getHeight() / 2, getHeight() - 1, getHeight() - 1};
-			polygon = new Polygon(xCoords, yCoords, xCoords.length);
+		double[] xCoords;
+		double[] yCoords;
+		if(getShapeConfiguration().isUniform()){
+			xCoords = new double[]{0, 1/4f, 3/4f , 1, 3/4f, 1/4f};
+			yCoords = new double[]{1/2f, 0,  0,  1/2f, 1, 1};
 		}
 		else {
-			final int zoomedHorizontalInset = (int) (getWidth() * (1 - 1 / getHorizontalMarginFactor()) / 2);
-			int[] xCoords = new int[]{0,               zoomedHorizontalInset, getWidth() - zoomedHorizontalInset - 1, getWidth(),      getWidth() - zoomedHorizontalInset - 1, zoomedHorizontalInset};
-			int[] yCoords = new int[]{getHeight() / 2, 0,                     0,                                      getHeight() / 2, getHeight() - 1,                        getHeight() - 1};
-			polygon = new Polygon(xCoords, yCoords, xCoords.length);
+			final double zoomedHorizontalInset = (1 - 1 / getHorizontalMarginFactor() ) / 2;
+			xCoords = new double[]{0, zoomedHorizontalInset, 1-zoomedHorizontalInset, 1, 1-zoomedHorizontalInset, zoomedHorizontalInset};
+			yCoords = new double[]{1/2f, 0, 0, 1/2f, 1, 1};
 		}
-		return polygon;
+		return polygonOf(xCoords, yCoords);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabelUI.java b/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabelUI.java
index f997d72..5a32e2e 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabelUI.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/ZoomableLabelUI.java
@@ -441,8 +441,6 @@ public class ZoomableLabelUI extends BasicLabelUI {
 	
 	private void layout(ZoomableLabel label) {
 		String text = label.getText();
-		if(text == null || text.equals(""))
-			text = "!";
 		Icon icon = (label.isEnabled()) ? label.getIcon() :
 			label.getDisabledIcon();
 		boolean wasPainting = isPainting;
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java
index 8341524..8400258 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTable.java
@@ -21,6 +21,7 @@ package org.freeplane.view.swing.map.attribute;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Font;
@@ -55,6 +56,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.TableModelEvent;
@@ -111,6 +113,9 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
 				int row, int column) {
 			final Component c = delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+			final Container mapView = SwingUtilities.getAncestorOfClass(MapView.class, table);
+			if(mapView != null)
+				c.setBackground(mapView.getBackground());
 			final int height = (int) (((AttributeTable)table).getZoom() * 6);
 			final Dimension preferredSize = new Dimension(1, height);
 			c.setPreferredSize(preferredSize);
@@ -138,7 +143,7 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 			.getModel();
 			for (int col = 0; col < table.getColumnCount(); col++) {
 				final int modelColumnWidth = model.getColumnWidth(col).toBaseUnitsRounded();
-				final int currentColumnWidth = (int) (table.getColumnModel().getColumn(col).getWidth() / zoom);
+				final int currentColumnWidth = Math.round(table.getColumnModel().getColumn(col).getWidth() / zoom);
 				if (modelColumnWidth != currentColumnWidth) {
 					model.setColumnWidth(col, LengthUnits.pixelsInPt(currentColumnWidth));
 				}
@@ -263,8 +268,9 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		getTableHeader().setReorderingAllowed(false);
 		setRowSelectionAllowed(false);
 		putClientProperty("JTable.autoStartsEdit", Boolean.FALSE);
+		setShowGrid(true);
 	}
-
+	
 	@Override
 	protected JTableHeader createDefaultTableHeader() {
 		return new TableHeader(columnModel);
@@ -593,9 +599,9 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		}
 		final DefaultComboBoxModel currentModel = new DefaultComboBoxModel(items);
 		comboBox.setModel(currentModel);
-		updateComponentColors(comboBox);
+		updateComponentFontAndColors(comboBox);
 		final JComponent editorComponent = (JComponent) comboBox.getEditor().getEditorComponent();
-		updateComponentColors(editorComponent);
+		updateComponentFontAndColors(editorComponent);
 		editorComponent.setOpaque(true);
 		final Font font = editorComponent.getFont();
 		editorComponent.setFont(font.deriveFont(font.getSize2D() * getZoom()));
@@ -722,14 +728,17 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		Component comp = null;
 		int cellWidth = 0;
 		int maxCellWidth = 2 * (int) (Math.ceil(getFont().getSize2D() / UITools.FONT_SCALE_FACTOR +  AttributeTable.TABLE_ROW_HEIGHT));
-		for (int col = 0; col < 2; col++) {
-			for (int row = 0; row < getRowCount(); row++) {
-				comp = AttributeTable.dtcr.getTableCellRendererComponent(this, getValueAt(row, col), false, false, row,
-				    col);
-				cellWidth = comp.getPreferredSize().width;
-				maxCellWidth = Math.max(cellWidth, maxCellWidth);
+		int rowCount = getRowCount();
+		if(rowCount > 0) {
+			for (int col = 0; col < 2; col++) {
+				for (int row = 0; row < rowCount; row++) {
+					comp = AttributeTable.dtcr.getTableCellRendererComponent(this, getValueAt(row, col), false, false, row,
+							col);
+					cellWidth = comp.getPreferredSize().width;
+					maxCellWidth = Math.max(cellWidth, maxCellWidth);
+				}
+				getAttributeTableModel().setColumnWidth(col, LengthUnits.pixelsInPt(maxCellWidth + 1));
 			}
-			getAttributeTableModel().setColumnWidth(col, LengthUnits.pixelsInPt(maxCellWidth + 1));
 		}
 	}
 
@@ -778,7 +787,7 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 	}
 
 	void updateAttributeTable() {
-		updateComponentColors(this);
+		updateComponentFontAndColors(this);
 		updateGridColor();
 		updateRowHeights();
 		updateColumnWidths();
@@ -806,7 +815,9 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		if(gridColor != null) {
 			if(! gridColor.equals(getGridColor())) {
 				AttributeViewScrollPane scrollPane = (AttributeViewScrollPane) SwingUtilities.getAncestorOfClass(AttributeViewScrollPane.class, this);
-				scrollPane.setBorder(BorderFactory.createLineBorder(gridColor));
+				final Border border = BorderFactory.createLineBorder(gridColor);
+				scrollPane.setBorder(border);
+				scrollPane.setViewportBorder(border);
 				super.setGridColor(gridColor);
 			}
 		}
@@ -820,12 +831,8 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		}
 	}
 
-	private void updateComponentColors(final JComponent c) {
+	private void updateComponentFontAndColors(final JComponent c) {
 		final NodeView nodeView = attributeView.getNodeView();
-		if(! SwingUtilities.isDescendingFrom(this, nodeView)) {
-			c.setFont(c.getFont().deriveFont(12f));
-			return;
-		}
 		final MapView mapView = nodeView.getMap();
 		final ModeController modeController = mapView.getModeController();
 		final NodeStyleController style = (NodeStyleController) modeController.getExtension(NodeStyleController.class);
@@ -833,6 +840,9 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
         final NodeModel attributeStyleNode = model.getStyleNodeSafe(MapStyleModel.ATTRIBUTE_STYLE);
         final Font font = style.getFont(attributeStyleNode);
         c.setFont(font.deriveFont(UITools.FONT_SCALE_FACTOR * font.getSize2D()));
+        if(! SwingUtilities.isDescendingFrom(this, nodeView)) {
+        	return;
+        }
         final Color backgroundColor = NodeStyleModel.getBackgroundColor(attributeStyleNode);
         if(backgroundColor!= null) {
         	c.setOpaque(true);
@@ -951,7 +961,7 @@ class AttributeTable extends JTable implements IColumnWidthChangeListener {
 		if(gridColor == null){
 			final NodeView nodeView = attributeView.getNodeView();
 			if(SwingUtilities.isDescendingFrom(this, nodeView))
-				setGridAndBorderColor(nodeView.getEdgeColor());
+				setGridAndBorderColor(nodeView.getMainView().getBorderColor());
 		}
 		super.paintComponent(g);
 	}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTableCellRenderer.java b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTableCellRenderer.java
index f98e449..5c2b647 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTableCellRenderer.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeTableCellRenderer.java
@@ -29,20 +29,20 @@ import java.net.URI;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JTable;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
 import javax.swing.table.DefaultTableCellRenderer;
 
+import org.freeplane.core.ui.LengthUnits;
 import org.freeplane.core.util.HtmlUtils;
+import org.freeplane.core.util.Quantity;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.attribute.IAttributeTableModel;
+import org.freeplane.features.icon.factory.ImageIconFactory;
 import org.freeplane.features.text.HighlightedTransformedObject;
 import org.freeplane.features.text.TextController;
 
 class AttributeTableCellRenderer extends DefaultTableCellRenderer {
 	public AttributeTableCellRenderer() {
 		super();
-		defaultBorder = getBorder();
 	}
 
 	/**
@@ -53,7 +53,6 @@ class AttributeTableCellRenderer extends DefaultTableCellRenderer {
 	private boolean isPainting;
 	private float zoom;
 	private boolean opaque;
-	final private Border defaultBorder;
 
 	/*
 	 * (non-Javadoc)
@@ -74,15 +73,11 @@ class AttributeTableCellRenderer extends DefaultTableCellRenderer {
 	                                               final boolean hasFocus, final int row, final int column) {
 		final Component rendererComponent = super.getTableCellRendererComponent(table, value, hasFocus, isSelected, row,
 		    column);
-		if (hasFocus) {
-			setBorder(UIManager.getBorder("Table.focusCellHighlightBorder"));
-		}
 		final AttributeTable attributeTable = (AttributeTable) table;
 		zoom = attributeTable.getZoom();
 	    final IAttributeTableModel attributeTableModel = (IAttributeTableModel) table.getModel();
 		final String originalText = value == null ? null : value.toString();
 		String text = originalText;
-		setBorder(defaultBorder);
 		Icon icon;
 		if (column == 1 && value != null) {
 			try {
@@ -108,8 +103,16 @@ class AttributeTableCellRenderer extends DefaultTableCellRenderer {
 		else{
 			icon = null;
 		}
-		if(icon != getIcon()){
-			setIcon(icon);
+		final Icon scaledIcon;
+		final ImageIconFactory iconFactory = ImageIconFactory.getInstance();
+		if(icon != null && iconFactory.canScaleIcon(icon)){
+			final int fontSize = getFont().getSize();
+			scaledIcon = iconFactory.getScaledIcon(icon, new Quantity<LengthUnits>(fontSize, LengthUnits.px));
+		}
+		else
+			scaledIcon = icon;
+		if(scaledIcon != getIcon()){
+			setIcon(scaledIcon);
 		}
 		setText(text);
 		if(text != originalText){
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeView.java
index bad6fd1..25cc0ba 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/attribute/AttributeView.java
@@ -317,7 +317,9 @@ public class AttributeView implements ChangeListener, TableModelListener {
     }
 	
 	public void setOptimalColumnWidths() {
-		attributeTable.setOptimalColumnWidths();
+		syncronizeAttributeView();
+		if(attributeTable != null)
+			attributeTable.setOptimalColumnWidths();
 	}
 
 	public AttributeTable getAttributeTable() {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/AutomaticEdgeStyle.java b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/AutomaticEdgeStyle.java
index 2db1090..cde9974 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/AutomaticEdgeStyle.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/AutomaticEdgeStyle.java
@@ -11,8 +11,6 @@ import org.freeplane.features.map.SummaryNode;
 import org.freeplane.features.mode.ModeController;
 import org.freeplane.features.nodelocation.LocationModel;
 import org.freeplane.features.nodestyle.NodeStyleController;
-import org.freeplane.features.styles.AutomaticLayoutController;
-import org.freeplane.features.styles.IStyle;
 import org.freeplane.features.styles.MapStyleModel;
 import org.freeplane.features.styles.MapViewLayout;
 import org.freeplane.view.swing.map.MainView;
@@ -20,12 +18,11 @@ import org.freeplane.view.swing.map.MapView;
 import org.freeplane.view.swing.map.NodeView;
 
 public class AutomaticEdgeStyle {
-	private NodeModel levelStyleNode;
-	private EdgeController edgeController;
+	private Color color;
+
 	public AutomaticEdgeStyle(NodeView node){
 		MapView map = node.getMap();
 		ModeController modeController = map.getModeController();
-		AutomaticLayoutController automaticLayoutController = modeController.getExtension(AutomaticLayoutController.class);
 		modeController.getExtension(NodeStyleController.class);
 		
 		final NodeView rootView = map.getRoot();
@@ -40,13 +37,13 @@ public class AutomaticEdgeStyle {
 		final int distance;
 		final int nodeColumnWidth;
 		if(map.getLayoutType() == MapViewLayout.OUTLINE){
-			distance = coordinate.x - origin.x;
+			distance = Math.max(0, coordinate.x - origin.x);
 			final int hgapProperty = ResourceController.getResourceController().getLengthProperty("outline_hgap");
-			nodeColumnWidth = map.getZoomed(hgapProperty);
+			nodeColumnWidth = Math.max(1, map.getZoomed(hgapProperty));
 		}
 		else {
 			if(origin.x < coordinate.x ){
-				distance = coordinate.x + nodeContent.getWidth() - origin.x - rootContent.getWidth();
+				distance = Math.max(0, coordinate.x  - origin.x + nodeContent.getWidth() - rootContent.getWidth());
 			}
 			else{
 				distance = origin.x - coordinate.x;
@@ -59,14 +56,13 @@ public class AutomaticEdgeStyle {
 		if(SummaryNode.isHidden(node.getModel()))
 			level++;
 		
-		final IStyle levelStyle = automaticLayoutController.getStyle(map.getModel(), level, true);
-		levelStyleNode = mapStyleNodes.getStyleNode(levelStyle);
-		edgeController = modeController.getExtension(EdgeController.class);
+		EdgeController edgeController = modeController.getExtension(EdgeController.class);
+		color = edgeController.areEdgeColorsAvailable(map.getModel()) ? edgeController.getEdgeColor(map.getModel(), level) : EdgeController.STANDARD_EDGE_COLOR;
 		
 		
 	}
 	
 	public Color getColor(){
-		return levelStyleNode != null ? edgeController.getColor(levelStyleNode) : EdgeController.STANDARD_EDGE_COLOR;
+		return color;
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/EdgeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/EdgeView.java
index bec7ac8..fb90a19 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/EdgeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/EdgeView.java
@@ -27,6 +27,7 @@ import java.awt.Point;
 import java.awt.Stroke;
 
 import org.freeplane.core.ui.components.UITools;
+import org.freeplane.features.DashVariant;
 import org.freeplane.view.swing.map.MainView;
 import org.freeplane.view.swing.map.MainView.ConnectorLocation;
 import org.freeplane.view.swing.map.MapView;
@@ -72,6 +73,7 @@ public abstract class EdgeView {
 	private Integer width;
     private ConnectorLocation startConnectorLocation;
     private ConnectorLocation endConnectorLocation;
+	private int[] dash;
 
 	protected void createStart() {
         final MainView mainView = source.getMainView();
@@ -155,13 +157,16 @@ public abstract class EdgeView {
 
 	protected Stroke getStroke() {
 		final int width = getWidth();
-		if (width < 0) {
-			return EdgeView.DEF_STROKE;
-		}
-		if (width == 0) {
+		return getStroke(width);
+	}
+
+	protected Stroke getStroke(final float width) {
+		int[] dash = getDash();
+		if (width <= 0 && dash == null) {
 			return EdgeView.DEF_STROKE;
 		}
-		return new BasicStroke(width * getMap().getZoom(), BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
+		final int[] dash1 = dash;
+    	return UITools.createStroke(width * getMap().getZoom(), dash1, BasicStroke.JOIN_ROUND);
 	}
 
 	/**
@@ -183,6 +188,18 @@ public abstract class EdgeView {
 		this.width = width;
 	}
 
+	public int[] getDash() {
+		if (dash != null) {
+			return dash;
+		}
+		final DashVariant dash = target.getEdgeDash();
+		return dash.variant;
+	}
+
+	public void setDash(final int[] dash) {
+		this.dash = dash;
+	}
+
 	protected boolean isTargetEclipsed() {
 		return getTarget().isParentHidden();
 	}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/HorizontalEdgeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/HorizontalEdgeView.java
index 53d45ca..05514ad 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/HorizontalEdgeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/HorizontalEdgeView.java
@@ -69,7 +69,6 @@ public class HorizontalEdgeView extends EdgeView {
 		g.setColor(color);
 		final Stroke stroke = getStroke();
 		g.setStroke(stroke);
-		getWidth();
 		int xMiddle = getTarget().getMap().getZoomed(LocationModel.DEFAULT_HGAP_PX) / 2;
 		final boolean left = getTarget().isLeft() 
 		    || ! MainView.USE_COMMON_OUT_POINT_FOR_ROOT_NODE && getSource().isRoot()&& start.x > end.x;
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/OutlineEdgeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/OutlineEdgeView.java
index 0a7d309..792c787 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/OutlineEdgeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/OutlineEdgeView.java
@@ -19,15 +19,14 @@
  */
 package org.freeplane.view.swing.map.edge;
 
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Stroke;
 
-import org.freeplane.features.edge.EdgeStyle;
 import org.freeplane.features.nodestyle.NodeStyleModel;
+import org.freeplane.view.swing.map.MainView;
 import org.freeplane.view.swing.map.NodeView;
 
 /**
@@ -71,15 +70,11 @@ public class OutlineEdgeView extends EdgeView {
 
 	@Override
 	protected Stroke getStroke() {
-		final NodeView target = getTarget();
-		int edgeWidth = target.getEdgeWidth();
-		final EdgeStyle style = target.getEdgeStyle();
-		final int nodeLineWidth = style.getNodeLineWidth(edgeWidth);
-		final int zoomedWidth;
-		if(edgeWidth != 0)
-	        zoomedWidth = getTarget().getZoomed(nodeLineWidth);
-        else
-	        zoomedWidth = nodeLineWidth;
-		return new BasicStroke(zoomedWidth);
+		final NodeView nodeView = getTarget();
+		final MainView mainView = nodeView.getMainView();
+		final float nodeLineWidth = mainView.getUnzoomedEdgeWidth();
+		final float zoomedLineWidth = nodeView.getMap().getZoom() * nodeLineWidth;
+		float strokeWidth =  Math.max(zoomedLineWidth, 1);
+		return getStroke(strokeWidth);
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpBezierEdgeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpBezierEdgeView.java
index 5cc27f4..dee65c1 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpBezierEdgeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpBezierEdgeView.java
@@ -42,7 +42,7 @@ public class SharpBezierEdgeView extends SharpEdgeView {
 
 	@Override
 	public Stroke getStroke() {
-		return EdgeView.DEF_STROKE;
+		return getStroke(0);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpLinearEdgeView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpLinearEdgeView.java
index 5b3ff9e..a0e13c3 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpLinearEdgeView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/edge/SharpLinearEdgeView.java
@@ -38,7 +38,7 @@ public class SharpLinearEdgeView extends SharpEdgeView {
 
 	@Override
 	public Stroke getStroke() {
-		return EdgeView.DEF_STROKE;
+		return getStroke(0);
 	}
 
 	@Override
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/link/ConnectorView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/link/ConnectorView.java
index 3f2b052..a1d6097 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/link/ConnectorView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/link/ConnectorView.java
@@ -77,7 +77,7 @@ public class ConnectorView extends AConnectorView{
 			stroke = new BasicStroke(width);
 		}
 		else{
-			stroke = UITools.createStroke(width, linkController.getDash(connectorModel));
+			stroke = UITools.createStroke((float) width, linkController.getDash(connectorModel), BasicStroke.JOIN_ROUND);
 		}
 
 	}
@@ -319,14 +319,15 @@ public class ConnectorView extends AConnectorView{
 				endPoint = target.getLinkPoint(connectorModel.getEndInclination());
 			}
 		}
+		final MapView map = getMap();
 		if (startPoint != null) {
 			startPoint2 = new Point(startPoint);
 			Point startInclination = connectorModel.getStartInclination();
 			if(endPoint == null){
 				normalizeLength(NORMAL_LENGTH, startInclination);
 			}
-			startPoint2.translate(((sourceIsLeft) ? -1 : 1) * getMap().getZoomed(startInclination.x),
-				getMap().getZoomed(startInclination.y));
+			startPoint2.translate(((sourceIsLeft) ? -1 : 1) * map.getZoomed(startInclination.x),
+				map.getZoomed(startInclination.y));
 
 		}
 		if (endPoint != null) {
@@ -335,11 +336,14 @@ public class ConnectorView extends AConnectorView{
 			if(startPoint == null){
 				normalizeLength(NORMAL_LENGTH, endInclination);
 			}
-			endPoint2.translate(((targetIsLeft) ? -1 : 1) * getMap().getZoomed(endInclination.x), getMap()
+			endPoint2.translate(((targetIsLeft) ? -1 : 1) * map.getZoomed(endInclination.x), map
 				.getZoomed(endInclination.y));
 		}
-		paintCurve(g, startPoint, startPoint2, endPoint2, endPoint);
-		drawLabels(g, startPoint, startPoint2, endPoint2, endPoint);
+		final boolean showsConnectors = map.showsConnectors();
+		paintCurve(g, startPoint, startPoint2, endPoint2, endPoint, showsConnectors);
+		if(showsConnectors) {
+			drawLabels(g, startPoint, startPoint2, endPoint2, endPoint);
+		}
 		g.setColor(oldColor);
 	}
 
@@ -362,35 +366,36 @@ public class ConnectorView extends AConnectorView{
 		return generalPath;
     }
 
-	private void paintCurve(final Graphics2D g, Point startPoint, Point startPoint2, Point endPoint2, Point endPoint) {
+	private void paintCurve(final Graphics2D g, Point startPoint, Point startPoint2, Point endPoint2, Point endPoint, boolean showsConnectors) {
 		final boolean selfLink = getSource() == getTarget();
 		final boolean isLine = ConnectorModel.Shape.LINE.equals(connectorModel.getShape());
-		if (startPoint != null && endPoint != null) {
-			if(isLine) {
-                            if (selfLink) {
-				arrowLinkCurve = createLine(startPoint, startPoint2);
-                            }
-                            else {
-				arrowLinkCurve = createLine(startPoint, endPoint);
-                            }
-                        }
-                        else if (ConnectorModel.Shape.LINEAR_PATH.equals(connectorModel.getShape()))
-                            arrowLinkCurve = createLinearPath(startPoint, startPoint2, endPoint2, endPoint);
-                        else
-                            arrowLinkCurve = createCubicCurve2D(startPoint, startPoint2, endPoint2, endPoint);
-		}
-		else
-			arrowLinkCurve = null;
-	    if (arrowLinkCurve != null) {
-			g.draw(arrowLinkCurve);
-		}
-		if (isSourceVisible() && !connectorModel.getStartArrow().equals(ArrowType.NONE)) {
+		arrowLinkCurve = null;
+		if (showsConnectors) {
+			if (startPoint != null && endPoint != null) {
+				if(isLine) {
+			                    if (selfLink) {
+					arrowLinkCurve = createLine(startPoint, startPoint2);
+			                    }
+			                    else {
+					arrowLinkCurve = createLine(startPoint, endPoint);
+			                    }
+			                }
+			                else if (ConnectorModel.Shape.LINEAR_PATH.equals(connectorModel.getShape()))
+			                    arrowLinkCurve = createLinearPath(startPoint, startPoint2, endPoint2, endPoint);
+			                else
+			                    arrowLinkCurve = createCubicCurve2D(startPoint, startPoint2, endPoint2, endPoint);
+			} 
+			if (arrowLinkCurve != null) {
+				g.draw(arrowLinkCurve);
+			}
+		} 
+		if (isSourceVisible() && !(showsConnectors && connectorModel.getStartArrow().equals(ArrowType.NONE))) {
 			if(!selfLink && isLine && endPoint != null)
 				paintArrow(g, endPoint, startPoint);
 			else
 				paintArrow(g, startPoint2, startPoint);
 		}
-		if (isTargetVisible() && !connectorModel.getEndArrow().equals(ArrowType.NONE)) {
+		if (isTargetVisible() && !(showsConnectors && connectorModel.getEndArrow().equals(ArrowType.NONE))) {
 			if(isLine && startPoint != null) {
                             if (selfLink)
 				paintArrow(g, startPoint, startPoint2);
@@ -398,25 +403,27 @@ public class ConnectorView extends AConnectorView{
 				paintArrow(g, startPoint, endPoint);
                         }
 			else
-			paintArrow(g, endPoint2, endPoint);
-		}
-		if (connectorModel.getShowControlPointsFlag()) {
-			g.setColor(textColor);
-			g.setStroke(new BasicStroke(stroke.getLineWidth(), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 0, DOTTED_DASH, 0));
-		}
-		if (connectorModel.getShowControlPointsFlag() || !isSourceVisible() || !isTargetVisible()) {
-			if (startPoint != null) {
-				g.drawLine(startPoint.x, startPoint.y, startPoint2.x, startPoint2.y);
-				drawCircle(g, startPoint2, source.getZoomedFoldingSymbolHalfWidth());
-			    if (arrowLinkCurve == null) {
-			    	arrowLinkCurve = createLine(startPoint, startPoint2);
-				}
+				paintArrow(g, endPoint2, endPoint);
+		}
+		if(showsConnectors) {
+			if (connectorModel.getShowControlPointsFlag()) {
+				g.setColor(textColor);
+				g.setStroke(new BasicStroke(stroke.getLineWidth(), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 0, DOTTED_DASH, 0));
 			}
-			if (endPoint != null && !(selfLink && isLine)) {
-				g.drawLine(endPoint.x, endPoint.y, endPoint2.x, endPoint2.y);
-				drawCircle(g, endPoint2, target.getZoomedFoldingSymbolHalfWidth());
-			    if (arrowLinkCurve == null) {
-			    	arrowLinkCurve = createLine(endPoint, endPoint2);
+			if (connectorModel.getShowControlPointsFlag() || !isSourceVisible() || !isTargetVisible()) {
+				if (startPoint != null) {
+					g.drawLine(startPoint.x, startPoint.y, startPoint2.x, startPoint2.y);
+					drawCircle(g, startPoint2, source.getZoomedFoldingSymbolHalfWidth());
+					if (arrowLinkCurve == null) {
+						arrowLinkCurve = createLine(startPoint, startPoint2);
+					}
+				}
+				if (endPoint != null && !(selfLink && isLine)) {
+					g.drawLine(endPoint.x, endPoint.y, endPoint2.x, endPoint2.y);
+					drawCircle(g, endPoint2, target.getZoomedFoldingSymbolHalfWidth());
+					if (arrowLinkCurve == null) {
+						arrowLinkCurve = createLine(endPoint, endPoint2);
+					}
 				}
 			}
 		}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/link/EdgeLinkView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/link/EdgeLinkView.java
index c296d98..e55340c 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/link/EdgeLinkView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/link/EdgeLinkView.java
@@ -65,6 +65,8 @@ public class EdgeLinkView extends AConnectorView {
 			color =  ColorUtils.alphaToColor(alpha, color);
 			final int width = linkController.getWidth(model);
 			edgeView.setWidth(width);
+			int[] dash = linkController.getDash(model);
+			edgeView.setDash(dash);
 		}
 		edgeView.setColor(color);
 	}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/link/OutlineLinkView.java b/freeplane/src/main/java/org/freeplane/view/swing/map/link/OutlineLinkView.java
index f827a9e..a389f07 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/link/OutlineLinkView.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/link/OutlineLinkView.java
@@ -19,7 +19,6 @@
  */
 package org.freeplane.view.swing.map.link;
 
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics2D;
@@ -76,6 +75,6 @@ public class OutlineLinkView extends EdgeView {
 
 	@Override
 	protected Stroke getStroke() {
-		return new BasicStroke(getWidth());
+		return getStroke(getWidth());
 	}
 }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java b/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java
index 0a4f22a..61854e0 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/map/mindmapmode/EditNodeTextField.java
@@ -86,6 +86,7 @@ import org.freeplane.core.util.Compat;
 import org.freeplane.core.util.HtmlUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
+import org.freeplane.features.link.LinkController;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
@@ -97,7 +98,6 @@ import org.freeplane.features.text.mindmapmode.EventBuffer;
 import org.freeplane.features.text.mindmapmode.MTextController;
 import org.freeplane.features.ui.IMapViewChangeListener;
 import org.freeplane.features.ui.IMapViewManager;
-import org.freeplane.features.url.UrlManager;
 import org.freeplane.view.swing.map.MapView;
 import org.freeplane.view.swing.map.NodeView;
 import org.freeplane.view.swing.map.ZoomableLabel;
@@ -418,7 +418,7 @@ public class EditNodeTextField extends EditNodeBase {
 				final String linkURL = HtmlUtils.getURLOfExistingLink((HTMLDocument) textfield.getDocument(), textfield.viewToModel(ev.getPoint()));
 				if (linkURL != null) {
 					try {
-						UrlManager.getController().loadURL(new URI(linkURL));
+						LinkController.getController().loadURI(nodeView.getModel(), new URI(linkURL));
 					} catch (Exception e) {
 						LogUtils.warn(e);
 					}
@@ -693,7 +693,6 @@ public class EditNodeTextField extends EditNodeBase {
 		}
 		Insets parentInsets = parent.getZoomedInsets();
 		maxWidth -= parentInsets.left + parentInsets.right;
-		maxWidth = mapView.getZoomed(maxWidth);
 		extraWidth = ResourceController.getResourceController().getIntProperty("editor_extra_width", 80);
 		extraWidth = mapView.getZoomed(extraWidth);
 		final TextFieldListener textFieldListener = new TextFieldListener();
@@ -747,11 +746,12 @@ public class EditNodeTextField extends EditNodeBase {
 		textFieldMinimumSize.width = Math.max(textFieldMinimumSize.width, nodeWidth - textFieldX - (parentInsets.right - textFieldBorderWidth));
 		textFieldMinimumSize.height = Math.max(textFieldMinimumSize.height, textR.height);
 		textfield.setSize(textFieldMinimumSize.width, textFieldMinimumSize.height);
-		final Dimension newParentSize = new Dimension(textFieldX + textFieldMinimumSize.width + parentInsets.right,  2 * textR.y + textFieldMinimumSize.height);
+		final int textY = Math.max(textR.y - (textFieldMinimumSize.height - textR.height) / 2, 0);
+		final Dimension newParentSize = new Dimension(textFieldX + textFieldMinimumSize.width + parentInsets.right,  2 * textY + textFieldMinimumSize.height);
 		horizontalSpace = newParentSize.width - textFieldMinimumSize.width;
-		verticalSpace = 2 * textR.y;
+		verticalSpace = 2 * textY;
 		final int widthAddedToParent = newParentSize.width - parent.getWidth();
-		final Point location = new Point(textR.x - textFieldBorderWidth, textR.y);
+		final Point location = new Point(textR.x - textFieldBorderWidth, textY);
 		
 		final int widthAddedToTextField = textFieldMinimumSize.width - (textR.width + 2 * textFieldBorderWidth);
 		if(widthAddedToTextField > 0){
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeKeyListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeKeyListener.java
index 0cd84ed..34294cd 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeKeyListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeKeyListener.java
@@ -11,6 +11,7 @@ import org.freeplane.core.ui.ActionAcceleratorManager;
 import org.freeplane.core.ui.ControllerPopupMenuListener;
 import org.freeplane.core.ui.IEditHandler;
 import org.freeplane.core.ui.IEditHandler.FirstAction;
+import org.freeplane.core.util.Compat;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
@@ -120,7 +121,7 @@ public class DefaultNodeKeyListener implements KeyListener {
 	}
 
 	public void keyTyped(final KeyEvent e) {
-		if ((e.isAltDown() || e.isControlDown() || e.isMetaDown()) || AltCodeChecker.isAltCode(e.getKeyChar())) {
+		if ((e.isAltDown() && ! Compat.isMacOsX() || e.isControlDown() || e.isMetaDown()) || AltCodeChecker.isAltCode(e.getKeyChar())) {
 			return;
 		}
 		final String keyTypeActionString = ResourceController.getResourceController().getProperty("key_type_action",
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java
index 668f782..6ac1210 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/DefaultNodeMouseMotionListener.java
@@ -20,7 +20,6 @@ import org.freeplane.features.map.MapController;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
-import org.freeplane.features.url.UrlManager;
 import org.freeplane.view.swing.map.MainView;
 import org.freeplane.view.swing.map.MapView;
 import org.freeplane.view.swing.map.MouseArea;
@@ -75,8 +74,7 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 				UIIcon uiIcon = component.getUIIconAt(e.getPoint());
 				if(uiIcon != null){
 					final IconController iconController = mc.getExtension(IconController.class);
-					final NodeModel model = component.getNodeView().getModel();
-					if(iconController.onIconClicked(model, uiIcon))
+					if(iconController.onIconClicked(node, uiIcon))
 						return;
 				}
 				else if (component.isClickableLink(e.getX())) {
@@ -90,7 +88,7 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 				if (link != null) {
 					doubleClickTimer.start(new Runnable() {
 						public void run() {
-							loadLink(link);
+							loadLink(node, link);
 						}
 					});
 					e.consume();
@@ -98,11 +96,10 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 				}
 
 				if(inside && e.getClickCount() == 1 && ResourceController.getResourceController().getBooleanProperty(FOLD_ON_CLICK_INSIDE)){
-					final boolean fold = !isFoldedOnCurrentView(node);
 					if (!nodeSelector.shouldSelectOnClick(e)) {
 						doubleClickTimer.start(new Runnable() {
 							public void run() {
-								mapController.setFolded(node, fold);
+								mapController.toggleFolded(node);
 							}
 						});
 					}
@@ -111,7 +108,7 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 			else if(Compat.isShiftEvent(e)){
 				if (isInFoldingRegion(e)) {
 					if (! mapController.showNextChild(node))
-						mapController.setFolded(node, true);
+						mapController.fold(node);
 					e.consume();
 				}
 			}
@@ -120,9 +117,8 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 		if ((plainEvent && inFoldingRegion
 				|| (inFoldingRegion || inside) && Compat.isCtrlShiftEvent(e))
 		        && !nodeSelector.shouldSelectOnClick(e)) {
-			final boolean fold = ! isFoldedOnCurrentView(node);
 			doubleClickTimer.cancel();
-			mapController.setFolded(node, fold);
+			mapController.toggleFolded(node);
 			e.consume();
 			return;
 		}
@@ -134,9 +130,9 @@ public class DefaultNodeMouseMotionListener implements IMouseListener {
 	}
 
 
-	protected void loadLink(final String link) {
+	private void loadLink(NodeModel node, final String link) {
 		try {
-			UrlManager.getController().loadURL(new URI(link));
+			LinkController.getController().loadURI(node, new URI(link));
 		} catch (Exception ex) {
 			LogUtils.warn(ex);
 		}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/LinkNavigatorMouseListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/LinkNavigatorMouseListener.java
index afc859f..3e102ef 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/LinkNavigatorMouseListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/LinkNavigatorMouseListener.java
@@ -27,11 +27,14 @@ import java.awt.Cursor;
 import java.awt.event.MouseEvent;
 import java.net.URI;
 
+import javax.swing.SwingUtilities;
+
 import org.freeplane.core.ui.AMouseListener;
 import org.freeplane.core.util.Compat;
 import org.freeplane.core.util.LogUtils;
+import org.freeplane.features.link.LinkController;
 import org.freeplane.features.mode.Controller;
-import org.freeplane.features.url.UrlManager;
+import org.freeplane.view.swing.map.NodeView;
 import org.freeplane.view.swing.map.ZoomableLabel;
 
 public class LinkNavigatorMouseListener extends AMouseListener {
@@ -65,7 +68,8 @@ public class LinkNavigatorMouseListener extends AMouseListener {
     			if(link != null){
     				if (link != null) {
     					try {
-    						UrlManager.getController().loadURL(new URI(link));
+    						NodeView nodeView = (NodeView) SwingUtilities.getAncestorOfClass(NodeView.class, component);
+    						LinkController.getController().loadURI(nodeView.getModel(), new URI(link));
     					} catch (Exception ex) {
     						LogUtils.warn(ex);
     					}
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java
index e2fd0a4..95be9a4 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/UserInputListenerFactory.java
@@ -379,6 +379,7 @@ public class UserInputListenerFactory implements IUserInputListenerFactory {
 			modeController.addActionIfNotAlreadySet(modesMenuAction);
 			Entry actionEntry = new Entry();
 			entryAccessor.setAction(actionEntry, modesMenuAction);
+			actionEntry.setName(modesMenuAction.getKey());
 			final ModeController modeController = controller.getModeController();
 			if (modeController != null && modeController.getModeName().equals(key)) {
 				actionEntry.setAttribute("selected", true);
@@ -400,6 +401,7 @@ public class UserInputListenerFactory implements IUserInputListenerFactory {
 			final String displayName = mapView.getName();
 			Entry actionEntry = new Entry();
 			final MapsMenuAction action = new MapsMenuAction(displayName);
+			actionEntry.setName(action.getKey());
 			modeController.addActionIfNotAlreadySet(action);
 			entryAccessor.setAction(actionEntry, action);
 			final MapView currentMapView = (MapView) mapViewManager.getMapViewComponent();
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java
index 09a7ca2..1bcdd45 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/GlassPaneNodeSelector.java
@@ -74,14 +74,14 @@ class GlassPaneNodeSelector extends MouseAdapter implements IMouseListener{
         }
         MainView mainView = (MainView) component;
         NodeView nodeView = mainView.getNodeView();
-		final NodeModel model = nodeView.getModel();
+		final NodeModel node = nodeView.getModel();
         switch(e.getClickCount()){
         	case 1:
         		final MapController mapController = Controller.getCurrentModeController().getMapController();
-				mapController.setFolded(model, ! nodeView.isFolded());
+				mapController.toggleFolded(node);
         		break;
         	case 2:
-    	        nodeSelector.nodeSelected(model);
+    	        nodeSelector.nodeSelected(node);
         		break;
         }
     }
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MMapMouseListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MMapMouseListener.java
index eb3cc00..87b712e 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MMapMouseListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MMapMouseListener.java
@@ -56,37 +56,41 @@ public class MMapMouseListener extends DefaultMapMouseListener{
 
 	public void mouseDragged(final MouseEvent e) {
 		final MapView mapView = (MapView) e.getComponent();
-		if (draggedLink != null && mapView.getLayoutType().equals(MapViewLayout.MAP)) {
-			final int deltaX = (int) ((e.getX() - originX) / mapView.getZoom());
-			final int deltaY = (int) ((e.getY() - originY) / mapView.getZoom());
-			double distSqToTarget = 0;
-			double distSqToSource = 0;
-			final NodeModel target = draggedLink.getTarget();
-			final NodeView targetView = mapView.getNodeView(target);
-			final NodeView sourceView = mapView.getNodeView(draggedLink.getSource());
-			if (targetView != null && sourceView != null) {
-				final Point targetLinkPoint = targetView.getLinkPoint(draggedLink.getEndInclination());
-				final Point sourceLinkPoint = sourceView.getLinkPoint(draggedLink.getStartInclination());
-				distSqToTarget = targetLinkPoint.distanceSq(originX, originY);
-				distSqToSource = sourceLinkPoint.distanceSq(originX, originY);
-			}
-			if ((targetView == null || sourceView != null) && distSqToSource <= distSqToTarget * 2.25) {
-				final Point changedInclination = draggedLink.getStartInclination();
-				draggedLink.changeInclination(deltaX, deltaY, draggedLink.getSource(), changedInclination);
-				draggedLink.setStartInclination(changedInclination);
-			}
-			if ((sourceView == null || targetView != null) && distSqToTarget <= distSqToSource * 2.25) {
-				final Point changedInclination = draggedLink.getEndInclination();
-				draggedLink.changeInclination(deltaX, deltaY, target, changedInclination);
-				draggedLink.setEndInclination(changedInclination);
-			}
-			originX = e.getX();
-			originY = e.getY();
-			mapView.repaintVisible();
+		if (draggedLink == null || !mapView.getLayoutType().equals(MapViewLayout.MAP)) {
+			super.mouseDragged(e);
+			return;
 		}
-		else {
+		final NodeModel target = draggedLink.getTarget();
+		if(target == null) {
 			super.mouseDragged(e);
+			return;
+		}
+		final int deltaX = (int) ((e.getX() - originX) / mapView.getZoom());
+		final int deltaY = (int) ((e.getY() - originY) / mapView.getZoom());
+		double distSqToTarget = 0;
+		double distSqToSource = 0;
+		final NodeView targetView = mapView.getNodeView(target);
+		final NodeView sourceView = mapView.getNodeView(draggedLink.getSource());
+		if (targetView != null && sourceView != null) {
+			final Point targetLinkPoint = targetView.getLinkPoint(draggedLink.getEndInclination());
+			final Point sourceLinkPoint = sourceView.getLinkPoint(draggedLink.getStartInclination());
+			distSqToTarget = targetLinkPoint.distanceSq(originX, originY);
+			distSqToSource = sourceLinkPoint.distanceSq(originX, originY);
+		}
+		if ((targetView == null || sourceView != null) && distSqToSource <= distSqToTarget * 2.25) {
+			final Point changedInclination = draggedLink.getStartInclination();
+			draggedLink.changeInclination(deltaX, deltaY, draggedLink.getSource(), changedInclination);
+			draggedLink.setStartInclination(changedInclination);
 		}
+		if ((sourceView == null || targetView != null) && distSqToTarget <= distSqToSource * 2.25) {
+			final Point changedInclination = draggedLink.getEndInclination();
+			draggedLink.changeInclination(deltaX, deltaY, target, changedInclination);
+			draggedLink.setEndInclination(changedInclination);
+		}
+		originX = e.getX();
+		originY = e.getY();
+		mapView.repaintVisible();
+
 	}
 
 	public void mousePressed(final MouseEvent e) {
diff --git a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeDropListener.java b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeDropListener.java
index 212edd6..d6a6b44 100644
--- a/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeDropListener.java
+++ b/freeplane/src/main/java/org/freeplane/view/swing/ui/mindmapmode/MNodeDropListener.java
@@ -72,8 +72,8 @@ private Timer timer;
 	 * item.
 	 */
 	public void dragEnter(final DropTargetDragEvent dtde) {
-		supportFolding(dtde);
 		if (isDragAcceptable(dtde)) {
+			supportFolding(dtde);
 			dtde.acceptDrag(DnDConstants.ACTION_MOVE);
 		}
 		else {
@@ -113,15 +113,17 @@ private Timer timer;
     }
 
 	public void dragOver(final DropTargetDragEvent dtde) {
-		supportFolding(dtde);
+		if(isDragAcceptable(dtde)) {
+			supportFolding(dtde);
 
-		final MainView draggedNode = (MainView) dtde.getDropTargetContext().getComponent();
-		final int oldDraggedOver = draggedNode.getDraggedOver();
-		draggedNode.setDraggedOver(dtde.getLocation());
-		final int newDraggedOver = draggedNode.getDraggedOver();
-		final boolean repaint = newDraggedOver != oldDraggedOver;
-		if (repaint) {
-			draggedNode.repaint();
+			final MainView draggedNode = (MainView) dtde.getDropTargetContext().getComponent();
+			final int oldDraggedOver = draggedNode.getDraggedOver();
+			draggedNode.setDraggedOver(dtde.getLocation());
+			final int newDraggedOver = draggedNode.getDraggedOver();
+			final boolean repaint = newDraggedOver != oldDraggedOver;
+			if (repaint) {
+				draggedNode.repaint();
+			}
 		}
 	}
 
@@ -132,7 +134,7 @@ private Timer timer;
 					if(mainView.isDisplayable()){
 						NodeView nodeView = mainView.getNodeView();
 						final NodeModel node = nodeView.getModel();
-						Controller.getCurrentModeController().getMapController().setFolded(node, !nodeView.isFolded());
+						Controller.getCurrentModeController().getMapController().unfold(node);
 					}
 				}
 			});
@@ -311,13 +313,9 @@ private Timer timer;
 	}
 
 	private boolean isDragAcceptable(final DropTargetDragEvent ev) {
-		if (ev.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-			return true;
-		}
-		if (ev.isDataFlavorSupported(MindMapNodesSelection.fileListFlavor)) {
-			return true;
-		}
-		return false;
+		return ev.isDataFlavorSupported(DataFlavor.stringFlavor) 
+				||ev.isDataFlavorSupported(MindMapNodesSelection.fileListFlavor)
+				||ev.isDataFlavorSupported(DataFlavor.imageFlavor);
 	}
 
 }
diff --git a/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java b/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java
index 6be1500..9168fe0 100644
--- a/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java
+++ b/freeplane/src/test/java/org/freeplane/core/ui/components/html/CssRuleBuilderShould.java
@@ -117,19 +117,25 @@ public class CssRuleBuilderShould {
 
 	@Test
 	public void addWidth() throws Exception {
-		cssRuleBuilder.withMaxWidthAsPt(new Quantity<Metrics>(1000, Metrics.cm));
+		cssRuleBuilder.withMaxWidthAsPt(1, new Quantity<Metrics>(1000, Metrics.cm));
 		assertRule("width: 10pt;");
 	}
 
 	@Test
+	public void considerZoomCalculatingWidth() throws Exception {
+		cssRuleBuilder.withMaxWidthAsPt(2, new Quantity<Metrics>(1000, Metrics.cm));
+		assertRule("width: 20pt;");
+	}
+
+	@Test
 	public void addMaxWidth() throws Exception {
-		cssRuleBuilder.withMaxWidthAsPt(new Quantity<Metrics>(2, Metrics.m), new Quantity<Metrics>(1, Metrics.m));
+		cssRuleBuilder.withMaxWidthAsPt(1, new Quantity<Metrics>(2, Metrics.m), new Quantity<Metrics>(1, Metrics.m));
 		assertRule("width: 2pt;");
 	}
 
 	@Test
 	public void ignoreNullWidth() throws Exception {
-		cssRuleBuilder.withMaxWidthAsPt((Quantity<Metrics>) null);
+		cssRuleBuilder.withMaxWidthAsPt(1, (Quantity<Metrics>) null);
 		assertRule("");
 	}
 }
diff --git a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/action/ActionFinderTest.java b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/action/ActionFinderTest.java
index b2e53cf..a2747d2 100644
--- a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/action/ActionFinderTest.java
+++ b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/action/ActionFinderTest.java
@@ -40,7 +40,7 @@ public class ActionFinderTest {
 		
 		final ActionFinder actionFinder = new ActionFinder(freeplaneActions){
 			@Override
-			protected AFreeplaneAction createSetBooleanPropertyAction(Class<? extends AFreeplaneAction> actionClass,
+			protected AFreeplaneAction createAction(Class<? extends AFreeplaneAction> actionClass,
 					String propertyName) {
 				return setBooleanPropertyAction;
 			}
diff --git a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilderTest.java b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilderTest.java
index 7ca3287..f78b86e 100644
--- a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilderTest.java
+++ b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/JMenuItemBuilderTest.java
@@ -21,6 +21,7 @@ import org.freeplane.core.ui.AFreeplaneAction;
 import org.freeplane.core.ui.AccelerateableAction;
 import org.freeplane.core.ui.components.FreeplaneMenuBar;
 import org.freeplane.core.ui.components.JAutoCheckBoxMenuItem;
+import org.freeplane.core.ui.menubuilders.HeadlessFreeplaneRunner;
 import org.freeplane.core.ui.menubuilders.action.AcceleratebleActionProvider;
 import org.freeplane.core.ui.menubuilders.action.IAcceleratorMap;
 import org.freeplane.core.ui.menubuilders.generic.Entry;
@@ -34,6 +35,9 @@ import org.junit.Test;
 import org.mockito.Mockito;
 
 public class JMenuItemBuilderTest {
+	static{
+		new HeadlessFreeplaneRunner();
+	}
 	
 	private Entry actionEntry;
 	private AFreeplaneAction action;
diff --git a/freeplane/src/test/java/org/freeplane/core/util/QuantityShould.java b/freeplane/src/test/java/org/freeplane/core/util/QuantityShould.java
index cc38fdf..0eb3903 100644
--- a/freeplane/src/test/java/org/freeplane/core/util/QuantityShould.java
+++ b/freeplane/src/test/java/org/freeplane/core/util/QuantityShould.java
@@ -112,6 +112,12 @@ public class QuantityShould {
 		assertThat(first.add(second), equalTo(new Quantity<Metrics>(300, Metrics.cm)));
 	}
 
+	
+	@Test
+	public void zoomQuantity() throws Exception {
+		Quantity<Metrics> q = new Quantity<Metrics>(100, Metrics.cm);
+		assertThat(q.zoomBy(0.5), equalTo(new Quantity<Metrics>(50, Metrics.cm)));
+	}
 	@Test
 	public void addQuantitiesGivenAsPrimitives() throws Exception {
 		Quantity<Metrics> first = new Quantity<Metrics>(100, Metrics.cm);
diff --git a/freeplane/src/test/java/org/freeplane/features/presentations/mindmapmode/CollectionModelShould.java b/freeplane/src/test/java/org/freeplane/features/presentations/mindmapmode/CollectionModelShould.java
new file mode 100644
index 0000000..2775a88
--- /dev/null
+++ b/freeplane/src/test/java/org/freeplane/features/presentations/mindmapmode/CollectionModelShould.java
@@ -0,0 +1,274 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.COLLECTION_SIZE_CHANGED;
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.SELECTION_CHANGED;
+import static org.freeplane.features.presentations.mindmapmode.CollectionChangedEvent.EventType.SELECTION_INDEX_CHANGED;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.refEq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import javax.swing.ComboBoxModel;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+ at RunWith(MockitoJUnitRunner.class)
+public class CollectionModelShould {
+	private NamedElementCollection<Presentation> elementCollectionModel;
+	@Mock
+	private CollectionChangeListener<Presentation> listener;
+
+	@Before 
+	public void setup() {
+		final NamedElementFactory<Slide> slideFactory = new NamedElementFactory<Slide>(){
+
+			@Override
+			public Slide create(String name) {
+				return new Slide(name);
+			}
+
+			@Override
+			public Slide create(Slide prototype, String newName) {
+				return prototype.create(newName);
+			}
+			
+		};
+		final NamedElementFactory<Presentation> presentationFactory = new NamedElementFactory<Presentation>() {
+
+			@Override
+			public Presentation create(String name) {
+				return new Presentation(name, slideFactory);
+			}
+
+			@Override
+			public Presentation create(Presentation prototype, String newName) {
+				return prototype.create(newName);
+			}
+		};
+		elementCollectionModel = new NamedElementCollection<Presentation>(presentationFactory);
+	}
+	
+	@Test
+	public void containNoElementsInitially() throws Exception {
+		assertThat(elementCollectionModel.getSize()).isEqualTo(0);
+	}
+	
+	@Test
+	public void addNewElement() throws Exception {
+		elementCollectionModel.add("element");
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element");
+	}
+	
+	@Test
+	public void notifyListenerAddingNewElement() throws Exception {
+		elementCollectionModel.addCollectionChangeListener(listener);
+		elementCollectionModel.add("element");
+		verify(listener).onCollectionChange(refEq(COLLECTION_SIZE_CHANGED.of(elementCollectionModel)));
+		verify(listener).onCollectionChange(refEq(SELECTION_INDEX_CHANGED.of(elementCollectionModel)));
+	}
+	
+	@Test
+	public void setCurrentItemToNewElement() throws Exception {
+		elementCollectionModel.add("element");
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0)).isEqualTo(elements.getSelectedItem());
+	}
+
+
+	@Test
+	public void deleteElement() throws Exception {
+		elementCollectionModel.add("element");
+		elementCollectionModel.removeCurrentElement();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getSize()).isEqualTo(0);
+	}
+
+	@Test
+	public void notifyListenerDeletingElement() throws Exception {
+		elementCollectionModel.add("element");
+		elementCollectionModel.addCollectionChangeListener(listener);
+		elementCollectionModel.removeCurrentElement();
+		verify(listener).onCollectionChange(refEq(COLLECTION_SIZE_CHANGED.of(elementCollectionModel)));
+	}
+
+	@Test
+	public void deleteLastAddedElement() throws Exception {
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.removeCurrentElement();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 1");
+	}
+
+
+	@Test
+	public void deleteSelectedElement() throws Exception {
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.selectCurrentElement(0);
+		elementCollectionModel.removeCurrentElement();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 2");
+	}
+
+
+	@Test
+	public void addNewElementAfterSelectedElement() throws Exception {
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 3");
+		elementCollectionModel.selectCurrentElement(0);
+		elementCollectionModel.add("element 2");
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		Stringifyed<Presentation> element = elements.getElementAt(1);
+		assertThat(element.toString()).isEqualTo("element 2");
+	}
+
+	@Test
+	public void addAndDeleteElements() throws Exception {
+		elementCollectionModel.add("element");
+		elementCollectionModel.removeCurrentElement();
+		elementCollectionModel.add("element");
+		elementCollectionModel.removeCurrentElement();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getSize()).isEqualTo(0);
+	}
+
+
+	@Test
+	public void moveLastElementUp() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.moveCurrentElementUp();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 0");
+		assertThat(elements.getElementAt(1).toString()).isEqualTo("element 2");
+		assertThat(elements.getElementAt(2).toString()).isEqualTo("element 1");
+		assertThat(elements.getSelectedItem().toString()).isEqualTo("element 2");
+	}
+	
+
+	@Test
+	public void notifyListenerMovingLastElementUp() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.addCollectionChangeListener(listener);
+		elementCollectionModel.moveCurrentElementUp();
+		verify(listener).onCollectionChange(refEq(SELECTION_INDEX_CHANGED.of(elementCollectionModel)));
+		verifyNoMoreInteractions(listener);
+	}
+
+
+	@Test
+	public void moveSelectedElementUp() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.selectCurrentElement(1);
+		elementCollectionModel.moveCurrentElementUp();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 1");
+		assertThat(elements.getElementAt(1).toString()).isEqualTo("element 0");
+		assertThat(elements.getElementAt(2).toString()).isEqualTo("element 2");
+		assertThat(elements.getSelectedItem().toString()).isEqualTo("element 1");
+	}
+
+
+	@Test
+	public void moveFirstElementUp() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.selectCurrentElement(0);
+		elementCollectionModel.moveCurrentElementUp();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 0");
+		assertThat(elements.getElementAt(1).toString()).isEqualTo("element 1");
+		assertThat(elements.getElementAt(2).toString()).isEqualTo("element 2");
+		assertThat(elements.getSelectedItem().toString()).isEqualTo("element 0");
+	}
+
+
+	@Test
+	public void moveLastElementDown() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.moveCurrentElementDown();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 0");
+		assertThat(elements.getElementAt(1).toString()).isEqualTo("element 1");
+		assertThat(elements.getElementAt(2).toString()).isEqualTo("element 2");
+	}
+
+	@Test
+	public void moveSelectedElementDown() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.selectCurrentElement(1);
+		elementCollectionModel.moveCurrentElementDown();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 0");
+		assertThat(elements.getElementAt(1).toString()).isEqualTo("element 2");
+		assertThat(elements.getElementAt(2).toString()).isEqualTo("element 1");
+	}
+
+
+	@Test
+	public void moveFirstElementDown() throws Exception {
+		elementCollectionModel.add("element 0");
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.selectCurrentElement(0);
+		elementCollectionModel.moveCurrentElementDown();
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		assertThat(elements.getElementAt(0).toString()).isEqualTo("element 1");
+		assertThat(elements.getElementAt(1).toString()).isEqualTo("element 0");
+		assertThat(elements.getElementAt(2).toString()).isEqualTo("element 2");
+	}
+
+	@Test
+	public void ignoresDeletingElementsFromEmptyCollection() throws Exception {
+		elementCollectionModel.removeCurrentElement();
+	}
+
+	@Test
+	public void changeCurrentElementIndexAfterSelectionChange() throws Exception {
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		ComboBoxModel<Stringifyed<Presentation>> elements = elementCollectionModel.getElements();
+		elements.setSelectedItem(elements.getElementAt(0));
+		assertThat(elementCollectionModel.getCurrentElement().getName()).isEqualTo("element 1");
+	}
+
+	@Test
+	public void notifyListenerOnSelectionChange() throws Exception {
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.addCollectionChangeListener(listener);
+		elementCollectionModel.selectCurrentElement(0);
+		
+		verify(listener).onCollectionChange(refEq(SELECTION_INDEX_CHANGED.of(elementCollectionModel)));
+		verify(listener).onCollectionChange(refEq(SELECTION_CHANGED.of(elementCollectionModel)));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	public void doNotNotifyRemovedListeners() throws Exception {
+		elementCollectionModel.add("element 1");
+		elementCollectionModel.add("element 2");
+		elementCollectionModel.addCollectionChangeListener(listener);
+		elementCollectionModel.removeCollectionChangeListener(listener);
+		elementCollectionModel.selectCurrentElement(0);
+		verify(listener, never()).onCollectionChange(any(CollectionChangedEvent.class));
+	}
+}
diff --git a/freeplane/src/test/java/org/freeplane/features/presentations/mindmapmode/MainFrame.java b/freeplane/src/test/java/org/freeplane/features/presentations/mindmapmode/MainFrame.java
new file mode 100644
index 0000000..0d84cb1
--- /dev/null
+++ b/freeplane/src/test/java/org/freeplane/features/presentations/mindmapmode/MainFrame.java
@@ -0,0 +1,41 @@
+package org.freeplane.features.presentations.mindmapmode;
+
+import javax.swing.JFrame;
+
+public class MainFrame {
+	public static void main(String... argv){
+		final JFrame frame = new JFrame("Freeplane presentation editor");
+		final PresentationState presentationStateModel = new PresentationState();
+		final PresentationEditorController presentationEditorController = new PresentationEditorController(presentationStateModel);
+		frame.getContentPane().add(presentationEditorController.createPanel(null));
+		final NamedElementFactory<Slide> slideFactory = new NamedElementFactory<Slide>(){
+
+			@Override
+			public Slide create(String name) {
+				return new Slide(name);
+			}
+
+			@Override
+			public Slide create(Slide prototype, String newName) {
+				return prototype.create(newName);
+			}
+			
+		};
+		final NamedElementFactory<Presentation> presentationFactory = new NamedElementFactory<Presentation>() {
+
+			@Override
+			public Presentation create(String name) {
+				return new Presentation(name, slideFactory);
+			}
+
+			@Override
+			public Presentation create(Presentation prototype, String newName) {
+				return prototype.create(newName);
+			}
+		};
+		presentationEditorController.setPresentations(new NamedElementCollection<>(presentationFactory));
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		frame.pack();
+		frame.show();
+	}
+}
diff --git a/freeplane/viewer-resources/freeplane.properties b/freeplane/viewer-resources/freeplane.properties
index 5e2811f..7f6cd3d 100644
--- a/freeplane/viewer-resources/freeplane.properties
+++ b/freeplane/viewer-resources/freeplane.properties
@@ -8,12 +8,13 @@ AutomaticEdgeColorHookAction.icon=/images/AutomaticEdgeColorHookAction.png
 BackAction.icon=/images/MoveTo_PrevNode.png
 BlinkingNodeHookAction.icon=/images/xeyes.png
 BoldAction.icon=/images/Bold16.png
-CenterAction.icon=/images/CenterSelectedNodeAction.png
-CenterSelectedNodeAction.icon=/images/CenterSelectedNodeAction.png
+CenterAction.icon=/images/MoveSelectedNodeAction.CENTER.png
+MoveSelectedNodeAction.CENTER.icon=/images/MoveSelectedNodeAction.CENTER.png
 ChangeConnectorArrowsAction.backward.icon=/images/arrow-mode-backward.png
 ChangeConnectorArrowsAction.both.icon=/images/arrow-mode-both.png
 ChangeConnectorArrowsAction.forward.icon=/images/arrow-mode-forward.png
 ChangeConnectorArrowsAction.none.icon=/images/arrow-mode-none.png
+CloneAction.icon=/images/CloneAction.png
 CloseAction.icon=/images/close.png
 CloudAction.icon=/images/Cloud24.png
 CloudColorAction.icon=/images/Colors24.png
@@ -33,6 +34,7 @@ EditDetailsInDialogAction.icon=/images/EditDetailsInDialogAction.png
 EditFilterAction.icon=/images/edit_filtering_condition.png
 EditLongAction.icon=/images/edit_long_node.png
 EditNoteInDialogAction.icon=/images/EditNoteInDialogAction.png
+EdgeColorAction.icon=/images/AutomaticEdgeColorHookAction.png
 EncryptedMap.icon=/images/lock.png
 EnterPassword.icon=/images/unlock.png
 ExecuteScriptForAllNodes.icon=/images/ExecuteScriptForAllNodes.png
@@ -40,6 +42,7 @@ ExecuteScriptForSelectionAction.icon=/images/ExecuteScriptForSelectionAction.png
 ExecuteScripts.icon=/images/ExecuteScripts.png
 ExportAction.icon=/images/export.png
 ExternalImageAddAction.icon=/images/ExternalImageAddAction.png
+ExternalImageRemoveAction.icon=/images/ExternalImageRemoveAction.png
 ExtractLinkFromTextAction.icon=/images/ExtractLinkFromTextAction.png
 FaqOpenURLAction.icon=/images/Link.png
 FilePropertiesAction.icon=/images/MapStats.png
@@ -89,11 +92,12 @@ IconSelectionPlugin.icon=/images/kalzium.png
 IncreaseNodeFontAction.icon=/images/IncreaseNodeFontAction.png
 ItalicAction.icon=/images/Italic16.png
 JoinNodesAction.icon=/images/JoinNodesAction.png
-LaTeX_in_freeplane_url=http\://freeplane.sourceforge.net/wiki/index.php/LaTeX_in_Freeplane
+LaTeX_in_freeplane_url=https\://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane
 ManageAddOnsAction.icon=/images/addons.png
 MapBackgroundClearAction.icon=/images/MapBackgroundClearAction.png
 MapBackgroundColorAction.icon=/images/MapBackgroundColorAction.png
 MapBackgroundImageAction.icon=/images/MapBackgroundImageAction.png
+menu_displayAttributes.icon=/images/AttributesView.png
 NavigationNextMapAction.icon=/images/MoveTo_NextMM.png
 NavigationPreviousMapAction.icon=/images/MoveTo_PrevMM.png
 NewChildAction.icon=/images/idea.png
@@ -106,14 +110,16 @@ NodeColorBlendAction.icon=/images/NodeColorBlendAction.png
 NodeListAction.icon=/images/NodeListAction.png
 OpenAction.icon=/images/fileopen.png
 OpenURLAction.icon=/images/Link.png
+OpenURLMapAction.icon=/images/OpenURLMapAction.png
 OpenUserDirAction.icon=/images/OpenUserDirAction.png
 OptionPanel.display_inline_editor_for_all_new_nodes=false
 PasteAction.icon=/images/editpaste.png
 PrintAction.icon=/images/fileprint.png
-PrintDirectAction.icon=/images/fileprint.png
+PrintDirectAction.icon=/images/filePrintDirect.png
 PrintPreviewAction.icon=/images/print_preview.png
 PropertyAction.icon=/images/ShowPreferencesAction.png
 QuickFilterAction.icon=/images/apply_quick_filter.png
+filterConditions.icon=/images/filterConditions.png
 FindNextAction.icon=/images/find_next.png
 QuickFindAction.FORWARD.icon=/images/find_next.png
 FindPreviousAction.icon=/images/find_previous.png
@@ -148,9 +154,9 @@ ShowFilterToolbarAction.icon=/images/filter.png
 ShowSelectionAsRectangleAction.icon=/images/ShowSelectionAsRectangleAction.png
 SortNodes.icon=/images/SortNodes.png
 SplitNode.icon=/images/split_node.png
-TextAlignAction.CENTER.icon=/images/algnCtr16.gif
-TextAlignAction.LEFT.icon=/images/algnLft16.gif
-TextAlignAction.RIGHT.icon=/images/algnRt16.gif
+TextAlignAction.CENTER.icon=/images/algnCtr16.png
+TextAlignAction.LEFT.icon=/images/algnLft16.png
+TextAlignAction.RIGHT.icon=/images/algnRt16.png
 TimeListAction.icon=/images/TimeListAction.png
 TimeManagementAction.icon=/images/TimeManagementAction.png
 UndoAction.icon=/images/undo.png
@@ -176,9 +182,9 @@ connector_alpha=200
 connector_shape=CUBIC_CURVE
 connector_width=2
 convert_to_current_version=true
-copyright_url=http\://freeplane.sourceforge.net/wiki/index.php/Contributors
+copyright_url=https\://www.freeplane.org/wiki/index.php/Contributors
 cut_nodes_without_question=true
-cut_out_pictures_when_pasting_html=true
+cut_out_pictures_when_pasting_html=false
 date_format=SHORT
 datetime_format=SHORT,SHORT
 default_attribute_key_column_width=60 pt
@@ -203,7 +209,6 @@ disable_cursor_move_paper=false
 disable_key_type=false
 display_inline_editor_for_all_new_nodes=false
 display_node_id=false
-docu-online=http\://freeplane.sourceforge.net/mapsOnline/IndexFreeplaneGuides.mm
 docu_map=doc/freeplane.mm
 draganddrop=true
 edit_on_double_click=true
@@ -215,7 +220,6 @@ el__max_default_window_width=500
 el__min_default_window_height=150
 el__min_default_window_width=500
 el__position_window_below_node=true
-executable_icon=Executable.png
 experimental_file_locking_on=false
 export_icons_in_html=false
 exported_image_resolution_dpi=300
@@ -227,12 +231,12 @@ filter_toolbar_visible=false
 filter_toolbar_visible.fullscreen=false
 whatsnew_map=doc/whatsNew-1.5.x.mm
 fit_map=USER_DEFINED
-fit_to_viewport=false;
+fit_to_viewport=false
 fold_on_click_inside=true
 foldingsymbolwidth=10
 statesymbolwidth=10
 format_locale=automatic
-freeplane_copyright=(C)2000-2016
+freeplane_copyright=(C)2000-2017
 freeplane_description=Free mind mapping and knowledge management software
 fullscreen_enabled=true
 goto_note_end_on_edit=true
@@ -254,7 +258,7 @@ icons.group.media=video;audio;executable;image;internet;internet_warning;mindmap
 icons.group.miscellaneous=wizard;gohome;knotify;password;pencil;xmag;bell;bookmark;launch;broken-line;stop;prepare;go
 icons.group.nature=licq;penguin;freemind_butterfly;bee
 icons.group.numbers=full-1;full-2;full-3;full-4;full-5;full-6;full-7;full-8;full-9;full-0;0%;25%;50%;75%;100%
-icons.group.office=attach;desktop_new;list;edit;kaddressbook;pencil;folder;kmail;Mail;revision
+icons.group.office=attach;desktop_new;list;edit;kaddressbook;pencil;folder;kmail;Mail;revision;revision-green;revision-pink;revision-red
 icons.group.people=family;female1;female2;females;male1;male2;males;fema;group
 icons.group.rating=very_negative;negative;neutral;positive;very_positive
 icons.group.signs=help;yes;button_ok;button_cancel;bookmark;idea;messagebox_warning;stop-sign;closed;info;clanbomber;checked;unchecked
@@ -266,7 +270,7 @@ icons.list=help;yes;button_ok;button_cancel;bookmark;idea;messagebox_warning;sto
 wizard;gohome;knotify;password;pencil;xmag;bell;bookmark;launch;broken-line;stop;prepare;go;\
 very_negative;negative;neutral;positive;very_positive;\
 full-1;full-2;full-3;full-4;full-5;full-6;full-7;full-8;full-9;full-0;0%;25%;50%;75%;100%;\
-attach;desktop_new;list;edit;kaddressbook;pencil;folder;kmail;Mail;revision;\
+attach;desktop_new;list;edit;kaddressbook;pencil;folder;kmail;Mail;revision;revision-green;revision-pink;revision-red;\
 video;audio;executable;image;internet;internet_warning;mindmap;narrative;\
 flag-black;flag-blue;flag-green;flag-orange;flag-pink;flag;flag-yellow;\
 clock;clock2;hourglass;calendar;\
@@ -293,8 +297,16 @@ layout_map_on_text_change=false
 leftToolbarVisible=false
 leftToolbarVisible.fullscreen=false
 license_url=http\://www.gnu.org/licenses/gpl-2.0.html
-link_icon=Link.png
-link_local_icon=LinkLocal.png
+text_icon = /images/text.png
+number_icon=/images/number.png
+date_icon=/images/calendar_red.png
+date_time_icon=/images/calendar_clock_red.png
+link_icon = /images/Link.png
+executable_icon=/images/icons/executable.png
+link_local_icon= /images/LinkLocal.png
+menuitem_icon=/images/icons/button.png
+mail_icon=/images/Mail.png
+messagebox_warning_icon=/images/icons/messagebox_warning.png
 links=relative
 load_folding=load_folding_from_map_default_fold_all
 load_last_map=false
@@ -302,7 +314,6 @@ load_last_maps=true
 load_next_properties=
 lock_expiration_time_in_minutes=5
 lookandfeel=default
-mail_icon=Mail.png
 mapxsize=1000
 mapysize=3200
 max_displayed_node_count=20
@@ -328,7 +339,7 @@ parse_latex=true
 placenewbranches=last
 preferred_browsers=explorer;konqueror;netscape  \# Not yet implemented \!\!\!
 presentation_dimmer_transparency=144
-presentation_mode=false
+spotlight=false
 printonwhitebackground=true
 remind_use_rich_text_in_new_nodes=true
 remove_notes_without_question=true
@@ -347,60 +358,55 @@ show_icon_for_attributes=true
 show_node_tooltips=true
 show_note_icons=true
 show_styles_in_tooltip=false
-simplyhtml.appIcon=resources/icon_trans.gif
-simplyhtml.appImage=resources/appImage.jpg
+simplyhtml.default_paste_mode=PASTE_HTML
+simplyhtml.menubar=edit format table help
+simplyhtml.edit=undo redo - selectAll cut copy paste pasteOther - findReplace editLink setLinkByFileChooser - print
+simplyhtml.format=font - formatPara fontBold fontItalic fontUnderline  - increaseFontSize decreaseFontSize - fontColor selectedFontColor redFontColor greenFontColor blueFontColor blackFontColor removeFontColor - paraAlignLeft paraAlignCenter paraAlignRight - formatList toggleBullets toggleNumbers - clearFormat
+simplyhtml.formatToolBar=fontFamily fontSize - fontBold fontItalic fontUnderline fontColor clearFormat
+simplyhtml.paraToolBar=paraAlignLeft paraAlignCenter paraAlignRight - toggleBullets toggleNumbers
+simplyhtml.table=insertTable - nextTableCell prevTableCell - appendTableRow appendTableCol - insertTableRow insertTableCol - deleteTableRow deleteTableCol
+simplyhtml.toolBar=print undo redo - cut copy paste - findReplace
+simplyhtml.use_std_styles=false
+simplyhtml.help=about
+simplyhtml.linkType2=http
+simplyhtml.okBtnName=OK
+simplyhtml.popup=undo redo - cut copy paste pasteOther
+simplyhtml.simpleLinkDialog=true
+simplyhtml.standardStyleName=standard
+#simplyhtml.appIcon=resources/icon_trans.gif
+#simplyhtml.appImage=resources/appImage.jpg
 simplyhtml.clearFormatImage=/images/clearFormat.png
 simplyhtml.copyImage=/images/editcopy.png
 simplyhtml.cutImage=/images/editcut.png
-simplyhtml.default_paste_mode=PASTE_HTML
-simplyhtml.deleteTableColImage=resources/delCol.gif
-simplyhtml.deleteTableRowImage=resources/delRow.gif
-simplyhtml.edit=undo redo - selectAll cut copy paste pasteOther - findReplace editLink setLinkByFileChooser - print
-simplyhtml.editLinkImage=resources/link.gif
+simplyhtml.deleteTableColImage=/images/delCol.png
+simplyhtml.deleteTableRowImage=/images/delRow.png
+#simplyhtml.editLinkImage=resources/link.gif
 simplyhtml.findReplaceImage=/images/filefind.png
 simplyhtml.fontBoldImage=/images/Bold16.png
 simplyhtml.fontBoldSelectedIcon=/images/Bold_on16.png
-simplyhtml.fontColorImage=resources/fontColor.gif
-simplyhtml.fontColorSelectedIcon=resources/fontColor.gif
-simplyhtml.fontImage=resources/font.gif
+simplyhtml.fontColorImage=/images/fontColor.png
+simplyhtml.fontImage=/images/font.png
 simplyhtml.fontItalicImage=/images/Italic16.png
-simplyhtml.fontItalicSelectedIcon=/images/Italic_on16.png
 simplyhtml.fontUnderlineImage=/images/uline.png
-simplyhtml.fontUnderlineSelectedIcon=/images/uline_on.png
-simplyhtml.format=font - formatPara fontBold fontItalic fontUnderline  - increaseFontSize decreaseFontSize - fontColor selectedFontColor redFontColor greenFontColor blueFontColor blackFontColor removeFontColor - paraAlignLeft paraAlignCenter paraAlignRight - formatList toggleBullets toggleNumbers - clearFormat
-simplyhtml.formatParaImage=resources/fmtPara.gif
-simplyhtml.formatTableImage=resources/fmtTab.gif
-simplyhtml.formatToolBar=fontFamily fontSize - fontBold fontItalic fontUnderline fontColor clearFormat
-simplyhtml.help=about
-simplyhtml.insertImageImage=resources/image.gif
-simplyhtml.insertTableColImage=resources/insCol.gif
-simplyhtml.insertTableImage=resources/table.gif
-simplyhtml.insertTableRowImage=resources/insRow.gif
-simplyhtml.linkType2=http
-simplyhtml.menubar=edit format table help
-simplyhtml.okBtnName=OK
-simplyhtml.paraAlignCenterImage=resources/algnCtr.gif
-simplyhtml.paraAlignCenterSelectedIcon=resources/algnCtr_on.gif
-simplyhtml.paraAlignLeftImage=resources/algnLft.gif
-simplyhtml.paraAlignLeftSelectedIcon=resources/algnLft_on.gif
-simplyhtml.paraAlignRightImage=resources/algnRt.gif
-simplyhtml.paraAlignRightSelectedIcon=resources/algnRt_on.gif
-simplyhtml.paraToolBar=paraAlignLeft paraAlignCenter paraAlignRight - toggleBullets toggleNumbers
+simplyhtml.formatParaImage=/images/fmtPara.png
+#simplyhtml.formatTableImage=/images/fmtTab.png
+#simplyhtml.insertImageImage=/images/image.gif
+simplyhtml.insertTableColImage=/images/insCol.png
+simplyhtml.insertTableImage=/images/table.png
+simplyhtml.insertTableRowImage=/images/insRow.png
+#simplyhtml.paraAlignLeftImage=resources/algnLft.gif
+#simplyhtml.paraAlignRightImage=resources/algnRt.gif
 simplyhtml.pasteImage=/images/editpaste.png
 simplyhtml.pasteOtherImage=/images/editpaste.png
-simplyhtml.popup=undo redo - cut copy paste pasteOther
 simplyhtml.printImage=/images/fileprint.png
 simplyhtml.redoImage=/images/redo.png
-simplyhtml.simpleLinkDialog=true
-simplyhtml.splashImage=resources/splashImage.jpg
-simplyhtml.standardStyleName=standard
-simplyhtml.table=insertTable - nextTableCell prevTableCell - appendTableRow appendTableCol - insertTableRow insertTableCol - deleteTableRow deleteTableCol
-simplyhtml.toggleBulletsImage=resources/ul.gif
-simplyhtml.toggleNumbersImage=resources/ol.gif
-simplyhtml.toolBar=print undo redo - cut copy paste - findReplace
+#simplyhtml.splashImage=resources/splashImage.jpg
+simplyhtml.toggleBulletsImage=/images/ul.png
+simplyhtml.toggleNumbersImage=/images/ol.png
 simplyhtml.undoImage=/images/undo.png
-simplyhtml.use_std_styles=false
-
+simplyhtml.paraAlignCenterImage=/images/algnCtr16.png
+simplyhtml.paraAlignLeftImage=/images/algnLft16.png
+simplyhtml.paraAlignRightImage=/images/algnRt16.png
 # menu accelerators
 simplyhtml.selectAllAccelerator=control A
 simplyhtml.fontBoldAccelerator=control B
@@ -438,7 +444,7 @@ spelling_opt_ignore_capitalization=true
 spelling_opt_ignore_words_with_numbers=false
 spelling_opt_suggestions_limit_dialog=15
 spelling_opt_suggestions_limit_menu=15
-standard_template=standard.mm
+standard_template=standard-1.6.mm
 standardbackgroundcolor=\#ffffff
 standardcloudcolor=\#f0f0f0
 standardcloudestyle=bezier
@@ -477,11 +483,8 @@ use_common_out_point_for_root_node=false
 use_split_pane=false
 user_defined_screen_resolution=96
 user_zoom=1
-webDocuLocation=http\://freeplane.sourceforge.net/docu.html
-webDownloadLocation=http\://sourceforge.net/project/showfiles.php?group_id\=211069
-webFAQLocation=http\://freeplane.sourceforge.net/faq.html
-webFreeplaneLocation=http\://freeplane.sourceforge.net/
-webUpdateLocation=http\://freeplane.sourceforge.net/info/history/
+webFreeplaneLocation=https\://www.freeplane.org/
+webUpdateLocation=https\://www.freeplane.org/info/history/
 wheel_velocity=80
 SplitToWordsAction.nodeNumbersInLine=1, 2, 6, 12
 SplitToWordsAction.leaveOriginalNodeEmpty=true
@@ -498,10 +501,87 @@ indentationUsesTabsInTextOutput=false
 JoinNodesAction.textSeparators={{\\n}} {{ }} {{, }}
 filter.showAncestors=true
 filter.showDescendants=false
-locales=ar,ca,cs,da,de,el,es,et,eu,fr,gl,hr,hu,id,it,ja,ko,lt,nb,nl,nn,pl,pt_BR,pt_PT,ru,sk,sl,sr,sv,tr,uk_UA,zh_CN,zh_TW,en
+locales=ar,af,ca,cs,da,de,el,es,et,eu,fr,gl,hr,hu,id,it,ja,ko,lt,nb,nl,nn,pl,pt_BR,pt_PT,ru,sk,sl,sr,sv,tr,uk_UA,zh_CN,zh_TW,en
 org.freeplane.plugin.bugreport.dialog.disabled=false
+use_svg_icons=true
+antialias_svg=true
 lookandfeel.scaleuifonts=true
 weblateUrlFormat=https://hosted.weblate.org/translate/freeplane/translation/{0}/?q={1}&search=exact&context=on&type=all&ignored=False
 surveyUrl=https://raw.githubusercontent.com/freeplane/conf/master/survey/surveyConfig
 neverShowSurvey=false
-
+connector_arrows=FORWARD
+connector_dash=SOLID
+toolbar_icon_height=16 pt
+fit_to_viewport.icon=/images/MapBackgroundImageSize.png
+presentation.processesUpDownKeys=false
+presentation.processesNavigationKeys=false
+presentation.switchToFullScreen=false
+presentation.switchToSpotlight=false
+presentation.maxDropBoxRowCount=9
+standardcloudshape=ARC
+markClones=false
+markSelectedClones=true
+presentation.processesEscapeKey=true
+presentation.slideDisplaysAllNodes=true
+presentation.delete.icon=/images/DeletePresentation.svg
+presentation.up.icon=/images/UpPresentation.svg
+presentation.down.icon=/images/DownPresentation.svg
+presentation.move.icon=/images/MovePresentation.svg
+presentation.new.icon=/images/NewPresentation.svg
+presentation.copy.icon=/images/CopyPresentation.svg
+spotlight.icon=/images/spotlight.svg
+StartPresentationOrShowNextSlideAction.icon=/images/StartPresentationOrShowNextSlideAction.svg
+slide.delete.icon=/images/DeleteSlide.svg
+slide.up.icon=/images/UpSlide.svg
+slide.down.icon=/images/DownSlide.svg
+slide.move.icon=/images/MoveSlide.svg
+slide.new.icon=/images/NewSlide.svg
+slide.copy.icon=/images/CopySlide.svg
+ToggleFullScreenAction.icon=/images/fullscreen.png
+NewSummaryAction.icon=/images/NewSummary.png
+MoveToRootAction.icon=/images/MoveToRootAction.png
+pasteImagesFromFiles=true
+presentation.slowMotion=false
+StartPresentationAction.icon=/images/StartPresentation.svg
+StopPresentationAction.icon=/images/StopPresentation.svg
+ShowFirstSlideAction.icon=/images/FirstSlide.svg
+ShowPreviousSlideAction.icon=/images/PreviousSlide.svg
+ShowNextSlideAction.icon=/images/NextSlide.svg
+ShowLastSlideAction.icon=/images/LastSlide.svg
+spotlight.icon=/images/spotlight.png
+AddSlideContent.icon=/images/AddSlideContent.svg
+PlaceSelectedNodeOnSlide.icon=/images/PlaceSelectedNodeOnSlide.svg
+PresentationPreference.icon=/images/PresentationPreference.svg
+RemoveSlideContent.icon=/images/RemoveSlideContent.svg
+SelectSlideContent.icon=/images/SelectSlideContent.svg
+SetFilterSlideContent.icon=/images/SetFilterSlideContent.svg
+SetFoldingSlideContent.icon=/images/SetFoldingSlideContent.svg
+SetSlideContent.icon=/images/SetSlideContent.svg
+SetZoomSlideContent.icon=/images/SetZoomSlideContent.svg
+ShowAncestorsSlideContent.icon=/images/ShowAncestorsSlideContent.svg
+ShowDescendantsSlideContent.icon=/images/ShowDescendantsSlideContent.svg
+ShowOnlySelectedNodeSlideContent.icon=/images/ShowOnlySelectedNodeSlideContent.svg
+attributes_AddAttributeAction.icon=/images/AddAttributeAction.png
+AssignAttributesAction.icon=/images/AssignAttributesAction.png
+center_selected_node.icon=/images/CenterSelectedNodeAutomatically.png
+ShowFirstSlideAndStartPresentationAction.icon=/images/ShowFirstSlideAndStartPresentationAction.png
+presentation.exportDirectory=exportedPresentation
+slide.at_center.icon=/images/NodeCenter.png
+slide.on_the_left.icon=/images/NodeLeft.png
+slide.on_the_right.icon=/images/NodeRight.png
+AddMenuItemLinkAction.icon=/images/AddMenuItemLinkAction.png
+ExportPresentationAction.icon=/images/PresentationToPNG.png
+ExportAllPresentationsAction.icon=/images/AllPresentationsToPNG.png
+AddElementaryConditionAction.icon=/images/AddFilter.png
+CreateConjunctConditionAction.icon=/images/AndFilter.png
+CreateDisjunctConditionAction.icon=/images/OrFilter.png
+CreateNotSatisfiedConditionAction.icon=/images/NotFilter.png
+SplitConditionAction.icon=/images/SplitFilter.png
+DeleteConditionAction.icon=/images/DeleteFilter.png
+NameConditionAction.icon=/images/NameFilter.png
+UpConditionAction.icon=/images/UpFilter.png
+DownConditionAction.icon=/images/DownFilter.png
+show_note_icon_in_tooltip=true
+show_connectors=true
+show_icons=true
+move_slowly=false
diff --git a/freeplane/viewer-resources/images/AddFilter.svg b/freeplane/viewer-resources/images/AddFilter.svg
new file mode 100644
index 0000000..cf0de63
--- /dev/null
+++ b/freeplane/viewer-resources/images/AddFilter.svg
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="32"
+   viewBox="0 0 40 32"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="AddFilter.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </radialGradient>
+    <linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </linearGradient>
+    <linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </linearGradient>
+    <linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </linearGradient>
+    <linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.5476641"
+     inkscape:cx="8.4964159"
+     inkscape:cy="61.809851"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1193.0483)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.321671"
+       height="31.321405"
+       x="94.538063"
+       y="1193.3876"
+       rx="1.7739983"
+       ry="1.8605328" />
+    <g
+       id="g4609"
+       transform="matrix(1.5301188,0,0,1.5324121,75.110994,1154.0478)"
+       style="stroke-width:0.73146331">
+      <g
+         id="g4607"
+         transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+         style="stroke-width:0.73146331">
+        <g
+           id="g4603"
+           transform="translate(5.1953e-6,28.466)"
+           style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+          <path
+             style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+             id="path4599"
+             d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+             inkscape:connector-curvature="0" />
+          <ellipse
+             style="fill:url(#a-8);stroke-width:0.31768915"
+             id="ellipse4601"
+             cx="290.51001"
+             cy="557.94"
+             ry="0.79745001"
+             transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+             rx="8.6450996" />
+        </g>
+        <rect
+           id="rect4605"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry="0.18513"
+           rx="0.16552"
+           style="fill:none;stroke-width:0.73146331" />
+      </g>
+    </g>
+    <path
+       d="m 121.94781,1205.9039 v 4.6749 h -4.32535 v 3.2601 h 4.32535 v 4.6751 h 3.28984 v -4.6751 h 4.32534 v -3.2601 h -4.32534 v -4.6749 z"
+       id="path3153"
+       inkscape:connector-curvature="0"
+       style="fill:#f21313;stroke:none;stroke-width:0.13748308px" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/AndFilter.svg b/freeplane/viewer-resources/images/AndFilter.svg
new file mode 100644
index 0000000..45f8f6b
--- /dev/null
+++ b/freeplane/viewer-resources/images/AndFilter.svg
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="AndFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="150.2"
+       y1="673.53"
+       gradientTransform="matrix(0.59338289,0.16508124,-0.23772172,0.85452432,271.88031,593.20912)"
+       x2="158.14"
+       gradientUnits="userSpaceOnUse"
+       y2="677.01"
+       id="a-3">
+      <svg:stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#f00" />
+      <svg:stop
+         id="stop9-4"
+         offset="1"
+         stop-color="#fffe21" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3261255"
+     inkscape:cx="-50.692828"
+     inkscape:cy="34.371733"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.321671"
+       height="31.321405"
+       x="184.48253"
+       y="1184.6935"
+       rx="1.7739983"
+       ry="1.8605328" />
+    <svg:g
+       id="g4609"
+       transform="matrix(1.5301188,0,0,1.5324121,163.05952,1144.6131)"
+       style="stroke-width:0.73146331">
+      <svg:g
+         id="g4607"
+         transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+         style="stroke-width:0.73146331">
+        <svg:g
+           id="g4603"
+           transform="translate(5.1953e-6,28.466)"
+           style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+          <svg:path
+             style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+             id="path4599"
+             d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+             inkscape:connector-curvature="0" />
+          <svg:ellipse
+             style="fill:url(#a-8);stroke-width:0.31768915"
+             id="ellipse4601"
+             cx="290.51001"
+             cy="557.94"
+             ry="0.79745001"
+             transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+             rx="8.6450996" />
+        </svg:g>
+        <svg:rect
+           id="rect4605"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry="0.18513"
+           rx="0.16552"
+           style="fill:none;stroke-width:0.73146331" />
+      </svg:g>
+    </svg:g>
+    <svg:text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:25.1760006px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.62940097"
+       x="202.49268"
+       y="1212.3925"
+       id="text4862"><svg:tspan
+         sodipodi:role="line"
+         id="tspan4860"
+         x="202.49268"
+         y="1212.3925"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:25.1760006px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.62940097">&</svg:tspan></svg:text>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/AttributesView.svg b/freeplane/viewer-resources/images/AttributesView.svg
new file mode 100644
index 0000000..ada8bb6
--- /dev/null
+++ b/freeplane/viewer-resources/images/AttributesView.svg
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17560"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs17562">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3773"
+       id="radialGradient14019"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.610003,0,0,0.610003,57.68046,101.3106)"
+       spreadMethod="reflect"
+       cx="147.89946"
+       cy="259.77209"
+       fx="147.89946"
+       fy="259.77209"
+       r="227.53777" />
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8251"
+       id="radialGradient14021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.991749,-0.1351,0.1351,0.991749,-57.27289,-28.38547)"
+       cx="-235.12236"
+       cy="409.56799"
+       fx="-235.12236"
+       fy="409.56799"
+       r="206.68015" />
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8983"
+       id="radialGradient14023"
+       gradientUnits="userSpaceOnUse"
+       cx="-235.12236"
+       cy="409.56799"
+       fx="-235.12236"
+       fy="409.56799"
+       r="206.68015" />
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8983"
+       id="radialGradient14025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.067294,-2.894885e-7,1.666001e-7,0.614226,14.09976,131.3014)"
+       spreadMethod="pad"
+       cx="-209.52437"
+       cy="340.35858"
+       fx="-207.43031"
+       fy="302.83432"
+       r="103.34007" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8983"
+       id="radialGradient14027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.807107,-0.216266,0.149951,0.559619,-90.93863,105.4105)"
+       spreadMethod="pad"
+       cx="-205.79749"
+       cy="344.59457"
+       fx="-200.75925"
+       fy="374.52814"
+       r="103.34007" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.265876"
+     inkscape:cx="-18.01854"
+     inkscape:cy="13.468374"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17565">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g18340"
+       transform="translate(-4.8697612e-7,-3.7515049e-5)">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="M:\FreePlane_radna_mapa\images-view\showAttributes.gif.png"
+         transform="matrix(1.9817952,0,0,1.9817952,-177.26986,-1648.8823)"
+         id="g9934-1-9">
+        <g
+           id="g10366-7-6"
+           transform="matrix(0.7060479,0,0,0.7060479,63.01753,229.2518)">
+          <rect
+             y="854.06769"
+             x="38.699677"
+             height="22.161352"
+             width="20.342138"
+             id="rect10214-4-0"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.70816725;marker:none;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-0-5"
+             d="m 48.870745,858.77559 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#b1b1b1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.16712102;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-8-9-2"
+             d="m 48.870745,863.63668 -10.121756,0 0,-4.68684 10.121756,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-89-4-3"
+             d="m 48.870746,868.49777 -10.121757,0 0,-4.68684 10.121757,0 m 0,4.68684 10.121757,0 0,-4.68684 -10.121757,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccccccc"
+             id="rect10216-7-8-7"
+             d="m 48.870744,873.35886 -10.121755,0 0,-4.68684 10.121755,0 m 0,4.68684 10.121758,0 0,-4.68684 -10.121758,0 -0.03471,4.69397"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:none;stroke:#000000;stroke-width:0.35408363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path10281-8-1"
+             d="m 39.022949,874.74058 0,-1.23649 9.847796,0 9.847797,0 0,1.23649 0,1.2365 -9.847797,0 -9.847796,0 0,-1.2365 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.04416052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <text
+             id="text10283-2-3"
+             y="861.82092"
+             x="40.057484"
+             style="font-style:italic;font-size:2.08346057px;fill:#0000ff;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="861.82092"
+               x="40.057484"
+               id="tspan10285-4-5"
+               sodipodi:role="line">Predrag</tspan></text>
+          <text
+             id="text10283-8-5-1"
+             y="866.51904"
+             x="40.350864"
+             style="font-style:italic;font-size:2.08346057px;fill:#ff0000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="866.51904"
+               x="40.350864"
+               id="tspan10285-1-5-6"
+               sodipodi:role="line">Romina</tspan></text>
+          <text
+             id="text10283-86-1-0"
+             y="866.53125"
+             x="51.055748"
+             style="font-style:italic;font-size:2.08346057px;fill:#008000;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               id="tspan10362-7-4"
+               y="866.53125"
+               x="51.055748"
+               sodipodi:role="line">Sara</tspan></text>
+          <text
+             id="text10283-86-4-1-0"
+             y="862.04016"
+             x="51.055748"
+             style="font-style:italic;font-size:2.08346057px;fill:#ff6600;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="862.04016"
+               x="51.055748"
+               id="tspan10285-12-2-1-0"
+               sodipodi:role="line">Stela</tspan></text>
+        </g>
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate"
+           id="rect6193-0-23-7-8-2-89-0-36-52-9"
+           width="16"
+           height="16"
+           x="89.522621"
+           y="832.08801" />
+      </g>
+      <g
+         transform="matrix(0.97020322,0,0,0.97020322,13.986932,7.0995543)"
+         id="g18326">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11973214;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:4.50300026;stroke-opacity:1;marker:none;enable-background:accumulate"
+           d="m 17.910121,6.879283 c -4.304346,6.256794 -7.420617,7.71017 -15.777834,7.988778 -8.594951,-0.477894 -13.318225,-3.576698 -15.777845,-7.988778 -2.148342,-3.853712 7.06398,-7.98878 15.777845,-7.98878 8.713853,0 18.278511,4.353796 15.777834,7.98878 z"
+           id="path12873"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scsss" />
+        <g
+           transform="matrix(0.02792154,0,0,0.02792154,-5.3767978,-0.831001)"
+           inkscape:label="Layer 1"
+           id="layer1-3">
+          <g
+             transform="translate(-98,-252)"
+             id="g2059">
+            <circle
+               r="227.53777"
+               cy="259.77228"
+               cx="147.89955"
+               transform="matrix(1.199801,0,0,1.199801,194.5972,214.5061)"
+               style="fill:url(#radialGradient14019);fill-opacity:1;fill-rule:nonzero;stroke:none"
+               inkscape:label="#path1310"
+               id="eyecol" />
+            <path
+               transform="matrix(0.964567,0.131397,-0.131397,0.964567,652.6546,162.0202)"
+               style="fill:url(#radialGradient14021);fill-opacity:1;fill-rule:nonzero;stroke:none"
+               sodipodi:type="star"
+               sodipodi:sides="24"
+               sodipodi:r2="73.729027"
+               sodipodi:r1="206.81926"
+               sodipodi:cy="409.56799"
+               sodipodi:cx="-235.12236"
+               sodipodi:arg2="0.094218906"
+               sodipodi:arg1="-0.036680788"
+               inkscape:rounded="0"
+               inkscape:randomized="0"
+               inkscape:flatsided="false"
+               id="path2067"
+               d="m -28.442221,401.9834 -133.278129,14.52099 128.198711,39.23021 -132.495091,-20.46872 113.676917,71.07373 -122.682737,-54.06352 91.408235,98.07371 -104.509755,-83.97397 62.91023,118.39012 -79.21461,-108.16175 30.125,130.63844 -48.52111,-124.97847 -4.71321,133.98396 -14.52099,-133.27812 -39.2302,128.1987 20.46872,-132.49509 -71.07374,113.67692 54.06352,-122.68273 -98.07371,91.40823 83.97398,-104.50976 -118.39013,62.91023 108.16175,-79.2146 -130.63844,30.12499 124.97848,-4 [...]
+            <path
+               transform="matrix(1.138602,0,0,1.138602,639.7583,59.8463)"
+               style="fill:url(#radialGradient14023);fill-opacity:1;fill-rule:nonzero;stroke:none"
+               sodipodi:type="star"
+               sodipodi:sides="24"
+               sodipodi:r2="73.729027"
+               sodipodi:r1="206.81926"
+               sodipodi:cy="409.56799"
+               sodipodi:cx="-235.12236"
+               sodipodi:arg2="0.094218906"
+               sodipodi:arg1="-0.036680788"
+               inkscape:rounded="0"
+               inkscape:randomized="0"
+               inkscape:flatsided="false"
+               id="path2065"
+               d="m -28.442221,401.9834 -133.278129,14.52099 128.198711,39.23021 -132.495091,-20.46872 113.676917,71.07373 -122.682737,-54.06352 91.408235,98.07371 -104.509755,-83.97397 62.91023,118.39012 -79.21461,-108.16175 30.125,130.63844 -48.52111,-124.97847 -4.71321,133.98396 -14.52099,-133.27812 -39.2302,128.1987 20.46872,-132.49509 -71.07374,113.67692 54.06352,-122.68273 -98.07371,91.40823 83.97398,-104.50976 -118.39013,62.91023 108.16175,-79.2146 -130.63844,30.12499 124.97848,-4 [...]
+            <circle
+               r="227.53777"
+               cy="259.77228"
+               cx="147.89955"
+               transform="matrix(0.469923,0,0,0.469923,302.5458,404.1086)"
+               style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               id="path1306" />
+            <ellipse
+               ry="63.520962"
+               rx="103.34007"
+               cy="340.35858"
+               cx="-209.52437"
+               transform="matrix(1.082821,-1.082821,1.082821,1.082821,116.8324,-181.3922)"
+               style="fill:url(#radialGradient14025);fill-opacity:1;fill-rule:nonzero;stroke:none"
+               id="path2809" />
+            <ellipse
+               ry="63.520962"
+               rx="103.34007"
+               cy="340.35858"
+               cx="-209.52437"
+               transform="matrix(0.915538,-0.245317,0.245317,0.915538,585.3109,336.3361)"
+               style="fill:url(#radialGradient14027);fill-opacity:1;fill-rule:nonzero;stroke:none"
+               id="path3559" />
+          </g>
+        </g>
+        <path
+           style="fill:#ffccaa;stroke:none"
+           d="M -14.023756,4.952829 C -3.8436396,3.084361 8.3861598,3.610547 18.566277,5.567737 14.889447,-3.565479 -10.278728,-2.582993 -14.023756,4.952829 Z"
+           id="path13743"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path13750"
+           d="M -14.02375,5.112737 C -3.8436328,3.244269 8.3861666,3.770455 18.566284,5.727645 14.889454,-3.405571 -10.27872,-2.423085 -14.02375,5.112737 Z"
+           style="opacity:0.30199998;fill:#ffffff;fill-opacity:1;stroke:none" />
+        <path
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.19732141px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="M -13.818776,5.362767 C -4.1168804,2.152125 7.7028964,2.424337 17.951369,5.772693 9.9485206,3.740361 3.8356442,-2.719069 -13.818776,5.362767 Z"
+           id="path13748"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/BranchStats.png b/freeplane/viewer-resources/images/BranchStats.png
index 66d2762..0d057f6 100644
Binary files a/freeplane/viewer-resources/images/BranchStats.png and b/freeplane/viewer-resources/images/BranchStats.png differ
diff --git a/freeplane/viewer-resources/images/BranchStats.svg b/freeplane/viewer-resources/images/BranchStats.svg
new file mode 100644
index 0000000..dd99446
--- /dev/null
+++ b/freeplane/viewer-resources/images/BranchStats.svg
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11344">
+      <stop
+         id="stop11346"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="0.5"
+         id="stop11348" />
+      <stop
+         id="stop11350"
+         offset="1"
+         style="stop-color:#6796df;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11189">
+      <stop
+         id="stop11191"
+         offset="0"
+         style="stop-color:#ff1010;stop-opacity:1;" />
+      <stop
+         id="stop11193"
+         offset="1"
+         style="stop-color:#ff8e8e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2304-6">
+      <stop
+         id="stop2306-1"
+         offset="0"
+         style="stop-color:#babdb6" />
+      <stop
+         id="stop2308-6"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11469">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop11471" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop11473" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9385">
+      <stop
+         style="stop-color:#009f00;stop-opacity:1"
+         offset="0"
+         id="stop9387" />
+      <stop
+         style="stop-color:#60ff60;stop-opacity:1"
+         offset="1"
+         id="stop9389" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7819-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop7821-9" />
+      <stop
+         style="stop-color:#b9150a;stop-opacity:1"
+         offset="1"
+         id="stop7823-2" />
+    </linearGradient>
+    <filter
+       id="filter8252">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.61377733"
+         id="feGaussianBlur8254" />
+    </filter>
+    <linearGradient
+       id="linearGradient22117">
+      <stop
+         id="stop22119"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873"
+         offset="0.31645569"
+         style="stop-color:#fffab3;stop-opacity:0.84375" />
+      <stop
+         id="stop22121"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <filter
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749" />
+    </filter>
+    <linearGradient
+       id="linearGradient31540-7-9">
+      <stop
+         style="stop-color:#b7bec8;stop-opacity:1"
+         offset="0"
+         id="stop31542-4-3" />
+      <stop
+         style="stop-color:#535d6c;stop-opacity:1"
+         offset="1"
+         id="stop31544-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30703-7-6">
+      <stop
+         style="stop-color:#77000d;stop-opacity:1;"
+         offset="0"
+         id="stop30705-1-0" />
+      <stop
+         style="stop-color:#ff0731;stop-opacity:1;"
+         offset="1"
+         id="stop30707-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30709-4-1">
+      <stop
+         style="stop-color:#5c000f;stop-opacity:1;"
+         offset="0"
+         id="stop30711-5-8" />
+      <stop
+         style="stop-color: rgb(124, 31, 22); stop-opacity: 0;"
+         offset="1"
+         id="stop30713-5-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient18230-4-2">
+      <stop
+         id="stop18232-2-9"
+         offset="0"
+         style="stop-color: rgb(208, 188, 186); stop-opacity: 1;" />
+      <stop
+         id="stop18234-3-1"
+         offset="1"
+         style="stop-color: rgb(254, 253, 253); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15958-1-8">
+      <stop
+         id="stop15960-6-4"
+         offset="0"
+         style="stop-color: rgb(151, 136, 136); stop-opacity: 1;" />
+      <stop
+         id="stop15962-8-0"
+         offset="1"
+         style="stop-color: rgb(251, 252, 252); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15966-7-6">
+      <stop
+         id="stop15968-6-3"
+         offset="0"
+         style="stop-color: rgb(208, 188, 186); stop-opacity: 1;" />
+      <stop
+         id="stop15970-1-6"
+         offset="1"
+         style="stop-color: rgb(108, 108, 108); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       y2="260.52774"
+       y1="402.15451"
+       x2="243.32458"
+       x1="243.32458"
+       id="L2"
+       gradientTransform="scale(0.99984473,1.0001553)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2271"
+         style="stop-color:#fff;stop-opacity:0" />
+      <stop
+         id="stop2273"
+         style="stop-color:#fff;stop-opacity:.57254905"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="469.55243"
+       y1="307.82748"
+       x2="260.54816"
+       x1="259.40082"
+       id="L1"
+       gradientTransform="scale(0.99992221,1.0000778)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2266"
+         style="stop-color:#ddd" />
+      <stop
+         id="stop2268"
+         style="stop-color:#f5f5f5"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="850.52936"
+       y1="987.17004"
+       x2="106.81163"
+       x1="104.63348"
+       id="L3"
+       gradientTransform="scale(0.97710312,1.0234334)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2276"
+         style="stop-color:#fff;stop-opacity:0" />
+      <stop
+         id="stop2278"
+         style="stop-color:#fff;stop-opacity:.85000002"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter5747-2-3"
+       height="1.4931167"
+       y="-0.24655832"
+       width="1.8415892"
+       x="-0.42079461"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur5749-1-8"
+         stdDeviation="0.56224844"
+         inkscape:collect="always" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.6269818"
+     inkscape:cx="13.221639"
+     inkscape:cy="8.2075379"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1082"
+     inkscape:window-height="748"
+     inkscape:window-x="781"
+     inkscape:window-y="129"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <g
+       id="g20243"
+       transform="matrix(1.0531493,0,0,1.0531493,-1.2694015,-1.1208829)">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscccc"
+         id="path11123-2"
+         d="m 12.471545,-3.3899927 c 1.880097,-0.044543 3.027133,-0.8536929 4.136779,-2.217384 1.109626,-1.3636911 2.17544,-2.1722574 3.768792,-1.9622509 -1.331934,-0.1630666 -2.555274,1.081431 -3.625182,2.6635868 -1.090204,1.6151975 -2.349604,3.533332 -4.269638,3.5786655 l -0.01072,-2.0626174 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;f [...]
+      <rect
+         ry="1.3041183"
+         rx="1.4186554"
+         y="-13.495234"
+         x="14.716176"
+         height="5.9136524"
+         width="12.546025"
+         id="rect7279-0-8-5"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1.01696575;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscccc"
+         id="path11123"
+         d="m 5.9630097,2.7965557 c 1.8708094,0.054267 3.0121631,1.0400879 4.1163223,2.7014886 1.104149,1.6614155 2.164692,2.6465247 3.750164,2.3906691 C 12.504139,8.0873811 11.286847,6.5711817 10.222232,4.643591 9.137429,2.6757597 7.884246,0.33886832 5.9737085,0.28362273 L 5.9630408,2.7965557 Z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;f [...]
+      <rect
+         ry="1.3069067"
+         rx="1.4202037"
+         y="-3.3169918"
+         x="1.8279209"
+         height="5.9262967"
+         width="12.559718"
+         id="rect7279-0-8-5-9"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:1.00379658;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         ry="1.3148711"
+         rx="1.4246085"
+         y="7.987711"
+         x="10.354267"
+         height="5.9624119"
+         width="12.598672"
+         id="rect7279-0-8-5-1"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:0.96626019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         transform="matrix(1.7103673,0,0,1.7103673,-12.604895,-25.1798)"
+         id="g18591">
+        <path
+           style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-opacity:1"
+           id="path18557"
+           sodipodi:type="arc"
+           sodipodi:cx="20.599487"
+           sodipodi:cy="18.984362"
+           sodipodi:rx="5.1696005"
+           sodipodi:ry="5.1696005"
+           sodipodi:start="0"
+           sodipodi:end="2.0943951"
+           d="m 25.769088,18.984362 a 5.1696005,5.1696005 0 0 1 -2.5848,4.477005 5.1696005,5.1696005 0 0 1 -5.169601,0 l 2.5848,-4.477005 z" />
+        <path
+           style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-opacity:1"
+           id="path18557-2"
+           sodipodi:type="arc"
+           sodipodi:cx="6.0899391"
+           sodipodi:cy="-27.346172"
+           sodipodi:rx="5.1696005"
+           sodipodi:ry="5.1696005"
+           sodipodi:start="0"
+           sodipodi:end="2.0943951"
+           d="m 11.25954,-27.346172 a 5.1696005,5.1696005 0 0 1 -2.5848006,4.477005 5.1696005,5.1696005 0 0 1 -5.1696005,0 l 2.5848002,-4.477005 z"
+           transform="matrix(-0.50164028,0.86507631,-0.86507631,-0.50164028,0,0)" />
+        <path
+           style="opacity:1;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-opacity:1"
+           id="path18557-2-9"
+           sodipodi:type="arc"
+           sodipodi:cx="-26.737934"
+           sodipodi:cy="8.3638811"
+           sodipodi:rx="5.1696005"
+           sodipodi:ry="5.1696005"
+           sodipodi:start="0"
+           sodipodi:end="2.0943951"
+           d="m -21.568334,8.3638811 a 5.1696005,5.1696005 0 0 1 -2.5848,4.4770049 5.1696005,5.1696005 0 0 1 -5.1696,0 l 2.5848,-4.4770049 z"
+           transform="matrix(-0.499321,-0.86641707,0.86641707,-0.499321,0,0)" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 18.026712,14.511028 2.5297,4.467697 -2.566954,4.4599"
+           id="path18555"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 20.559224,18.99582 25.760756,18.9629"
+           id="path18589"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/Btn_edit.gif b/freeplane/viewer-resources/images/Btn_edit.gif
deleted file mode 100644
index 1a6f83c..0000000
Binary files a/freeplane/viewer-resources/images/Btn_edit.gif and /dev/null differ
diff --git a/freeplane/viewer-resources/images/CloneAction.png b/freeplane/viewer-resources/images/CloneAction.png
new file mode 100644
index 0000000..fd804f9
Binary files /dev/null and b/freeplane/viewer-resources/images/CloneAction.png differ
diff --git a/freeplane/viewer-resources/images/CloneAction.svg b/freeplane/viewer-resources/images/CloneAction.svg
new file mode 100644
index 0000000..5f63aed
--- /dev/null
+++ b/freeplane/viewer-resources/images/CloneAction.svg
@@ -0,0 +1,957 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg11692"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   viewBox="0 0 16 16"
+   sodipodi:docname="CloneAction.svg"
+   inkscape:export-filename="F:\Freeplane\freeplane\viewer-resources\images\CloneAction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs11694">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11279"
+       id="linearGradient11285"
+       x1="784.90271"
+       y1="763.25671"
+       x2="772.09869"
+       y2="763.37689"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90430794,0,0,0.90430794,158.34371,-0.985201)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11279">
+      <stop
+         style="stop-color:#d5d5ff;stop-opacity:1;"
+         offset="0"
+         id="stop11281" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop11283" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11287"
+       id="linearGradient11293"
+       x1="788.26123"
+       y1="746.14429"
+       x2="773.62781"
+       y2="743.9024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90430794,0,0,0.90430794,158.34371,-0.985201)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11287">
+      <stop
+         style="stop-color:#d5d5ff;stop-opacity:1"
+         offset="0"
+         id="stop11289" />
+      <stop
+         style="stop-color:#f9f9ff;stop-opacity:1"
+         offset="1"
+         id="stop11291" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter1112-9-2-8"
+       x="-0.16003649"
+       width="1.320073"
+       y="-0.21881174"
+       height="1.4376235">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.0493453"
+         id="feGaussianBlur1114-8-0-2" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter1112-2-6-2-2"
+       x="-0.16003649"
+       width="1.320073"
+       y="-0.21881174"
+       height="1.4376235">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.0493453"
+         id="feGaussianBlur1114-7-5-8-0" />
+    </filter>
+    <clipPath
+       id="SVGID_2_-02-6-4">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use27-8-70-3"
+         overflow="visible"
+         xlink:href="#SVGID_1_-2-8-3" />
+    </clipPath>
+    <clipPath
+       id="SVGID_4_-6-8-6">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use37-0-1-3"
+         overflow="visible"
+         xlink:href="#SVGID_3_-5-4-9" />
+    </clipPath>
+    <clipPath
+       id="SVGID_6_-2-8-3">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use47-4-3-6"
+         overflow="visible"
+         xlink:href="#SVGID_5_-0-90-3" />
+    </clipPath>
+    <clipPath
+       id="SVGID_8_-8-0-6">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use57-6-36-1"
+         overflow="visible"
+         xlink:href="#SVGID_7_-6-3-1" />
+    </clipPath>
+    <clipPath
+       id="SVGID_10_-50-2-8">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use67-9-0-8"
+         overflow="visible"
+         xlink:href="#SVGID_9_-2-9-1" />
+    </clipPath>
+    <clipPath
+       id="SVGID_12_-0-2-0">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use77-0-8-3"
+         overflow="visible"
+         xlink:href="#SVGID_11_-3-7-3" />
+    </clipPath>
+    <clipPath
+       id="SVGID_14_-6-4-5">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use87-1-18-1"
+         overflow="visible"
+         xlink:href="#SVGID_13_-0-3-3" />
+    </clipPath>
+    <clipPath
+       id="SVGID_16_-3-3-6">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use97-8-7-1"
+         overflow="visible"
+         xlink:href="#SVGID_15_-7-7-5" />
+    </clipPath>
+    <clipPath
+       id="clipPath11551">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11553"
+         overflow="visible"
+         xlink:href="#SVGID_1_-2-8-3" />
+    </clipPath>
+    <clipPath
+       id="clipPath11555">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11557"
+         overflow="visible"
+         xlink:href="#SVGID_3_-5-4-9" />
+    </clipPath>
+    <clipPath
+       id="clipPath11559">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11561"
+         overflow="visible"
+         xlink:href="#SVGID_5_-0-90-3" />
+    </clipPath>
+    <clipPath
+       id="clipPath11563">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11565"
+         overflow="visible"
+         xlink:href="#SVGID_7_-6-3-1" />
+    </clipPath>
+    <clipPath
+       id="clipPath11567">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11569"
+         overflow="visible"
+         xlink:href="#SVGID_9_-2-9-1" />
+    </clipPath>
+    <clipPath
+       id="clipPath11571">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11573"
+         overflow="visible"
+         xlink:href="#SVGID_11_-3-7-3" />
+    </clipPath>
+    <clipPath
+       id="clipPath11575">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11577"
+         overflow="visible"
+         xlink:href="#SVGID_13_-0-3-3" />
+    </clipPath>
+    <clipPath
+       id="clipPath11579">
+      <use
+         height="434"
+         width="240"
+         y="0"
+         x="0"
+         style="overflow:visible"
+         id="use11581"
+         overflow="visible"
+         xlink:href="#SVGID_15_-7-7-5" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="14.418985"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata11697">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       id="rect12992"
+       width="16"
+       height="16"
+       x="0"
+       y="0" />
+    <g
+       transform="matrix(0.38265261,0,0,0.38288797,-322.76182,-254.30799)"
+       style="display:inline;stroke-width:1.04008996"
+       id="g11405">
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#acacd8;fill-opacity:1;fill-rule:nonzero;stroke:#008080;stroke-width:0.94056165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="path3-3-2-2"
+         d="m 875.06604,682.09952 c 0,0 2.01113,8.84297 0.2586,16.0713 -0.0887,0.75924 -1.03946,1.68056 -0.77571,0.0883 0,0 -3.03108,-15.42106 -2.15532,-15.39838 0.87568,0.0227 2.67243,-0.76126 2.67243,-0.76126 z" />
+      <path
+         sodipodi:nodetypes="csccc"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient11285);fill-opacity:1;fill-rule:nonzero;stroke:#008080;stroke-width:0.94056165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         id="path7-6-0-0"
+         d="m 872.95035,697.6455 c -1.7376,7.60687 -11.11981,10.91288 -15.1609,0.46986 -2.78207,-7.18963 -2.11182,-16.41135 -2.11182,-16.41135 h 19.2063 c 0,0 -0.6142,10.1648 -1.93358,15.94149 z" />
+      <path
+         style="fill:#5eaba8;stroke:#008080;stroke-width:0.94056165;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0"
+         id="path9-0-6-7"
+         d="m 874.94154,681.7258 c -0.34906,0.54921 -4.42373,1.073 -9.77385,1.073 -5.34993,0 -9.43631,-0.52392 -9.60013,-1.073 -0.24251,-0.81302 4.33705,-1.59679 9.68699,-1.59679 5.35012,9e-5 10.10466,0.93975 9.68699,1.59679 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient11293);fill-opacity:1;stroke:#008080;stroke-width:0.94056165;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path11-6-5-0"
+         d="m 875.05208,674.62615 c 0,5.07602 -3.49834,6.62421 -9.00538,6.62421 -5.50686,-10e-5 -10.93703,-1.54819 -10.93703,-6.62421 0,-5.07603 4.4643,-9.19099 9.97116,-9.19099 5.50686,0 9.97125,4.11496 9.97125,9.19099 z" />
+      <path
+         style="fill:#000000;stroke-width:1.04008996"
+         inkscape:connector-curvature="0"
+         id="path13-6-0-8"
+         d="m 872.979,675.42714 c -0.0712,2.73768 -3.7631,3.41974 -7.20979,3.41974 -3.44688,0 -6.89485,-0.90869 -6.98679,-3.64574 -0.10937,-3.25075 3.28351,-6.51339 6.7303,-6.51339 3.87309,0 7.59425,1.81675 7.46628,6.73939 z" />
+      <ellipse
+         style="fill:#b2d3bd;stroke-width:1.04008996"
+         ry="0.20157784"
+         rx="0.54746401"
+         cy="670.77997"
+         cx="863.22919"
+         id="BOTTOM_HIGHLIGHT-1-9-4" />
+      <path
+         style="fill:#b2d3bd;stroke-width:1.04008996"
+         inkscape:connector-curvature="0"
+         d="m 865.30216,669.96257 c 0,0.17144 -0.42086,0.24133 -0.92948,0.31031 -0.66172,0.0898 -0.92938,-0.13896 -0.92938,-0.31031 0,-0.17135 0.55419,-0.36867 1.06571,-0.41088 0.63105,-0.0521 0.79315,0.23962 0.79315,0.41088 z"
+         id="TOP_HIGHLIGHT-8-7-4" />
+      <ellipse
+         style="fill:#5eaba8;fill-opacity:1;stroke:#3771c8;stroke-width:1.04008996;filter:url(#filter1112-9-2-8)"
+         id="ellipse17-4-2-8"
+         ry="23.257"
+         rx="16.163"
+         cy="97.246002"
+         cx="115.154"
+         transform="matrix(0.02319825,-0.08774673,0.08774673,0.02319825,852.59106,681.98058)" />
+      <path
+         transform="matrix(0.09075995,0,0,0.09075995,855.01891,665.43516)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#5eaba8;fill-opacity:1;fill-rule:nonzero;stroke:#3771c8;stroke-width:1.04010749;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter1112-2-6-2-2);enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         id="path101-9-2-8"
+         d="m 139.55158,100.12435 c 2.072,7.838 12.896,11.775 24.171,8.793 11.279,-2.982 18.742,-11.751998 16.672,-19.590998 -2.074,-7.838 -12.896,-11.774 -24.176,-8.793 -11.278,2.982 -18.738,11.754 -16.667,19.590998 z" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#f6f6ff;fill-opacity:1;fill-rule:nonzero;stroke:#008080;stroke-width:0.94056165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         d="m 855.41973,682.09047 c 0,0 -3.2726,8.4577 -2.58714,15.8638 0.3202,0.99249 0.87077,1.60096 0.75469,0.19992 0,0 5.42631,-15.46538 4.55652,-15.56999 -0.8697,-0.10458 -2.72407,-0.49373 -2.72407,-0.49373 z"
+         id="path1028-3-2-9" />
+      <g
+         style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+         transform="matrix(0.09075995,0,0,0.09075995,853.40832,665.30631)"
+         id="g19-7-9-6">
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g21-8-4-5">
+          <defs
+             id="defs23-8-4-3">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_1_-2-8-3" />
+          </defs>
+          <clipPath
+             id="clipPath1654-2-3">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1656-7-8"
+               overflow="visible"
+               xlink:href="#SVGID_1_-2-8-3" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line29-9-2-7"
+             y2="110.939"
+             x2="101.642"
+             y1="110.939"
+             x1="134.56599"
+             clip-path="url(#SVGID_2_-02-6-4)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g31-1-5-7">
+          <defs
+             id="defs33-3-8-3">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_3_-5-4-9" />
+          </defs>
+          <clipPath
+             id="clipPath1662-7-7">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1664-3-2"
+               overflow="visible"
+               xlink:href="#SVGID_3_-5-4-9" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line39-9-9-9"
+             y2="107.122"
+             x2="143.25101"
+             y1="107.122"
+             x1="94.551003"
+             clip-path="url(#SVGID_4_-6-8-6)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g41-8-5-0">
+          <defs
+             id="defs43-4-1-4">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_5_-0-90-3" />
+          </defs>
+          <clipPath
+             id="clipPath1670-2-0">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1672-8-2"
+               overflow="visible"
+               xlink:href="#SVGID_5_-0-90-3" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line49-7-3-6"
+             y2="102.973"
+             x2="90.208"
+             y1="102.973"
+             x1="146.22501"
+             clip-path="url(#SVGID_6_-2-8-3)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g51-6-1-0">
+          <defs
+             id="defs53-3-4-0">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_7_-6-3-1" />
+          </defs>
+          <clipPath
+             id="clipPath1678-1-1">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1680-0-5"
+               overflow="visible"
+               xlink:href="#SVGID_7_-6-3-1" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line59-1-4-8"
+             y2="99.487"
+             x2="146.22501"
+             y1="99.487"
+             x1="85.634003"
+             clip-path="url(#SVGID_8_-8-0-6)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g61-5-0-1">
+          <defs
+             id="defs63-4-7-8">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_9_-2-9-1" />
+          </defs>
+          <clipPath
+             id="clipPath1686-0-5">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1688-8-4"
+               overflow="visible"
+               xlink:href="#SVGID_9_-2-9-1" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line69-0-1-5"
+             y2="95.667999"
+             x2="84.489998"
+             y1="95.667999"
+             x1="144.164"
+             clip-path="url(#SVGID_10_-50-2-8)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g71-9-4-2">
+          <defs
+             id="defs73-7-0-8">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_11_-3-7-3" />
+          </defs>
+          <clipPath
+             id="clipPath1694-9-4">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1696-5-5"
+               overflow="visible"
+               xlink:href="#SVGID_11_-3-7-3" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line79-7-3-1"
+             y2="91.353996"
+             x2="140.964"
+             y1="91.353996"
+             x1="83.577003"
+             clip-path="url(#SVGID_12_-0-2-0)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g81-2-8-1">
+          <defs
+             id="defs83-6-2-4">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_13_-0-3-3" />
+          </defs>
+          <clipPath
+             id="clipPath1702-2-4">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1704-1-5"
+               overflow="visible"
+               xlink:href="#SVGID_13_-0-3-3" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line89-1-0-1"
+             y2="87.204002"
+             x2="85.634003"
+             y1="87.204002"
+             x1="133.64799"
+             clip-path="url(#SVGID_14_-6-4-5)" />
+        </g>
+        <g
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1"
+           id="g91-6-4-2">
+          <defs
+             id="defs93-5-0-0">
+            <ellipse
+               ry="23.257999"
+               rx="16.164"
+               cy="97.245003"
+               cx="114.954"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               id="SVGID_15_-7-7-5" />
+          </defs>
+          <clipPath
+             id="clipPath1710-5-4">
+            <use
+               height="434"
+               width="240"
+               y="0"
+               x="0"
+               style="overflow:visible"
+               id="use1712-90-8"
+               overflow="visible"
+               xlink:href="#SVGID_15_-7-7-5" />
+          </clipPath>
+          <line
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1"
+             id="line99-5-5-7"
+             y2="83.552002"
+             x2="126.559"
+             y1="83.552002"
+             x1="92.950996"
+             clip-path="url(#SVGID_16_-3-3-6)" />
+        </g>
+      </g>
+      <g
+         id="g1316-4-1-3"
+         transform="matrix(-0.08199096,0,0,0.08199096,878.93636,666.03021)"
+         style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+        <g
+           id="g1318-1-2-3"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1320-2-0-2">
+            <ellipse
+               id="ellipse1322-0-9-5"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1324-0-89-2">
+            <use
+               xlink:href="#SVGID_1_-2-8-3"
+               overflow="visible"
+               id="use1326-1-1-2"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_2_-02-6-4)"
+             x1="134.56599"
+             y1="110.939"
+             x2="101.642"
+             y2="110.939"
+             id="line1328-4-7-4"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1330-6-3-0"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1332-0-3-9">
+            <ellipse
+               id="ellipse1334-7-0-1"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1336-1-7-9">
+            <use
+               xlink:href="#SVGID_3_-5-4-9"
+               overflow="visible"
+               id="use1338-7-6-7"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_4_-6-8-6)"
+             x1="94.551003"
+             y1="107.122"
+             x2="143.25101"
+             y2="107.122"
+             id="line1340-7-6-8"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1342-7-0-4"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1344-7-2-3">
+            <ellipse
+               id="ellipse1346-3-8-2"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1348-3-9-8">
+            <use
+               xlink:href="#SVGID_5_-0-90-3"
+               overflow="visible"
+               id="use1350-5-8-4"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_6_-2-8-3)"
+             x1="146.22501"
+             y1="102.973"
+             x2="90.208"
+             y2="102.973"
+             id="line1352-9-9-7"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1354-9-9-2"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1356-8-9-2">
+            <ellipse
+               id="ellipse1358-1-4-3"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1360-8-20-1">
+            <use
+               xlink:href="#SVGID_7_-6-3-1"
+               overflow="visible"
+               id="use1362-2-8-8"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_8_-8-0-6)"
+             x1="85.634003"
+             y1="99.487"
+             x2="146.22501"
+             y2="99.487"
+             id="line1364-6-7-1"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1366-6-8-5"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1368-0-7-4">
+            <ellipse
+               id="ellipse1370-3-3-8"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1372-8-0-0">
+            <use
+               xlink:href="#SVGID_9_-2-9-1"
+               overflow="visible"
+               id="use1374-0-7-0"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_10_-50-2-8)"
+             x1="144.164"
+             y1="95.667999"
+             x2="84.489998"
+             y2="95.667999"
+             id="line1376-1-6-4"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1378-2-4-7"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1380-5-21-3">
+            <ellipse
+               id="ellipse1382-0-9-6"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1384-9-16-3">
+            <use
+               xlink:href="#SVGID_11_-3-7-3"
+               overflow="visible"
+               id="use1386-4-0-9"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_12_-0-2-0)"
+             x1="83.577003"
+             y1="91.353996"
+             x2="140.964"
+             y2="91.353996"
+             id="line1388-7-3-5"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1390-8-3-5"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1392-3-6-6">
+            <ellipse
+               id="ellipse1394-5-2-9"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1396-1-2-6">
+            <use
+               xlink:href="#SVGID_13_-0-3-3"
+               overflow="visible"
+               id="use1398-2-1-1"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_14_-6-4-5)"
+             x1="133.64799"
+             y1="87.204002"
+             x2="85.634003"
+             y2="87.204002"
+             id="line1400-0-4-7"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+        <g
+           id="g1402-1-3-5"
+           style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:1.04008996;stroke-opacity:1">
+          <defs
+             id="defs1404-6-2-6">
+            <ellipse
+               id="ellipse1406-4-6-0"
+               transform="matrix(0.2556,-0.9668,0.9668,0.2556,-8.4427,183.5253)"
+               cx="114.954"
+               cy="97.245003"
+               rx="16.164"
+               ry="23.257999" />
+          </defs>
+          <clipPath
+             id="clipPath1408-0-0-9">
+            <use
+               xlink:href="#SVGID_15_-7-7-5"
+               overflow="visible"
+               id="use1410-6-5-4"
+               style="overflow:visible"
+               x="0"
+               y="0"
+               width="240"
+               height="434" />
+          </clipPath>
+          <line
+             clip-path="url(#SVGID_16_-3-3-6)"
+             x1="92.950996"
+             y1="83.552002"
+             x2="126.559"
+             y2="83.552002"
+             id="line1412-1-4-8"
+             style="fill:#386b68;fill-opacity:1;stroke:#386b68;stroke-width:2.08017993;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <rect
+       y="0"
+       x="0"
+       height="16"
+       width="16"
+       id="rect13432"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/DeleteFilter.svg b/freeplane/viewer-resources/images/DeleteFilter.svg
new file mode 100644
index 0000000..46ec252
--- /dev/null
+++ b/freeplane/viewer-resources/images/DeleteFilter.svg
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="32"
+   viewBox="0 0 40 32"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="DeleteFilter.svg">
+  <defs
+     id="defs5656">
+    <linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </linearGradient>
+    <linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </linearGradient>
+    <radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </radialGradient>
+    <linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </linearGradient>
+    <linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </linearGradient>
+    <linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </linearGradient>
+    <linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8251">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8983">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.5476641"
+     inkscape:cx="8.4964159"
+     inkscape:cy="61.809851"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-94.198897,-1193.0483)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.321671"
+       height="31.321405"
+       x="94.538063"
+       y="1193.3876"
+       rx="1.7739983"
+       ry="1.8605328" />
+    <g
+       id="g4609"
+       transform="matrix(1.5301188,0,0,1.5324121,75.110994,1154.0478)"
+       style="stroke-width:0.73146331">
+      <g
+         id="g4607"
+         transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+         style="stroke-width:0.73146331">
+        <g
+           id="g4603"
+           transform="translate(5.1953e-6,28.466)"
+           style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+          <path
+             style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+             id="path4599"
+             d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+             inkscape:connector-curvature="0" />
+          <ellipse
+             style="fill:url(#a-8);stroke-width:0.31768915"
+             id="ellipse4601"
+             cx="290.51001"
+             cy="557.94"
+             ry="0.79745001"
+             transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+             rx="8.6450996" />
+        </g>
+        <rect
+           id="rect4605"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry="0.18513"
+           rx="0.16552"
+           style="fill:none;stroke-width:0.73146331" />
+      </g>
+    </g>
+    <g
+       id="g4483"
+       transform="matrix(0.53570284,0,0,0.53570284,-145.97377,895.25261)"
+       style="stroke-width:1.30910456">
+      <path
+         style="color:#000000;fill:#ff0000;stroke-width:1.30910456"
+         d="m 485.54327,611.61627 c 1.33669,-16.30925 12.92478,-35.21456 31.03321,-37.92629 l 3.12185,5.6138 c -17.56802,3.85047 -27.23992,13.73121 -34.15551,32.3132 z"
+         id="path3736"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ff0000;stroke-width:1.30910456"
+         d="m 477.20659,576.46334 c 15.60088,0.17991 34.43566,10.89124 38.36678,29.63465 l -5.10232,3.68596 c -4.97241,-18.09297 -15.08644,-27.47522 -33.2631,-33.32061 z"
+         id="path3738"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/DownFilter.svg b/freeplane/viewer-resources/images/DownFilter.svg
new file mode 100644
index 0000000..e3d2e82
--- /dev/null
+++ b/freeplane/viewer-resources/images/DownFilter.svg
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="DownFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3261255"
+     inkscape:cx="-50.692828"
+     inkscape:cy="21.725761"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g4754"
+       transform="translate(89.944469,-8.6941051)">
+      <svg:rect
+         ry="1.8605328"
+         rx="1.7739983"
+         y="1193.3876"
+         x="94.538063"
+         height="31.321405"
+         width="39.321671"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <svg:g
+         style="stroke-width:0.73146331"
+         transform="matrix(1.5301188,0,0,1.5324121,75.110994,1154.0478)"
+         id="g4609">
+        <svg:g
+           style="stroke-width:0.73146331"
+           transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+           id="g4607">
+          <svg:g
+             style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331"
+             transform="translate(5.1953e-6,28.466)"
+             id="g4603">
+            <svg:path
+               inkscape:connector-curvature="0"
+               d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+               id="path4599"
+               style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round" />
+            <svg:ellipse
+               rx="8.6450996"
+               transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+               ry="0.79745001"
+               cy="557.94"
+               cx="290.51001"
+               id="ellipse4601"
+               style="fill:url(#a-8);stroke-width:0.31768915" />
+          </svg:g>
+          <svg:rect
+             style="fill:none;stroke-width:0.73146331"
+             rx="0.16552"
+             ry="0.18513"
+             height="32"
+             width="32"
+             y="564.25"
+             x="191.33"
+             id="rect4605" />
+        </svg:g>
+      </svg:g>
+      <svg:g
+         id="g4548"
+         transform="matrix(1.7684485,0,0,1.7684485,152.02607,1160.8738)"
+         style="stroke-width:0.81299937">
+        <svg:path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4544"
+           d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+           inkscape:transform-center-y="2.6604092"
+           inkscape:transform-center-x="0.022858851"
+           style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.60974956;stroke-opacity:1" />
+        <svg:path
+           inkscape:connector-curvature="0"
+           id="path4546"
+           d="m -14.930158,21.808892 v 7.927934"
+           style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.26463759;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/Executable.png b/freeplane/viewer-resources/images/Executable.png
deleted file mode 100644
index 25b1d7a..0000000
Binary files a/freeplane/viewer-resources/images/Executable.png and /dev/null differ
diff --git a/freeplane/resources/images/Freeplane_frame_icon_64x64.png b/freeplane/viewer-resources/images/Freeplane_frame_icon_64x64.png
similarity index 100%
rename from freeplane/resources/images/Freeplane_frame_icon_64x64.png
rename to freeplane/viewer-resources/images/Freeplane_frame_icon_64x64.png
diff --git a/freeplane/viewer-resources/images/IconNotFound.png b/freeplane/viewer-resources/images/IconNotFound.png
index 993b3b9..5069542 100644
Binary files a/freeplane/viewer-resources/images/IconNotFound.png and b/freeplane/viewer-resources/images/IconNotFound.png differ
diff --git a/freeplane/viewer-resources/images/IconNotFound.svg b/freeplane/viewer-resources/images/IconNotFound.svg
new file mode 100644
index 0000000..1604696
--- /dev/null
+++ b/freeplane/viewer-resources/images/IconNotFound.svg
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11344">
+      <stop
+         id="stop11346"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="0.5"
+         id="stop11348" />
+      <stop
+         id="stop11350"
+         offset="1"
+         style="stop-color:#6796df;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11189">
+      <stop
+         id="stop11191"
+         offset="0"
+         style="stop-color:#ff1010;stop-opacity:1;" />
+      <stop
+         id="stop11193"
+         offset="1"
+         style="stop-color:#ff8e8e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2304-6">
+      <stop
+         id="stop2306-1"
+         offset="0"
+         style="stop-color:#babdb6" />
+      <stop
+         id="stop2308-6"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11469">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop11471" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop11473" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9385">
+      <stop
+         style="stop-color:#009f00;stop-opacity:1"
+         offset="0"
+         id="stop9387" />
+      <stop
+         style="stop-color:#60ff60;stop-opacity:1"
+         offset="1"
+         id="stop9389" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7819-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop7821-9" />
+      <stop
+         style="stop-color:#b9150a;stop-opacity:1"
+         offset="1"
+         id="stop7823-2" />
+    </linearGradient>
+    <filter
+       id="filter8252">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.61377733"
+         id="feGaussianBlur8254" />
+    </filter>
+    <linearGradient
+       id="linearGradient22117">
+      <stop
+         id="stop22119"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873"
+         offset="0.31645569"
+         style="stop-color:#fffab3;stop-opacity:0.84375" />
+      <stop
+         id="stop22121"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <filter
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.7236641"
+     inkscape:cx="-33.23134"
+     inkscape:cy="29.313684"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <g
+       id="g19367"
+       transform="matrix(1.8059818,0,0,1.8059818,74.017599,-2.4736192)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect19262"
+         d="m -33.332153,-4.9688042 0,0.582031 0,12.1464846 3.625,0 0,-12.7285156 z m 1.164062,1.8553363 1.296875,0 0,9.0774528 -1.296875,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:non [...]
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect19262-0"
+         d="m -26.260475,7.764621 1.159993,-0.00491 0,-12.728516 -3.625,0 0,0.582031 0,12.146485 1.162728,-0.00273 0.0013,-10.8704448 1.296875,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:non [...]
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect19262-8"
+         d="m -35.810414,5.9648648 0,-9.0774531 1.49659,-2.244e-4 0,-1.8551119 -2.660652,0 0,0.582031 0,12.146485 2.660652,0 0,-1.8153266 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:non [...]
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect19262-8-6"
+         d="m -37.956148,-5.0252587 -1.19385,0 0,12.7285165 1.19385,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:non [...]
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/Link.png b/freeplane/viewer-resources/images/Link.png
index c83b5ff..aa08e96 100644
Binary files a/freeplane/viewer-resources/images/Link.png and b/freeplane/viewer-resources/images/Link.png differ
diff --git a/freeplane/viewer-resources/images/Link.svg b/freeplane/viewer-resources/images/Link.svg
new file mode 100644
index 0000000..75e2ebd
--- /dev/null
+++ b/freeplane/viewer-resources/images/Link.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="16"
+   width="16"
+   id="svg2"
+   viewBox="0 0 16 16"
+   version="1.1">
+  <defs
+     id="defs14" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     transform="scale(-1,-1)"
+     y="-16"
+     x="-20.5"
+     height="16"
+     width="24"
+     id="rect814"
+     style="opacity:0.99545456;fill:none;fill-opacity:1;stroke:none;stroke-width:1.76404297;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+  <path
+     id="path4490"
+     d="m 3.0151396,7.9521667 8.5118114,0"
+     style="fill:none;stroke:#d40101;stroke-width:1.58381009;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     id="rect4774"
+     d="M 9.9138866,6.0525943 12.823007,8.0080426 9.8898348,9.9474565"
+     style="opacity:0.99545456;fill:none;fill-opacity:1;stroke:#d40000;stroke-width:1.51383531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+</svg>
diff --git a/freeplane/viewer-resources/images/LinkLocal.png b/freeplane/viewer-resources/images/LinkLocal.png
index 5fe19fb..333c327 100644
Binary files a/freeplane/viewer-resources/images/LinkLocal.png and b/freeplane/viewer-resources/images/LinkLocal.png differ
diff --git a/freeplane/viewer-resources/images/LinkLocal.svg b/freeplane/viewer-resources/images/LinkLocal.svg
new file mode 100644
index 0000000..cedda19
--- /dev/null
+++ b/freeplane/viewer-resources/images/LinkLocal.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="16"
+   width="16"
+   id="svg2"
+   viewBox="0 0 16 16"
+   version="1.1">
+  <defs
+     id="defs14" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     transform="scale(1,-1)"
+     y="-16"
+     x="-3.5"
+     height="16"
+     width="23.5"
+     id="rect814"
+     style="opacity:0.99545456;fill:none;fill-opacity:1;stroke:none;stroke-width:1.76404297;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+  <path
+     id="path4490-7"
+     d="m 13.044612,7.8035855 -9.0374617,0"
+     style="fill:none;stroke:#009b00;stroke-width:1.61151195;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     id="rect4774-6"
+     d="M 6.2209997,5.8855438 2.9165162,7.7922455 6.2483203,9.6833125"
+     style="opacity:0.99545456;fill:none;fill-opacity:1;stroke:#009b00;stroke-width:1.59319079;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+</svg>
diff --git a/freeplane/viewer-resources/images/Mail.svg b/freeplane/viewer-resources/images/Mail.svg
new file mode 100644
index 0000000..8d99e23
--- /dev/null
+++ b/freeplane/viewer-resources/images/Mail.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="27.482"
+   width="34.173"
+   version="1.1"
+   viewBox="0 0 34.173484 27.482118"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Mail.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="685"
+     inkscape:window-height="480"
+     id="namedview26"
+     showgrid="false"
+     inkscape:zoom="8.5874389"
+     inkscape:cx="0.84184318"
+     inkscape:cy="13.741"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#e3e2db"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="520.48"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       y1="520.48"
+       gradientTransform="translate(156.8,-180.92)"
+       x2="165.42"
+       x1="154.03" />
+    <linearGradient
+       id="c"
+       y2="515.51"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       y1="529.35"
+       gradientTransform="translate(156.8,-180.92)"
+       x2="150.34"
+       x1="150.19" />
+    <linearGradient
+       id="d"
+       y2="516.19"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       y1="507.6"
+       gradientTransform="translate(156.8,-180.92)"
+       x2="150.24"
+       x1="150.19" />
+  </defs>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-383.19 -341.75)"
+     id="g16">
+    <g
+       fill-rule="evenodd"
+       transform="translate(93.131,15.788)"
+       id="g18">
+      <rect
+         stroke-linejoin="round"
+         height="26.202"
+         width="32"
+         stroke="#313231"
+         stroke-linecap="round"
+         y="326.46"
+         x="291.64"
+         fill="url(#b)"
+         id="rect20" />
+      <path
+         d="m291.76 352.5-0.13898-4.5105 15.793-11.308 16.311 11.611-0.16425 4.4095-31.801-0.20215z"
+         stroke="#333"
+         stroke-width="1px"
+         fill="url(#c)"
+         id="path22" />
+      <path
+         d="m291.76 326.5-0.0379 6.3299 15.692 8.3767 16.311-9.4886-0.16425-5.2181h-31.801z"
+         stroke="#333"
+         stroke-width="1px"
+         fill="url(#d)"
+         id="path24" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/MapStats.svg b/freeplane/viewer-resources/images/MapStats.svg
new file mode 100644
index 0000000..299e7a1
--- /dev/null
+++ b/freeplane/viewer-resources/images/MapStats.svg
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.18783"
+     inkscape:cx="-2.9970542"
+     inkscape:cy="-2.1387515"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g18598">
+      <g
+         transform="matrix(-1.0024708,0,0,1.0024708,16.619459,-2.3041191)"
+         id="g18534">
+        <rect
+           style="fill:#f9f9f9;fill-opacity:1;stroke:#000000;stroke-width:0.99073058;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect2993-5-8-8-5"
+           width="10.594457"
+           height="14.969833"
+           x="-16.083132"
+           y="2.7938054"
+           transform="scale(-1,1)" />
+        <ellipse
+           ry="1.0375253"
+           rx="2.6851256"
+           cy="10.278715"
+           cx="-12.71054"
+           style="fill:#000000;fill-opacity:0.37726093;stroke:#000000;stroke-width:0.41948274;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path3775-4-7-3-2"
+           transform="scale(-1,1)" />
+        <ellipse
+           ry="1.0606275"
+           rx="3.6697373"
+           cy="5.5411901"
+           cx="-10.785891"
+           style="fill:#000000;fill-opacity:0.37726093;stroke:#000000;stroke-width:0.37315679;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path3775-9-4-9-9-3"
+           transform="scale(-1,1)" />
+        <ellipse
+           ry="1.0606275"
+           rx="3.6697373"
+           cy="15.01623"
+           cx="-10.785891"
+           style="fill:#000000;fill-opacity:0.37726093;stroke:#000000;stroke-width:0.37315679;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path3775-0-1-0-4-2"
+           transform="scale(-1,1)" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 12.559952,11.387819 c -2.421845,2.450964 -2.421845,2.450964 -2.421845,2.450964"
+           id="path3804-7-3-6-4"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 12.608318,9.1753977 C 10.888073,6.7423972 10.888073,6.7423972 10.888073,6.7423972"
+           id="path3814-4-1-0-8"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="translate(-9.7690878,-8.1539621)"
+         id="g18591">
+        <path
+           style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-opacity:1"
+           id="path18557"
+           sodipodi:type="arc"
+           sodipodi:cx="20.599487"
+           sodipodi:cy="18.984362"
+           sodipodi:rx="5.1696005"
+           sodipodi:ry="5.1696005"
+           sodipodi:start="0"
+           sodipodi:end="2.0943951"
+           d="m 25.769088,18.984362 a 5.1696005,5.1696005 0 0 1 -2.5848,4.477005 5.1696005,5.1696005 0 0 1 -5.169601,0 l 2.5848,-4.477005 z" />
+        <path
+           style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-opacity:1"
+           id="path18557-2"
+           sodipodi:type="arc"
+           sodipodi:cx="6.0899391"
+           sodipodi:cy="-27.346172"
+           sodipodi:rx="5.1696005"
+           sodipodi:ry="5.1696005"
+           sodipodi:start="0"
+           sodipodi:end="2.0943951"
+           d="m 11.25954,-27.346172 a 5.1696005,5.1696005 0 0 1 -2.5848006,4.477005 5.1696005,5.1696005 0 0 1 -5.1696005,0 l 2.5848002,-4.477005 z"
+           transform="matrix(-0.50164028,0.86507631,-0.86507631,-0.50164028,0,0)" />
+        <path
+           style="opacity:1;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-opacity:1"
+           id="path18557-2-9"
+           sodipodi:type="arc"
+           sodipodi:cx="-26.737934"
+           sodipodi:cy="8.3638811"
+           sodipodi:rx="5.1696005"
+           sodipodi:ry="5.1696005"
+           sodipodi:start="0"
+           sodipodi:end="2.0943951"
+           d="m -21.568334,8.3638811 a 5.1696005,5.1696005 0 0 1 -2.5848,4.4770049 5.1696005,5.1696005 0 0 1 -5.1696,0 l 2.5848,-4.4770049 z"
+           transform="matrix(-0.499321,-0.86641707,0.86641707,-0.499321,0,0)" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 18.026712,14.511028 2.5297,4.467697 -2.566954,4.4599"
+           id="path18555"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 20.559224,18.99582 25.760756,18.9629"
+           id="path18589"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/CenterSelectedNodeAction.png b/freeplane/viewer-resources/images/MoveSelectedNodeAction.CENTER.png
similarity index 100%
rename from freeplane/viewer-resources/images/CenterSelectedNodeAction.png
rename to freeplane/viewer-resources/images/MoveSelectedNodeAction.CENTER.png
diff --git a/freeplane/viewer-resources/images/MoveSelectedNodeAction.CENTER.svg b/freeplane/viewer-resources/images/MoveSelectedNodeAction.CENTER.svg
new file mode 100644
index 0000000..27bc4d9
--- /dev/null
+++ b/freeplane/viewer-resources/images/MoveSelectedNodeAction.CENTER.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003128"
+   width="16"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="centerselectednodeaction.svg">
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview22"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="342.90501"
+     inkscape:cy="-371.63001"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-155.41,-727.37688)"
+     id="g6">
+    <g
+       transform="matrix(0.99611,0,0,0.99611,-17.49,-18.585)"
+       id="g8"
+       style="fill:#d40000;stroke:#000000">
+      <path
+         style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;stroke-width:0.25"
+         d="m 181.62,749 c -4.3531,0 -7.9062,3.5531 -7.9062,7.9062 0,4.3531 3.5531,7.9062 7.9062,7.9062 4.3531,0 7.875,-3.5531 7.875,-7.9062 0,-4.36 -3.52,-7.91 -7.88,-7.91 z m 0,1.5 c 3.5425,0 6.375,2.8638 6.375,6.4062 0,3.5425 -2.8325,6.4062 -6.375,6.4062 -3.5425,0 -6.4062,-2.8638 -6.4062,-6.4062 0,-3.5425 2.8638,-6.4062 6.4062,-6.4062 z"
+         id="path10"
+         inkscape:connector-curvature="0" />
+      <path
+         style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;stroke-width:0.16405"
+         d="m 181.62,751.72 c -2.8566,0 -5.1882,2.3316 -5.1882,5.1882 0,2.8566 2.3316,5.1882 5.1882,5.1882 2.8566,0 5.1676,-2.3316 5.1676,-5.1882 0,-2.8566 -2.3111,-5.1882 -5.1676,-5.1882 z m 0,0.98431 c 2.3246,0 4.1833,1.8792 4.1833,4.2038 0,2.3246 -1.8587,4.2038 -4.1833,4.2038 -2.3246,0 -4.2038,-1.8792 -4.2038,-4.2038 0,-2.3246 1.8792,-4.2038 4.2038,-4.2038 z"
+         id="path12"
+         inkscape:connector-curvature="0" />
+      <path
+         style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;stroke-width:0.096658"
+         d="m 181.62,753.85 c -1.6831,0 -3.0568,1.3737 -3.0568,3.0568 0,1.6831 1.3738,3.0568 3.0568,3.0568 1.683,0 3.0447,-1.3737 3.0447,-3.0568 0,-1.6831 -1.3617,-3.0568 -3.0447,-3.0568 z m 0,0.57994 c 1.3696,0 2.4648,1.1072 2.4648,2.4769 0,1.3696 -1.0952,2.4769 -2.4648,2.4769 -1.3696,0 -2.4769,-1.1072 -2.4769,-2.4769 0,-1.3696 1.1072,-2.4769 2.4769,-2.4769 z"
+         id="path14"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill-rule:evenodd;stroke-width:0.0075029;stroke-dasharray:0.09003475, 0.09003475"
+         d="m 181.33,758.02 c -0.23023,-0.062 -0.37238,-0.14315 -0.5342,-0.30497 -0.44061,-0.44061 -0.43887,-1.1693 0.004,-1.612 0.45087,-0.45087 1.1666,-0.44926 1.6195,0.004 0.43604,0.43604 0.43612,1.1725 1.9e-4,1.6084 -0.16553,0.16553 -0.30419,0.2432 -0.54707,0.30646 -0.20931,0.0545 -0.33558,0.0542 -0.54231,-10e-4 h 1e-5 z"
+         id="path16"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       style="opacity:0.92510998;color:#000000;fill:none"
+       rx="0.070384003"
+       ry="0.092563003"
+       height="16"
+       width="16"
+       y="727.38"
+       x="155.41"
+       id="rect18" />
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="727.38"
+       x="155.41"
+       id="rect20" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/NameFilter.svg b/freeplane/viewer-resources/images/NameFilter.svg
new file mode 100644
index 0000000..3eed347
--- /dev/null
+++ b/freeplane/viewer-resources/images/NameFilter.svg
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="NameFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="150.2"
+       y1="673.53"
+       gradientTransform="matrix(0.59338289,0.16508124,-0.23772172,0.85452432,271.88031,593.20912)"
+       x2="158.14"
+       gradientUnits="userSpaceOnUse"
+       y2="677.01"
+       id="a-3">
+      <svg:stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#f00" />
+      <svg:stop
+         id="stop9-4"
+         offset="1"
+         stop-color="#fffe21" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.7404352"
+     inkscape:cx="42.991855"
+     inkscape:cy="43.633218"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g4576">
+      <svg:g
+         id="g4849">
+        <svg:rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+           id="rect4498"
+           width="39.321671"
+           height="31.321405"
+           x="184.48253"
+           y="1184.6935"
+           rx="1.7739983"
+           ry="1.8605328" />
+        <svg:g
+           id="g4609"
+           transform="matrix(1.5301188,0,0,1.5324121,163.05952,1144.6131)"
+           style="stroke-width:0.73146331">
+          <svg:g
+             id="g4607"
+             transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+             style="stroke-width:0.73146331">
+            <svg:g
+               id="g4603"
+               transform="translate(5.1953e-6,28.466)"
+               style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+              <svg:path
+                 style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+                 id="path4599"
+                 d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+                 inkscape:connector-curvature="0" />
+              <svg:ellipse
+                 style="fill:url(#a-8);stroke-width:0.31768915"
+                 id="ellipse4601"
+                 cx="290.51001"
+                 cy="557.94"
+                 ry="0.79745001"
+                 transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+                 rx="8.6450996" />
+            </svg:g>
+            <svg:rect
+               id="rect4605"
+               x="191.33"
+               y="564.25"
+               width="32"
+               height="32"
+               ry="0.18513"
+               rx="0.16552"
+               style="fill:none;stroke-width:0.73146331" />
+          </svg:g>
+        </svg:g>
+      </svg:g>
+      <svg:rect
+         ry="0"
+         y="1198.6694"
+         x="193.30901"
+         height="8.1463022"
+         width="26.81422"
+         id="rect4545"
+         style="opacity:0.99545456;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+      <svg:text
+         id="text4563"
+         y="1205.2966"
+         x="200.13617"
+         style="font-style:normal;font-weight:normal;font-size:7.02593374px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.17564836"
+         xml:space="preserve"><svg:tspan
+           dx="0 0.60000002 0.60000002"
+           style="stroke-width:0.17564836"
+           y="1205.2966"
+           x="200.13617"
+           id="tspan4561"
+           sodipodi:role="line">Xxx</svg:tspan></svg:text>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/NotFilter.svg b/freeplane/viewer-resources/images/NotFilter.svg
new file mode 100644
index 0000000..cb2de5c
--- /dev/null
+++ b/freeplane/viewer-resources/images/NotFilter.svg
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="NotFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="150.2"
+       y1="673.53"
+       gradientTransform="matrix(0.59338289,0.16508124,-0.23772172,0.85452432,271.88031,593.20912)"
+       x2="158.14"
+       gradientUnits="userSpaceOnUse"
+       y2="677.01"
+       id="a-3">
+      <svg:stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#f00" />
+      <svg:stop
+         id="stop9-4"
+         offset="1"
+         stop-color="#fffe21" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3261255"
+     inkscape:cx="-50.692828"
+     inkscape:cy="34.371733"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-bbox="true" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.321671"
+       height="31.321405"
+       x="184.48253"
+       y="1184.6935"
+       rx="1.7739983"
+       ry="1.8605328" />
+    <svg:g
+       id="g4609"
+       transform="matrix(1.5301188,0,0,1.5324121,163.05952,1144.6131)"
+       style="stroke-width:0.73146331">
+      <svg:g
+         id="g4607"
+         transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+         style="stroke-width:0.73146331">
+        <svg:g
+           id="g4603"
+           transform="translate(5.1953e-6,28.466)"
+           style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+          <svg:path
+             style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+             id="path4599"
+             d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+             inkscape:connector-curvature="0" />
+          <svg:ellipse
+             style="fill:url(#a-8);stroke-width:0.31768915"
+             id="ellipse4601"
+             cx="290.51001"
+             cy="557.94"
+             ry="0.79745001"
+             transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+             rx="8.6450996" />
+        </svg:g>
+        <svg:rect
+           id="rect4605"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry="0.18513"
+           rx="0.16552"
+           style="fill:none;stroke-width:0.73146331" />
+      </svg:g>
+    </svg:g>
+    <svg:g
+       id="g4872"
+       transform="matrix(0.51372062,0,0,0.51372062,138.87861,591.7064)">
+      <svg:circle
+         r="12.811206"
+         cy="1192.1686"
+         cx="143.04396"
+         id="path4864"
+         style="opacity:0.99545456;vector-effect:none;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:4.72108507;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+      <svg:path
+         inkscape:connector-curvature="0"
+         id="path4868"
+         d="m 133.98507,1201.2275 18.11778,-18.1178"
+         style="fill:none;stroke:#ff0000;stroke-width:4.72108507;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/OpenURLMapAction.png b/freeplane/viewer-resources/images/OpenURLMapAction.png
new file mode 100644
index 0000000..78127eb
Binary files /dev/null and b/freeplane/viewer-resources/images/OpenURLMapAction.png differ
diff --git a/freeplane/viewer-resources/images/OpenURLMapAction.svg b/freeplane/viewer-resources/images/OpenURLMapAction.svg
new file mode 100644
index 0000000..f70acad
--- /dev/null
+++ b/freeplane/viewer-resources/images/OpenURLMapAction.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ExtractLinkFromTextAction.svg"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     id="namedview47"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-12.354966"
+     inkscape:cy="7.9322034"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="315.41"
+       cx="298.10001"
+       gradientTransform="matrix(1.131,0,0,1.1312,-22.1,-17.655)"
+       r="149.3">
+      <stop
+         stop-color="#007fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#1c8eff"
+         offset=".39286"
+         id="stop9" />
+      <stop
+         stop-color="#1a4a7a"
+         offset="1"
+         id="stop11" />
+    </radialGradient>
+    <radialGradient
+       id="b"
+       spreadMethod="reflect"
+       gradientUnits="userSpaceOnUse"
+       cy="249.47"
+       cx="317.85999"
+       gradientTransform="matrix(0.92255,0.54994,-0.61282,1.0614,218.04,-49.879)"
+       r="141.81">
+      <stop
+         stop-color="#b8ff71"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#6c0"
+         offset="1"
+         id="stop16" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       gradientUnits="userSpaceOnUse"
+       cx="298.67001"
+       cy="309.10999"
+       r="130.08"
+       gradientTransform="matrix(0.24362,0.87764,-1.1344,0.31491,586.41,-25.658)">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".86735"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop21" />
+    </radialGradient>
+    <linearGradient
+       x1="-290.09"
+       y1="915.11"
+       gradientTransform="matrix(0.57371545,-0.03503424,0.0371069,0.54166974,108.86103,-494.47862)"
+       x2="-290.83"
+       gradientUnits="userSpaceOnUse"
+       y2="909.21"
+       id="b-6">
+      <stop
+         id="stop4468"
+         offset="0"
+         stop-color="#ffd700" />
+      <stop
+         id="stop4470"
+         offset="1"
+         stop-color="#f5f6c2" />
+    </linearGradient>
+    <linearGradient
+       x1="-290.83"
+       y1="912.77"
+       gradientTransform="matrix(0.57371545,-0.03503424,0.0371069,0.54166974,108.86103,-494.47862)"
+       x2="-298.56"
+       gradientUnits="userSpaceOnUse"
+       y2="903.8"
+       id="a-8">
+      <stop
+         id="stop4473"
+         offset="0"
+         stop-color="#ebc600" />
+      <stop
+         id="stop4475"
+         offset="1"
+         stop-color="#f5f6c2" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4509"
+     transform="translate(33.142759,0.40678085)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#b-6);stroke:#6c5d53;stroke-width:0.58791411;stroke-linecap:round;stroke-linejoin:round"
+       d="m -18.91112,11.169255 -0.773164,-11.28606077 -7.160549,2.10655367 -1.136229,-1.6438242 -4.861758,1.7026274 c 0.175707,2.3059516 0.619184,8.7721269 0.7928,11.1943039 0.203775,2.84258 1.423813,2.011147 1.974946,1.654085 5.021747,-1.676679 6.853319,-2.510282 11.163735,-3.726896 l -2.1e-5,0 2.1e-5,0 z"
+       id="path4483" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#a-8);stroke:#6c5d53;stroke-width:0.58791411;stroke-linecap:round;stroke-linejoin:round"
+       d="m -31.04357,15.303235 c 2.17569,-0.52176 8.664722,-2.921412 12.996665,-4.382118 l 0.584646,-9.8040433 -3.131447,0.9819435 -5.093016,1.676383 -1.006586,1.2906108 -3.29499,0.9047791 c 0.17509,3.8323669 0.169698,8.8700009 -1.055763,9.3324349 z"
+       id="path4485" />
+    <g
+       transform="matrix(0.53390025,0,0,0.53390025,-25.694084,6.916097)"
+       id="g4446">
+      <g
+         id="g31"
+         transform="matrix(0.053575,0,0,0.053575,-11.37,-14.262)">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#a)"
+           id="path33"
+           d="m 361.52,266.24 c -26.481,0 -51.311,6.9656 -72.882,19.078 -0.0135,0.008 -0.0407,-0.008 -0.0541,0 -13.958,7.8431 -26.446,17.93 -37.17,29.67 -24.263,26.559 -39.223,61.789 -39.223,100.58 0,82.436 66.919,149.32 149.33,149.32 2.5937,0 5.1106,-0.2475 7.6718,-0.37835 4.1212,-0.21072 8.1835,-0.54189 12.21,-1.081 37.336,-4.9964 70.315,-23.697 93.628,-51.017 22.259,-26.086 35.766,-59.887 35.766,-96.846 0,-18.861 -3.6075,-36.83 -9.9949,-53.449 -3.1327,-8.1514 -7.0048,-15.955 -11.454,- [...]
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#b)"
+           id="path35"
+           d="m 340.38,270.95 c -0.53748,0 -1.3878,0.0981 -1.7524,0.58444 -0.35197,0.46939 -0.68987,1.0794 -1.0708,1.4603 -0.22822,0.22827 -0.4672,0.87639 -1.0709,0.87639 -0.3483,0 -1.5018,-0.18792 -1.7523,0 -0.46412,0.34834 -1.1189,0.67898 -1.2656,1.2658 -0.18838,0.75367 -0.82657,0.63186 -1.3628,1.1683 -0.30271,0.30282 -1.0106,0.86135 -1.4603,0.97381 -0.58787,0.14689 -1.1038,0.29187 -1.7524,0.29202 -0.49352,0 -1.1789,-0.11892 -1.655,0 -0.7773,0.19439 -1.1842,0.90474 -1.8496,1.071 -0.604 [...]
+        <path
+           inkscape:connector-curvature="0"
+           id="path37"
+           d="m 485.93,359.96 c 0,0 -39.081,-3.7873 -65.969,15.659 -26.888,19.447 -41.584,62.128 -72.815,75.064 -62.462,25.872 -111.06,12.767 -111.06,12.767 -28.563,-68.958 4.2207,-148.1 73.178,-176.67 68.958,-28.563 148.1,4.2207 176.67,73.178 z"
+           style="color:#000000;fill:url(#c)" />
+      </g>
+      <rect
+         style="color:#000000;fill:#ffffff;stroke:#ffffff;stroke-width:0.18358;stroke-linecap:square;stroke-dasharray:0.55075116, 0.55075116"
+         height="5.9103999"
+         width="15.816"
+         y="5.0480108"
+         x="0.097712204"
+         id="rect41" />
+      <g
+         style="font-size:5.69980001px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000"
+         id="text43"
+         transform="matrix(0.95036157,0,0,1,0.00938134,0)">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 5.3126907,5.8986262 -1.0770618,4.1440438 -0.6206326,0 -0.871112,-3.4399181 -0.8516302,3.4399181 -0.606717,0 -1.0965436,-4.1440438 0.56497041,0 0.87111199,3.4454846 0.8571965,-3.4454846 0.5594042,0 0.8655458,3.4788818 0.8655458,-3.4788818 0.5399225,0 z"
+           id="path4420" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 10.945696,5.8986262 -1.0770615,4.1440438 -0.6206325,0 -0.8711121,-3.4399181 -0.8516302,3.4399181 -0.606717,0 -1.0965436,-4.1440438 0.5649704,0 0.871112,3.4454846 0.8571965,-3.4454846 0.5594042,0 0.8655458,3.4788818 0.865546,-3.4788818 0.539922,0 z"
+           id="path4422" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 16.578702,5.8986262 -1.077062,4.1440438 -0.620632,0 -0.871112,-3.4399181 -0.851631,3.4399181 -0.606717,0 -1.096543,-4.1440438 0.56497,0 0.871112,3.4454846 0.857197,-3.4454846 0.559404,0 0.865546,3.4788818 0.865545,-3.4788818 0.539923,0 z"
+           id="path4424" />
+      </g>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#00d400;fill-rule:evenodd;stroke:#008033;stroke-width:0.51480561;stroke-linecap:round;stroke-linejoin:round"
+       d="m -21.850355,7.4263982 -3.121728,3.8747918 -3.426033,-3.4750093 1.878701,-0.2068273 c -0.185571,-4.349953 -3.4485,-4.5317889 -5.376002,-2.5899037 0.813354,-1.8445048 1.984977,-2.6129909 3.22581,-2.620884 2.329723,0.088205 4.772097,1.3974628 4.828841,5.0472045 l 1.990411,-0.0295 0,4.94e-5 z"
+       id="path4487" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/OrFilter.svg b/freeplane/viewer-resources/images/OrFilter.svg
new file mode 100644
index 0000000..5c39340
--- /dev/null
+++ b/freeplane/viewer-resources/images/OrFilter.svg
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="OrFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="150.2"
+       y1="673.53"
+       gradientTransform="matrix(0.59338289,0.16508124,-0.23772172,0.85452432,271.88031,593.20912)"
+       x2="158.14"
+       gradientUnits="userSpaceOnUse"
+       y2="677.01"
+       id="a-3">
+      <svg:stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#f00" />
+      <svg:stop
+         id="stop9-4"
+         offset="1"
+         stop-color="#fffe21" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#b-4"
+       id="linearGradient4570"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x1="295.32001"
+       y1="563.58002"
+       x2="285.19"
+       y2="563.76001" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a-8"
+       id="linearGradient4572"
+       gradientUnits="userSpaceOnUse"
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       y2="557.23999" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#b-4"
+       id="linearGradient4574"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x1="295.32001"
+       y1="563.58002"
+       x2="285.19"
+       y2="563.76001" />
+    <svg:linearGradient
+       inkscape:collect="always"
+       xlink:href="#a-8"
+       id="linearGradient4576"
+       gradientUnits="userSpaceOnUse"
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       y2="557.23999" />
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3261255"
+     inkscape:cx="-58.648813"
+     inkscape:cy="34.371733"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:g
+       id="g4620">
+      <svg:rect
+         ry="1.8605328"
+         rx="1.7739983"
+         y="1184.6935"
+         x="184.48253"
+         height="31.321405"
+         width="39.321671"
+         id="rect4498"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1" />
+      <svg:g
+         style="stroke-width:0.73146331"
+         transform="matrix(1.0755616,0,0,1.0771736,171.10745,1156.9808)"
+         id="g4609">
+        <svg:g
+           style="stroke-width:0.73146331"
+           transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+           id="g4607">
+          <svg:g
+             style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331"
+             transform="translate(5.1953e-6,28.466)"
+             id="g4603">
+            <svg:path
+               inkscape:connector-curvature="0"
+               d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+               id="path4599"
+               style="fill:url(#linearGradient4574);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round" />
+            <svg:ellipse
+               rx="8.6450996"
+               transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+               ry="0.79745001"
+               cy="557.94"
+               cx="290.51001"
+               id="ellipse4601"
+               style="fill:url(#linearGradient4576);stroke-width:0.31768915" />
+          </svg:g>
+          <svg:rect
+             style="fill:none;stroke-width:0.73146331"
+             rx="0.16552"
+             ry="0.18513"
+             height="32"
+             width="32"
+             y="564.25"
+             x="191.33"
+             id="rect4605" />
+        </svg:g>
+      </svg:g>
+      <svg:path
+         inkscape:connector-curvature="0"
+         id="path4556"
+         d="m 212.04533,1190.5267 -15.55834,19.7694"
+         style="fill:none;stroke:#ff0000;stroke-width:1.66166019;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <svg:g
+         id="g4568"
+         transform="matrix(0.95712957,0,0,0.95856406,192.01573,1172.4157)"
+         style="stroke-width:0.73146331">
+        <svg:g
+           id="g4566"
+           transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+           style="stroke-width:0.73146331">
+          <svg:g
+             id="g4562"
+             transform="translate(5.1953e-6,28.466)"
+             style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+            <svg:path
+               style="fill:url(#linearGradient4570);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+               id="path4558"
+               d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+               inkscape:connector-curvature="0" />
+            <svg:ellipse
+               style="fill:url(#linearGradient4572);stroke-width:0.31768915"
+               id="ellipse4560"
+               cx="290.51001"
+               cy="557.94"
+               ry="0.79745001"
+               transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+               rx="8.6450996" />
+          </svg:g>
+          <svg:rect
+             id="rect4564"
+             x="191.33"
+             y="564.25"
+             width="32"
+             height="32"
+             ry="0.18513"
+             rx="0.16552"
+             style="fill:none;stroke-width:0.73146331" />
+        </svg:g>
+      </svg:g>
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/SetShortenerStateAction.svg b/freeplane/viewer-resources/images/SetShortenerStateAction.svg
new file mode 100644
index 0000000..bf79ab7
--- /dev/null
+++ b/freeplane/viewer-resources/images/SetShortenerStateAction.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16.01001"
+   version="1.1"
+   id="svg3176"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="setshortenerstateaction.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3199"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="340.67502"
+     inkscape:cy="-395.01001"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3176" />
+  <defs
+     id="defs3178">
+    <linearGradient
+       id="a"
+       y2="396.54999"
+       gradientUnits="userSpaceOnUse"
+       x2="307.79001"
+       y1="381.32999"
+       x1="301.20001">
+      <stop
+         stop-color="#000080"
+         offset="0"
+         id="stop3181" />
+      <stop
+         stop-color="#000080"
+         stop-opacity="0"
+         offset="1"
+         id="stop3183" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3185">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(387.44,-458.85001)"
+     id="g3187">
+    <rect
+       style="color:#000000;fill:none"
+       height="14.163"
+       width="16.004999"
+       y="459.76999"
+       x="-387.44"
+       id="rect3189" />
+    <g
+       transform="translate(1.3351e-5,4.0151)"
+       id="g3191"
+       style="stroke-linejoin:round">
+      <rect
+         height="6.4723001"
+         rx="1.6754"
+         ry="1.6252"
+         width="14.359"
+         y="459.60001"
+         x="-386.60999"
+         id="rect3193"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.71829998" />
+      <path
+         transform="matrix(0.24031,0,0,0.24031,-454.93,369.49)"
+         d="m 301.17,397 -9.5008,-16.456 h 19.002 z"
+         id="path3195"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);stroke:#000000;stroke-width:1.29999995;stroke-linecap:round" />
+    </g>
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="458.85001"
+       x="-387.42999"
+       id="rect3197" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/ShowSelectionAsRectangleAction.svg b/freeplane/viewer-resources/images/ShowSelectionAsRectangleAction.svg
new file mode 100644
index 0000000..ae753a5
--- /dev/null
+++ b/freeplane/viewer-resources/images/ShowSelectionAsRectangleAction.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16.014999"
+   version="1.1"
+   id="svg3201"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="showselectionasrectangleaction.svg">
+  <defs
+     id="defs3215" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3213"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="343.51001"
+     inkscape:cy="-330.74003"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3201" />
+  <metadata
+     id="metadata3203">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-132.125,-726.97998)"
+     id="g3205">
+    <rect
+       style="opacity:0.92510998;color:#000000;fill:none"
+       rx="0.070384003"
+       ry="0.092563003"
+       height="16"
+       width="16"
+       y="726.97998"
+       x="132.14"
+       id="rect3207" />
+    <rect
+       height="7.3909001"
+       rx="1.7122"
+       ry="1.6299"
+       width="15.142"
+       y="731.28003"
+       x="132.56"
+       id="rect3209"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.85776001;stroke-linejoin:round" />
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="726.97998"
+       x="132.14"
+       id="rect3211" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/SplitFilter.svg b/freeplane/viewer-resources/images/SplitFilter.svg
new file mode 100644
index 0000000..d1d94c6
--- /dev/null
+++ b/freeplane/viewer-resources/images/SplitFilter.svg
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="SplitFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="150.2"
+       y1="673.53"
+       gradientTransform="matrix(0.59338289,0.16508124,-0.23772172,0.85452432,268.76973,592.52705)"
+       x2="158.14"
+       gradientUnits="userSpaceOnUse"
+       y2="677.01"
+       id="a-3">
+      <svg:stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#f00" />
+      <svg:stop
+         id="stop9-4"
+         offset="1"
+         stop-color="#fffe21" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3261255"
+     inkscape:cx="-50.692828"
+     inkscape:cy="21.725761"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.321671"
+       height="31.321405"
+       x="184.48253"
+       y="1184.6935"
+       rx="1.7739983"
+       ry="1.8605328" />
+    <svg:g
+       id="g4827"
+       transform="translate(3.1105779,0.68206598)">
+      <svg:g
+         style="stroke-width:0.73146331"
+         transform="matrix(1.5301188,0,0,1.5324121,165.05546,1145.3537)"
+         id="g4609">
+        <svg:g
+           style="stroke-width:0.73146331"
+           transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+           id="g4607">
+          <svg:g
+             style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331"
+             transform="translate(5.1953e-6,28.466)"
+             id="g4603">
+            <svg:path
+               inkscape:connector-curvature="0"
+               d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+               id="path4599"
+               style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round" />
+            <svg:ellipse
+               rx="8.6450996"
+               transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+               ry="0.79745001"
+               cy="557.94"
+               cx="290.51001"
+               id="ellipse4601"
+               style="fill:url(#a-8);stroke-width:0.31768915" />
+          </svg:g>
+          <svg:rect
+             style="fill:none;stroke-width:0.73146331"
+             rx="0.16552"
+             ry="0.18513"
+             height="32"
+             width="32"
+             y="564.25"
+             x="191.33"
+             id="rect4605" />
+        </svg:g>
+      </svg:g>
+      <svg:path
+         d="m 205.20194,1188.4683 -4.07063,7.84 3.33244,-0.9025 -12.49582,15.3194 7.44797,-15.5906 -3.13885,0.7497 5.16056,-8.6867"
+         id="path43"
+         style="fill:url(#a-3);fill-rule:evenodd;stroke:#b40000;stroke-width:1.12452197;stroke-linecap:round;stroke-linejoin:round"
+         inkscape:connector-curvature="0" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/UpFilter.svg b/freeplane/viewer-resources/images/UpFilter.svg
new file mode 100644
index 0000000..6592ef8
--- /dev/null
+++ b/freeplane/viewer-resources/images/UpFilter.svg
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="31.999737"
+   viewBox="0 0 40 31.999737"
+   id="svg5654"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="UpFilter.svg">
+  <svg:defs
+     id="defs5656">
+    <svg:linearGradient
+       x1="268.63"
+       x2="219.96001"
+       y1="238.03"
+       gradientUnits="userSpaceOnUse"
+       y2="124.52"
+       id="a"
+       gradientTransform="matrix(0.09048591,0,0,0.0907745,264.0459,479.40474)">
+      <svg:stop
+         id="stop4697"
+         offset="0"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop4699"
+         offset="1"
+         stop-opacity=".99225"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="56.425999"
+       y1="834.12"
+       gradientTransform="matrix(-1,0,0,1,783.51,-380.02)"
+       x2="56.047001"
+       gradientUnits="userSpaceOnUse"
+       y2="838.97998"
+       id="a-5">
+      <svg:stop
+         id="stop3019"
+         offset="0"
+         stop-opacity=".54615"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3021"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#fff" />
+    </svg:linearGradient>
+    <svg:radialGradient
+       r="61.352001"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       cx="386.20999"
+       cy="866.01001"
+       gradientUnits="userSpaceOnUse"
+       id="a-2">
+      <svg:stop
+         id="stop3222"
+         offset="0"
+         stop-opacity=".92035"
+         stop-color="#fff" />
+      <svg:stop
+         id="stop3224"
+         offset="1"
+         stop-color="#ccc" />
+    </svg:radialGradient>
+    <svg:linearGradient
+       x1="348.72"
+       y1="863.29999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       x2="318.67999"
+       gradientUnits="userSpaceOnUse"
+       y2="864.59003"
+       id="c">
+      <svg:stop
+         id="stop3227"
+         offset="0"
+         stop-color="#d4aa00" />
+      <svg:stop
+         id="stop3229"
+         offset="1"
+         stop-color="#fea" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="333.48999"
+       y1="791.28003"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       x2="343.89001"
+       gradientUnits="userSpaceOnUse"
+       y2="791.12"
+       id="b">
+      <svg:stop
+         id="stop3232"
+         offset="0"
+         stop-opacity=".99608"
+         stop-color="#3c3c3c" />
+      <svg:stop
+         id="stop3234"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#b3b3b3" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="295.32001"
+       y1="563.58002"
+       gradientTransform="matrix(1.7686,0,0,1.8459,-306.28,-490.99)"
+       x2="285.19"
+       gradientUnits="userSpaceOnUse"
+       y2="563.76001"
+       id="b-4">
+      <svg:stop
+         id="stop4581"
+         offset="0"
+         stop-color="#2a89ea" />
+      <svg:stop
+         id="stop4583"
+         offset=".47542"
+         stop-color="#d4e2f6" />
+      <svg:stop
+         id="stop4585"
+         offset=".86308"
+         stop-color="#e5eef9" />
+      <svg:stop
+         id="stop4587"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="290.75"
+       y1="558.21002"
+       x2="290.70001"
+       gradientUnits="userSpaceOnUse"
+       y2="557.23999"
+       id="a-8">
+      <svg:stop
+         id="stop4590"
+         offset="0"
+         stop-color="#b6c6dd" />
+      <svg:stop
+         id="stop4592"
+         offset="1"
+         stop-color="#f7fafd" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient3773">
+      <svg:stop
+         style="stop-color:#24424c;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3775" />
+      <svg:stop
+         style="stop-color:#79dfee;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3777" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8251">
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.25098041;"
+         offset="0.00000000"
+         id="stop8253" />
+      <svg:stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop8255" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient8983">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.37254903;"
+         offset="0.00000000"
+         id="stop8985" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.094117649;"
+         offset="1.0000000"
+         id="stop8987" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="a-4"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96001"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-54.143103,-29.289398)">
+      <svg:stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <svg:stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient18569">
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.99342108"
+         offset="0.0000000"
+         id="stop18571" />
+      <svg:stop
+         style="stop-color:#ffffff;stop-opacity:0.11842106"
+         offset="1.0000000"
+         id="stop18573" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="128.00049"
+       y1="244.42773"
+       x2="128.00047"
+       y2="11.573135"
+       id="XMLID_11_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop120"
+         style="stop-color: rgb(0, 53, 237); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop122"
+         style="stop-color: rgb(0, 0, 141); stop-opacity: 1;"
+         offset="0.54494399" />
+      <svg:stop
+         id="stop124"
+         style="stop-color: rgb(0, 83, 189); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop126"
+         style="stop-color:#0035ED"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop128"
+         style="stop-color:#0035ED"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop130"
+         style="stop-color:#00008D"
+         offset="0.544944" />
+      <midPointStop
+         id="midPointStop132"
+         style="stop-color:#00008D"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop134"
+         style="stop-color:#0053BD"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       x1="127.99951"
+       y1="244.40723"
+       x2="127.9995"
+       y2="11.546326"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <svg:stop
+         id="stop141"
+         style="stop-color: rgb(66, 138, 255); stop-opacity: 1;"
+         offset="0.005615" />
+      <svg:stop
+         id="stop143"
+         style="stop-color: rgb(148, 202, 255); stop-opacity: 1;"
+         offset="0.57303399" />
+      <svg:stop
+         id="stop145"
+         style="stop-color: rgb(220, 240, 255); stop-opacity: 1;"
+         offset="1" />
+      <midPointStop
+         id="midPointStop147"
+         style="stop-color:#428AFF"
+         offset="0.005615" />
+      <midPointStop
+         id="midPointStop149"
+         style="stop-color:#428AFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop151"
+         style="stop-color:#94CAFF"
+         offset="0.573034" />
+      <midPointStop
+         id="midPointStop153"
+         style="stop-color:#94CAFF"
+         offset="0.5" />
+      <midPointStop
+         id="midPointStop155"
+         style="stop-color:#DCF0FF"
+         offset="1" />
+    </svg:linearGradient>
+    <svg:linearGradient
+       id="linearGradient4568-1">
+      <svg:stop
+         id="stop4570-9"
+         offset="0"
+         style="stop-color:#e12b1c;stop-opacity:1;" />
+      <svg:stop
+         id="stop4572-8"
+         offset="1.0000000"
+         style="stop-color:#980b00;stop-opacity:1.0000000;" />
+    </svg:linearGradient>
+  </svg:defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.3261255"
+     inkscape:cx="-50.692828"
+     inkscape:cy="21.725761"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     units="px" />
+  <svg:metadata
+     id="metadata5659">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-184.14337,-1184.3543)">
+    <svg:rect
+       style="fill:#aa0000;fill-opacity:1;stroke:#aa0000;stroke-width:0.90643668"
+       id="rect234"
+       transform="matrix(0.50024975,0.86588116,-0.86624538,0.49961879,0,0)"
+       y="495.14658"
+       x="1089.7218"
+       height="0"
+       width="0.9126758" />
+    <svg:rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.6783312;stroke-opacity:1"
+       id="rect4498"
+       width="39.321671"
+       height="31.321405"
+       x="184.48253"
+       y="1184.6935"
+       rx="1.7739983"
+       ry="1.8605328" />
+    <svg:g
+       id="g4609"
+       transform="matrix(1.5301188,0,0,1.5324121,165.05546,1145.3537)"
+       style="stroke-width:0.73146331">
+      <svg:g
+         id="g4607"
+         transform="matrix(0.49915,0,0,0.49915,-79.976,-253.66)"
+         style="stroke-width:0.73146331">
+        <svg:g
+           id="g4603"
+           transform="translate(5.1953e-6,28.466)"
+           style="fill-rule:evenodd;stroke:#000080;stroke-width:0.73146331">
+          <svg:path
+             style="fill:url(#b-4);stroke-width:0.66347378;stroke-linecap:round;stroke-linejoin:round"
+             id="path4599"
+             d="m 192.08,538.38 c 1.5448,6.8951 11.713,11.923 12.715,15.136 l 0.0641,13.784 5.4493,-5.8882 -0.19234,-8.2969 c 0.63957,-3.4367 7.9818,-5.1312 12.518,-14.801"
+             inkscape:connector-curvature="0" />
+          <svg:ellipse
+             style="fill:url(#a-8);stroke-width:0.31768915"
+             id="ellipse4601"
+             cx="290.51001"
+             cy="557.94"
+             ry="0.79745001"
+             transform="matrix(1.7715,0,0,2.4653,-307.3,-837.27)"
+             rx="8.6450996" />
+        </svg:g>
+        <svg:rect
+           id="rect4605"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry="0.18513"
+           rx="0.16552"
+           style="fill:none;stroke-width:0.73146331" />
+      </svg:g>
+    </svg:g>
+    <svg:g
+       style="stroke-width:0.81299937"
+       transform="matrix(1.7684485,0,0,-1.7684485,242.12861,1249.0421)"
+       id="g4548">
+      <svg:path
+         style="opacity:1;fill:#080088;fill-opacity:1;stroke:none;stroke-width:0.60974956;stroke-opacity:1"
+         inkscape:transform-center-x="0.022858851"
+         inkscape:transform-center-y="2.6604092"
+         d="m -14.903382,34.141338 -3.871764,-5.692778 7.689867,-0.03098 z"
+         id="path4544"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <svg:path
+         style="fill:none;fill-rule:evenodd;stroke:#080088;stroke-width:1.26463759;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -14.930158,21.808892 v 7.927934"
+         id="path4546"
+         inkscape:connector-curvature="0" />
+    </svg:g>
+  </svg:g>
+</svg:svg>
diff --git a/freeplane/viewer-resources/images/ZoomIn24.svg b/freeplane/viewer-resources/images/ZoomIn24.svg
new file mode 100644
index 0000000..be1f8fd
--- /dev/null
+++ b/freeplane/viewer-resources/images/ZoomIn24.svg
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.007771"
+   width="16"
+   version="1.1"
+   id="svg3217"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="zoomin24.gif.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3252"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="343.19502"
+     inkscape:cy="-456.39003"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3217" />
+  <defs
+     id="defs3219">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3222" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3224" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-587.14,683.57)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3227" />
+      <stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3229" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-43.705,879.66)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3232" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3234" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3236">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(100.73,-854.85221)"
+     id="g3238">
+    <g
+       transform="translate(3.5753,-25.448)"
+       id="g3240">
+      <path
+         d="m 451.11,879.75 c 0,31.882 -26.98,57.727 -60.261,57.727 -33.281,0 -60.261,-25.845 -60.261,-57.727 0,-31.882 26.98,-57.727 60.261,-57.727 33.259,0 60.23,25.812 60.261,57.672"
+         transform="matrix(-0.095277,0,0,0.099482,-57.227,798.84)"
+         id="path3242"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.81395" />
+      <rect
+         ry="0.32876"
+         rx="0.32876"
+         transform="matrix(-0.7273,-0.68632,-0.70389,0.7103,0,0)"
+         height="5.2533002"
+         width="2.0947001"
+         y="717.26001"
+         x="-558.15002"
+         id="rect3244"
+         style="fill:url(#c);stroke:#a25d2b;stroke-width:0.33790001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.93725" />
+      <path
+         d="m -98.125,890.88 -0.78603,1.5437 -1.4082,-1.3724 1.4643,-0.87188 0.72987,0.70049 z"
+         id="path3246"
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);fill-rule:evenodd;stroke:#333333;stroke-width:0.20107;stroke-linejoin:round;stroke-opacity:0.88372001" />
+      <path
+         style="color:#000000;fill:#1a1a1a;fill-rule:evenodd"
+         d="m -95.23,883.19 -0.0048,2.3557 -2.4475,-0.005 v 1.6013 h 2.4427 l -0.0048,2.3944 h 1.6013 v -2.3944 h 2.3944 v -1.587 l -2.3944,-0.005 v -2.3605 h -1.587 l 4.6e-5,-1.8e-4 z"
+         id="path3248"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="854.85999"
+       x="-100.73"
+       id="rect3250" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/ZoomOut24.svg b/freeplane/viewer-resources/images/ZoomOut24.svg
new file mode 100644
index 0000000..cdc8004
--- /dev/null
+++ b/freeplane/viewer-resources/images/ZoomOut24.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.004808"
+   width="16"
+   version="1.1"
+   id="svg3254"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="zoomout24.gif.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3291"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="342.15901"
+     inkscape:cy="-435.93999"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3254" />
+  <defs
+     id="defs3256">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop3259" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop3261" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.08852,0,0,0.041832,-600.51,670.29)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#d4aa00"
+         offset="0"
+         id="stop3264" />
+      <stop
+         stop-color="#fea"
+         offset="1"
+         id="stop3266" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(-0.067239,-0.065994,-0.041412,0.04252,-24.631,879.41)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop3269" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop3271" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3273">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(70.293999,-856.70521)"
+     id="g3275">
+    <g
+       transform="translate(14.932,-23.345)"
+       id="g3277">
+      <path
+         d="m 451.11,879.75 c 0,31.882 -26.98,57.727 -60.261,57.727 -33.281,0 -60.261,-25.845 -60.261,-57.727 0,-31.882 26.98,-57.727 60.261,-57.727 33.259,0 60.23,25.812 60.261,57.672"
+         transform="matrix(-0.095277,0,0,0.099482,-38.153,798.59)"
+         id="path3279"
+         inkscape:connector-curvature="0"
+         style="fill:url(#a);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.81395" />
+      <rect
+         ry="0.32876"
+         rx="0.32876"
+         transform="matrix(-0.7273,-0.68632,-0.70389,0.7103,0,0)"
+         height="5.2533002"
+         width="2.0947001"
+         y="703.97998"
+         x="-571.53003"
+         id="rect3281"
+         style="fill:url(#c);stroke:#a05a2c;stroke-width:0.33790001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.90697997" />
+      <path
+         d="m -79.051,890.62 -0.78603,1.5437 -1.4082,-1.3724 1.4643,-0.87188 0.72987,0.70049 z"
+         id="path3283"
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);fill-rule:evenodd;stroke:#333333;stroke-width:0.20107;stroke-linejoin:round;stroke-opacity:0.88372001" />
+      <g
+         transform="matrix(0.38424,0,0,0.38424,-38.871,555.1)"
+         id="g3285"
+         style="fill:#1a1a1a">
+        <path
+           style="color:#000000;fill:#1a1a1a;fill-rule:evenodd"
+           d="m -103.42,859.31 v 4.1675 h 16.744 v -4.1301 l -16.744,-0.0373 z"
+           id="path3287"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="856.71002"
+       x="-70.293999"
+       id="rect3289" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/applies_to_filtered_nodes.svg b/freeplane/viewer-resources/images/applies_to_filtered_nodes.svg
new file mode 100644
index 0000000..5109fa7
--- /dev/null
+++ b/freeplane/viewer-resources/images/applies_to_filtered_nodes.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5161mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.001822 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(.88432 0 0 .92139 126.37 98.363)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" gradientTransform="matrix(.88574 0 0 1.2306 125.86 -74.484)" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="c" y2="370.95" gradientUnits="userSpaceOnUse" x2="135.49" gradientTransform="matrix(-.00038125 -.43842 .33510 -.00045279 253.73 682.49)" y1="385.54" x1="152.37">
+   <stop stop-color="#f97700" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-19.443 -276.9)">
+  <g transform="matrix(1.0192 0 0 1.0001 -362.95 -334.03)">
+   <g transform="matrix(.98124 0 0 .98124 7.0402 11.763)">
+    <path stroke-linejoin="round" d="m390.83 612.14-15.277 0.0332c0.77238 3.4417 5.8567 5.9512 6.3574 7.5547l0.002 0.24024h-1.873c-0.50594 0-0.91406 0.38753-0.91406 0.86914v2.2031c0 0.48161 0.40812 0.86914 0.91406 0.86914h1.8906l0.0137 2.6992 2.502-2.6992h1.8438c0.50594 0 0.91211-0.38753 0.91211-0.86914v-2.2031c0-0.48161-0.40617-0.86914-0.91211-0.86914h-1.707l-0.01-0.44141c0.31978-1.7154 3.9896-2.5599 6.2578-7.3867z" fill-rule="evenodd" stroke="#000080" stroke-linecap="round" stroke-widt [...]
+    <ellipse fill-rule="evenodd" rx="7.6573" ry=".98131" stroke="#000080" cy="612.09" cx="383.18" stroke-width=".45343" fill="url(#a)"/>
+    <rect rx=".082762" ry=".092405" height="15.973" width="16" y="610.87" x="375.18" fill="none"/>
+   </g>
+   <path stroke-linejoin="round" d="m382.99 621.4-4.1615-5.0787 2.4665-0.0251-0.0797-5.2468 3.466-0.005 0.0514 5.2468 2.4012-0.003-4.1439 5.1117z" fill-rule="evenodd" stroke="#803300" stroke-width=".38330" fill="url(#c)"/>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/apply_quick_filter.svg b/freeplane/viewer-resources/images/apply_quick_filter.svg
new file mode 100644
index 0000000..58ed7e6
--- /dev/null
+++ b/freeplane/viewer-resources/images/apply_quick_filter.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5291mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999999 16.048102" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="c" y2="677.01" gradientUnits="userSpaceOnUse" x2="158.14" gradientTransform="matrix(.47430 .090038 -.19002 .46606 674.33 266.62)" y1="673.53" x1="150.2">
+   <stop stop-color="#ffb300" offset="0"/>
+   <stop stop-color="#fffe21" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-16.585 -117.08)">
+  <g transform="translate(-595.92 -473.93)">
+   <rect rx=".082762" ry=".092563" height="16" width="16" y="591.06" x="612.51" fill="none"/>
+   <g fill-rule="evenodd" transform="matrix(.97834 0 0 .99662 17.697 4.9716)">
+    <path stroke-linejoin="round" d="m616.79 589.89c2.4642-0.15753 4.2185-0.16659 6.2458-0.30279l-1.9553 3.9205h2.8939l-11.024 10.286 4.1544-7.6184h-3.0847" stroke="#e40000" stroke-linecap="round" stroke-width=".67158" fill="url(#c)"/>
+    <g transform="matrix(.36788 0 0 .36788 537.59 391.02)" stroke="#000080">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width="1.2485" fill="url(#a)"/>
+     <ellipse rx="8.6451" ry=".79745" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" cy="557.94" cx="290.51" stroke-width=".59781" fill="url(#b)"/>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/back.png b/freeplane/viewer-resources/images/back.png
deleted file mode 100644
index 1b7f399..0000000
Binary files a/freeplane/viewer-resources/images/back.png and /dev/null differ
diff --git a/freeplane/viewer-resources/images/calendar_clock_red.svg b/freeplane/viewer-resources/images/calendar_clock_red.svg
new file mode 100644
index 0000000..226ce19
--- /dev/null
+++ b/freeplane/viewer-resources/images/calendar_clock_red.svg
@@ -0,0 +1,800 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="41"
+   height="32"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 41 32">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11344">
+      <stop
+         id="stop11346"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="0.5"
+         id="stop11348" />
+      <stop
+         id="stop11350"
+         offset="1"
+         style="stop-color:#6796df;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11189">
+      <stop
+         id="stop11191"
+         offset="0"
+         style="stop-color:#ff1010;stop-opacity:1;" />
+      <stop
+         id="stop11193"
+         offset="1"
+         style="stop-color:#ff8e8e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2304-6">
+      <stop
+         id="stop2306-1"
+         offset="0"
+         style="stop-color:#babdb6" />
+      <stop
+         id="stop2308-6"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11469">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop11471" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop11473" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9385">
+      <stop
+         style="stop-color:#009f00;stop-opacity:1"
+         offset="0"
+         id="stop9387" />
+      <stop
+         style="stop-color:#60ff60;stop-opacity:1"
+         offset="1"
+         id="stop9389" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7819-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop7821-9" />
+      <stop
+         style="stop-color:#b9150a;stop-opacity:1"
+         offset="1"
+         id="stop7823-2" />
+    </linearGradient>
+    <filter
+       id="filter8252">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.61377733"
+         id="feGaussianBlur8254" />
+    </filter>
+    <linearGradient
+       id="linearGradient22117">
+      <stop
+         id="stop22119"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873"
+         offset="0.31645569"
+         style="stop-color:#fffab3;stop-opacity:0.84375" />
+      <stop
+         id="stop22121"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <filter
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749" />
+    </filter>
+    <linearGradient
+       id="linearGradient31540-7-9">
+      <stop
+         style="stop-color:#b7bec8;stop-opacity:1"
+         offset="0"
+         id="stop31542-4-3" />
+      <stop
+         style="stop-color:#535d6c;stop-opacity:1"
+         offset="1"
+         id="stop31544-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30703-7-6">
+      <stop
+         style="stop-color:#77000d;stop-opacity:1;"
+         offset="0"
+         id="stop30705-1-0" />
+      <stop
+         style="stop-color:#ff0731;stop-opacity:1;"
+         offset="1"
+         id="stop30707-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30709-4-1">
+      <stop
+         style="stop-color:#5c000f;stop-opacity:1;"
+         offset="0"
+         id="stop30711-5-8" />
+      <stop
+         style="stop-color: rgb(124, 31, 22); stop-opacity: 0;"
+         offset="1"
+         id="stop30713-5-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient18230-4-2">
+      <stop
+         id="stop18232-2-9"
+         offset="0"
+         style="stop-color: rgb(208, 188, 186); stop-opacity: 1;" />
+      <stop
+         id="stop18234-3-1"
+         offset="1"
+         style="stop-color: rgb(254, 253, 253); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15958-1-8">
+      <stop
+         id="stop15960-6-4"
+         offset="0"
+         style="stop-color: rgb(151, 136, 136); stop-opacity: 1;" />
+      <stop
+         id="stop15962-8-0"
+         offset="1"
+         style="stop-color: rgb(251, 252, 252); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15966-7-6">
+      <stop
+         id="stop15968-6-3"
+         offset="0"
+         style="stop-color: rgb(208, 188, 186); stop-opacity: 1;" />
+      <stop
+         id="stop15970-1-6"
+         offset="1"
+         style="stop-color: rgb(108, 108, 108); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient31540-7-9"
+       id="linearGradient13518"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.31824406,0,0,0.30411198,-442.31904,132.71212)"
+       x1="-33.818184"
+       y1="36.486488"
+       x2="14.181816"
+       y2="50.550369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30703-7-6"
+       id="linearGradient13513"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3248741,0,0,0.2980304,-509.48494,117.62885)"
+       x1="195.92659"
+       y1="88.995918"
+       x2="196.20729"
+       y2="70.697823" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30709-4-1"
+       id="linearGradient13515"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3248741,0,0,0.2980304,-509.48494,117.62885)"
+       x1="195.92659"
+       y1="72.995918"
+       x2="195.92659"
+       y2="103.62462" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30703-7-6"
+       id="linearGradient13510"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3248741,0,0,0.2980304,-509.48494,117.67375)"
+       x1="197.9975"
+       y1="82.763222"
+       x2="196.69408"
+       y2="88.711494" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3216-2"
+       id="radialGradient55015"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.988775,-1.01162,0,343.811,-116.139)"
+       cx="196.92123"
+       cy="132.30916"
+       fx="196.92123"
+       fy="132.30916"
+       r="21.000002" />
+    <linearGradient
+       id="linearGradient3216-2"
+       inkscape:collect="always">
+      <stop
+         id="stop3218-7"
+         offset="0"
+         style="stop-color: rgb(255, 254, 254); stop-opacity: 1;" />
+      <stop
+         id="stop3220-6"
+         offset="1"
+         style="stop-color: rgb(213, 215, 218); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18230-4-2"
+       id="linearGradient55017"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-34.4048,9.15775)"
+       x1="281.202"
+       y1="94.043068"
+       x2="279.5672"
+       y2="92.45208" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18230-4-2"
+       id="linearGradient55019"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(29.5,-14)"
+       x1="213.29681"
+       y1="113.86611"
+       x2="223.51112"
+       y2="122.70285" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-55.1133,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55023"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-68.059,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-47.594,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.5397,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-40.0747,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-53.0204,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-32.5553,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-45.5011,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-25.036,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-37.9818,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#L2"
+       id="linearGradient56110"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93683152,0.01444949,0,0.96960856,-682.59472,-551.60918)"
+       x1="243.32458"
+       y1="402.15451"
+       x2="243.32458"
+       y2="260.52774" />
+    <linearGradient
+       y2="260.52774"
+       y1="402.15451"
+       x2="243.32458"
+       x1="243.32458"
+       id="L2"
+       gradientTransform="scale(0.99984473,1.0001553)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2271"
+         style="stop-color:#fff;stop-opacity:0" />
+      <stop
+         id="stop2273"
+         style="stop-color:#fff;stop-opacity:.57254905"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#L1"
+       id="linearGradient56112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99992221,0,0,1.0000778,-717.60662,-582.53738)"
+       x1="259.40082"
+       y1="307.82748"
+       x2="260.54816"
+       y2="469.55243" />
+    <linearGradient
+       y2="469.55243"
+       y1="307.82748"
+       x2="260.54816"
+       x1="259.40082"
+       id="L1"
+       gradientTransform="scale(0.99992221,1.0000778)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2266"
+         style="stop-color:#ddd" />
+      <stop
+         id="stop2268"
+         style="stop-color:#f5f5f5"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#L3"
+       id="linearGradient56114"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9428752,0,0,0.92662172,-557.49048,-1056.4279)"
+       x1="104.63348"
+       y1="987.17004"
+       x2="106.81163"
+       y2="850.52936" />
+    <linearGradient
+       y2="850.52936"
+       y1="987.17004"
+       x2="106.81163"
+       x1="104.63348"
+       id="L3"
+       gradientTransform="scale(0.97710312,1.0234334)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2276"
+         style="stop-color:#fff;stop-opacity:0" />
+      <stop
+         id="stop2278"
+         style="stop-color:#fff;stop-opacity:.85000002"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.6269818"
+     inkscape:cx="13.221639"
+     inkscape:cy="8.2075379"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1082"
+     inkscape:window-height="748"
+     inkscape:window-x="781"
+     inkscape:window-y="129"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <g
+       transform="matrix(1.9716183,0,0,2.0006402,893.30356,-291.43852)"
+       id="g14188"
+       inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\Clock\calendar&clock_red.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         id="g13842">
+        <rect
+           rx="0.49655452"
+           style="fill:#6f7c91;fill-opacity:1;stroke:none"
+           id="rect2221-3"
+           width="15.275715"
+           height="14.597375"
+           x="-452.76315"
+           y="139.07306"
+           ry="0.45552415" />
+        <rect
+           rx="0.49655452"
+           style="fill:url(#linearGradient13518);fill-opacity:1;stroke:none"
+           id="rect3194-3"
+           width="15.275715"
+           height="14.597375"
+           x="-453.08139"
+           y="138.76895"
+           ry="0.45552415" />
+        <rect
+           style="fill:url(#linearGradient13513);fill-opacity:1;stroke:url(#linearGradient13515);stroke-width:0.18669775;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3212-4"
+           width="13.449788"
+           height="4.5896688"
+           x="-451.99588"
+           y="139.47324" />
+        <path
+           style="fill:url(#linearGradient13510);fill-opacity:1;stroke:none"
+           d="m -451.9654,139.66893 -0.0371,4.34326 c 0.10354,0.01 13.37261,-1.3e-4 13.41018,0 0.0309,1.1e-4 0.0315,-0.20877 0.0112,-0.78233 -3.4379,-0.0373 -4.59433,-0.70373 -6.132,-1.32251 -1.39211,-0.51736 -4.37656,-0.0249 -5.78682,-0.39116 -1.03584,-0.3981 -0.96467,-0.78648 -1.46541,-1.84726 z"
+           id="rect5193-1"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g3403-1"
+           transform="matrix(0.3248741,0,0,0.2983801,-518.99027,121.78498)">
+          <g
+             id="g3392-3">
+            <rect
+               style="fill:url(#radialGradient55015);fill-opacity:1;stroke:#afa497;stroke-width:0.599648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               id="rect3214-8"
+               width="41.400002"
+               height="29.365538"
+               x="206.17499"
+               y="75.136406" />
+            <g
+               id="g11086-7"
+               transform="matrix(1,0,0,0.998828,-20.8814,-12.4458)">
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9134-4"
+                 d="m 227.37902,90.87374 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9136-2"
+                 d="m 227.37902,94.880683 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9138-7"
+                 d="m 227.37902,114.91537 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9140-7"
+                 d="m 227.37902,110.90842 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9142-9"
+                 d="m 227.37902,106.9015 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9144-3"
+                 d="m 227.37902,102.89455 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+              <path
+                 inkscape:connector-curvature="0"
+                 id="path9146-1"
+                 d="m 227.37902,98.887607 41.18897,0"
+                 style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097" />
+            </g>
+          </g>
+          <path
+             inkscape:connector-curvature="0"
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="/home/zouzi/Desktop/date.png"
+             sodipodi:nodetypes="cccc"
+             id="path17237-9"
+             d="m 247.45778,97.63087 c -1.35559,2.86529 -3.04566,4.71511 -5.62196,6.64649 2.09893,0.31643 3.98643,-0.45739 5.03623,-0.89983 0.36782,-1.70383 0.67046,-4.03024 0.58573,-5.74666 z"
+             style="overflow:visible;opacity:0.53898297;fill:url(#linearGradient55017);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient55019);stroke-width:0.45300001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+        <g
+           id="g16973-8"
+           transform="matrix(0.3248741,0,0,0.2980304,-509.31499,118.15831)">
+          <rect
+             rx="1.4292973"
+             ry="2.2433741"
+             y="65.818001"
+             x="180.62552"
+             height="11.397371"
+             width="2.8585947"
+             id="rect14987-6"
+             style="fill:url(#linearGradient55021);fill-opacity:1;stroke:url(#linearGradient55023);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <rect
+             rx="1.4292973"
+             ry="2.2433741"
+             y="65.818001"
+             x="188.14482"
+             height="11.397371"
+             width="2.8585947"
+             id="rect15974-5"
+             style="fill:url(#linearGradient55025);fill-opacity:1;stroke:url(#linearGradient55027);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <rect
+             rx="1.4292973"
+             ry="2.2433741"
+             y="65.818001"
+             x="195.66412"
+             height="11.397371"
+             width="2.8585947"
+             id="rect15980-0"
+             style="fill:url(#linearGradient55029);fill-opacity:1;stroke:url(#linearGradient55031);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <rect
+             rx="1.4292973"
+             ry="2.2433741"
+             y="65.818001"
+             x="203.18344"
+             height="11.397371"
+             width="2.8585947"
+             id="rect15986-2"
+             style="fill:url(#linearGradient55033);fill-opacity:1;stroke:url(#linearGradient55035);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <rect
+             rx="1.4292973"
+             ry="2.2433741"
+             y="65.818001"
+             x="210.70273"
+             height="11.397371"
+             width="2.8585947"
+             id="rect15992-8"
+             style="fill:url(#linearGradient55037);fill-opacity:1;stroke:url(#linearGradient55039);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18px;line-height:100%;font-family:'Bitstream Vera Sans';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m -448.22915,149.9027 2.22759,0 0,0.95952 -3.67874,0 0,-0.95952 1.84784,-1.63086 c 0.16501,-0.14918 0.28707,-0.29497 0.36619,-0.43738 0.0791,-0.1424 0.11866,-0.29045 0.11866,-0.44416 0,-0.23733 -0.0802,-0.42833 -0.24072,-0.573 -0.15823,-0.14466 -0.36958,-0.21699 -0.63404,-0.217 -0.20343,1e-5 -0.42608,0.0441 -0.66793,0.13223 -0.24186,0.0859 -0.50068,0.21474 -0.77644,0.38653 l 0,-1.1121 c 0.29385,-0.0972 0.5843,-0.17065 0.87137,-0.22039 0.28706,-0.052 0.56848,-0.078 0.84425,- [...]
+           id="text2383-6" />
+      </g>
+      <g
+         transform="matrix(0.04092157,0,0,0.04092157,-417.91494,156.14044)"
+         id="g56096">
+        <path
+           inkscape:connector-curvature="0"
+           d="m -351.19254,-193.65917 a 103.64882,103.64882 0 1 0 -207.29763,0 103.64882,103.64882 0 1 0 207.29763,0 z"
+           id="path2283" />
+        <path
+           style="fill:url(#linearGradient56110);stroke-width:1.25354886"
+           inkscape:connector-curvature="0"
+           id="P1"
+           d="m -356.17519,-193.45025 a 100.64511,96.960302 78.224334 1 0 -194.23311,-2.9958 100.64511,96.960302 78.224334 1 0 194.23311,2.9958 z" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m -366.58088,-185.31678 a 88.295215,95.537015 0 1 0 -176.59043,0 88.295215,95.537015 0 0 0 176.59043,0 z"
+           id="path2286" />
+        <path
+           style="fill:url(#linearGradient56112);stroke-width:3.75"
+           inkscape:connector-curvature="0"
+           id="P2"
+           d="m -372.18295,-194.39898 a 82.601311,82.601311 0 1 0 -165.20262,0 82.601311,82.601311 0 1 0 165.20262,0 z" />
+        <path
+           style="fill:url(#linearGradient56114)"
+           inkscape:connector-curvature="0"
+           id="P3"
+           d="m -384.90006,-200.65246 a 69.826658,68.606844 0 1 0 -139.65331,0 69.826658,68.606844 0 1 0 139.65331,0 z" />
+        <path
+           d="m -449.00525,-184.24718 -30.71949,-47.78589"
+           id="P4"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:6" />
+        <path
+           d="m -460.66242,-183.45805 36.96746,-67.11315"
+           id="P5"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:6" />
+        <path
+           d="m -468.11959,-191.75639 79.87069,-8.19186"
+           id="P6"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#ff0000;stroke-width:3" />
+        <rect
+           height="9.060586"
+           width="3.7730832"
+           x="-456.61523"
+           y="-271.08325"
+           id="rect2295" />
+        <rect
+           height="9.060586"
+           width="3.7730832"
+           x="-456.61523"
+           y="-127.1108"
+           id="rect2297" />
+        <rect
+           height="9.060586"
+           transform="matrix(0,1,-1,0,0,0)"
+           width="3.7730832"
+           x="-196.68045"
+           y="521.49988"
+           id="rect2299" />
+        <rect
+           height="9.060586"
+           transform="matrix(0,1,-1,0,0,0)"
+           width="3.7730832"
+           x="-196.68045"
+           y="379.12909"
+           id="rect2301" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/calendar_red.svg b/freeplane/viewer-resources/images/calendar_red.svg
new file mode 100644
index 0000000..e4978b7
--- /dev/null
+++ b/freeplane/viewer-resources/images/calendar_red.svg
@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11344">
+      <stop
+         id="stop11346"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="0.5"
+         id="stop11348" />
+      <stop
+         id="stop11350"
+         offset="1"
+         style="stop-color:#6796df;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11189">
+      <stop
+         id="stop11191"
+         offset="0"
+         style="stop-color:#ff1010;stop-opacity:1;" />
+      <stop
+         id="stop11193"
+         offset="1"
+         style="stop-color:#ff8e8e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2304-6">
+      <stop
+         id="stop2306-1"
+         offset="0"
+         style="stop-color:#babdb6" />
+      <stop
+         id="stop2308-6"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11469">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop11471" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop11473" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9385">
+      <stop
+         style="stop-color:#009f00;stop-opacity:1"
+         offset="0"
+         id="stop9387" />
+      <stop
+         style="stop-color:#60ff60;stop-opacity:1"
+         offset="1"
+         id="stop9389" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7819-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop7821-9" />
+      <stop
+         style="stop-color:#b9150a;stop-opacity:1"
+         offset="1"
+         id="stop7823-2" />
+    </linearGradient>
+    <filter
+       id="filter8252">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.61377733"
+         id="feGaussianBlur8254" />
+    </filter>
+    <linearGradient
+       id="linearGradient22117">
+      <stop
+         id="stop22119"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873"
+         offset="0.31645569"
+         style="stop-color:#fffab3;stop-opacity:0.84375" />
+      <stop
+         id="stop22121"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <filter
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient31540-7-9"
+       id="linearGradient13518-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.31824406,0,0,0.30411198,-442.31904,132.71212)"
+       x1="-33.818184"
+       y1="36.486488"
+       x2="14.181816"
+       y2="50.550369" />
+    <linearGradient
+       id="linearGradient31540-7-9">
+      <stop
+         style="stop-color:#b7bec8;stop-opacity:1"
+         offset="0"
+         id="stop31542-4-3" />
+      <stop
+         style="stop-color:#535d6c;stop-opacity:1"
+         offset="1"
+         id="stop31544-0-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30703-7-6"
+       id="linearGradient13513-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3248741,0,0,0.2980304,-509.48494,117.62885)"
+       x1="195.92659"
+       y1="88.995918"
+       x2="196.20729"
+       y2="70.697823" />
+    <linearGradient
+       id="linearGradient30703-7-6">
+      <stop
+         style="stop-color:#77000d;stop-opacity:1;"
+         offset="0"
+         id="stop30705-1-0" />
+      <stop
+         style="stop-color:#ff0731;stop-opacity:1;"
+         offset="1"
+         id="stop30707-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30709-4-1"
+       id="linearGradient13515-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3248741,0,0,0.2980304,-509.48494,117.62885)"
+       x1="195.92659"
+       y1="72.995918"
+       x2="195.92659"
+       y2="103.62462" />
+    <linearGradient
+       id="linearGradient30709-4-1">
+      <stop
+         style="stop-color:#5c000f;stop-opacity:1;"
+         offset="0"
+         id="stop30711-5-8" />
+      <stop
+         style="stop-color: rgb(124, 31, 22); stop-opacity: 0;"
+         offset="1"
+         id="stop30713-5-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient30703-7-6"
+       id="linearGradient13510-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3248741,0,0,0.2980304,-509.48494,117.67375)"
+       x1="197.9975"
+       y1="82.763222"
+       x2="196.69408"
+       y2="88.711494" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3216-2-3"
+       id="radialGradient55015-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.988775,-1.01162,0,343.811,-116.139)"
+       cx="196.92123"
+       cy="132.30916"
+       fx="196.92123"
+       fy="132.30916"
+       r="21.000002" />
+    <linearGradient
+       id="linearGradient3216-2-3"
+       inkscape:collect="always">
+      <stop
+         id="stop3218-7-7"
+         offset="0"
+         style="stop-color: rgb(255, 254, 254); stop-opacity: 1;" />
+      <stop
+         id="stop3220-6-8"
+         offset="1"
+         style="stop-color: rgb(213, 215, 218); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18230-4-2"
+       id="linearGradient55017-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-34.4048,9.15775)"
+       x1="281.202"
+       y1="94.043068"
+       x2="279.5672"
+       y2="92.45208" />
+    <linearGradient
+       id="linearGradient18230-4-2">
+      <stop
+         id="stop18232-2-9"
+         offset="0"
+         style="stop-color: rgb(208, 188, 186); stop-opacity: 1;" />
+      <stop
+         id="stop18234-3-1"
+         offset="1"
+         style="stop-color: rgb(254, 253, 253); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18230-4-2"
+       id="linearGradient55019-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(29.5,-14)"
+       x1="213.29681"
+       y1="113.86611"
+       x2="223.51112"
+       y2="122.70285" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55021-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-55.1133,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       id="linearGradient15958-1-8">
+      <stop
+         id="stop15960-6-4"
+         offset="0"
+         style="stop-color: rgb(151, 136, 136); stop-opacity: 1;" />
+      <stop
+         id="stop15962-8-0"
+         offset="1"
+         style="stop-color: rgb(251, 252, 252); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55023-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-68.059,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       id="linearGradient15966-7-6">
+      <stop
+         id="stop15968-6-3"
+         offset="0"
+         style="stop-color: rgb(208, 188, 186); stop-opacity: 1;" />
+      <stop
+         id="stop15970-1-6"
+         offset="1"
+         style="stop-color: rgb(108, 108, 108); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55025-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-47.594,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55027-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-60.5397,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55029-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-40.0747,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55031-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-53.0204,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55033-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-32.5553,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55035-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-45.5011,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15958-1-8"
+       id="linearGradient55037-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.07804,0,0,1.07455,-25.036,33.8941)"
+       x1="221.62442"
+       y1="35.012306"
+       x2="219.2321"
+       y2="35.012306" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15966-7-6"
+       id="linearGradient55039-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-37.9818,38.9777)"
+       x1="250.11383"
+       y1="38.570667"
+       x2="250.11383"
+       y2="26.507296" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.786181"
+     inkscape:cx="11.783834"
+     inkscape:cy="17.911778"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1082"
+     inkscape:window-height="748"
+     inkscape:window-x="781"
+     inkscape:window-y="129"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <g
+       transform="matrix(2.0520776,0,0,2.0003905,929.75817,-291.40215)"
+       id="g13842-2"
+       inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\Clock\calendar_red.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         ry="0.45552415"
+         y="139.07306"
+         x="-452.76315"
+         height="14.597375"
+         width="15.275715"
+         id="rect2221-3-6"
+         style="fill:#6f7c91;fill-opacity:1;stroke:none"
+         rx="0.49655452" />
+      <rect
+         ry="0.45552415"
+         y="138.76895"
+         x="-453.08139"
+         height="14.597375"
+         width="15.275715"
+         id="rect3194-3-0"
+         style="fill:url(#linearGradient13518-8);fill-opacity:1;stroke:none"
+         rx="0.49655452" />
+      <rect
+         y="139.47324"
+         x="-451.99588"
+         height="4.5896688"
+         width="13.449788"
+         id="rect3212-4-1"
+         style="fill:url(#linearGradient13513-4);fill-opacity:1;stroke:url(#linearGradient13515-6);stroke-width:0.18669775;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="rect5193-1-6"
+         d="m -451.9654,139.66893 -0.0371,4.34326 c 0.10354,0.01 13.37261,-1.3e-4 13.41018,0 0.0309,1.1e-4 0.0315,-0.20877 0.0112,-0.78233 -3.4379,-0.0373 -4.59433,-0.70373 -6.132,-1.32251 -1.39211,-0.51736 -4.37656,-0.0249 -5.78682,-0.39116 -1.03584,-0.3981 -0.96467,-0.78648 -1.46541,-1.84726 z"
+         style="fill:url(#linearGradient13510-9);fill-opacity:1;stroke:none" />
+      <g
+         transform="matrix(0.3248741,0,0,0.2983801,-518.99027,121.78498)"
+         id="g3403-1-5">
+        <g
+           id="g3392-3-7">
+          <rect
+             y="75.136406"
+             x="206.17499"
+             height="29.365538"
+             width="41.400002"
+             id="rect3214-8-5"
+             style="fill:url(#radialGradient55015-6);fill-opacity:1;stroke:#afa497;stroke-width:0.599648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <g
+             transform="matrix(1,0,0,0.998828,-20.8814,-12.4458)"
+             id="g11086-7-4">
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,90.87374 41.18897,0"
+               id="path9134-4-1"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,94.880683 41.18897,0"
+               id="path9136-2-2"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,114.91537 41.18897,0"
+               id="path9138-7-0"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,110.90842 41.18897,0"
+               id="path9140-7-0"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,106.9015 41.18897,0"
+               id="path9142-9-1"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,102.89455 41.18897,0"
+               id="path9144-3-4"
+               inkscape:connector-curvature="0" />
+            <path
+               style="fill:none;stroke:#c60002;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.10135097"
+               d="m 227.37902,98.887607 41.18897,0"
+               id="path9146-1-6"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+        <path
+           style="overflow:visible;opacity:0.53898297;fill:url(#linearGradient55017-8);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient55019-3);stroke-width:0.45300001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 247.45778,97.63087 c -1.35559,2.86529 -3.04566,4.71511 -5.62196,6.64649 2.09893,0.31643 3.98643,-0.45739 5.03623,-0.89983 0.36782,-1.70383 0.67046,-4.03024 0.58573,-5.74666 z"
+           id="path17237-9-0"
+           sodipodi:nodetypes="cccc"
+           inkscape:export-filename="/home/zouzi/Desktop/date.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0.3248741,0,0,0.2980304,-509.31499,118.15831)"
+         id="g16973-8-7">
+        <rect
+           style="fill:url(#linearGradient55021-9);fill-opacity:1;stroke:url(#linearGradient55023-7);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect14987-6-1"
+           width="2.8585947"
+           height="11.397371"
+           x="180.62552"
+           y="65.818001"
+           ry="2.2433741"
+           rx="1.4292973" />
+        <rect
+           style="fill:url(#linearGradient55025-1);fill-opacity:1;stroke:url(#linearGradient55027-5);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect15974-5-7"
+           width="2.8585947"
+           height="11.397371"
+           x="188.14482"
+           y="65.818001"
+           ry="2.2433741"
+           rx="1.4292973" />
+        <rect
+           style="fill:url(#linearGradient55029-4);fill-opacity:1;stroke:url(#linearGradient55031-2);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect15980-0-7"
+           width="2.8585947"
+           height="11.397371"
+           x="195.66412"
+           y="65.818001"
+           ry="2.2433741"
+           rx="1.4292973" />
+        <rect
+           style="fill:url(#linearGradient55033-0);fill-opacity:1;stroke:url(#linearGradient55035-9);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect15986-2-7"
+           width="2.8585947"
+           height="11.397371"
+           x="203.18344"
+           y="65.818001"
+           ry="2.2433741"
+           rx="1.4292973" />
+        <rect
+           style="fill:url(#linearGradient55037-3);fill-opacity:1;stroke:url(#linearGradient55039-7);stroke-width:0.66600001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect15992-8-7"
+           width="2.8585947"
+           height="11.397371"
+           x="210.70273"
+           y="65.818001"
+           ry="2.2433741"
+           rx="1.4292973" />
+      </g>
+      <path
+         id="text2383-6-3"
+         d="m -448.22915,149.9027 2.22759,0 0,0.95952 -3.67874,0 0,-0.95952 1.84784,-1.63086 c 0.16501,-0.14918 0.28707,-0.29497 0.36619,-0.43738 0.0791,-0.1424 0.11866,-0.29045 0.11866,-0.44416 0,-0.23733 -0.0802,-0.42833 -0.24072,-0.573 -0.15823,-0.14466 -0.36958,-0.21699 -0.63404,-0.217 -0.20343,1e-5 -0.42608,0.0441 -0.66793,0.13223 -0.24186,0.0859 -0.50068,0.21474 -0.77644,0.38653 l 0,-1.1121 c 0.29385,-0.0972 0.5843,-0.17065 0.87137,-0.22039 0.28706,-0.052 0.56848,-0.078 0.84425,-0. [...]
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18px;line-height:100%;font-family:'Bitstream Vera Sans';text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/close.svg b/freeplane/viewer-resources/images/close.svg
new file mode 100644
index 0000000..66d5f47
--- /dev/null
+++ b/freeplane/viewer-resources/images/close.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.764 16.751" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.37028 0 0 .36654 1011.7 985.36)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="d" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="b" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.33386 0 0 .33049 917.56 908.65)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="335.21" gradientUnits="userSpaceOnUse" y1="355.87" gradientTransform="matrix(.33929 0 0 .33895 -176.7 -195.38)" x2="32.638" x1="53.55">
+<stop stop-color="#c83737" offset="0"/>
+<stop stop-color="#c83737" stop-opacity=".40708" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -299.35)">
+<g fill-rule="evenodd" transform="matrix(.79802 0 0 .79802 227.88 371.29)">
+<g transform="matrix(1.3267 0 0 1.3267 -220.82 -359.26)" stroke="#666">
+<path d="m44.481 203.1h7.8035l3.9268 4.0816-0.0887 11.207h-11.642v-15.288z" stroke-width=".53351" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.33386 0 0 .33049 996.91 807.89)" filter="url(#d)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m52.517 203.34c0.35669 1.5836 0.12812 2.8224-0.02 3.5988 0.8796-0.21633 1.9163-0.45787 3.4556 0.009-1.6593-1.8338-2.3361-2.3982-3.4356-3.6086z" stroke-width=".53351" fill="url(#b)"/>
+</g>
+<path d="m-155.89-73.436c-0.02 0.70656 0.36067 1.64-1.5163 1.3862l-3.19-3.2439-3.2992 3.0929c-0.65128 0.5027-2.0586-0.31983-1.3141-1.3879 0.20641-0.29613 3.0735-3.151 3.0826-3.2055l-3.333-3.1439c0.37349-1.634 1.0672-1.477 1.645-1.6577l3.1756 3.0724c0.0133 0.103 3.088-3.0248 3.2186-3.0581 1.3686-0.34908 1.8011 0.99438 1.502 1.5719-0.13693 0.26444-3.1327 3.1597-3.1327 3.201l3.1614 3.3725z" stroke="url(#a)" stroke-width=".33912px" fill="#dc0000"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/copy_single.svg b/freeplane/viewer-resources/images/copy_single.svg
new file mode 100644
index 0000000..7715dc1
--- /dev/null
+++ b/freeplane/viewer-resources/images/copy_single.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 838.93 1582.3)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="d" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="a" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.31920 0 0 .31597 748.88 1509)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 838.93 1582.3)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="e" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-60.355 -232.72)">
+<g transform="translate(-169.08 -152.87)">
+<g transform="translate(381.87 -479.06)">
+<g fill-rule="evenodd" transform="matrix(.76061 0 0 .76061 -86.255 230.27)" stroke="#666">
+<path d="m-85.847 834.41h7.4607l3.7543 3.9023-0.08477 10.715h-11.13v-14.617z" stroke-width=".51007" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.31920 0 0 .31597 824.74 1412.6)" filter="url(#d)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m-78.164 834.64c0.34102 1.514 0.12249 2.6984-0.01908 3.4407 0.84097-0.20682 1.8321-0.43775 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" stroke-width=".51007" fill="url(#a)"/>
+<g transform="translate(7.3241 5.8)">
+<path d="m-85.847 834.41h7.4607l3.7543 3.9023-0.08477 10.715h-11.13v-14.617z" stroke-width=".51007" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.31920 0 0 .31597 824.74 1412.6)" filter="url(#e)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m-78.164 834.64c0.34102 1.514 0.12249 2.6984-0.01908 3.4407 0.84097-0.20682 1.8321-0.43775 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" stroke-width=".51007" fill="url(#a)"/>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="864.65" x="-152.43" fill="none"/>
+</g>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Sans" transform="scale(1.0074 .99269)" line-height="125%" stroke="#000000" xml:space="preserve" font-size="9.7263px" y="402.83551" x="235.29607" stroke-width=".24833" fill="#000000"><tspan y="402.83551" x="235.29607" stroke-width=".24833">1</tspan></text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/edit_filtering_condition.svg b/freeplane/viewer-resources/images/edit_filtering_condition.svg
new file mode 100644
index 0000000..fb844f5
--- /dev/null
+++ b/freeplane/viewer-resources/images/edit_filtering_condition.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5275mm" width="4.5108mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.983021 16.042342" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="j" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(.89748 0 0 .92452 -281.55 239.91)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="i" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="d" y2="446.77" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="215.36" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="440.75" x1="209.71"/>
+  <linearGradient id="e">
+   <stop stop-color="#f70000" offset="0"/>
+   <stop stop-color="#780000" offset="1"/>
+  </linearGradient>
+  <linearGradient id="c" y2="449.6" xlink:href="#f" gradientUnits="userSpaceOnUse" x2="194.27" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="456.24" x1="202.53"/>
+  <linearGradient id="f">
+   <stop stop-color="#baa492" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="449.64" xlink:href="#h" gradientUnits="userSpaceOnUse" x2="193.04" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="457.89" x1="203.5"/>
+  <linearGradient id="h">
+   <stop offset="0"/>
+   <stop stop-color="#7e7e7e" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2="462.65" xlink:href="#g" gradientUnits="userSpaceOnUse" x2="196.75" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" y1="458.87" x1="193.01"/>
+  <linearGradient id="g">
+   <stop stop-color="#c00000" offset="0"/>
+   <stop offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-17.169 -210.93)">
+  <g transform="translate(3.2831 53.219)">
+   <g transform="translate(-89.238 -438.33)">
+    <g transform="translate(61.537 -3.4187)">
+     <rect opacity=".92511" style="color:#000000" rx=".070219" ry=".091815" height="15.871" width="15.962" y="599.56" x="41.587" fill="none"/>
+     <rect style="color:#000000" height="15.871" width="15.962" y="599.56" x="41.587" fill="none"/>
+     <g transform="translate(4.0759 37.809)">
+      <g fill-rule="evenodd" transform="translate(66.414 -192.48)" stroke="#000080">
+       <path stroke-linejoin="round" d="m-28.659 755.46c0.78387 3.4534 5.9438 5.9718 6.452 7.5807l0.03254 6.9034 2.7652-2.949-0.0976-4.1555c0.32454-1.7212 4.0503-2.5699 6.3522-7.4132" stroke-linecap="round" stroke-width=".45727" fill="url(#j)"/>
+       <ellipse rx="8.6451" transform="matrix(.89892 0 0 1.2347 -282.06 66.471)" ry=".79745" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#i)"/>
+      </g>
+      <g transform="matrix(1.2401 -.13473 .13551 1.2329 -152.66 114.18)">
+       <g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+        <path stroke-linejoin="round" d="m340.34 304.7 10.562-10.6 1.2706-8.9948-8.9644-0.60659-12.355 11.644" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+        <path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+        <path d="m335.35 297.57-6.1721 7.7077" stroke="#000" stroke-width=".40004" fill="none"/>
+        <path d="m338.29 300.98c-0.2939 0.11951-8.1706 5.5567-8.1706 5.5567" stroke="#000" stroke-width=".40004" fill="none"/>
+        <path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+        <path d="m351.02 294.19-10.31 10.57" stroke="#000" stroke-width=".46147" fill="none"/>
+       </g>
+       <g transform="matrix(.35249 .010495 .0022081 .35250 -.004426 272.71)">
+        <path stroke-linejoin="round" d="m340.34 304.7 10.878-10.924 1.2315-8.9383-8.9253-0.66307-12.671 11.968" fill-rule="evenodd" stroke="#500" stroke-width="1.1768" fill="url(#d)"/>
+        <path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.1762px" fill="url(#c)"/>
+        <path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.1762px" fill="url(#a)"/>
+        <path d="m351.01 294.5-10.3 10.26" stroke="#000" stroke-width=".46147" fill="none"/>
+       </g>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/editcopy.svg b/freeplane/viewer-resources/images/editcopy.svg
new file mode 100644
index 0000000..33f4c64
--- /dev/null
+++ b/freeplane/viewer-resources/images/editcopy.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 838.93 1582.3)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="e" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="a" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.31920 0 0 .31597 748.88 1509)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 838.93 1582.3)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dfdfdf" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="d" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-36.304 -231.76)">
+<g transform="translate(188.74 -632.88)">
+<g fill-rule="evenodd" transform="matrix(.76061 0 0 .76061 -86.255 230.27)" stroke="#666">
+<path d="m-85.847 834.41h7.4607l3.7543 3.9023-0.08477 10.715h-11.13v-14.617z" stroke-width=".51007" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.31920 0 0 .31597 824.74 1412.6)" filter="url(#e)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m-78.164 834.64c0.34102 1.514 0.12249 2.6984-0.01908 3.4407 0.84097-0.20682 1.8321-0.43775 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" stroke-width=".51007" fill="url(#a)"/>
+<g transform="translate(7.3241 5.8)">
+<path d="m-85.847 834.41h7.4607l3.7543 3.9023-0.08477 10.715h-11.13v-14.617z" stroke-width=".51007" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" transform="matrix(.31920 0 0 .31597 824.74 1412.6)" filter="url(#d)" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m-78.164 834.64c0.34102 1.514 0.12249 2.6984-0.01908 3.4407 0.84097-0.20682 1.8321-0.43775 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" stroke-width=".51007" fill="url(#a)"/>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="864.65" x="-152.43" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/empty.png b/freeplane/viewer-resources/images/empty.png
deleted file mode 100644
index bf91fa5..0000000
Binary files a/freeplane/viewer-resources/images/empty.png and /dev/null differ
diff --git a/freeplane/viewer-resources/images/filePrintDirect.png b/freeplane/viewer-resources/images/filePrintDirect.png
new file mode 100644
index 0000000..a22ca7a
Binary files /dev/null and b/freeplane/viewer-resources/images/filePrintDirect.png differ
diff --git a/freeplane/viewer-resources/images/filePrintDirect.svg b/freeplane/viewer-resources/images/filePrintDirect.svg
new file mode 100644
index 0000000..dca7ce4
--- /dev/null
+++ b/freeplane/viewer-resources/images/filePrintDirect.svg
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11344"
+       id="radialGradient9522"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1699719,-5.2037847e-7,3.7705374e-7,0.84773353,632.51387,358.79656)"
+       cx="-897.07111"
+       cy="552.22009"
+       fx="-897.07111"
+       fy="552.22009"
+       r="81.75972" />
+    <linearGradient
+       id="linearGradient11344">
+      <stop
+         id="stop11346"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="0.5"
+         id="stop11348" />
+      <stop
+         id="stop11350"
+         offset="1"
+         style="stop-color:#6796df;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10095-5"
+       id="linearGradient9524"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-185.81644,-14.965083)"
+       x1="-728.10278"
+       y1="712.69769"
+       x2="-726.61334"
+       y2="741.38074" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11189"
+       id="linearGradient9526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6666666,0,0,1,-841.90623,610.36603)"
+       x1="40.791222"
+       y1="30.003317"
+       x2="40.791222"
+       y2="29.084894" />
+    <linearGradient
+       id="linearGradient11189">
+      <stop
+         id="stop11191"
+         offset="0"
+         style="stop-color:#ff1010;stop-opacity:1;" />
+      <stop
+         id="stop11193"
+         offset="1"
+         style="stop-color:#ff8e8e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2304-6"
+       id="linearGradient9528"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8853266,0,0,1.499469,-851.41796,594.6317)"
+       x1="38.742561"
+       y1="29.743778"
+       x2="38.742561"
+       y2="31.167559" />
+    <linearGradient
+       id="linearGradient2304-6">
+      <stop
+         id="stop2306-1"
+         offset="0"
+         style="stop-color:#babdb6" />
+      <stop
+         id="stop2308-6"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10095-5"
+       id="linearGradient9530"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-856.51741,606.36603)"
+       x1="41.820312"
+       y1="33.109375"
+       x2="41.820312"
+       y2="33.46909" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11469"
+       id="linearGradient9532"
+       gradientUnits="userSpaceOnUse"
+       x1="-417.216"
+       y1="868.41119"
+       x2="-416.16174"
+       y2="894.68964" />
+    <linearGradient
+       id="linearGradient11469">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop11471" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop11473" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9385"
+       id="linearGradient9534"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.27877532,0,0,0.41816302,-287.16707,828.16897)"
+       x1="40.791222"
+       y1="30.003317"
+       x2="40.791222"
+       y2="29.084894" />
+    <linearGradient
+       id="linearGradient9385">
+      <stop
+         style="stop-color:#009f00;stop-opacity:1"
+         offset="0"
+         id="stop9387" />
+      <stop
+         style="stop-color:#60ff60;stop-opacity:1"
+         offset="1"
+         id="stop9389" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2304-6"
+       id="linearGradient9536"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37021084,0,0,0.62702249,-291.14452,821.58946)"
+       x1="38.742561"
+       y1="29.743778"
+       x2="38.742561"
+       y2="31.167559" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10095-5"
+       id="linearGradient9538"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.41816302,0,0,0.41816302,-293.24267,826.50779)"
+       x1="41.820312"
+       y1="33.109375"
+       x2="41.820312"
+       y2="33.46909" />
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-156.19706,-190.21126)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468"
+       xlink:href="#linearGradient10095-5"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="387.43924"
+       x2="332.02466"
+       y1="369.97995"
+       x1="314.56537"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2464"
+       xlink:href="#linearGradient4568"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.52298354,0,0,0.52298354,-170.59763,-171.51266)" />
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-186.81368,-190.34295)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468-8"
+       xlink:href="#linearGradient10095-5"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.5939152"
+     inkscape:cx="-29.907174"
+     inkscape:cy="8.9518223"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <path
+       id="path4537"
+       d="m 30.282496,19.036765 c -4.031996,0 -7.303104,3.271101 -7.303098,7.303097 0,1.93721 0.790567,3.668321 2.022673,4.97613 0.640096,-5.286823 5.102252,-9.397367 10.560849,-9.397367 0.147184,0 0.283852,0.02991 0.429595,0.0358 -1.335695,-1.737259 -3.350867,-2.917659 -5.710019,-2.917659 z"
+       style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2468);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g18933"
+       transform="matrix(2.1990888,0,0,2.1990888,52.487784,-12.742516)">
+      <g
+         transform="matrix(0.90946699,0,0,0.90946699,270.16691,-758.70414)"
+         id="g9498">
+        <g
+           id="g8490"
+           transform="translate(-42.692121,0.51269453)"
+           inkscape:export-filename="M:\FreePlane_radna_mapa\images-view\fileprint.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90">
+          <g
+             transform="matrix(0.09784769,0,0,0.09784769,-231.80669,759.97293)"
+             id="g11490">
+            <path
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccc"
+               id="rect2233-4"
+               d="m -450.60796,787.81846 67.14802,0 c 2.53637,0 4.57828,-1.89804 4.57828,-4.25571 l 0,-44.33274 -76.30458,0.0113 0,44.32172 c 0,2.35767 2.04191,4.25571 4.57828,4.25571 z"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2.82609773;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+            <rect
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:url(#radialGradient9522);fill-opacity:1;fill-rule:evenodd;stroke:#70747d;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               id="rect11223"
+               width="159.51944"
+               height="93.509377"
+               x="-496.79367"
+               y="780.1778"
+               rx="10.810508"
+               ry="11.639202" />
+            <g
+               id="g11263"
+               transform="translate(498.94655,70.813182)">
+              <rect
+                 ry="11.639202"
+                 rx="10.810508"
+                 y="699.81927"
+                 x="-967.8042"
+                 height="54.718876"
+                 width="103.64739"
+                 id="rect11237"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#70747d;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+              <path
+                 inkscape:connector-curvature="0"
+                 sodipodi:nodetypes="cccscccc"
+                 id="rect11241"
+                 d="m -955.04165,701.59418 c -7.5797,0 -10.63187,4.49115 -10.63187,11.07526 l 0,21.10851 c 13.29073,-5.45666 31.94018,-9.94573 52.40231,-12.2066 17.33583,-1.91545 33.83246,-3.24874 46.98377,-1.73957 l -0.11022,-8.59531 c 0,-6.1432 -3.82378,-9.53206 -9.5296,-9.53206 l -79.11439,-0.11023 z"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:url(#linearGradient9524);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" />
+            </g>
+            <g
+               id="g11269"
+               transform="matrix(4.2736116,0,0,4.2736116,3129.1385,-1938.4173)">
+              <rect
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9526);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9528);stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+                 id="rect2320-7"
+                 width="2.9999998"
+                 height="2"
+                 x="-815.90619"
+                 y="638.86597"
+                 rx="0.99999988"
+                 ry="1" />
+              <rect
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9530);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none"
+                 id="rect7589-8"
+                 width="1.5468748"
+                 height="0.35937488"
+                 x="-815.28302"
+                 y="639.47534"
+                 rx="0.51562488"
+                 ry="0.17968744" />
+            </g>
+            <g
+               id="g11477"
+               transform="translate(-0.41323391,-11.679879)">
+              <rect
+                 ry="0.17968744"
+                 rx="0.51562488"
+                 y="858.34564"
+                 x="-472.73978"
+                 height="14.341537"
+                 width="112.23812"
+                 id="rect11279"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.93719806;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:#a7aaae;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+              <path
+                 inkscape:connector-curvature="0"
+                 sodipodi:nodetypes="cccc"
+                 id="rect2233-4-9"
+                 d="m -454.46972,865.8685 0,44.1276 76.3125,0 0,-44.1276"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9532);fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2.82609773;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+              <rect
+                 transform="scale(-1,-1)"
+                 y="-904.4917"
+                 x="382.69318"
+                 width="65.221703"
+                 style="fill:#ffee4f;fill-opacity:1;stroke:none"
+                 id="rect11355-2"
+                 height="4.5558758" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#000000;stroke-width:1.81525731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+                 id="path11977-0"
+                 d="m -384.85538,894.42563 -60.62741,0" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#000000;stroke-width:1.81525731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+                 id="path13220-98"
+                 d="m -384.85538,888.54543 -60.62741,0" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#000000;stroke-width:1.81525731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+                 id="path13221-9"
+                 d="m -384.85538,882.66522 -60.62741,0" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#000000;stroke-width:1.81525731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+                 id="path13843-1"
+                 d="m -384.85538,876.78501 -60.62741,0" />
+            </g>
+          </g>
+          <rect
+             y="832.08801"
+             x="-280.61249"
+             height="16"
+             width="16"
+             id="rect6193-0-23-7-8-2"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+        </g>
+        <g
+           id="g9381"
+           transform="translate(-33.182835,-0.65194133)">
+          <rect
+             ry="0.41816303"
+             rx="0.41816297"
+             y="840.08661"
+             x="-276.29483"
+             height="0.83632606"
+             width="1.2544889"
+             id="rect2320-7-2"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9534);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9536);stroke-width:0.41816306;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+          <rect
+             ry="0.075138643"
+             rx="0.21561526"
+             y="840.35284"
+             x="-275.99997"
+             height="0.15027729"
+             width="0.64684582"
+             id="rect7589-8-7"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9538);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0.45646146,0,0,0.45646146,-12.557327,-9.8545993)"
+         id="g18928">
+        <circle
+           r="7.3043432"
+           cy="26.205395"
+           cx="-0.32931644"
+           id="path4533"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2464);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.16992879;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+        <path
+           sodipodi:nodetypes="cccccsscccc"
+           id="rect4574"
+           d="m -5.4972311,26.964732 c -0.067322,0.06731 -0.054658,0.17317 0.012658,0.24048 l 4.0866721,4.286097 6.8070015,-7.699386 c 0.067322,-0.06732 0.06731,-0.160509 0,-0.227822 L 3.8902568,22.045257 c -0.067319,-0.06732 -0.1771398,-0.08373 -0.2404802,-0.01266 l -5.0840985,5.704214 -2.2909216,-2.290922 c -0.067313,-0.06732 -0.1858251,-0.06732 -0.253138,0 l -1.5188436,1.518844 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4537-5"
+           d="m -0.33412257,18.905081 c -4.03199583,0 -7.30310313,3.271101 -7.30309713,7.303097 0,1.93721 0.7905664,3.668321 2.0226727,4.97613 0.6400955,-5.286823 5.10225141,-9.397367 10.5608488,-9.397367 0.1471841,0 0.2838522,0.02991 0.4295952,0.0358 -1.335695,-1.737259 -3.3508666,-2.917659 -5.71001957,-2.917659 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2468-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/filefind.svg b/freeplane/viewer-resources/images/filefind.svg
new file mode 100644
index 0000000..b3a9349
--- /dev/null
+++ b/freeplane/viewer-resources/images/filefind.svg
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16.012"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="filefindt.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="685"
+     inkscape:window-height="480"
+     id="namedview89"
+     showgrid="false"
+     inkscape:zoom="14.738947"
+     inkscape:cx="-1.4647198"
+     inkscape:cy="8.0059996"
+     inkscape:window-x="1104"
+     inkscape:window-y="6"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="e"
+       y2="-2104.9"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.4"
+       gradientTransform="matrix(0.3505,0,0,0.34695,915.92,740.86)"
+       y1="-2128.6"
+       x1="-2585.9">
+      <stop
+         stop-color="#dcdcdc"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="g"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315"
+       width="1.3481"
+       y="-.16576"
+       x="-.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="f"
+       y2="-2125.2"
+       gradientUnits="userSpaceOnUse"
+       x2="-2589.3"
+       gradientTransform="matrix(0.31602,0,0,0.31283,826.72,668.26)"
+       y1="-2130.1"
+       x1="-2584.4">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop15" />
+      <stop
+         stop-color="#dcdcdc"
+         offset="1"
+         id="stop17" />
+    </linearGradient>
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01"
+       cx="386.21"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop20" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop22" />
+    </radialGradient>
+    <linearGradient
+       id="d"
+       y2="864.59"
+       gradientUnits="userSpaceOnUse"
+       x2="318.68"
+       gradientTransform="matrix(0.074862,0,0,0.035378,-776.1,471.94)"
+       y1="863.3"
+       x1="348.72">
+      <stop
+         stop-color="#00f"
+         offset="0"
+         id="stop25" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop27" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89"
+       gradientTransform="matrix(0.056864,-0.055812,0.035022,0.03596,-241.08,860.4)"
+       y1="791.28"
+       x1="333.49">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop30" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop32" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="839.97"
+       gradientUnits="userSpaceOnUse"
+       x2="58.986"
+       gradientTransform="translate(-10.311,-15.418)"
+       y1="835.07"
+       x1="59.003">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop35" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop37" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata39">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4533">
+    <rect
+       id="rect45"
+       x="4.8828124e-006"
+       y="0.010024414"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+    <g
+       transform="translate(0.78981129,-0.00578311)"
+       id="g4514">
+      <path
+         d="m 7.6865,0.37 3.717,3.8635 -0.084,10.608 -11.02,0 2.5e-4,-14.47175 z"
+         id="path47"
+         style="fill:url(#e);fill-rule:evenodd;stroke:#666666;stroke-width:0.505"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z"
+         transform="matrix(0.31602,0,0,0.31283,901.82,572.86)"
+         id="path49"
+         inkscape:connector-curvature="0"
+         style="fill:#d3d3d3;fill-rule:evenodd;stroke:#666666;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#g)" />
+      <g
+         transform="matrix(0.81407,0,0,-0.81407,121.46,731.36)"
+         id="g51">
+        <path
+           d="m -136.67,894.82 0,-7.2898 c 0,-0.27565 -0.2203,-0.48099 -0.4916,-0.48099 l -9.9595,0 c -0.2713,0 -0.49161,0.20534 -0.49161,0.48099 l 0,7.2898 10.943,0 z"
+           id="path53"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;stroke:#000000;stroke-width:0.088094" />
+        <rect
+           transform="scale(-1,-1)"
+           height="1.0283999"
+           width="10.824"
+           y="-894.72998"
+           x="136.73"
+           id="rect55"
+           style="fill:#ffee4f" />
+        <path
+           d="m -137.52,892.5 -9.1804,0"
+           id="path57"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.073412" />
+        <path
+           d="m -137.52,891.14 -9.1804,0"
+           id="path59"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.073412" />
+        <path
+           d="m -137.52,889.79 -9.1804,0"
+           id="path61"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.073412" />
+        <path
+           d="m -137.52,888.44 -9.1804,0"
+           id="path63"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:0.073412" />
+      </g>
+      <path
+         d="M 7.91,0.6 C 8.24762,2.099 8.03126,3.2716 7.8911,4.0065 8.72371,3.80173 9.705,3.57309 11.1621,4.0155 9.5915,2.2797 8.9508,1.7455 7.9101,0.5997 Z"
+         id="path65"
+         style="fill:url(#f);fill-rule:evenodd;stroke:#666666;stroke-width:0.505;stroke-linejoin:round"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(1.0011,-0.14964,0.14964,1.0011,73.85,-888.14)"
+         id="g67"
+         style="stroke-linejoin:round">
+        <rect
+           transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
+           rx="0.27803001"
+           ry="0.27803001"
+           height="4.4428"
+           width="1.7715"
+           y="500.42999"
+           x="-751.59003"
+           id="rect69"
+           style="fill:#ffffff;stroke:#7900aa;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997" />
+        <path
+           d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+           id="path71"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001" />
+        <g
+           transform="translate(-0.035609,-0.059735)"
+           id="g73">
+          <path
+             d="m 451.11,879.75 a 60.261,57.727 0 0 1 -60.247,57.727 60.261,57.727 0 0 1 -60.275,-57.699 60.261,57.727 0 0 1 60.218,-57.754 60.261,57.727 0 0 1 60.304,57.672"
+             transform="matrix(0.06936,0,0,0.072422,-224.82,802.68)"
+             id="path75"
+             style="fill:url(#a);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-opacity:0.81395"
+             inkscape:connector-curvature="0" />
+          <rect
+             transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)"
+             rx="0.27803001"
+             ry="0.27803001"
+             height="4.4428"
+             width="1.7715"
+             y="500.42999"
+             x="-751.59003"
+             id="rect77"
+             style="fill:url(#d);stroke:#000080;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997" />
+          <path
+             d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z"
+             id="path79"
+             style="fill:url(#c);fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/filenew.svg b/freeplane/viewer-resources/images/filenew.svg
new file mode 100644
index 0000000..e149e68
--- /dev/null
+++ b/freeplane/viewer-resources/images/filenew.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="filenew.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1543"
+     inkscape:window-height="763"
+     id="namedview52"
+     showgrid="false"
+     inkscape:zoom="24.539823"
+     inkscape:cx="0.95780739"
+     inkscape:cy="7.6949153"
+     inkscape:window-x="203"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="-2104.9"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.4"
+       gradientTransform="matrix(0.35401,0,0,0.35044,1182.6,1429.7)"
+       y1="-2128.6"
+       x1="-2585.9">
+      <stop
+         stop-color="#dcdcdc"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="d"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315"
+       width="1.3481"
+       y="-.16576"
+       x="-.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="b"
+       y2="-2125.2"
+       gradientUnits="userSpaceOnUse"
+       x2="-2589.3"
+       gradientTransform="matrix(0.3192,0,0,0.31597,1092.5,1356.3)"
+       y1="-2130.1"
+       x1="-2584.4">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop15" />
+      <stop
+         stop-color="#dcdcdc"
+         offset="1"
+         id="stop17" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="169.99"
+       gradientUnits="userSpaceOnUse"
+       x2="233.17"
+       y1="287.9"
+       x1="290.64"
+       gradientTransform="matrix(0.091997,0,0,0.091997,-18.692,-9.221)">
+      <stop
+         stop-color="#dc7fcf"
+         offset="0"
+         id="stop20" />
+      <stop
+         stop-color="#a8bef9"
+         offset="1"
+         id="stop22" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4398">
+    <g
+       transform="translate(-254.262,-681.401)"
+       style="fill-rule:evenodd;stroke:#666666"
+       id="g30">
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="fill:url(#a);stroke-width:0.51007003"
+         inkscape:connector-curvature="0"
+         id="path32"
+         d="m 265.2407,681.76 3.7543,3.9023 -0.0848,10.715 -11.13005,0 0,-14.61715 z" />
+      <path
+         style="fill:#d3d3d3;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#d)"
+         inkscape:connector-curvature="0"
+         id="path34"
+         transform="matrix(0.3192,0,0,0.31597,1168.4,1260)"
+         d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);stroke-width:0.51007003;stroke-linejoin:round"
+         id="path36"
+         d="m 265.47,681.99 c 0.34102,1.514 0.12249,2.6984 -0.0191,3.4407 0.84096,-0.20682 1.8321,-0.43775 3.3038,0.009 -1.5864,-1.7532 -2.2335,-2.2928 -3.2847,-3.4501 z" />
+    </g>
+    <rect
+       id="rect38"
+       x="-0.0020054933"
+       y="-0.00097558595"
+       width="16"
+       height="16"
+       style="color:#000000;fill:none" />
+    <circle
+       style="fill:url(#c);fill-rule:evenodd;stroke:#9000e1;stroke-width:0.55019724;stroke-opacity:0.58332998"
+       id="circle40"
+       r="4.7107983"
+       cx="4.9917078"
+       cy="11.01006" />
+    <path
+       id="text44"
+       d="M 4.3085938 8.0585938 L 4.3085938 10.328125 L 2.171875 10.328125 L 2.171875 11.691406 L 4.3085938 11.691406 L 4.3085938 13.960938 L 5.6738281 13.960938 L 5.6738281 11.691406 L 7.8105469 11.691406 L 7.8105469 10.328125 L 5.6738281 10.328125 L 5.6738281 8.0585938 L 4.3085938 8.0585938 z "
+       style="font-size:16.90200043px;font-family:'Bitstream Vera Sans';fill:#ffffff;stroke:#ffffff;stroke-width:0.12138px" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/fileprint.svg b/freeplane/viewer-resources/images/fileprint.svg
new file mode 100644
index 0000000..6d14080
--- /dev/null
+++ b/freeplane/viewer-resources/images/fileprint.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="552.22" cx="-897.07" gradientTransform="matrix(1.17 -5.2038e-7 3.7705e-7 .84773 632.51 358.8)" r="81.76">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#f8f8f8" offset=".5"/>
+<stop stop-color="#6796df" offset="1"/>
+</radialGradient>
+<linearGradient id="i" y2="741.38" gradientUnits="userSpaceOnUse" x2="-726.61" gradientTransform="translate(-185.82 -14.965)" y1="712.7" x1="-728.1">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="h" y2="29.085" gradientUnits="userSpaceOnUse" x2="40.791" gradientTransform="matrix(.66667 0 0 1 -841.91 610.37)" y1="30.003" x1="40.791">
+<stop stop-color="#ff1010" offset="0"/>
+<stop stop-color="#ff8e8e" offset="1"/>
+</linearGradient>
+<linearGradient id="g" y2="31.168" gradientUnits="userSpaceOnUse" x2="38.743" gradientTransform="matrix(.88533 0 0 1.4995 -851.42 594.63)" y1="29.744" x1="38.743">
+<stop stop-color="#babdb6" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="f" y2="33.469" gradientUnits="userSpaceOnUse" x2="41.82" gradientTransform="translate(-856.52 606.37)" y1="33.109" x1="41.82">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="e" y2="894.69" gradientUnits="userSpaceOnUse" x2="-416.16" y1="868.41" x1="-417.22">
+<stop stop-color="#ccc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="29.085" gradientUnits="userSpaceOnUse" x2="40.791" gradientTransform="matrix(.27878 0 0 .41816 -287.17 828.17)" y1="30.003" x1="40.791">
+<stop stop-color="#009f00" offset="0"/>
+<stop stop-color="#60ff60" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="31.168" gradientUnits="userSpaceOnUse" x2="38.743" gradientTransform="matrix(.37021 0 0 .62702 -291.14 821.59)" y1="29.744" x1="38.743">
+<stop stop-color="#babdb6" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="33.469" gradientUnits="userSpaceOnUse" x2="41.82" gradientTransform="matrix(.41816 0 0 .41816 -293.24 826.51)" y1="33.109" x1="41.82">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -276.7)">
+<g transform="translate(419 -555.9)">
+<g transform="translate(-42.692 .51269)">
+<g transform="matrix(.097848 0 0 .097848 -231.81 759.97)">
+<path stroke-linejoin="round" style="color:#000000" d="m-450.61 787.82h67.148c2.5364 0 4.5783-1.898 4.5783-4.2557v-44.333l-76.305 0.0113v44.322c0 2.3577 2.0419 4.2557 4.5783 4.2557z" stroke="#d45500" stroke-linecap="square" stroke-width="2.8261" fill="#fff"/>
+<rect stroke-linejoin="round" height="93.509" stroke="#70747d" stroke-linecap="round" stroke-width="4" fill="url(#a)" style="color:#000000" fill-rule="evenodd" rx="10.811" ry="11.639" width="159.52" opacity=".93720" y="780.18" x="-496.79"/>
+<g fill-rule="evenodd" transform="translate(498.95 70.813)">
+<rect stroke-linejoin="round" height="54.719" stroke="#70747d" stroke-linecap="round" stroke-width="6" style="color:#000000" rx="10.811" ry="11.639" width="103.65" opacity=".93720" y="699.82" x="-967.8"/>
+<path opacity=".93720" style="color:#000000" d="m-955.04 701.59c-7.5797 0-10.632 4.4912-10.632 11.075v21.109c13.291-5.4567 31.94-9.9457 52.402-12.207 17.336-1.9154 33.832-3.2487 46.984-1.7396l-0.11022-8.5953c0-6.1432-3.8238-9.5321-9.5296-9.5321l-79.114-0.11023z" fill="url(#i)"/>
+</g>
+<g transform="matrix(4.2736 0 0 4.2736 3129.1 -1938.4)">
+<rect height="2" stroke="url(#g)" stroke-linecap="square" fill="url(#h)" style="color:#000000" rx="1" ry="1" width="3" y="638.87" x="-815.91"/>
+<rect style="color:#000000" rx=".51562" ry=".17969" height=".35937" width="1.5469" y="639.48" x="-815.28" fill="url(#f)"/>
+</g>
+<g transform="translate(-.41323 -11.68)">
+<rect stroke-linejoin="round" height="14.342" stroke="#a7aaae" stroke-linecap="round" stroke-width="6" fill="#1a1a1a" style="color:#000000" fill-rule="evenodd" rx=".51562" ry=".17969" width="112.24" opacity=".93720" y="858.35" x="-472.74"/>
+<path stroke-linejoin="round" style="color:#000000" d="m-454.47 865.87v44.128h76.312v-44.128" stroke="#d45500" stroke-linecap="square" stroke-width="2.8261" fill="url(#e)"/>
+<rect transform="scale(-1)" height="4.5559" width="65.222" y="-904.49" x="382.69" fill="#ffee4f"/>
+<path d="m-384.86 894.43h-60.627" stroke="#000" stroke-width="1.8153" fill="none"/>
+<path d="m-384.86 888.55h-60.627" stroke="#000" stroke-width="1.8153" fill="none"/>
+<path d="m-384.86 882.67h-60.627" stroke="#000" stroke-width="1.8153" fill="none"/>
+<path d="m-384.86 876.79h-60.627" stroke="#000" stroke-width="1.8153" fill="none"/>
+</g>
+</g>
+<rect style="color:#000000" height="16" width="16" y="832.09" x="-280.61" fill="none"/>
+</g>
+<g transform="translate(-33.183 -.65194)">
+<rect height=".83633" stroke="url(#c)" stroke-linecap="square" stroke-width=".41816" fill="url(#d)" style="color:#000000" rx=".41816" ry=".41816" width="1.2545" y="840.09" x="-276.29"/>
+<rect style="color:#000000" rx=".21562" ry=".075139" height=".15028" width=".64685" y="840.35" x="-276" fill="url(#b)"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/filter.gif b/freeplane/viewer-resources/images/filter.gif
deleted file mode 100644
index 699cefb..0000000
Binary files a/freeplane/viewer-resources/images/filter.gif and /dev/null differ
diff --git a/freeplane/viewer-resources/images/filter.svg b/freeplane/viewer-resources/images/filter.svg
new file mode 100644
index 0000000..77926e0
--- /dev/null
+++ b/freeplane/viewer-resources/images/filter.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5079mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.97275 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-15.524 -27.954)">
+  <g transform="matrix(.49915 0 0 .49915 -79.976 -253.66)">
+   <g fill-rule="evenodd" transform="translate(.0000051953 28.466)" stroke="#000080">
+    <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#b)"/>
+    <ellipse rx="8.6451" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" ry=".79745" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#a)"/>
+   </g>
+   <rect rx=".16552" ry=".18513" height="32" width="32" y="564.25" x="191.33" fill="none"/>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/filterConditions.png b/freeplane/viewer-resources/images/filterConditions.png
new file mode 100644
index 0000000..f4a70f3
Binary files /dev/null and b/freeplane/viewer-resources/images/filterConditions.png differ
diff --git a/freeplane/viewer-resources/images/filterConditions.svg b/freeplane/viewer-resources/images/filterConditions.svg
new file mode 100644
index 0000000..607c995
--- /dev/null
+++ b/freeplane/viewer-resources/images/filterConditions.svg
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="4.5156mm"
+   width="4.5079mm"
+   version="1.1"
+   viewBox="0 0 15.97275 15.999999"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="filterConditions.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1207"
+     inkscape:window-height="896"
+     id="namedview34"
+     showgrid="false"
+     inkscape:zoom="14.749854"
+     inkscape:cx="-2.3187492"
+     inkscape:cy="7.9322818"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b"
+       y2="563.76"
+       gradientUnits="userSpaceOnUse"
+       x2="285.19"
+       gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)"
+       y1="563.58"
+       x1="295.32">
+      <stop
+         stop-color="#2a89ea"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#d4e2f6"
+         offset=".47542"
+         id="stop9" />
+      <stop
+         stop-color="#e5eef9"
+         offset=".86308"
+         id="stop11" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop13" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="557.24"
+       gradientUnits="userSpaceOnUse"
+       x2="290.7"
+       y1="558.21"
+       x1="290.75">
+      <stop
+         stop-color="#b6c6dd"
+         offset="0"
+         id="stop16" />
+      <stop
+         stop-color="#f7fafd"
+         offset="1"
+         id="stop18" />
+    </linearGradient>
+    <linearGradient
+       x1="-290.09"
+       y1="915.10999"
+       gradientTransform="matrix(0.57369,-0.035034,0.037105,0.54167,-218.47,-255.9)"
+       x2="-290.82999"
+       gradientUnits="userSpaceOnUse"
+       y2="909.21002"
+       id="e">
+      <stop
+         id="stop3609"
+         offset="0"
+         stop-color="#ffd700" />
+      <stop
+         id="stop3611"
+         offset="1"
+         stop-color="#f5f6c2" />
+    </linearGradient>
+    <linearGradient
+       x1="-290.82999"
+       y1="912.77002"
+       gradientTransform="matrix(0.57369,-0.035034,0.037105,0.54167,-218.47,-255.9)"
+       x2="-298.56"
+       gradientUnits="userSpaceOnUse"
+       y2="903.79999"
+       id="d">
+      <stop
+         id="stop3614"
+         offset="0"
+         stop-color="#ebc600" />
+      <stop
+         id="stop3616"
+         offset="1"
+         stop-color="#f5f6c2" />
+    </linearGradient>
+    <radialGradient
+       r="9.493"
+       gradientTransform="matrix(1.1987,0.55359,-0.33581,0.72715,179.8,95.034)"
+       cx="131.66"
+       cy="613.34003"
+       gradientUnits="userSpaceOnUse"
+       id="b-8">
+      <stop
+         id="stop3619"
+         offset="0"
+         stop-color="#7ff44c" />
+      <stop
+         id="stop3621"
+         offset="1"
+         stop-color="#35981b" />
+    </radialGradient>
+    <linearGradient
+       x1="28.851"
+       y1="591.89001"
+       x2="34.084999"
+       gradientUnits="userSpaceOnUse"
+       y2="596.5"
+       id="c">
+      <stop
+         id="stop3624"
+         offset="0"
+         stop-color="#fcc362" />
+      <stop
+         id="stop3626"
+         offset="1"
+         stop-color="#cb923a" />
+    </linearGradient>
+    <radialGradient
+       r="9.2658997"
+       gradientTransform="matrix(-0.21675,1.1894,-0.81691,-0.1393,621.01,623.86)"
+       cx="48.061001"
+       cy="587.32001"
+       gradientUnits="userSpaceOnUse"
+       id="a-7">
+      <stop
+         id="stop3629"
+         offset="0"
+         stop-color="#636363" />
+      <stop
+         id="stop3631"
+         offset="1"
+         stop-color="#0e0d0c" />
+    </radialGradient>
+  </defs>
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4539"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <g
+       id="g22"
+       transform="translate(-15.524 -27.954)">
+      <g
+         id="g24"
+         transform="matrix(.49915 0 0 .49915 -79.976 -253.66)">
+        <g
+           id="g26"
+           stroke="#000080"
+           transform="translate(.0000051953 28.466)"
+           fill-rule="evenodd">
+          <path
+             id="path28"
+             fill="url(#b)"
+             stroke-width=".90705"
+             stroke-linecap="round"
+             d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801"
+             stroke-linejoin="round" />
+          <ellipse
+             id="ellipse30"
+             fill="url(#a)"
+             stroke-width=".43432"
+             cx="290.51"
+             cy="557.94"
+             ry=".79745"
+             transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)"
+             rx="8.6451" />
+        </g>
+        <rect
+           id="rect32"
+           fill="none"
+           x="191.33"
+           y="564.25"
+           width="32"
+           height="32"
+           ry=".18513"
+           rx=".16552" />
+      </g>
+    </g>
+    <g
+       id="g3643"
+       transform="matrix(0.35517365,0,0,0.35517366,3.1681036,-179.88044)">
+      <g
+         id="g3645"
+         transform="matrix(1,0,0,1.0597,-113.08,-113.24)">
+        <path
+           style="fill:#ffffff;fill-rule:evenodd"
+           inkscape:connector-curvature="0"
+           id="path3647"
+           d="m 139.18,617.54 -7.7588,-8.0132 c 7.7008,-0.66485 7.1398,-0.17854 10.684,-0.38158 l -1.6535,1.2719 c 0.55907,2.4637 0.0334,4.8287 -1.2719,7.1229 z" />
+        <path
+           style="fill:url(#b-8);fill-rule:evenodd;stroke:#196616;stroke-width:1px"
+           inkscape:connector-curvature="0"
+           id="path3649"
+           d="m 139.23,617.64 c -1.2321,-2.1074 -3.4345,-5.2685 -7.8591,-8.1614 -1.8954,1.1506 -3.364,2.304 -3.854,4.7608 l 0.0756,6.65 c 2.732,2.1497 6.5631,2.358 9.8995,2.4182 5.0237,-0.61895 6.362,-2.1462 7.9347,-3.6273 0.0861,-2.0983 0.23606,-3.4857 -0.45341,-6.5744 -0.46374,-1.5638 -1.9521,-3.4539 -2.796,-4.0051 -1.2035,0.84618 -1.2922,0.81697 -1.6625,1.2846 -0.16577,2.5852 -0.72557,5.2594 -1.2847,7.2546 z" />
+        <path
+           style="fill:url(#c);stroke:#62340a;stroke-opacity:0.72673998"
+           inkscape:connector-curvature="0"
+           id="path3651"
+           d="m 37.935,591.89 a 6.6122,6.6122 0 0 1 -6.6107,6.6122 6.6122,6.6122 0 0 1 -6.6138,-6.6091 6.6122,6.6122 0 0 1 6.6075,-6.6154 6.6122,6.6122 0 0 1 6.6169,6.606"
+           transform="matrix(1.0913,0,0,1.0614,102.35,-23.922)" />
+        <path
+           style="fill:url(#a-7);fill-rule:evenodd;stroke:#000000;stroke-width:1.02980006px;stroke-linecap:round;stroke-linejoin:round"
+           inkscape:connector-curvature="0"
+           id="path3653"
+           d="m 144.58,603.22 -1.5186,-2.6026 -1.7262,2.0843 c -3.8382,1.0955 -6.5335,0.90128 -9.3442,0.83735 l -1.266,-1.3777 c -0.56495,2.4766 0.95041,5.213 -1.4143,5.6888 -1.4958,-1.5569 -1.78,-3.2859 -2.0882,-5.2819 0.0285,-2.7803 0.29214,-3.9009 2.0783,-5.9941 1.5178,-1.3282 3.1044,-2.1723 6.3298,-2.4492 5.2391,-0.13522 9.1222,3.0967 8.9494,9.095 z" />
+      </g>
+      <path
+         style="fill-rule:evenodd;stroke:#196616;stroke-width:1px"
+         inkscape:connector-curvature="0"
+         id="path3655"
+         d="m 26.203,540.85 c -0.119,1.985 -0.21962,3.9701 0.21018,5.9551" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/filter_selected_nodes.svg b/freeplane/viewer-resources/images/filter_selected_nodes.svg
new file mode 100644
index 0000000..786774b
--- /dev/null
+++ b/freeplane/viewer-resources/images/filter_selected_nodes.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5233mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999999 16.027306" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-17.161 -140.12)">
+  <g transform="translate(-33.981 -667.05)">
+   <g transform="matrix(.5 0 0 .5 20.029 498.85)">
+    <g stroke="#000080" fill-rule="evenodd" transform="translate(-129.1 80.903)">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#b)"/>
+     <ellipse rx="8.6451" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" ry=".79745" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#a)"/>
+    </g>
+    <rect rx=".16552" ry=".18513" height="32" width="32" y="616.69" x="62.226" fill="none"/>
+    <rect rx=".16202" ry=".18121" height="31.322" width="31.322" y="617.03" x="62.565" fill="none"/>
+   </g>
+   <rect stroke-linejoin="round" height="4.3082" stroke="#000080" stroke-width=".5" fill="#fff" fill-rule="evenodd" rx=".99808" ry=".95008" width="8.8266" y="811.42" x="54.011"/>
+   <rect stroke-linejoin="round" height="4.3082" stroke="#000080" stroke-width=".5" fill="#fff" fill-rule="evenodd" rx=".99808" ry=".95008" width="8.8266" y="817.38" x="56.419"/>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/find_next.svg b/freeplane/viewer-resources/images/find_next.svg
new file mode 100644
index 0000000..7f83fc3
--- /dev/null
+++ b/freeplane/viewer-resources/images/find_next.svg
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16.000001"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="find_previous.svg"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1109"
+     inkscape:window-height="841"
+     id="namedview89"
+     showgrid="false"
+     inkscape:zoom="27.453313"
+     inkscape:cx="6.1788895"
+     inkscape:cy="9.1254826"
+     inkscape:window-x="545"
+     inkscape:window-y="160"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="c"
+       y2="-2104.8999"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.3999"
+       gradientTransform="matrix(0.3505,0,0,0.3467887,915.92,740.49101)"
+       y1="-2128.6001"
+       x1="-2585.8999">
+      <stop
+         stop-color="#dcdcdc"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="g"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315001"
+       width="1.3480999"
+       y="-0.16576"
+       x="-0.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="d"
+       y2="-2125.2"
+       gradientUnits="userSpaceOnUse"
+       x2="-2589.3"
+       gradientTransform="matrix(0.31602,0,0,0.31268456,826.72,667.92477)"
+       y1="-2130.1001"
+       x1="-2584.3999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop15" />
+      <stop
+         stop-color="#dcdcdc"
+         offset="1"
+         id="stop17" />
+    </linearGradient>
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop20" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop22" />
+    </radialGradient>
+    <linearGradient
+       id="f"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.074862,0,0,0.035378,-776.1,471.94)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#00f"
+         offset="0"
+         id="stop25" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop27" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(0.056864,-0.055812,0.035022,0.03596,-241.08,860.4)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop30" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop32" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="839.96997"
+       gradientUnits="userSpaceOnUse"
+       x2="58.986"
+       gradientTransform="translate(-10.311,-15.418)"
+       y1="835.07001"
+       x1="59.002998">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop35" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop37" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata39">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4619">
+    <rect
+       id="rect45"
+       x="1.7089844e-005"
+       y="0.0054591522"
+       width="16"
+       height="15.992561"
+       style="color:#000000;fill:none" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       style="fill:url(#c);fill-rule:evenodd;stroke:#666666;stroke-width:0.50488257"
+       inkscape:connector-curvature="0"
+       id="path47"
+       d="m 7.6865,0.36527226 3.717,3.86170374 -0.084,10.603068 -11.01975,0 0,-14.46502162 z" />
+    <path
+       style="fill:#d3d3d3;fill-rule:evenodd;stroke:#666666;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#g)"
+       inkscape:connector-curvature="0"
+       id="path49"
+       transform="matrix(0.31602,0,0,0.31268456,901.82,572.56912)"
+       d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z" />
+    <g
+       id="g51"
+       transform="matrix(0.81407,0,0,-0.81369152,121.46,730.99543)">
+      <path
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.088094"
+         inkscape:connector-curvature="0"
+         id="path53"
+         d="m -136.67,894.82 0,-7.2898 c 0,-0.27565 -0.2203,-0.48099 -0.4916,-0.48099 l -9.9595,0 c -0.2713,0 -0.49161,0.20534 -0.49161,0.48099 l 0,7.2898 10.943,0 z" />
+      <rect
+         style="fill:#ffee4f"
+         id="rect55"
+         x="136.73"
+         y="-894.72998"
+         width="10.824"
+         height="1.0283999"
+         transform="scale(-1,-1)" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path57"
+         d="m -137.52,892.5 -9.1804,0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path59"
+         d="m -137.52,891.14 -9.1804,0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path61"
+         d="m -137.52,889.79 -9.1804,0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path63"
+         d="m -137.52,888.44 -9.1804,0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#d);fill-rule:evenodd;stroke:#666666;stroke-width:0.50488257;stroke-linejoin:round"
+       id="path65"
+       d="M 7.91,0.59516533 C 8.24762,2.0934684 8.03126,3.2655232 7.8911,4.0000816 8.72371,3.7954068 9.705,3.5668731 11.1621,4.0090774 9.5915,2.2740844 8.9508,1.7401328 7.9101,0.59486547 Z" />
+    <g
+       style="stroke-linejoin:round"
+       id="g67"
+       transform="matrix(1.0011,-0.14957043,0.14964,1.0006346,73.85,-887.73164)">
+      <rect
+         style="fill:#ffffff;stroke:#7900aa;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
+         id="rect69"
+         x="-751.59003"
+         y="500.42999"
+         width="1.7715"
+         height="4.4428"
+         ry="0.27803001"
+         rx="0.27803001"
+         transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)" />
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+         inkscape:connector-curvature="0"
+         id="path71"
+         d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z" />
+      <g
+         id="g73"
+         transform="translate(-0.035609,-0.059735)">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#a);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-opacity:0.81395"
+           id="path75"
+           transform="matrix(0.06936,0,0,0.072422,-224.82,802.68)"
+           d="m 451.11,879.75 a 60.261,57.727 0 0 1 -60.247,57.727 60.261,57.727 0 0 1 -60.275,-57.699 60.261,57.727 0 0 1 60.218,-57.754 60.261,57.727 0 0 1 60.304,57.672" />
+        <rect
+           style="fill:url(#f);stroke:#000080;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
+           id="rect77"
+           x="-751.59003"
+           y="500.42999"
+           width="1.7715"
+           height="4.4428"
+           ry="0.27803001"
+           rx="0.27803001"
+           transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#e);fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+           id="path79"
+           d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z" />
+      </g>
+    </g>
+    <g
+       id="g81"
+       transform="matrix(-0.80983,0,0,0.80945349,47.616454,-660.31042)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path83"
+         d="m 40.589,823.88 7.3292,-7.4699 0.03141,4.4322 7.5636,-0.13497 0,6.2282 -7.5636,0.0842 0,4.3147 -7.3606,-7.4542 z"
+         style="color:#000000;fill:#00aad4;fill-rule:evenodd;stroke:#0044aa;stroke-width:1.32840002;stroke-linejoin:round" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path85"
+         d="m 40.589,823.88 7.3292,-7.4699 0.03141,4.4322 7.5636,-0.13497 0,6.2282 -7.5636,0.0842 0,4.3147 -7.3606,-7.4542 z"
+         style="color:#000000;fill:url(#b);fill-rule:evenodd" />
+      <rect
+         id="rect87"
+         x="40.050999"
+         y="815.87"
+         width="16"
+         height="16"
+         style="color:#000000;fill:none" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/find_previous.svg b/freeplane/viewer-resources/images/find_previous.svg
new file mode 100644
index 0000000..909ce53
--- /dev/null
+++ b/freeplane/viewer-resources/images/find_previous.svg
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 16 16.000001"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="find_previous.svg"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1109"
+     inkscape:window-height="841"
+     id="namedview89"
+     showgrid="false"
+     inkscape:zoom="27.453313"
+     inkscape:cx="6.9934708"
+     inkscape:cy="9.0890571"
+     inkscape:window-x="545"
+     inkscape:window-y="160"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="c"
+       y2="-2104.8999"
+       gradientUnits="userSpaceOnUse"
+       x2="-2596.3999"
+       gradientTransform="matrix(0.3505,0,0,0.3467887,915.92,740.49101)"
+       y1="-2128.6001"
+       x1="-2585.8999">
+      <stop
+         stop-color="#dcdcdc"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <filter
+       id="g"
+       style="color-interpolation-filters:sRGB"
+       height="1.3315001"
+       width="1.3480999"
+       y="-0.16576"
+       x="-0.17407">
+      <feGaussianBlur
+         stdDeviation="0.82320991"
+         id="feGaussianBlur12" />
+    </filter>
+    <linearGradient
+       id="d"
+       y2="-2125.2"
+       gradientUnits="userSpaceOnUse"
+       x2="-2589.3"
+       gradientTransform="matrix(0.31602,0,0,0.31268456,826.72,667.92477)"
+       y1="-2130.1001"
+       x1="-2584.3999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop15" />
+      <stop
+         stop-color="#dcdcdc"
+         offset="1"
+         id="stop17" />
+    </linearGradient>
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="866.01001"
+       cx="386.20999"
+       gradientTransform="matrix(1.1453,1.179,-0.80701,0.78396,653.16,-270.77)"
+       r="61.352001">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".92035"
+         offset="0"
+         id="stop20" />
+      <stop
+         stop-color="#ccc"
+         offset="1"
+         id="stop22" />
+    </radialGradient>
+    <linearGradient
+       id="f"
+       y2="864.59003"
+       gradientUnits="userSpaceOnUse"
+       x2="318.67999"
+       gradientTransform="matrix(0.074862,0,0,0.035378,-776.1,471.94)"
+       y1="863.29999"
+       x1="348.72">
+      <stop
+         stop-color="#00f"
+         offset="0"
+         id="stop25" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop27" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       y2="791.12"
+       gradientUnits="userSpaceOnUse"
+       x2="343.89001"
+       gradientTransform="matrix(0.056864,-0.055812,0.035022,0.03596,-241.08,860.4)"
+       y1="791.28003"
+       x1="333.48999">
+      <stop
+         stop-color="#3c3c3c"
+         stop-opacity=".99608"
+         offset="0"
+         id="stop30" />
+      <stop
+         stop-color="#b3b3b3"
+         stop-opacity="0"
+         offset="1"
+         id="stop32" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="839.96997"
+       gradientUnits="userSpaceOnUse"
+       x2="58.986"
+       gradientTransform="translate(-10.311,-15.418)"
+       y1="835.07001"
+       x1="59.002998">
+      <stop
+         stop-color="#fff"
+         stop-opacity=".54615"
+         offset="0"
+         id="stop35" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop37" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata39">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4508">
+    <rect
+       id="rect45"
+       x="1.7089844e-005"
+       y="0.0054591522"
+       width="16"
+       height="15.992561"
+       style="color:#000000;fill:none" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       style="fill:url(#c);fill-rule:evenodd;stroke:#666666;stroke-width:0.50488257"
+       inkscape:connector-curvature="0"
+       id="path47"
+       d="m 7.6865,0.36527226 3.717,3.86170374 -0.084,10.603068 -11.01975,0 0,-14.46502162 z" />
+    <path
+       style="fill:#d3d3d3;fill-rule:evenodd;stroke:#666666;stroke-width:1.60609996;stroke-linejoin:round;filter:url(#g)"
+       inkscape:connector-curvature="0"
+       id="path49"
+       transform="matrix(0.31602,0,0,0.31268456,901.82,572.56912)"
+       d="m -2829.3,-1828.3 c 1.0683,4.7916 0.3837,8.5401 -0.06,10.889 2.6346,-0.6545 5.7398,-1.3853 10.35,0.03 -4.9699,-5.5487 -6.9971,-7.2565 -10.29,-10.919 z" />
+    <g
+       id="g51"
+       transform="matrix(0.81407,0,0,-0.81369152,121.46,730.99543)">
+      <path
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.088094"
+         inkscape:connector-curvature="0"
+         id="path53"
+         d="m -136.67,894.82 0,-7.2898 c 0,-0.27565 -0.2203,-0.48099 -0.4916,-0.48099 l -9.9595,0 c -0.2713,0 -0.49161,0.20534 -0.49161,0.48099 l 0,7.2898 10.943,0 z" />
+      <rect
+         style="fill:#ffee4f"
+         id="rect55"
+         x="136.73"
+         y="-894.72998"
+         width="10.824"
+         height="1.0283999"
+         transform="scale(-1,-1)" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path57"
+         d="m -137.52,892.5 -9.1804,0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path59"
+         d="m -137.52,891.14 -9.1804,0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path61"
+         d="m -137.52,889.79 -9.1804,0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.073412"
+         inkscape:connector-curvature="0"
+         id="path63"
+         d="m -137.52,888.44 -9.1804,0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#d);fill-rule:evenodd;stroke:#666666;stroke-width:0.50488257;stroke-linejoin:round"
+       id="path65"
+       d="M 7.91,0.59516533 C 8.24762,2.0934684 8.03126,3.2655232 7.8911,4.0000816 8.72371,3.7954068 9.705,3.5668731 11.1621,4.0090774 9.5915,2.2740844 8.9508,1.7401328 7.9101,0.59486547 Z" />
+    <g
+       style="stroke-linejoin:round"
+       id="g67"
+       transform="matrix(1.0011,-0.14957043,0.14964,1.0006346,73.85,-887.73164)">
+      <rect
+         style="fill:#ffffff;stroke:#7900aa;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
+         id="rect69"
+         x="-751.59003"
+         y="500.42999"
+         width="1.7715"
+         height="4.4428"
+         ry="0.27803001"
+         rx="0.27803001"
+         transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)" />
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+         inkscape:connector-curvature="0"
+         id="path71"
+         d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z" />
+      <g
+         id="g73"
+         transform="translate(-0.035609,-0.059735)">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#a);stroke:#1a1a1a;stroke-width:6.33010006;stroke-linecap:round;stroke-opacity:0.81395"
+           id="path75"
+           transform="matrix(0.06936,0,0,0.072422,-224.82,802.68)"
+           d="m 451.11,879.75 a 60.261,57.727 0 0 1 -60.247,57.727 60.261,57.727 0 0 1 -60.275,-57.699 60.261,57.727 0 0 1 60.218,-57.754 60.261,57.727 0 0 1 60.304,57.672" />
+        <rect
+           style="fill:url(#f);stroke:#000080;stroke-width:0.28577;stroke-linecap:round;stroke-opacity:0.90697997"
+           id="rect77"
+           x="-751.59003"
+           y="500.42999"
+           width="1.7715"
+           height="4.4428"
+           ry="0.27803001"
+           rx="0.27803001"
+           transform="matrix(0.7273,-0.68632,0.70389,0.7103,0,0)" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#e);fill-rule:evenodd;stroke:#333333;stroke-width:0.17005;stroke-opacity:0.88372001"
+           id="path79"
+           d="m -195.06,869.88 0.66476,1.3056 1.1909,-1.1606 -1.2384,-0.73736 -0.61726,0.59241 z" />
+      </g>
+    </g>
+    <g
+       id="g81"
+       transform="matrix(0.80983,0,0,0.80945349,-30.21,-660.31042)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path83"
+         d="m 40.589,823.88 7.3292,-7.4699 0.03141,4.4322 7.5636,-0.13497 0,6.2282 -7.5636,0.0842 0,4.3147 -7.3606,-7.4542 z"
+         style="color:#000000;fill:#00aad4;fill-rule:evenodd;stroke:#0044aa;stroke-width:1.32840002;stroke-linejoin:round" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path85"
+         d="m 40.589,823.88 7.3292,-7.4699 0.03141,4.4322 7.5636,-0.13497 0,6.2282 -7.5636,0.0842 0,4.3147 -7.3606,-7.4542 z"
+         style="color:#000000;fill:url(#b);fill-rule:evenodd" />
+      <rect
+         id="rect87"
+         x="40.050999"
+         y="815.87"
+         width="16"
+         height="16"
+         style="color:#000000;fill:none" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/fold_all.svg b/freeplane/viewer-resources/images/fold_all.svg
new file mode 100644
index 0000000..6e82b71
--- /dev/null
+++ b/freeplane/viewer-resources/images/fold_all.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.022133"
+   width="23"
+   version="1.1"
+   viewBox="0 0 23 16.022133"
+   id="svg3165"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="xx013.svg">
+  <defs
+     id="defs3197" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview3195"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="344.44756"
+     inkscape:cy="-355.07039"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3165" />
+  <metadata
+     id="metadata3167">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-451.96801,-745.60857)"
+     id="g3169">
+    <g
+       transform="translate(-22.722,104.68)"
+       id="g3171">
+      <g
+         transform="translate(1.2311,-0.14858)"
+         id="g3173">
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.45978001;stroke-opacity:0.99607999"
+           d="m 484.2,652.97 c 1.8238,0.0366 2.9365,0.70148 4.0129,1.822 1.0764,1.12052 2.1103,1.7849 3.656,1.6124 -1.2921,0.13399 -2.4788,-0.8886 -3.5166,-2.1886 -1.0576,-1.3272 -2.2792,-2.9033 -4.1418,-2.9406 l -0.0104,1.6948 z"
+           id="path3175"
+           inkscape:connector-curvature="0" />
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.45978001;stroke-opacity:0.99607999"
+           d="m 485.51,649.65 c 1.8238,0.0265 3.0792,-0.91261 4.1557,-0.10145 1.0764,0.81112 1.92,0.38817 3.4656,0.26325 -1.292,0.0971 -2.2884,0.26065 -3.3263,-0.6804 -1.0576,-0.96069 -2.422,-0.6812 -4.2845,-0.70816 l -0.0104,1.2268 h -1e-5 z"
+           id="path3177"
+           inkscape:connector-curvature="0" />
+        <g
+           transform="translate(0,-0.58238)"
+           id="g3179">
+          <path
+             style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.45978001;stroke-opacity:0.99607999"
+             d="m 484.68,646.12 c 1.8238,-0.0366 2.9365,-0.70147 4.0129,-1.822 1.0764,-1.12053 2.1103,-1.7849 3.6559,-1.6124 -1.292,-0.13399 -2.4788,0.8886 -3.5166,2.1886 -1.0576,1.3272 -2.2792,2.9033 -4.1418,2.9406 L 484.68,646.12 z"
+             id="path3181"
+             inkscape:connector-curvature="0" />
+          <circle
+             cy="219.91"
+             transform="matrix(0.01273,0,0,0.01273,489.35,639.61)"
+             r="51.206001"
+             cx="257.44"
+             id="circle3183"
+             d="m 308.646,219.91 c 0,28.2803 -22.9257,51.206 -51.206,51.206 -28.28029,0 -51.206,-22.9257 -51.206,-51.206 0,-28.28029 22.92571,-51.206 51.206,-51.206 28.2803,0 51.206,22.92571 51.206,51.206 z"
+             sodipodi:cx="257.44"
+             sodipodi:cy="219.91"
+             sodipodi:rx="51.206001"
+             sodipodi:ry="51.206001"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#043b8e;stroke-width:15.42399979" />
+        </g>
+        <circle
+           transform="matrix(0.11654,0,0,0.11654,452.11,623.43)"
+           cy="219.91"
+           cx="257.44"
+           r="51.206001"
+           id="circle3185"
+           d="m 308.646,219.91 c 0,28.2803 -22.9257,51.206 -51.206,51.206 -28.28029,0 -51.206,-22.9257 -51.206,-51.206 0,-28.28029 22.92571,-51.206 51.206,-51.206 28.2803,0 51.206,22.92571 51.206,51.206 z"
+           sodipodi:cx="257.44"
+           sodipodi:cy="219.91"
+           sodipodi:rx="51.206001"
+           sodipodi:ry="51.206001"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:9.42259979;stroke-opacity:0.99607999" />
+        <path
+           d="m 478.16,647.99 v 2.1387 h 7.9092 V 647.99 H 478.16 z"
+           id="path3187"
+           inkscape:connector-curvature="0"
+           style="fill:#f21313;stroke:#f70808;stroke-width:0.19269px" />
+        <circle
+           transform="matrix(0.01273,0,0,0.01273,490.29,646.95)"
+           cy="219.91"
+           cx="257.44"
+           r="51.206001"
+           id="circle3189"
+           d="m 308.646,219.91 c 0,28.2803 -22.9257,51.206 -51.206,51.206 -28.28029,0 -51.206,-22.9257 -51.206,-51.206 0,-28.28029 22.92571,-51.206 51.206,-51.206 28.2803,0 51.206,22.92571 51.206,51.206 z"
+           sodipodi:cx="257.44"
+           sodipodi:cy="219.91"
+           sodipodi:rx="51.206001"
+           sodipodi:ry="51.206001"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#043b8e;stroke-width:15.42399979" />
+        <circle
+           transform="matrix(0.01273,0,0,0.01273,489.02,653.55)"
+           cy="219.91"
+           cx="257.44"
+           r="51.206001"
+           id="circle3191"
+           d="m 308.646,219.91 c 0,28.2803 -22.9257,51.206 -51.206,51.206 -28.28029,0 -51.206,-22.9257 -51.206,-51.206 0,-28.28029 22.92571,-51.206 51.206,-51.206 28.2803,0 51.206,22.92571 51.206,51.206 z"
+           sodipodi:cx="257.44"
+           sodipodi:cy="219.91"
+           sodipodi:rx="51.206001"
+           sodipodi:ry="51.206001"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#043b8e;stroke-width:15.42399979" />
+      </g>
+      <rect
+         style="color:#000000;fill:none"
+         height="16"
+         width="23"
+         y="640.94"
+         x="474.69"
+         id="rect3193" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/fold_one_level.svg b/freeplane/viewer-resources/images/fold_one_level.svg
new file mode 100644
index 0000000..16d30a3
--- /dev/null
+++ b/freeplane/viewer-resources/images/fold_one_level.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="23"
+   version="1.1"
+   viewBox="0 0 23 16"
+   id="svg3199"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="xx015.svg">
+  <defs
+     id="defs3219" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview3217"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.5881183"
+     inkscape:cx="153.54629"
+     inkscape:cy="-51.028517"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3199" />
+  <metadata
+     id="metadata3201">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-483.31601,-746.48)"
+     id="g3203">
+    <g
+       transform="translate(-27.284,103.23)"
+       id="g3205">
+      <g
+         transform="translate(1.483,3.1397)"
+         id="g3207">
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.72788;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           d="m 510.46,645.98 c 2.887,0.0579 5.5539,0.3457 8.5847,2.7871 2.8686,2.3528 6.5436,4.8638 8.9903,4.5906 -2.0453,0.2121 -5.2731,-2.5086 -8.0994,-5.3617 -4.2349,-4.2234 -6.5108,-4.6399 -9.4591,-4.6989 l -0.0165,2.6828 h -10e-6 z"
+           id="path3209"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 519.55,642.73 v 2.4974 h 9.2358 V 642.73 H 519.55 z"
+           id="path3211"
+           inkscape:connector-curvature="0"
+           style="fill:#f21313;stroke:#f70808;stroke-width:0.22500999px" />
+        <circle
+           cy="219.91"
+           transform="matrix(0.014211,0,0,0.014211,525.21,650.22)"
+           r="51.206001"
+           cx="257.44"
+           id="circle3213"
+           d="m 308.646,219.91 c 0,28.2803 -22.9257,51.206 -51.206,51.206 -28.28029,0 -51.206,-22.9257 -51.206,-51.206 0,-28.28029 22.92571,-51.206 51.206,-51.206 28.2803,0 51.206,22.92571 51.206,51.206 z"
+           sodipodi:cx="257.44"
+           sodipodi:cy="219.91"
+           sodipodi:rx="51.206001"
+           sodipodi:ry="51.206001"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#043b8e;stroke-width:15.42399979" />
+      </g>
+      <rect
+         style="color:#000000;fill:none"
+         height="16"
+         width="23"
+         y="643.25"
+         x="510.60001"
+         id="rect3215" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/forward.png b/freeplane/viewer-resources/images/forward.png
deleted file mode 100644
index 81ac999..0000000
Binary files a/freeplane/viewer-resources/images/forward.png and /dev/null differ
diff --git a/freeplane/viewer-resources/images/highlight_matching_nodes.svg b/freeplane/viewer-resources/images/highlight_matching_nodes.svg
new file mode 100644
index 0000000..3e21257
--- /dev/null
+++ b/freeplane/viewer-resources/images/highlight_matching_nodes.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999999 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <filter id="f" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+   <feGaussianBlur stdDeviation="0.82320991"/>
+  </filter>
+  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="866.01" cx="386.21" gradientTransform="matrix(1.1453 1.179 -.80701 .78396 653.16 -270.77)" r="61.352">
+   <stop stop-color="#fff" stop-opacity=".92035" offset="0"/>
+   <stop stop-color="#ccc" offset="1"/>
+  </radialGradient>
+  <linearGradient id="e" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 736.99 1605)" y1="-2128.6" x1="-2585.9">
+   <stop stop-color="#dcdcdc" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+  <linearGradient id="d" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.31920 0 0 .31597 646.95 1531.6)" y1="-2130.1" x1="-2584.4">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#dcdcdc" offset="1"/>
+  </linearGradient>
+  <linearGradient id="c" y2="864.59" gradientUnits="userSpaceOnUse" x2="318.68" gradientTransform="matrix(.074862 0 0 .035378 -776.1 471.94)" y1="863.3" x1="348.72">
+   <stop stop-color="#00f" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="791.12" gradientUnits="userSpaceOnUse" x2="343.89" gradientTransform="matrix(.056864 -.055812 .035022 .035960 -241.08 860.4)" y1="791.28" x1="333.49">
+   <stop stop-color="#3c3c3c" stop-opacity=".99608" offset="0"/>
+   <stop stop-color="#b3b3b3" stop-opacity="0" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-18.954 -302.87)">
+  <g transform="translate(391.47 -95.407)">
+   <g transform="translate(-438.06 327.47)">
+    <g transform="translate(256.69 -788.29)">
+     <rect style="color:#000000" height="16" width="16" y="859.1" x="-191.14" fill="none"/>
+     <g transform="matrix(.99006 0 0 .99006 -4.9251 10.904)">
+      <path d="m-187.78 857.08h7.4607l3.7543 3.9023-0.0848 10.715h-11.13v-14.617z" fill-rule="evenodd" stroke="#666" stroke-width=".51007" fill="url(#e)"/>
+      <path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" fill-rule="evenodd" transform="matrix(.31920 0 0 .31597 722.81 1435.3)" filter="url(#f)" stroke="#666" stroke-width="1.6061" fill="#d3d3d3"/>
+      <g transform="matrix(.82225 0 0 -.82225 -65.407 1595.4)">
+       <path d="m-136.67 894.82v-7.2898c0-0.27565-0.2203-0.48099-0.4916-0.48099h-9.9595c-0.2713 0-0.49161 0.20534-0.49161 0.48099v7.2898h10.943z" stroke="#000" stroke-width=".088094" fill="#fff"/>
+       <rect transform="scale(-1)" height="1.0284" width="10.824" y="-894.73" x="136.73" fill="#ffee4f"/>
+       <path d="m-137.52 892.5h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+       <path d="m-137.52 891.14h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+       <path d="m-137.52 889.79h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+       <path d="m-137.52 888.44h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+      </g>
+      <path stroke-linejoin="round" d="m-180.1 857.31c0.34101 1.514 0.12248 2.6984-0.0191 3.4407 0.84097-0.20683 1.8321-0.43776 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" fill-rule="evenodd" stroke="#666" stroke-width=".51007" fill="url(#d)"/>
+      <g stroke-linejoin="round" transform="matrix(1.0111 -.15114 .15114 1.0111 -111.91 -40.236)">
+       <rect transform="matrix(.72730 -.68632 .70389 .71030 0 0)" stroke-opacity=".90698" rx=".27803" ry=".27803" height="4.4428" width="1.7715" stroke="#7900aa" stroke-linecap="round" y="500.43" x="-751.59" stroke-width=".28577" fill="#fff"/>
+       <path d="m-195.06 869.88 0.66476 1.3056 1.1909-1.1606-1.2384-0.73736-0.61726 0.59241z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".17005" fill="#fff"/>
+       <g transform="translate(-.035609 -.059735)">
+        <path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(.069360 0 0 .072422 -224.82 802.68)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#a)"/>
+        <rect transform="matrix(.72730 -.68632 .70389 .71030 0 0)" stroke-opacity=".90698" rx=".27803" ry=".27803" height="4.4428" width="1.7715" stroke="#000080" stroke-linecap="round" y="500.43" x="-751.59" stroke-width=".28577" fill="url(#c)"/>
+        <path d="m-195.06 869.88 0.66476 1.3056 1.1909-1.1606-1.2384-0.73736-0.61726 0.59241z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".17005" fill="url(#b)"/>
+       </g>
+      </g>
+     </g>
+    </g>
+    <rect stroke-linejoin="round" height="4.3082" stroke="#ff7fff" stroke-width=".75" fill="#fff" fill-rule="evenodd" rx=".99808" ry=".95008" width="8.8266" y="72.092" x="71.666"/>
+    <rect stroke-linejoin="round" height="4.3082" stroke="#ff7eff" stroke-width=".75" fill="#fff" fill-rule="evenodd" rx=".99808" ry=".95008" width="8.8266" stroke-opacity=".94709" y="77.481" x="66.915"/>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/0%.png b/freeplane/viewer-resources/images/icons/0%.png
index 797c04d..db2230d 100644
Binary files a/freeplane/viewer-resources/images/icons/0%.png and b/freeplane/viewer-resources/images/icons/0%.png differ
diff --git a/freeplane/viewer-resources/images/icons/0%.svg b/freeplane/viewer-resources/images/icons/0%.svg
new file mode 100644
index 0000000..7367b5a
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/0%.svg
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg4099"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="0%.svg">
+  <defs
+     id="defs4101">
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient6405">
+      <stop
+         id="stop6407"
+         offset="0"
+         style="stop-color:#800080;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.23327851"
+         id="stop6409" />
+      <stop
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1"
+         id="stop6411" />
+      <stop
+         id="stop6413"
+         offset="1"
+         style="stop-color:#800080;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6369">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop6371" />
+      <stop
+         id="stop6387"
+         offset="1"
+         style="stop-color:#f7f7f7;stop-opacity:0.96862745;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6335">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop6337" />
+      <stop
+         id="stop6349"
+         offset="0.25"
+         style="stop-color:#800080;stop-opacity:0.74901961;" />
+      <stop
+         id="stop6347"
+         offset="0.5"
+         style="stop-color:#800080;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop6339" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4885"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop4887" />
+      <stop
+         id="stop6401"
+         offset="0.23327851"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6399"
+         offset="0.67576009"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop4889" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6429-0"
+       id="radialGradient6435-8"
+       cx="38.93148"
+       cy="43.321198"
+       fx="38.93148"
+       fy="43.321198"
+       r="15.090909"
+       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6429-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6431-7" />
+      <stop
+         id="stop6437-7"
+         offset="0.99891293"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6433-3" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-10.679838"
+     inkscape:cy="38.125"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4104">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(97.898073,-84.583866)"
+       id="g5088">
+      <g
+         transform="translate(-4.1584707,0.10984888)"
+         id="g4713">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -62.41662,84.589895 c -17.568015,-4.35e-4 -31.293957,13.692859 -31.363281,31.244135 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.05078,-1.01171 15.944881,15.944881 0 0 1 0.238281,-1.57422 15.944881,15.944881 0 0 1 0.394531,-1.54492 15.944881,15.944881 0 0 1 0.546875,-1.49805 15.944881,15.944881 0 0 1 0.693359,-1.4336 15.944881,15.944881 0 0 1 0.832032,-1.35937 15.944881,15.944881 0 0 1 0.964844,-1.26953 15.944881,15.944881 0 0 1 1.085937,-1.16602 15.944881,15.944881 0  [...]
+           id="path4699"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707"
+           d="m -61.062584,84.589945 c 17.568015,-4.35e-4 31.293957,13.692859 31.363281,31.244135 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.05078,-1.01171 15.944881,15.944881 0 0 0 -0.238281,-1.57422 15.944881,15.944881 0 0 0 -0.394531,-1.54492 15.944881,15.944881 0 0 0 -0.546875,-1.49805 15.944881,15.944881 0 0 0 -0.693359,-1.4336 15.944881,15.944881 0 0 0 -0.832032,-1.35937 15.944881,15.944881 0 0 0 -0.964844,-1.26953 15.944881,15.944881 0 0 0 -1.085937,-1.16602 15.944881,15.94 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709"
+           d="m -62.41662,148.35804 c -17.568015,4.3e-4 -31.293957,-13.69286 -31.363281,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.05078,1.01171 15.944881,15.944881 0 0 0 0.238281,1.57422 15.944881,15.944881 0 0 0 0.394531,1.54492 15.944881,15.944881 0 0 0 0.546875,1.49805 15.944881,15.944881 0 0 0 0.693359,1.4336 15.944881,15.944881 0 0 0 0.832032,1.35937 15.944881,15.944881 0 0 0 0.964844,1.26953 15.944881,15.944881 0 0 0 1.085937,1.16602 15.944881,15.944881 0 0 0 1.197 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -61.062584,148.35804 c 17.568015,4.4e-4 31.293957,-13.69286 31.363281,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.05078,1.01171 15.944881,15.944881 0 0 1 -0.238281,1.57422 15.944881,15.944881 0 0 1 -0.394531,1.54492 15.944881,15.944881 0 0 1 -0.546875,1.49805 15.944881,15.944881 0 0 1 -0.693359,1.4336 15.944881,15.944881 0 0 1 -0.832032,1.35937 15.944881,15.944881 0 0 1 -0.964844,1.26953 15.944881,15.944881 0 0 1 -1.085937,1.16602 15.944881,15.944881 0 0  [...]
+           id="path4711" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/100%.png b/freeplane/viewer-resources/images/icons/100%.png
index 20c2a13..24cafbb 100644
Binary files a/freeplane/viewer-resources/images/icons/100%.png and b/freeplane/viewer-resources/images/icons/100%.png differ
diff --git a/freeplane/viewer-resources/images/icons/100%.svg b/freeplane/viewer-resources/images/icons/100%.svg
new file mode 100644
index 0000000..da08450
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/100%.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg4099"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="100%.svg">
+  <defs
+     id="defs4101">
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient6405">
+      <stop
+         id="stop6407"
+         offset="0"
+         style="stop-color:#800080;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.23327851"
+         id="stop6409" />
+      <stop
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1"
+         id="stop6411" />
+      <stop
+         id="stop6413"
+         offset="1"
+         style="stop-color:#800080;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6369">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop6371" />
+      <stop
+         id="stop6387"
+         offset="1"
+         style="stop-color:#f7f7f7;stop-opacity:0.96862745;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6335">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop6337" />
+      <stop
+         id="stop6349"
+         offset="0.25"
+         style="stop-color:#800080;stop-opacity:0.74901961;" />
+      <stop
+         id="stop6347"
+         offset="0.5"
+         style="stop-color:#800080;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop6339" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4885"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop4887" />
+      <stop
+         id="stop6401"
+         offset="0.23327851"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6399"
+         offset="0.67576009"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop4889" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4885"
+       id="radialGradient6397"
+       cx="39.115246"
+       cy="44.287762"
+       fx="39.115246"
+       fy="44.287762"
+       r="15.090909"
+       gradientTransform="matrix(0.36220465,0.52594631,-0.80762604,0.62521886,60.715471,-4.1103057)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-10.679838"
+     inkscape:cy="38.125"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4104">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(461.17355,-80.819402)"
+       id="g5028">
+      <g
+         id="g4803-4-1-8-9"
+         transform="translate(-293.15235,-3.7342434)">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3-1-4-9-9"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3-4-5-3-6"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2-7-1-2-5"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3-1-8-4-1" />
+      </g>
+      <g
+         id="g4995-9"
+         transform="translate(357.689,81.428691)" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/25%.png b/freeplane/viewer-resources/images/icons/25%.png
index 9e81757..7fa83b0 100644
Binary files a/freeplane/viewer-resources/images/icons/25%.png and b/freeplane/viewer-resources/images/icons/25%.png differ
diff --git a/freeplane/viewer-resources/images/icons/25%.svg b/freeplane/viewer-resources/images/icons/25%.svg
new file mode 100644
index 0000000..068dd0f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/25%.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg4099"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="25%.svg">
+  <defs
+     id="defs4101">
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient6405">
+      <stop
+         id="stop6407"
+         offset="0"
+         style="stop-color:#800080;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.23327851"
+         id="stop6409" />
+      <stop
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1"
+         id="stop6411" />
+      <stop
+         id="stop6413"
+         offset="1"
+         style="stop-color:#800080;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6369">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop6371" />
+      <stop
+         id="stop6387"
+         offset="1"
+         style="stop-color:#f7f7f7;stop-opacity:0.96862745;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6335">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop6337" />
+      <stop
+         id="stop6349"
+         offset="0.25"
+         style="stop-color:#800080;stop-opacity:0.74901961;" />
+      <stop
+         id="stop6347"
+         offset="0.5"
+         style="stop-color:#800080;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop6339" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4885"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop4887" />
+      <stop
+         id="stop6401"
+         offset="0.23327851"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6399"
+         offset="0.67576009"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop4889" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6429-0"
+       id="radialGradient6435-8"
+       cx="38.93148"
+       cy="43.321198"
+       fx="38.93148"
+       fy="43.321198"
+       r="15.090909"
+       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6429-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6431-7" />
+      <stop
+         id="stop6437-7"
+         offset="0.99891293"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6433-3" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-10.679838"
+     inkscape:cy="38.125"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4104">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(168.0212,-84.553646)"
+       id="g5076">
+      <g
+         id="g4803">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3" />
+      </g>
+      <g
+         transform="translate(-2.7058545,86.30921)"
+         id="g4754-6-14" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/50%.png b/freeplane/viewer-resources/images/icons/50%.png
index 9dd37d5..b8d1aad 100644
Binary files a/freeplane/viewer-resources/images/icons/50%.png and b/freeplane/viewer-resources/images/icons/50%.png differ
diff --git a/freeplane/viewer-resources/images/icons/50%.svg b/freeplane/viewer-resources/images/icons/50%.svg
new file mode 100644
index 0000000..0f189ab
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/50%.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg4099"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="50%.svg">
+  <defs
+     id="defs4101">
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient6405">
+      <stop
+         id="stop6407"
+         offset="0"
+         style="stop-color:#800080;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.23327851"
+         id="stop6409" />
+      <stop
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1"
+         id="stop6411" />
+      <stop
+         id="stop6413"
+         offset="1"
+         style="stop-color:#800080;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6369">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop6371" />
+      <stop
+         id="stop6387"
+         offset="1"
+         style="stop-color:#f7f7f7;stop-opacity:0.96862745;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6335">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop6337" />
+      <stop
+         id="stop6349"
+         offset="0.25"
+         style="stop-color:#800080;stop-opacity:0.74901961;" />
+      <stop
+         id="stop6347"
+         offset="0.5"
+         style="stop-color:#800080;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop6339" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4885"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop4887" />
+      <stop
+         id="stop6401"
+         offset="0.23327851"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6399"
+         offset="0.67576009"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop4889" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6429-0"
+       id="radialGradient6435-8"
+       cx="38.93148"
+       cy="43.321198"
+       fx="38.93148"
+       fy="43.321198"
+       r="15.090909"
+       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6429-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6431-7" />
+      <stop
+         id="stop6437-7"
+         offset="0.99891293"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6433-3" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-10.679838"
+     inkscape:cy="38.125"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4104">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(242.21457,-84.553643)"
+       id="g5064">
+      <g
+         id="g4803-4"
+         transform="translate(-74.193372,-2.4900087e-6)">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3-1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3-4"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2-7"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3-1" />
+      </g>
+      <g
+         transform="translate(-76.899222,86.309211)"
+         id="g4754-6-14-2" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/75%.png b/freeplane/viewer-resources/images/icons/75%.png
index ee6e6f3..d9df2c9 100644
Binary files a/freeplane/viewer-resources/images/icons/75%.png and b/freeplane/viewer-resources/images/icons/75%.png differ
diff --git a/freeplane/viewer-resources/images/icons/75%.svg b/freeplane/viewer-resources/images/icons/75%.svg
new file mode 100644
index 0000000..adc3a53
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/75%.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg4099"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="75%.svg">
+  <defs
+     id="defs4101">
+    <linearGradient
+       osb:paint="gradient"
+       id="linearGradient6405">
+      <stop
+         id="stop6407"
+         offset="0"
+         style="stop-color:#800080;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.23327851"
+         id="stop6409" />
+      <stop
+         style="stop-color:#ff00ff;stop-opacity:1"
+         offset="1"
+         id="stop6411" />
+      <stop
+         id="stop6413"
+         offset="1"
+         style="stop-color:#800080;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6369">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop6371" />
+      <stop
+         id="stop6387"
+         offset="1"
+         style="stop-color:#f7f7f7;stop-opacity:0.96862745;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6335">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop6337" />
+      <stop
+         id="stop6349"
+         offset="0.25"
+         style="stop-color:#800080;stop-opacity:0.74901961;" />
+      <stop
+         id="stop6347"
+         offset="0.5"
+         style="stop-color:#800080;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop6339" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4885"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#800080;stop-opacity:1;"
+         offset="0"
+         id="stop4887" />
+      <stop
+         id="stop6401"
+         offset="0.23327851"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6399"
+         offset="0.67576009"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#800080;stop-opacity:0;"
+         offset="1"
+         id="stop4889" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6429-0"
+       id="radialGradient6435-8"
+       cx="38.93148"
+       cy="43.321198"
+       fx="38.93148"
+       fy="43.321198"
+       r="15.090909"
+       gradientTransform="matrix(0.98881461,1.48232,-1.2392904,0.92929832,53.784006,-56.118238)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6429-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6431-7" />
+      <stop
+         id="stop6437-7"
+         offset="0.99891293"
+         style="stop-color:#ff00ff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6433-3" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-33.04209"
+     inkscape:cy="38.125"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="1028"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4104">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(388.5404,-81.977484)"
+       id="g5040">
+      <g
+         id="g4803-4-1-8"
+         transform="translate(-220.5192,-2.5761614)">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -136.69822,84.669521 c -17.56801,-4.35e-4 -31.29395,13.692859 -31.36328,31.244139 l 15.96289,0.0644 a 15.944881,15.944881 0 0 1 0.0508,-1.01171 15.944881,15.944881 0 0 1 0.23828,-1.57422 15.944881,15.944881 0 0 1 0.39454,-1.54492 15.944881,15.944881 0 0 1 0.54687,-1.49805 15.944881,15.944881 0 0 1 0.69336,-1.4336 15.944881,15.944881 0 0 1 0.83203,-1.35937 15.944881,15.944881 0 0 1 0.96485,-1.26953 15.944881,15.944881 0 0 1 1.08593,-1.16602 15.944881,15.944881 0 0 1 1.1972 [...]
+           id="path4699-3-1-4-9"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4707-3-4-5-3"
+           d="m -135.34418,84.669571 c 17.56802,-4.35e-4 31.29396,13.692859 31.36328,31.244139 l -15.96289,0.0644 a 15.944881,15.944881 0 0 0 -0.0508,-1.01171 15.944881,15.944881 0 0 0 -0.23828,-1.57422 15.944881,15.944881 0 0 0 -0.39453,-1.54492 15.944881,15.944881 0 0 0 -0.54688,-1.49805 15.944881,15.944881 0 0 0 -0.69336,-1.4336 15.944881,15.944881 0 0 0 -0.83203,-1.35937 15.944881,15.944881 0 0 0 -0.96484,-1.26953 15.944881,15.944881 0 0 0 -1.08594,-1.16602 15.944881,15.944881 0 0 0  [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4709-2-7-1-2"
+           d="m -136.69822,148.43767 c -17.56801,4.3e-4 -31.29395,-13.69286 -31.36328,-31.24414 l 15.96289,-0.0644 a 15.944881,15.944881 0 0 0 0.0508,1.01171 15.944881,15.944881 0 0 0 0.23828,1.57422 15.944881,15.944881 0 0 0 0.39454,1.54492 15.944881,15.944881 0 0 0 0.54687,1.49805 15.944881,15.944881 0 0 0 0.69336,1.4336 15.944881,15.944881 0 0 0 0.83203,1.35937 15.944881,15.944881 0 0 0 0.96485,1.26953 15.944881,15.944881 0 0 0 1.08593,1.16602 15.944881,15.944881 0 0 0 1.19727,1.05078 [...]
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.43900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-re [...]
+           d="m -135.34418,148.43767 c 17.56802,4.4e-4 31.29396,-13.69286 31.36328,-31.24414 l -15.96289,-0.0644 a 15.944881,15.944881 0 0 1 -0.0508,1.01171 15.944881,15.944881 0 0 1 -0.23828,1.57422 15.944881,15.944881 0 0 1 -0.39453,1.54492 15.944881,15.944881 0 0 1 -0.54688,1.49805 15.944881,15.944881 0 0 1 -0.69336,1.4336 15.944881,15.944881 0 0 1 -0.83203,1.35937 15.944881,15.944881 0 0 1 -0.96484,1.26953 15.944881,15.944881 0 0 1 -1.08594,1.16602 15.944881,15.944881 0 0 1 -1.19726, [...]
+           id="path4711-3-1-8-4" />
+      </g>
+      <g
+         transform="translate(-223.22505,83.733053)"
+         id="g4754-6-14-2-5-1" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/Mail.svg b/freeplane/viewer-resources/images/icons/Mail.svg
new file mode 100644
index 0000000..8d169d9
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/Mail.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="27.482" width="34.173" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 34.173484 27.482118" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#e3e2db" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="520.48" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="520.48" gradientTransform="translate(156.8,-180.92)" x2="165.42" x1="154.03"/>
+<linearGradient id="c" y2="515.51" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="529.35" gradientTransform="translate(156.8,-180.92)" x2="150.34" x1="150.19"/>
+<linearGradient id="d" y2="516.19" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="507.6" gradientTransform="translate(156.8,-180.92)" x2="150.24" x1="150.19"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-383.19 -341.75)">
+<g fill-rule="evenodd" transform="translate(93.131,15.788)">
+<rect stroke-linejoin="round" height="26.202" width="32" stroke="#313231" stroke-linecap="round" y="326.46" x="291.64" fill="url(#b)"/>
+<path d="m291.76 352.5-0.13898-4.5105 15.793-11.308 16.311 11.611-0.16425 4.4095-31.801-0.20215z" stroke="#333" stroke-width="1px" fill="url(#c)"/>
+<path d="m291.76 326.5-0.0379 6.3299 15.692 8.3767 16.311-9.4886-0.16425-5.2181h-31.801z" stroke="#333" stroke-width="1px" fill="url(#d)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/addition.svg b/freeplane/viewer-resources/images/icons/addition.svg
new file mode 100644
index 0000000..7ba7c9b
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/addition.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999736 31.999736" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="548.49" gradientUnits="userSpaceOnUse" y1="548.49" x2="504.96" x1="489.21">
+<stop stop-color="#04a" offset="0"/>
+<stop stop-color="#06f" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-25.75 -901.88)">
+<g transform="matrix(1.9995,0,0,1.9995,-952.17,-178.82)">
+<text style="word-spacing:0px;letter-spacing:0px" stroke-width=".25" font-family="Arial" space="preserve" font-size="31.477px" stroke="#00112b" y="559.60706" x="487.90067" font-weight="bold" line-height="125%" fill="#0044aa">
+<tspan y="559.60706" x="487.90067" stroke-width=".25" fill="#0044aa">+</tspan>
+</text>
+<rect style="color:#000000" height="15.754" width="15.754" y="540.61" x="489.21" fill="none"/>
+<rect style="color:#000000" height="15.754" width="15.754" y="540.61" x="489.21" fill="none"/>
+<rect style="color:#000000" height="15.754" width="15.754" y="540.61" x="489.21" fill="none"/>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Arial" space="preserve" font-size="31.477px" y="559.60706" x="487.90067" font-weight="bold" line-height="125%" fill="url(#a)">
+<tspan y="559.60706" x="487.90067" fill="url(#a)">+</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/attach.svg b/freeplane/viewer-resources/images/icons/attach.svg
new file mode 100644
index 0000000..f7806c5
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/attach.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0311mm" width="9.0304mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 31.997559 31.999853">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-344 -622.08)">
+<path stroke-linejoin="round" d="m354.73 622.31c-0.5678 0.0423-1.0559 0.40344-1.2438 0.92034-0.1878 0.5169-0.04 1.0917 0.377 1.4648l18.95 18.075 0.078 8.3076h-7.6519l-17.695-17.155 4.2724-4.7218 13.955 12.934c0.8616 0.84253-0.4658 2.1548-1.4059 1.2223l-11.653-10.769c-0.5613-0.5396-1.4713-0.5396-2.0325 0-0.5613 0.5396-0.5613 1.4144 0 1.954l12.67 11.746c0.4139 0.25967 0.6122 0.32755 1.1127 0.40563 0.5109 0.0797 0.8084 0.0473 1.4683-0.0254 0.9739-0.10769 2.932-1.2839 3.2955-3.3161 0.062-0.4 [...]
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/audio.svg b/freeplane/viewer-resources/images/icons/audio.svg
new file mode 100644
index 0000000..2378fdc
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/audio.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.661" width="31.958" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.957722 31.660732" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="203" gradientUnits="userSpaceOnUse" y1="212.95" x2="64.94" x1="65.089">
+<stop offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="205.84" gradientUnits="userSpaceOnUse" y1="216.43" x2="68.504" x1="68.657">
+<stop stop-color="#414141" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="211.67" cx="81.537" gradientTransform="matrix(3.0185 -.10221 .22447 6.6291 -221.82 -1183.7)" r=".43311">
+<stop stop-color="#fff" stop-opacity=".62222" offset="0"/>
+<stop offset="1"/>
+</radialGradient>
+<filter id="a" style="color-interpolation-filters:sRGB" height="2.063" width="1.4586" y="-.53152" x="-.22928">
+<feGaussianBlur stdDeviation="0.47369027"/>
+</filter>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-68.593 -458.71)">
+<g transform="matrix(1.9788,0,0,1.9788,-72.38,145.62)">
+<g transform="translate(39,-12)">
+<g fill-rule="evenodd">
+<g transform="matrix(.97229 0 0 1.0182 -29.459 -36.905)">
+<rect style="color:#000000" ry=".97498" height="6.6657" width="3.6425" y="207.95" x="63.459" fill="url(#c)"/>
+<path stroke-linejoin="round" style="color:#000000" d="m66.032 207.95 5.2913-4.3994v15.464l-5.2913-4.3994z" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".25" fill="url(#b)"/>
+<g transform="matrix(1,0,0,1.0062,0,-1.2711)">
+<rect style="color:#000000" height="15.464" width=".86622" y="203.55" x="71.284"/>
+<rect style="color:#000000" height="15.464" width=".86622" y="203.45" x="71.382" fill="url(#d)"/>
+</g>
+<rect style="color:#000000" fill-opacity=".49333" transform="matrix(.9537 0 0 1 3.4153 0)" height="2.1389" filter="url(#a)" width="4.9583" y="210.42" x="66.208" fill="#fff"/>
+</g>
+<g transform="matrix(-.83093 0 0 .83093 98.679 31.506)" stroke="#000" stroke-width=".1" fill="#04a">
+<path d="m67.184 171.09c-0.22192 0.004-0.43082 0.10575-0.5709 0.27788-1.4301 1.7077-2.0716 3.5471-1.9956 5.3908 0.07614 1.8436 0.83853 3.6551 2.0495 5.4346 0.14921 0.22786 0.40965 0.35751 0.68137 0.3391 0.27172-0.0183 0.51238-0.18199 0.62946-0.42785 0.11717-0.24589 0.09246-0.5358-0.06472-0.75835-1.1081-1.6283-1.7297-3.1828-1.7902-4.6498-0.06039-1.4669 0.40757-2.882 1.6454-4.3601 0.19452-0.22504 0.2385-0.54345 0.11211-0.81277-0.12641-0.26933-0.39916-0.43914-0.6966-0.43349z"/>
+<path d="m64.328 168.81c-0.19603 0.0116-0.38034 0.0969-0.51363 0.24082-2.3234 2.4363-3.3587 5.0443-3.2351 7.6761 0.12352 2.6318 1.3628 5.227 3.3497 7.7906 0.25531 0.3288 0.72882 0.38835 1.0576 0.13306 0.32876-0.2553 0.38833-0.72879 0.13306-1.0576-1.8702-2.4132-2.9313-4.7336-3.0347-6.9368-0.1033-2.2032 0.70723-4.3499 2.8209-6.5663 0.21736-0.22184 0.27636-0.55431 0.14865-0.83737-0.12771-0.2831-0.41611-0.45879-0.72625-0.44255z"/>
+</g>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/back.svg b/freeplane/viewer-resources/images/icons/back.svg
new file mode 100644
index 0000000..951e6ad
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/back.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.5447mm" width="9.0312mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000202 33.81966" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="377.6" gradientUnits="userSpaceOnUse" y1="388.92" gradientTransform="matrix(1.3013 0 0 1.2399 186.67 111.06)" x2="142.38" x1="160.7">
+<stop stop-color="#0d56c0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-366.86 -572.6)">
+<path d="m367.49 589.52 15.091-15.381 0.065 9.1262 15.574-0.27816v12.824l-15.574 0.17337v8.8842l-15.156-15.349z" stroke-opacity=".72674" fill-rule="evenodd" stroke="#027" stroke-width="1.2702px" fill="url(#a)"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/bee.svg b/freeplane/viewer-resources/images/icons/bee.svg
new file mode 100644
index 0000000..0348252
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/bee.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="30.848" width="31.988" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.987725 30.847692" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="762.16" cx="-287.17" gradientTransform="matrix(.017037 .017161 -.016374 .039353 104.07 618.45)" r="27.027">
+<stop stop-color="#f5cd03" offset="0"/>
+<stop stop-color="#f8d21d" offset="1"/>
+</radialGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="770.32" cx="-286.68" gradientTransform="matrix(.018845 .018983 -.018112 .04353 104.28 614.88)" r="27.027">
+<stop stop-color="#f6cd03" offset="0"/>
+<stop stop-color="#f8d21d" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="767.94" cx="-202.58" gradientTransform="matrix(.036128 .023821 -.034722 .054624 123.05 607.85)" r="27.027">
+<stop stop-color="#f1d103" offset="0"/>
+<stop stop-color="#f7cd03" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-155.08 -784.93)">
+<g transform="matrix(-2.1136 .37782 .35796 2.1183 177.09 -599.53)">
+<g transform="translate(28.123 -.28844)">
+<g transform="matrix(1.0113,0,0,1.0113,23.302,-39.536)" stroke="#000">
+<path stroke-width="4.6752" d="m-362.73 767.36a52.159 49.091 0 0 1 -52.159 49.091 52.159 49.091 0 0 1 -52.159 -49.091 52.159 49.091 0 0 1 52.159 -49.091 52.159 49.091 0 0 1 52.159 49.091z" transform="matrix(.04289 .031926 -.032053 .042811 99.579 652.88)"/>
+<path fill-rule="evenodd" stroke-width=".5" d="m56.167 670.68c-1.049-1.9045-1.4988-3.9059-0.46333-3.7462 1.0516 0.29153-1.3592 0.44168 0.67427 3.5987"/>
+<path fill-rule="evenodd" stroke-width=".5" d="m54.928 672.12c-2.9716 0.43229-3.0072 2.3559-2.3222 2.5977 1.1331 0.17562-1.2063-1.8103 2.2781-2.3855"/>
+</g>
+<path stroke-width="1.0113" d="m90.608 645.78c-0.86888 1.5835-3.5621 1.752-6.2076 0.36615-2.6455-1.3859-4.0874-3.7957-3.2185-5.3792 0.86888-1.5834 3.7211-1.7438 6.3666-0.35796 2.6455 1.3859 3.9283 3.7876 3.0594 5.371z" stroke="#000"/>
+<path fill-rule="evenodd" fill="url(#a)" d="m85.676 646.51c0.08078-0.98487 0.28894-2.1144 0.77343-2.9906 0.46517-0.84129 1.0486-1.3583 1.9962-2.0915 0.29088 0.21263 0.53904 0.31427 0.87353 0.76197-1.0184 0.44313-1.5156 1.051-1.9199 1.8285-0.34452 0.66991-0.68711 2.0798-0.68282 2.7261-0.46246-0.0343-0.68615-0.0385-1.0405-0.23448z"/>
+<path fill-rule="evenodd" fill="url(#b)" d="m84.385 645.71c-0.26154-0.17817-0.25435-0.10277-0.42771-0.2875 0.07504-1.0879 0.30065-1.94 0.63305-2.682 0.38565-0.77759 1.6807-1.6781 2.1926-1.9948 0.30438 0.2352 0.60771 0.23852 0.96589 0.53149-1.2223 0.70834-1.8906 1.5958-2.129 2.2297-0.39439 0.86524-0.57502 1.82-0.57028 2.5349-0.16837-0.0629-0.4527-0.20259-0.6645-0.33178z"/>
+<path d="m82.823 644.37c-0.64034-0.82376-0.91288-1.7168-0.75359-2.4693 0.13878-0.65559 0.58126-1.1753 1.2556-1.4746 0.44624-0.19811 0.94145-0.29059 1.5372-0.28711 0.1377 0.0008 0.47255 0.0239 0.58013 0.04l0.6655 0.11542c-1.1457 0.70649-1.8267 1.3728-2.2221 2.0398-0.49024 0.82704-0.62422 1.4373-0.63534 2.5134-0.0016 0.00076-0.3828-0.42015-0.42736-0.47749z" fill-rule="evenodd" stroke="#f8d21d" stroke-width=".25283" fill="#f8d322"/>
+<path d="m88 644.77c0.21971-0.56593 0.59689-1.2668 1.8752-1.9324 0.15118 0.20128 0.41828 0.65333 0.53982 0.97879 0.30341 0.87421 0.1821 1.6798-0.45212 2.2992-0.66414 0.54294-1.5282 0.58167-2.3475 0.63034 0.09722-1.0752 0.15959-1.3962 0.38461-1.9759z" fill-rule="evenodd" stroke="#f8d21d" stroke-width=".25283" fill="url(#c)"/>
+</g>
+<g fill-rule="evenodd" transform="matrix(.16116 -.0024084 .0024084 .16116 57.043 559.6)" stroke="#000" stroke-width="3" fill="#fff">
+<g transform="translate(6.7042,-1.1174)">
+<path d="m319.62 514.6c2.818 8.2957-7.1056 55.479-28.858 41.133-21.605-16.638 22.234-41.325 28.858-41.133z"/>
+<path d="m319.71 514.39c6.0508 3.8944 23.521 36.841 2.0363 37.128-22.552-1.1741-6.4586-34.49-2.0363-37.128z"/>
+</g>
+<g transform="translate(1.1174,6.7042)">
+<path d="m326.93 504.45c8.6473-1.409 45.639-32.333 22.757-44.797-24.837-11.257-26.038 39.04-22.757 44.797z"/>
+<path d="m326.78 504.63c6.2803 3.5124 43.572 3.459 33.733-15.643-11.63-19.357-33.482 10.499-33.733 15.643z"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/bell.svg b/freeplane/viewer-resources/images/icons/bell.svg
new file mode 100644
index 0000000..5abc9e9
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/bell.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.039" width="21.188" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 21.187968 32.03852" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="441.74" cx="377.08" gradientTransform="matrix(-1.3526,-1.9915,1.9289,-1.3101,60.133,1659.1)" r="11.103">
+<stop stop-color="#756e33" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="441.09" cx="376.61" gradientTransform="matrix(-2.0544,-2.46,2.309,-1.9283,118.35,2189.3)" r="11.103">
+<stop stop-color="#756e33" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="424.28" cx="370.16" gradientTransform="matrix(.733 2.3687 -2.0163 .62396 942.37 -745.91)" r="4.0723">
+<stop stop-color="#b16620" offset="0"/>
+<stop stop-color="#370000" offset="1"/>
+</radialGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="413.13" cx="361.27" gradientTransform="matrix(1 .35143 -.32168 .91538 132.89 -92.001)" r="1.2865">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-386.46 -107.07)">
+<g transform="translate(13.507,-207)">
+<g transform="translate(-14.163,2.8582)">
+<path stroke-linejoin="round" d="m397.05 325.56c-3.975 0.0839-6.4736 1.5188-7.5684 4.5262s0.56886 5.6392 0.5936 8.6071l-1.4098 0.5194c-0.87291 0.76423-1.2369 0.91517-0.89039 1.855 0.50622 0.99986 1.3242 1.4981 2.5228 1.7066h14.321c1.2193-0.17376 3.1504-1.2081 3.1906-1.9292 0.0402-0.72111 0.11329-1.1712-1.113-2.0776l-1.5582-0.74199c0.20893-2.8457 1.7406-5.6089 0-8.4588s-4.1128-4.0907-8.0878-4.0068z" stroke-opacity=".76129" fill-rule="evenodd" stroke="#353516" stroke-linecap="round" stroke [...]
+<g transform="translate(38.366,-81.135)">
+<path stroke-linejoin="round" d="m358.63 406.66c-3.975 0.0839-6.4736 1.5188-7.5684 4.5262s0.56886 5.6392 0.5936 8.6071l-1.4098 0.5194c-0.87291 0.76423-1.2369 0.91517-0.89039 1.855 0.50622 0.99986 1.3242 1.4981 2.5228 1.7066h14.321c1.2193-0.17376 3.1504-1.2081 3.1906-1.9292 0.0402-0.72111 0.11329-1.1712-1.113-2.0776l-1.5582-0.74199c0.20893-2.8457 1.7406-5.6089 0-8.4588s-4.1128-4.0907-8.0878-4.0068z" stroke-opacity=".76129" fill-rule="evenodd" stroke="#353516" stroke-linecap="round" stroke [...]
+<path stroke-linejoin="round" d="m362.11 407.41c-1.5596 2.549-6.5662 1.078-6.2258 0l1.664-4.2121c-0.85754-2.3725-2.09-4.6631-1.664-7.6735 1.0691-2.6834 2.3784-2.3842 3.2072-2.4526 0.82882-0.0684 1.8374 0.0831 2.8702 1.9268 0.85155 4.2385-2.0285 5.6386-1.3609 8.8268l1.5093 3.5846z" stroke-opacity=".78065" fill-rule="evenodd" stroke="#43250a" stroke-linecap="round" stroke-width="1.4275" fill="url(#c)"/>
+<path fill="url(#d)" d="m362.56 413.13a1.2865 1.4875 0 0 1 -1.2862 1.4875 1.2865 1.4875 0 0 1 -1.2868 -1.4868 1.2865 1.4875 0 0 1 1.2856 -1.4882 1.2865 1.4875 0 0 1 1.2874 1.4861" transform="matrix(1.9394,0,0,1.9394,-337.47,-389.3)"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/bookmark.svg b/freeplane/viewer-resources/images/icons/bookmark.svg
new file mode 100644
index 0000000..5360464
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/bookmark.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0425mm" width="9.0386mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.026481 32.040261" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="400.23" gradientUnits="userSpaceOnUse" y1="398.81" gradientTransform="matrix(1.3785 .12722 -.11482 1.4436 254.62 -87.632)" x2="121.08" x1="102.34">
+<stop stop-color="#fc0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-343.99 -487.77)">
+<path stroke-linejoin="round" d="m369.25 518.92c-0.80382 0.59966-8.3382-6.123-9.3272-6.1344-0.989-0.0116-8.604 6.5339-9.4004 5.9156-0.79642-0.61835 2.9438-10.172 2.6441-11.161-0.29963-0.98896-8.6296-6.5835-8.3181-7.5654 0.31161-0.98182 10.158-0.16388 10.961-0.76353 0.80383-0.59964 3.2706-10.603 4.2595-10.591 0.98899 0.0116 3.334 10.071 4.1304 10.689 0.79643 0.61835 10.651 0.0307 10.951 1.0193 0.29964 0.98896-8.097 6.388-8.4087 7.3699-0.3116 0.98181 3.3121 10.622 2.5082 11.221z" stroke-op [...]
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/broken-line.svg b/freeplane/viewer-resources/images/icons/broken-line.svg
new file mode 100644
index 0000000..895793b
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/broken-line.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.012" width="32.015" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.015158 32.012302" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="677.01" gradientUnits="userSpaceOnUse" y1="673.53" gradientTransform="matrix(.9508 0 0 .97079 -42.174 -61.482)" x2="158.14" x1="150.2">
+<stop stop-color="#f00" offset="0"/>
+<stop stop-color="#fffe21" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-30.705 -165.09)">
+<g stroke-linejoin="round" fill-rule="evenodd" transform="translate(-54.991,-419.49)" stroke-linecap="round" stroke-width="1.4617">
+<path fill="#06f" d="m89.565 588.47c4.1609 9.1141 7.63 9.5856 10.576 10.276 2.7726 0.40641 6.8523 1.3578 9.6172 3.4565 2.9244 2.2512 4.8903 3.7628 7.2219 11.064l-1.1823 2.5977-2.1236-1.0393c-1.7499-5.8583-3.1132-6.966-5.4056-8.9264-2.209-1.889-7.0576-3.1692-10.233-3.593-2.3081-0.71841-7.3175-1.0308-11.609-11.691l2.1833 0.0467 0.95481-2.191z" stroke="#000"/>
+<path fill="url(#a)" d="m109.86 585.56-2.8102 9.461 4.5827-1.9291-12.246 19.819 4.6261-18.625-4.3579 1.7114 4.0808-10.674" stroke="#b40000"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/button.svg b/freeplane/viewer-resources/images/icons/button.svg
new file mode 100644
index 0000000..40e51ee
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/button.svg
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13.758335mm"
+   height="16.933332mm"
+   viewBox="0 0 13.758335 16.933332"
+   version="1.1"
+   id="svg8466"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="button.svg">
+  <defs
+     id="defs8460">
+    <linearGradient
+       gradientTransform="matrix(0.21562097,0,0,0.21822246,-0.27169639,59.471363)"
+       y2="467.62836"
+       x2="495.90735"
+       y1="504.90591"
+       x1="496.30939"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7430-39"
+       xlink:href="#linearGradient6664-2-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6664-2-2">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="0"
+         id="stop6667-7-4" />
+      <stop
+         id="stop6675-9-6"
+         offset="0.45940343"
+         style="stop-color:#dcdada;stop-opacity:1" />
+      <stop
+         id="stop6673-54-1"
+         offset="0.55800742"
+         style="stop-color:#ececec;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6669-3-82" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4350-9-0-8">
+      <stop
+         id="stop4352-2-9-2"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1" />
+      <stop
+         id="stop4354-7-4-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4332-7-82-0">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4334-6-45-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4336-1-5-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2960-7-4">
+      <stop
+         style="stop-color:#246e6f;stop-opacity:1;"
+         offset="0"
+         id="stop2962-61-2" />
+      <stop
+         style="stop-color:#6ac8ca;stop-opacity:1;"
+         offset="1"
+         id="stop2964-4-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2968-3-2">
+      <stop
+         style="stop-color:#2d7d7e;stop-opacity:1;"
+         offset="0"
+         id="stop2970-2-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop2972-2-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6644-2-2-2-4"
+       x1="20.794617"
+       x2="20.801508"
+       xlink:href="#linearGradient5742-1-8-3-3"
+       y1="42.42244"
+       y2="43.991676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(31.25002,0,0,31.24998,-215.80899,-680.37128)" />
+    <linearGradient
+       id="linearGradient5742-1-8-3-3">
+      <stop
+         id="stop5744-5-6-34-80"
+         offset="0"
+         stop-color="#adadad" />
+      <stop
+         id="stop5746-2-0-1-8"
+         offset="1"
+         stop-color="#f0f0f0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6646-8-2-13-8"
+       x1="20.842991"
+       x2="20.94149"
+       xlink:href="#linearGradient5756-1-4-8-06"
+       y1="42.620281"
+       y2="43.638878"
+       gradientTransform="matrix(31.250134,0,0,31.249867,-215.80618,-680.3658)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5756-1-4-8-06">
+      <stop
+         id="stop5758-7-8-74-8"
+         offset="0"
+         stop-color="#828282" />
+      <stop
+         id="stop5760-1-6-2-1"
+         offset="1"
+         stop-opacity="0.352941"
+         stop-color="#929292" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7452-2-5-7-98"
+       x1="20.464201"
+       x2="20.455572"
+       xlink:href="#linearGradient6506-7-4-09-79-9"
+       y1="52.158787"
+       y2="51.354359"
+       gradientTransform="matrix(35.535962,0,0,27.480963,-227.25446,-725.9174)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6506-7-4-09-79-9">
+      <stop
+         id="stop6508-9-8-00-3-7"
+         offset="0"
+         stop-opacity="0"
+         stop-color="#ffffff" />
+      <stop
+         id="stop6510-3-6-61-1-2"
+         offset="1"
+         stop-opacity="0.87451"
+         stop-color="#ffffff" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6644-0-5-6"
+       x1="20.794617"
+       x2="20.801508"
+       xlink:href="#linearGradient5742-1-8-3-3"
+       y1="42.418575"
+       y2="43.987812"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6646-1-0-8"
+       x1="20.842987"
+       x2="20.941488"
+       xlink:href="#linearGradient5756-1-4-8-06"
+       y1="42.616417"
+       y2="43.635014"
+       gradientTransform="scale(1.0000043,0.99999574)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="svg_1-62-8-2"
+       x1="20.873043"
+       y1="43.765972"
+       x2="20.547928"
+       y2="42.610008"
+       gradientTransform="scale(1.0000048,0.99999524)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6606-65-9-5"
+         stop-color="#001c00"
+         stop-opacity="0.972656"
+         offset="0"
+         style="stop-color:#2b7c2b;stop-opacity:1;" />
+      <stop
+         id="stop6608-3-3-5"
+         stop-color="#008200"
+         stop-opacity="0.976563"
+         offset="1"
+         style="stop-color:#02b602;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6650-9-4-3"
+       x1="16.109699"
+       x2="16.106449"
+       xlink:href="#linearGradient6506-7-4-09-79-9"
+       y1="54.954487"
+       y2="54.652622"
+       gradientTransform="scale(1.2775277,0.7827619)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0978168"
+     inkscape:cx="-40.377607"
+     inkscape:cy="35.526197"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata8463">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-99.727034,-161.44701)">
+    <g
+       id="g4578">
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.17421289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect4519"
+         width="13.758333"
+         height="16.933332"
+         x="99.727036"
+         y="161.44701"
+         ry="1.0691348" />
+      <rect
+         ry="0.52356797"
+         y="161.53412"
+         x="99.81414"
+         height="8.2924538"
+         width="13.584121"
+         id="rect6662-1-9"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7430-39);fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:0.17421289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/button_cancel.svg b/freeplane/viewer-resources/images/icons/button_cancel.svg
new file mode 100644
index 0000000..322da1b
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/button_cancel.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0291mm" width="9.0511mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.071002 31.992811" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="335.21" gradientUnits="userSpaceOnUse" y1="355.87" gradientTransform="matrix(1.089 0 0 1.0879 357.34 -45.306)" x2="34.999" x1="55.911">
+<stop stop-color="#fe0000" offset="0"/>
+<stop stop-color="#ff5858" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="335.21" gradientUnits="userSpaceOnUse" y1="355.87" gradientTransform="matrix(1.089 0 0 1.0879 359.91 -45.306)" x2="32.638" x1="53.55">
+<stop stop-color="#c83737" offset="0"/>
+<stop stop-color="#c83737" stop-opacity=".40708" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-395.39 -319.22)">
+<path d="m426.71 346.08c-0.064 2.2677 1.1576 5.2637-4.8666 4.4489l-10.238-10.411-10.589 9.9267c-2.0903 1.6134-6.607-1.0265-4.2176-4.4546 0.6625-0.95042 9.8646-10.113 9.8937-10.288l-10.697-10.09c1.1987-5.2442 3.4251-4.7406 5.2798-5.3203l10.192 9.8609c0.043 0.33059 9.911-9.7081 10.33-9.815 4.3925-1.1204 5.7806 3.1915 4.8207 5.0451-0.4395 0.84871-10.054 10.141-10.054 10.274l10.146 10.824z" fill-rule="evenodd" stroke="url(#b)" stroke-width="1.0884px" fill="url(#a)"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/button_ok.svg b/freeplane/viewer-resources/images/icons/button_ok.svg
new file mode 100644
index 0000000..1bb49c1
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/button_ok.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="8.5069mm" width="9.1917mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.56907 30.142396" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="364.23" cx="47.078" gradientTransform="matrix(1.2428 -1.8254 .91217 .71579 -21.829 278.85)" r="16.1">
+<stop stop-color="#05dc05" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-355.14 -428.72)">
+<path stroke-linejoin="round" d="m371.03 458.25c-4.3437-5.6562-7.8231-11.595-15.274-17.829 1.9323-0.041 4.8813-0.67624 13.794 6.6308 4.1269-8.0921 5.5036-9.4803 10.042-16.336l7.5081-1.3831c-10.62 10.344-15.25 26.27-16.07 28.917z" stroke-opacity=".72093" fill-rule="evenodd" stroke="#004800" stroke-width="1.2252" fill="url(#a)"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/calendar.svg b/freeplane/viewer-resources/images/icons/calendar.svg
new file mode 100644
index 0000000..1b9284c
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/calendar.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="31.656" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.655999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="f">
+<stop stop-color="#fce594" offset="0"/>
+<stop stop-color="#e0a916" offset="1"/>
+</linearGradient>
+<linearGradient id="b">
+<stop stop-color="#487cd2" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="542.24" gradientUnits="userSpaceOnUse" y1="576.96" gradientTransform="matrix(1.0958 0 0 .84992 -220.33 83.378)" x2="181.06" x1="205.6">
+<stop stop-color="#4679d1" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<radialGradient id="a" xlink:href="#f" gradientUnits="userSpaceOnUse" cy="526.19" cx="157" gradientTransform="matrix(0.6104,8.8908e-6,-3.4584e-5,2.3744,43.709,-699.22)" r="2.5231"/>
+<linearGradient id="d" y2="607.09" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="608.99" gradientTransform="matrix(.97612 0 0 .97612 -159.04 -31.357)" x2="198.02" x1="200.21"/>
+<linearGradient id="e" y2="612.86" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="609.96" gradientTransform="matrix(.97612 0 0 .97612 -159.04 -31.357)" x2="205.23" x1="201.64"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-145.69 -600.21)">
+<g transform="translate(135.62,62.837)">
+<rect transform="matrix(.99803 -.062668 .067934 .99769 0 0)" height="26.048" width="27.186" stroke="#000080" stroke-linecap="round" y="541.99" x="-25.424" stroke-width=".69208" fill="url(#c)"/>
+<g stroke-linejoin="round" stroke-linecap="round" transform="matrix(.50288 -.035635 .035635 .50288 -74.382 269.22)">
+<path d="m162.05 533.23a2.7803 2.7803 0 0 1 -2.7803 2.7803 2.7803 2.7803 0 0 1 -2.7804 -2.7803 2.7803 2.7803 0 0 1 2.7804 -2.7804 2.7803 2.7803 0 0 1 2.7803 2.7804z" transform="matrix(1.0874,0,0,1.0874,-33.668,-22.498)" stroke="#000" stroke-width=".5" fill="#fff"/>
+<path d="m141.55 557.63c-1.3932 1.2534-2.4896 1.2288-4.0462 0.16664l0.0206-9.7177c1.3402-1.1275 2.5219-1.1302 3.9788-0.0468l0.0468 9.5978z" stroke-opacity=".80814" fill-rule="evenodd" stroke="#774d10" stroke-width="1px" fill="url(#a)"/>
+</g>
+<text font-size="22.294px" stroke-width=".21951" space="preserve" transform="rotate(-3.5331)" stroke="#000000" y="560.32349" x="-19.352104" font-family="Georgia" line-height="125%" fill="#d40000">
+<tspan y="560.32349" x="-19.352104" stroke-width=".21951">12</tspan>
+</text>
+<path stroke-linejoin="round" d="m39.791 559.82-6.7952 7.1864c0.34287-2.1596 0.6651-4.6854 0.11991-7.1297 2.755 0.42873 4.5813 0.50553 6.6752-0.0568z" fill-rule="evenodd" stroke="#000080" stroke-linecap="round" stroke-width=".73209" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m40.312 566.5c-0.51172 0-7.3051 0.51213-7.3051 0.51213l6.9228-7.2693 0.3823 6.7572z" fill-rule="evenodd" stroke="#000080" stroke-width=".73209" fill="url(#e)"/>
+<g stroke-linejoin="round" stroke-linecap="round" transform="matrix(.50288 -.035635 .035635 .50288 -68.119 268.92)">
+<path d="m162.05 533.23a2.7803 2.7803 0 0 1 -2.7803 2.7803 2.7803 2.7803 0 0 1 -2.7804 -2.7803 2.7803 2.7803 0 0 1 2.7804 -2.7804 2.7803 2.7803 0 0 1 2.7803 2.7804z" transform="matrix(1.0874,0,0,1.0874,-33.668,-22.498)" stroke="#000" stroke-width=".5" fill="#fff"/>
+<path d="m141.55 557.63c-1.3932 1.2534-2.4896 1.2288-4.0462 0.16664l0.0206-9.7177c1.3402-1.1275 2.5219-1.1302 3.9788-0.0468l0.0468 9.5978z" stroke-opacity=".80814" fill-rule="evenodd" stroke="#774d10" stroke-width="1px" fill="url(#a)"/>
+</g>
+<g stroke-linejoin="round" stroke-linecap="round" transform="matrix(.50288 -.035635 .035635 .50288 -61.856 268.47)">
+<path d="m162.05 533.23a2.7803 2.7803 0 0 1 -2.7803 2.7803 2.7803 2.7803 0 0 1 -2.7804 -2.7803 2.7803 2.7803 0 0 1 2.7804 -2.7804 2.7803 2.7803 0 0 1 2.7803 2.7804z" transform="matrix(1.0874,0,0,1.0874,-33.668,-22.498)" stroke="#000" stroke-width=".5" fill="#fff"/>
+<path d="m141.55 557.63c-1.3932 1.2534-2.4896 1.2288-4.0462 0.16664l0.0206-9.7177c1.3402-1.1275 2.5219-1.1302 3.9788-0.0468l0.0468 9.5978z" stroke-opacity=".80814" fill-rule="evenodd" stroke="#774d10" stroke-width="1px" fill="url(#a)"/>
+</g>
+<g stroke-linejoin="round" stroke-linecap="round" transform="matrix(.50288 -.035635 .035635 .50288 -55.593 268.12)">
+<path d="m162.05 533.23a2.7803 2.7803 0 0 1 -2.7803 2.7803 2.7803 2.7803 0 0 1 -2.7804 -2.7803 2.7803 2.7803 0 0 1 2.7804 -2.7804 2.7803 2.7803 0 0 1 2.7803 2.7804z" transform="matrix(1.0874,0,0,1.0874,-33.668,-22.498)" stroke="#000" stroke-width=".5" fill="#fff"/>
+<path d="m141.55 557.63c-1.3932 1.2534-2.4896 1.2288-4.0462 0.16664l0.0206-9.7177c1.3402-1.1275 2.5219-1.1302 3.9788-0.0468l0.0468 9.5978z" stroke-opacity=".80814" fill-rule="evenodd" stroke="#774d10" stroke-width="1px" fill="url(#a)"/>
+</g>
+<rect rx=".20723" ry=".20723" height="32" width="31.656" y="537.37" x="10.068" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/checked.svg b/freeplane/viewer-resources/images/icons/checked.svg
new file mode 100644
index 0000000..4890817
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/checked.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.001" width="32.001" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000998 32.000999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-73.749 -107.11)">
+<g transform="matrix(2,0,0,2,466.91,243.47)">
+<rect style="color:#000000" height="15.72" width="15.72" stroke="#1a1a1a" y="-68.038" x="-196.44" stroke-width=".28050" fill="#fff"/>
+<path stroke-linejoin="round" style="color:#000000" d="m-196.36-67.902 1.2262 1.2272 0.0702 14.271h-1.2963z" stroke-opacity=".82447" stroke="#4d4d4d" stroke-linecap="round" stroke-width=".23645" fill="#808080"/>
+<path stroke-linejoin="round" style="color:#000000" d="m-196.36-67.96 1.2974 1.2263h14.304v-1.2614z" stroke-opacity=".82447" stroke="#4d4d4d" stroke-linecap="round" stroke-width=".23613" fill="#808080"/>
+<path stroke-linejoin="round" d="m-192.63-59.408 3.932 4.4736 6.6056-8.2493-1.8352-1.3934-4.812 7.3543-3.0973-3.2416z" stroke="#000" stroke-linecap="round" stroke-width=".44163"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/clanbomber.svg b/freeplane/viewer-resources/images/icons/clanbomber.svg
new file mode 100644
index 0000000..e732673
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/clanbomber.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.679" width="32.361" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.361396 32.678828" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="251.73" cx="390.42" gradientTransform="matrix(.17606 .53787 -.47702 .15567 440.12 3.1593)" r="13.897">
+<stop stop-color="#14b7e9" offset="0"/>
+<stop stop-color="#040f31" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="301.33" gradientUnits="userSpaceOnUse" y1="299.54" gradientTransform="matrix(1.4215,0,0,1.16,-223.8,-40.572)" x2="396.47" x1="397.21">
+<stop stop-color="#d40000" offset="0"/>
+<stop stop-color="#e93d00" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-35.157 -106.42)">
+<g transform="translate(-279,-197.19)">
+<g stroke-linecap="round">
+<path stroke-linejoin="round" d="m406.18 256.41a13.323 13.323 0 0 1 -13.323 13.323 13.323 13.323 0 0 1 -13.323 -13.323 13.323 13.323 0 0 1 13.323 -13.323 13.323 13.323 0 0 1 13.323 13.323z" stroke-opacity=".81395" transform="matrix(1.137,0,0,1.1294,-116.72,31.008)" stroke="#501644" stroke-width="1.149" fill="url(#b)"/>
+<path d="m338.63 312.62 2.4597-2.9945" stroke="#000" stroke-width="1.3568" fill="none"/>
+<path d="m338.71 310.25c0.74294-0.0821 1.7637-1.3018 2.46-0.74738 1.0695 0.85163 0.74937 4.909 1.1862 2.969 0.16803-0.74623 3.0096-2.1885 3.4818-2.8249 0.28186-0.37991-1.0688-1.888-1.2877-2.6121-0.18525-0.61284 0.74736-1.944 0.35186-2.2746-0.69541-0.58117-2.3114 0.48791-3.2998 0.52606-0.61994 0.024-2.1634-1.3-2.5859-0.97971-0.55231 0.41864-0.5386 0.79932-0.0551 3.0797 0.0136 0.064-1.5862 0.42873-1.5862 1.1941 0 0.41105-0.18272 0.63085 1.3348 1.6698z" fill-rule="evenodd" stroke="url(#a)"  [...]
+</g>
+<rect rx=".14086" ry=".14991" height="32" width="32" y="303.96" x="314.33" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/clock.svg b/freeplane/viewer-resources/images/icons/clock.svg
new file mode 100644
index 0000000..e13e7a6
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/clock.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="34.878" width="34.878" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 34.878104 34.878104" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="a" style="color-interpolation-filters:sRGB">
+<feGaussianBlur stdDeviation="0.51517956"/>
+</filter>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="609.34" cx="320.47" gradientTransform="matrix(1.0365 .72435 -.84887 1.2147 505.55 -362.95)" r="54.518">
+<stop stop-color="#fcd9af" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-30.442 -598.77)">
+<g transform="translate(-490.12,198.85)">
+<g transform="matrix(.29348 0 0 .29348 443.95 238.53)">
+<rect ry="9.5841" height="99.036" width="99.036" stroke="#90cffb" stroke-linecap="round" y="559.82" x="270.95" stroke-width="10" fill="url(#b)"/>
+<rect ry="9.5841" height="99.036" filter="url(#a)" width="99.036" stroke="#0055d4" stroke-linecap="round" y="559.82" x="270.95" stroke-width="4" fill="none"/>
+<text font-size="19.278px" space="preserve" line-height="125%" y="582.0556" x="309.20508" font-family="Arial" fill="#000000">
+<tspan y="582.0556" x="309.20508">12</tspan>
+</text>
+<text font-size="19.278px" space="preserve" line-height="125%" y="651.14349" x="315.19174" font-family="Arial" fill="#000000">
+<tspan y="651.14349" x="315.19174">6</tspan>
+</text>
+<text font-size="19.278px" space="preserve" line-height="125%" y="616.26984" x="278.7316" font-family="Arial" fill="#000000">
+<tspan y="616.26984" x="278.7316">9</tspan>
+</text>
+<text font-size="19.278px" space="preserve" line-height="125%" y="616.26984" x="351.6149" font-family="Arial" fill="#000000">
+<tspan y="616.26984" x="351.6149">3</tspan>
+</text>
+<path d="m341.01 581.33-20.827 27.87 19.337 14.652" stroke="#000080" stroke-linecap="round" stroke-width="4" fill="none"/>
+<path d="m320.31 609.12-33.313 22.111" stroke="#f00" stroke-linecap="round" stroke-width="2" fill="none"/>
+<path d="m76.719 629.64a9.2063 9.2063 0 0 1 -9.2063 9.2063 9.2063 9.2063 0 0 1 -9.2063 -9.2063 9.2063 9.2063 0 0 1 9.2063 -9.2063 9.2063 9.2063 0 0 1 9.2063 9.2063z" transform="matrix(.5419 0 0 .5419 283.89 268.14)" stroke="#000080" stroke-linecap="round" stroke-width="4" fill="#f00"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 258.86 470.09)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 270.49 457.33)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 316.96 457.17)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 328.86 470.52)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 327.74 509.92)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 311.01 525.03)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 273.06 522.78)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+<path d="m167.45 704.49a11.792 11.792 0 0 1 -11.792 11.792 11.792 11.792 0 0 1 -11.792 -11.792 11.792 11.792 0 0 1 11.792 -11.792 11.792 11.792 0 0 1 11.792 11.792z" transform="matrix(.17035 0 0 .17035 258.91 507.99)" stroke="#000" stroke-linecap="round" stroke-width="2"/>
+</g>
+<rect rx=".085455" ry=".094007" height="30.976" width="30.976" y="401.87" x="522.51" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/clock2.svg b/freeplane/viewer-resources/images/icons/clock2.svg
new file mode 100644
index 0000000..55145de
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/clock2.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.948" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.99965 31.947845" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="378.15" gradientUnits="userSpaceOnUse" y1="343.67" gradientTransform="matrix(.034458 -.0045512 .0045512 .034458 50.49 502)" x2="181.28" x1="171.37">
+<stop stop-color="#c8c800" offset="0"/>
+<stop stop-color="#ffff49" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-69.758 -600.3)">
+<g transform="matrix(1.99,0,0,1.99,-43.26,-415.13)">
+<path fill-opacity=".39216" d="m57.404 513.19c1.7717-0.68915 4.6762-1.0467 4.6762-1.0467l8.2754-1.093 0.8896 6.7353s0.47528 3.9326 1.6282 5.8108c-2.6976 1.1187-7.4739 1.8141-7.4739 1.8141l-6.7353 0.8896-1.5217-11.521s-0.24257-0.91915 0.26155-1.5887z"/>
+<path d="m57.146 512.94c2.0323-0.58487 4.7631-0.9424 4.7631-0.9424l8.2754-1.093 0.8896 6.7353s0.30472 2.6413 1.4577 4.5194c-2.1964 2.6463-7.3034 3.1054-7.3034 3.1054l-6.7353 0.88959-1.5217-11.521s-0.13194-1.1078 0.17466-1.693z" stroke="#000" stroke-width="0.3" fill="url(#a)"/>
+<g transform="matrix(.20785 0 0 .20785 49.567 414.22)">
+<path fill="#dfdf1f" d="m527.82 393.14a123.43 123.43 0 0 1 -123.43 123.44 123.43 123.43 0 0 1 -123.44 -123.44 123.43 123.43 0 0 1 123.44 -123.43 123.43 123.43 0 0 1 123.43 123.43z" transform="matrix(.097805 -.017874 .016854 .092222 22.094 450.65)"/>
+<g transform="matrix(.22442 0 0 .22442 -7.5146 451.03)">
+<path fill="#00bf00" d="m527.82 393.14a123.43 123.43 0 0 1 -123.43 123.44 123.43 123.43 0 0 1 -123.44 -123.44 123.43 123.43 0 0 1 123.44 -123.43 123.43 123.43 0 0 1 123.43 123.43z" transform="matrix(.43582 -.079648 .075103 .41094 140.95 -12.415)"/>
+<path fill="#00d600" d="m509.34 405.88-152.09 27.81-31.84 143.87c17.672 2.6926 36.123 2.7338 54.844-0.6875 84.379-15.421 141.36-91.532 129.09-171z" transform="matrix(.34629 0 0 .34629 227.1 -36.051)"/>
+<path fill="#00e600" d="m358.56 281.16c-10.467-0.1047-21.125 0.79104-31.844 2.75-85.752 15.672-143.34 94.018-128.56 174.88 11.551 63.205 63.973 109.14 127.25 118.78l31.84-143.88 152.09-27.81c-0.1997-1.2933-0.26335-2.5801-0.5-3.875-12.93-70.75-77.01-120.11-150.28-120.84z" transform="matrix(.34629 0 0 .34629 227.1 -36.051)"/>
+<path fill="#090" d="m294.21 361.94-11.417 8.4406-21.06 15.749c-8.5971 18.275-7.3982 37.665-2.0165 58.264 13.962 53.441 53.709 79.564 109.79 73.192 28.709-3.2616 55.008-12.916 71.137-33.43l29.26-36.68-175.69-85.54z" transform="matrix(.34629 0 0 .34629 227.1 -36.051)"/>
+<path fill="#00bf00" d="m527.82 393.14a123.43 123.43 0 0 1 -123.43 123.44 123.43 123.43 0 0 1 -123.44 -123.44 123.43 123.43 0 0 1 123.44 -123.43 123.43 123.43 0 0 1 123.43 123.43z" transform="matrix(.34065 -.062255 .058702 .3212 200.08 -8.6127)"/>
+<path fill="#00e600" d="m527.82 393.14a123.43 123.43 0 0 1 -123.43 123.44 123.43 123.43 0 0 1 -123.44 -123.44 123.43 123.43 0 0 1 123.44 -123.43 123.43 123.43 0 0 1 123.43 123.43z" transform="matrix(.34065 -.062255 .058702 .3212 203.09 -11.37)"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/closed.svg b/freeplane/viewer-resources/images/icons/closed.svg
new file mode 100644
index 0000000..29e5207
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/closed.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.003" width="32.003" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.002787 32.002788" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="124.52" gradientUnits="userSpaceOnUse" y1="238.03" x2="219.96" x1="268.63">
+<stop stop-color="#fc2814" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-350.55 -34.322)">
+<g transform="translate(276.51,-395.1)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".58333" fill-rule="evenodd" transform="matrix(.29291 0 0 .29291 14.636 381.01)" stroke="#f00" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="53.775px" font-family="'Bitstream Vera Sans'" space="preserve" transform="scale(1.3532 .73898)" stroke="#ffffff" y="617.48926" x="56.836712" stroke-width=".81343px" fill="#ffffff">
+<tspan y="617.48926" x="56.836712" stroke-width=".81343">-</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/decrypted.svg b/freeplane/viewer-resources/images/icons/decrypted.svg
new file mode 100644
index 0000000..30ba161
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/decrypted.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg16036"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs16038">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8947"
+       id="radialGradient9248"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3719703,0.9382341,-0.5258482,0.7689426,99.160824,-331.71655)"
+       cx="453.1087"
+       cy="498.91754"
+       fx="453.1087"
+       fy="498.91754"
+       r="8.4835997" />
+    <linearGradient
+       id="linearGradient8947">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8949" />
+      <stop
+         style="stop-color:#7c7c7c;stop-opacity:1"
+         offset="1"
+         id="stop8952" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9213"
+       id="linearGradient9259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-74.950904,-42.904727)"
+       x1="517.95044"
+       y1="543.42651"
+       x2="501.47144"
+       y2="536.09662" />
+    <linearGradient
+       id="linearGradient9213">
+      <stop
+         id="stop9215"
+         offset="0"
+         style="stop-color:#8dd35f;stop-opacity:1" />
+      <stop
+         id="stop9217"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9219"
+       id="linearGradient9261"
+       gradientUnits="userSpaceOnUse"
+       x1="475.91141"
+       y1="506.23492"
+       x2="486.7431"
+       y2="514.45044" />
+    <linearGradient
+       id="linearGradient9219"
+       inkscape:collect="always">
+      <stop
+         id="stop9221"
+         offset="0"
+         style="stop-color:#5aa02c;stop-opacity:1" />
+      <stop
+         id="stop9223"
+         offset="1"
+         style="stop-color:#e3f4d7;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="7.9549505"
+     inkscape:cy="7.9549505"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1022"
+     inkscape:window-height="643"
+     inkscape:window-x="817"
+     inkscape:window-y="153"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata16041">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g9263"
+       inkscape:export-filename="E:\FreePlane_radna_mapa\images\decrypted.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="matrix(0.49999923,0,0,0.49999923,-226.42454,-236.80112)">
+      <path
+         style="fill:url(#radialGradient9248);fill-opacity:1;fill-rule:evenodd;stroke:#484848;stroke-width:0.99570692px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 459.5318,485.07984 -4.8985,0.0645 0.043,-5.50008 c 0.11486,-3.07139 3.5127,-5.57658 7.82042,-5.54305 4.47519,-7e-4 7.95115,2.84118 8.03527,5.50008 l 0,9.6681 -4.85554,0 0,-9.23841 c -0.07,-1.08344 -1.48778,-2.03779 -3.03159,-1.99837 -1.33677,-0.002 -3.07346,0.31689 -3.15599,2.08431 l 0.043,4.96295 z"
+         id="path8991"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0" />
+      <rect
+         transform="scale(-1,-1)"
+         ry="0.18512595"
+         rx="0.16552438"
+         y="-505.60297"
+         x="-484.84979"
+         height="32"
+         width="32"
+         id="rect9020"
+         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+      <g
+         transform="translate(38,0)"
+         id="g9250">
+        <rect
+           y="487.20111"
+           x="424.04709"
+           height="17.901905"
+           width="21.143982"
+           id="rect9253"
+           style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9259);fill-opacity:1;fill-rule:nonzero;stroke:#225500;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+        <path
+           id="path9255"
+           d="m 434.60343,491.63642 c -1.13379,0 -2.03125,0.89746 -2.03125,2.03125 0,0.87514 0.54097,1.64183 1.3125,1.9375 l -0.40625,1.375 -1.09375,3.6875 2.21875,0 2.25,0 -1.15625,-3.6875 -0.40625,-1.375 c 0.80119,-0.28016 1.37499,-1.0411 1.375,-1.9375 0,-1.13379 -0.9287,-2.03126 -2.0625,-2.03125 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2d5016;stroke-width:0.66838199;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <circle
+           r="6.7778111"
+           cy="510.1373"
+           cx="481.84073"
+           transform="translate(-47.221669,-13.985247)"
+           id="path9257"
+           style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient9261);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/desktop_new.svg b/freeplane/viewer-resources/images/icons/desktop_new.svg
new file mode 100644
index 0000000..d289529
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/desktop_new.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.007" width="27.413" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 27.412723 32.006564" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#0243aa" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<pattern id="k" xlink:href="#j" patternTransform="matrix(9.2354 4.1188e-7 0 9.5822 -68.59 -224.35)"/>
+<pattern id="j" xlink:href="#i" patternTransform="matrix(10.634 4.7426e-7 0 11.033 -16.626 -100.22)"/>
+<pattern id="i" xlink:href="#h" patternTransform="matrix(11.137 0 0 11.555 -52.389 -156.93)"/>
+<pattern id="h" xlink:href="#g" patternTransform="matrix(11.582 0 0 11.582 -51.591 -86.506)"/>
+<pattern id="g" xlink:href="#b" patternTransform="scale(10)"/>
+<pattern id="b" width="2" patternUnits="userSpaceOnUse" patternTransform="translate(0) scale(10)" height="1">
+<rect y="-.5" width="1" x="0" height="2"/>
+</pattern>
+<linearGradient id="c" y2="511.32" gradientUnits="userSpaceOnUse" y1="510.13" gradientTransform="matrix(.87498 0 0 .96055 -54.156 -177.48)" x2="374.66" x1="392.13">
+<stop stop-color="#0243aa" offset="0"/>
+<stop stop-color="#f2ffff" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="427.12" gradientUnits="userSpaceOnUse" y1="443.06" gradientTransform="matrix(.33702 .10413 -.028535 .22948 186.27 174.85)" x2="336.6" x1="342.08">
+<stop stop-color="#520" offset="0"/>
+<stop stop-color="#262200" offset="1"/>
+</linearGradient>
+<linearGradient id="e" y2="504.68" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="526.04" gradientTransform="matrix(.86848 0 0 .79258 -51.972 -91.789)" x2="417.16" x1="393.53"/>
+<linearGradient id="f" y2="498.78" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="536.66" gradientTransform="matrix(.86848 0 0 .78794 -51.972 -89.296)" x2="393.08" x1="379.62"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-73.988 -336.99)">
+<g transform="translate(-200.82,29.942)">
+<path d="m275.71 313.25 20.334-2.3148 5.7043 0.76276c-7.1811 0.91337-13.882 1.7718-21.708 2.6851l-4.3297-1.1331z" fill-rule="evenodd" stroke="#000" stroke-width=".91677px" fill="url(#c)"/>
+<path d="m284.54 312.74c1.5827 0.5447 0.93729 0.23119 2.0287 0.0692-0.35673-3.6991 2.589-4.9252 4.3578-3.3584 0.6155 1.1708 0.53005 1.9012 0.49193 2.5435 0.79889 0.28692 1.3076 0.27369 1.8599-0.0406-0.57094-3.7139-2.4808-4.367-2.8811-4.5462-2.5825-0.83536-5.6367 0.63122-5.8572 5.3324z" fill-rule="evenodd" stroke="#2b1100" stroke-width=".28339px" fill="url(#d)"/>
+<path d="m288.58 319.54 0.7361-0.11446" stroke="#333" stroke-width=".30177" fill="none"/>
+<path d="m292.38 319.06 0.83509-0.085" stroke="#333" stroke-width=".30177" fill="none"/>
+<path stroke-linejoin="round" d="m281.99 314.29 19.373-2.165-0.16938 19.941-19.159 6.0898" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="1.7145px" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m286.86 312.03 2.6345-0.40471 2.5347 1.0569 0.20726 8.4176-1.3935 2.1717-1.504-1.672-0.0217-8.5117-2.4573-1.0579z" stroke-opacity=".88953" fill-rule="evenodd" stroke="#2b1100" stroke-linecap="round" stroke-width=".40211" fill="#debf67"/>
+<path d="m345.83 481.02a0.686 0.77746 0 0 1 -0.686 0.77747 0.686 0.77746 0 0 1 -0.68599 -0.77747 0.686 0.77746 0 0 1 0.68599 -0.77746 0.686 0.77746 0 0 1 0.686 0.77746z" stroke-opacity=".88953" fill-rule="evenodd" transform="matrix(.59193 .11061 0 .51701 86.409 28.935)" stroke="#000" stroke-width=".5" fill="#e3dbdb"/>
+<path d="m345.83 481.02a0.686 0.77746 0 0 1 -0.686 0.77747 0.686 0.77746 0 0 1 -0.68599 -0.77747 0.686 0.77746 0 0 1 0.68599 -0.77746 0.686 0.77746 0 0 1 0.686 0.77746z" stroke-opacity=".88953" fill-rule="evenodd" transform="matrix(.68454 .12791 0 .56587 54.525 1.2724)" stroke="#000" stroke-width=".5" fill="#e3dbdb"/>
+<path d="m345.83 481.02a0.686 0.77746 0 0 1 -0.686 0.77747 0.686 0.77746 0 0 1 -0.68599 -0.77747 0.686 0.77746 0 0 1 0.68599 -0.77746 0.686 0.77746 0 0 1 0.686 0.77746z" stroke-opacity=".88953" fill-rule="evenodd" transform="matrix(.68454 .12791 0 .56587 54.594 2.996)" stroke="#000" stroke-width=".5" fill="#e3dbdb"/>
+<rect stroke-linejoin="round" transform="matrix(.99183 -.12753 -.012647 .99992 0 0)" stroke-opacity=".88953" fill-rule="evenodd" rx=".88353" ry=".66733" height="2.7601" width="4.5107" stroke="#000" stroke-linecap="square" y="355.74" x="295.45" stroke-width=".28290" fill="url(#k)"/>
+<path d="m290.79 319.35 0.0696 1.8016" stroke="#000" stroke-linecap="round" stroke-width=".60354" fill="none"/>
+<path stroke-linejoin="round" d="m275.83 313.58 5.9095 0.81606v23.793l-6.0167-0.91752 0.10718-23.691z" fill-rule="evenodd" stroke="#000" stroke-width="1.7234px" fill="url(#f)"/>
+<path stroke-linejoin="round" d="m277.42 313.59-1.9398-0.31071 0.0859 2.7339c1.288-0.72338 1.471-0.92643 1.8539-2.4232z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".98535px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m301.59 329.03-0.0118 3.242-2.2501 0.73102c0.48149-1.3226 0.84578-2.4462 2.2619-3.973z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".94131px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m282.16 335.56 0.0118 2.9477 2.3307-0.66713c-0.48148-1.1018-1.007-1.6367-2.3425-2.2806z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".94131px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m282.08 317.48 0.0118-3.0687 2.6532-0.39786c-0.48149 1.4492-1.249 2.7611-2.6651 3.4666z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".98535px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m301.68 315.39-0.0118-3.5525-2.4113 0.32784c0.48149 1.4492 0.84579 2.1966 2.4232 3.2246z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".98535px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m282.08 317.48 0.0118-3.0687 2.6532-0.39786c-0.48149 1.4492-1.249 2.7611-2.6651 3.4666z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".98535px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m279.34 314.09 2.0205 0.41499 0.0753 2.9758c-1.6911-1.6103-1.5516-1.2489-2.0958-3.3908z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".98535px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m284.66 313.93-2.8268 0.3107-2.0911-0.31487c0.70309 0.10841 1.8502-0.94013 4.9179 0.004z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".98535px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m275.29 334.38-0.0132 3.1726 2.2142 0.41137c-0.48148-1.3148-0.87972-2.1116-2.2009-3.584z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".93855px" fill="#debf67"/>
+<path stroke-linejoin="round" d="m281.41 335.55 0.0383 2.9304-2.5062-0.34473c0.48148-1.0954 1.1324-1.9457 2.4679-2.5857z" stroke-opacity=".86628" fill-rule="evenodd" stroke="#803300" stroke-width=".93855px" fill="#debf67"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/division.svg b/freeplane/viewer-resources/images/icons/division.svg
new file mode 100644
index 0000000..b605a3f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/division.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#04a" offset="0"/>
+<stop stop-color="#06f" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="79.658" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="79.658" gradientTransform="translate(255.9,671.6)" x2="122.65" x1="108.4"/>
+<linearGradient id="c" y2="79.658" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="79.658" x2="122.65" x1="108.4"/>
+<linearGradient id="d" y2="118.51" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="119.18" gradientTransform="translate(255.9,671.6)" x2="81.44" x1="74.059"/>
+<linearGradient id="e" y2="75.453" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="74.852" x2="117.25" x1="113.36"/>
+<linearGradient id="f" y2="75.153" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="75.153" x2="116.95" x1="113.51"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-138.12 -901.88)">
+<g transform="matrix(2,0,0,2,-837.9,-144.84)">
+<text style="word-spacing:0px;letter-spacing:0px" stroke-width=".25" font-family="Arial" space="preserve" transform="scale(1.4868 .67257)" stroke="#00112b" font-size="34.935px" y="799.10809" x="326.9342" font-weight="bold" line-height="125%" fill="url(#b)">
+<tspan y="799.10809" x="326.9342" stroke-width=".25" fill="url(#b)">-</tspan>
+</text>
+<path style="color:#000000" d="m116.64 74.967a1.3562 1.3562 0 0 1 -1.3562 1.3562 1.3562 1.3562 0 0 1 -1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 1.3562z" transform="translate(380.73,451.7)" stroke="#00112b" stroke-width=".25" fill="url(#c)"/>
+<path style="color:#000000" d="m116.64 74.967a1.3562 1.3562 0 0 1 -1.3562 1.3562 1.3562 1.3562 0 0 1 -1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 1.3562z" transform="translate(380.73,461.09)" stroke="#00112b" stroke-width=".25" fill="url(#c)"/>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Arial" space="preserve" transform="scale(1.4868 .67257)" font-size="34.935px" y="799.10809" x="326.9342" font-weight="bold" line-height="125%" fill="url(#d)">
+<tspan y="799.10809" x="326.9342" fill="url(#d)">-</tspan>
+</text>
+<path style="color:#000000" fill="url(#e)" d="m116.64 74.967a1.3562 1.3562 0 0 1 -1.3562 1.3562 1.3562 1.3562 0 0 1 -1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 1.3562z" transform="translate(380.73,451.7)"/>
+<path style="color:#000000" fill="url(#f)" d="m116.64 74.967a1.3562 1.3562 0 0 1 -1.3562 1.3562 1.3562 1.3562 0 0 1 -1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 -1.3562 1.3562 1.3562 0 0 1 1.3562 1.3562z" transform="translate(380.73,461.09)"/>
+<rect style="color:#000000" height="16" width="16" y="523.36" x="488.01" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="523.36" x="488.01" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="523.36" x="488.01" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/down.svg b/freeplane/viewer-resources/images/icons/down.svg
new file mode 100644
index 0000000..6f968a3
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/down.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0933mm" width="9.5446mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 33.819528 32.220455" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="377.6" gradientUnits="userSpaceOnUse" y1="388.92" gradientTransform="matrix(-.0014106 -1.3013 1.2399 -.001344 -195.37 826.14)" x2="142.38" x1="160.7">
+<stop stop-color="#0d56c0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-265.95 -613.39)">
+<path d="m282.89 644.77-15.397-15.075 9.126-0.0745-0.295-15.574 12.824-0.0139 0.1903 15.574 8.8842-0.01-15.332 15.173z" stroke-opacity=".72674" fill-rule="evenodd" stroke="#027" stroke-width="1.2702px" fill="url(#a)"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/edit.svg b/freeplane/viewer-resources/images/icons/edit.svg
new file mode 100644
index 0000000..5174017
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/edit.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.008" width="32.846" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.845603 32.00764" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="a" style="color-interpolation-filters:sRGB">
+<feGaussianBlur stdDeviation="0.31352257"/>
+</filter>
+<linearGradient id="b" y2="444.71" gradientUnits="userSpaceOnUse" y1="440.75" gradientTransform="matrix(.54041 -.23369 .18899 .60384 -62.914 223.14)" x2="213.38" x1="209.71">
+<stop stop-color="#fbde69" offset="0"/>
+<stop stop-color="#fc8209" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="449.6" gradientUnits="userSpaceOnUse" y1="456.24" gradientTransform="matrix(.54041 -.23369 .18899 .60384 -62.914 223.14)" x2="194.27" x1="202.53">
+<stop stop-color="#baa492" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="449.64" gradientUnits="userSpaceOnUse" y1="457.89" gradientTransform="matrix(.54041 -.23369 .18899 .60384 -62.914 223.14)" x2="193.04" x1="203.5">
+<stop offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="e" y2="462.65" gradientUnits="userSpaceOnUse" y1="458.87" gradientTransform="matrix(.54041 -.23369 .18899 .60384 -62.914 223.14)" x2="196.75" x1="193.01">
+<stop stop-color="#916f6f" offset="0"/>
+<stop stop-color="#241c1c" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-157.68 -337.18)">
+<g transform="translate(-2.7135 .19382)">
+<rect rx=".16552" ry=".18513" height="32" width="32" y="336.99" x="160.81" fill="none"/>
+<g transform="translate(38.599,-92.443)">
+<path d="m122.51 430.43h18.357v5.966l5.966-0.00001v24.323h-24.323v-30.289z" fill-rule="evenodd" stroke="#999" stroke-linecap="round" stroke-width="1.4305" fill="#fff"/>
+<path d="m48.67 491.52c-3.7862 4.2796-5.6944 6.1855-6.7985 7.3454 1.2231-0.16341 7.6133-0.60062 9.9772-1.1291 5.7048-2.7496 13.373-6.5464 19.078-9.296-1.3878-1.8892-3.2042-4.0574-5.6959-4.8311-5.5202 2.6369-11.04 5.2739-16.561 7.9108z" fill-rule="evenodd" transform="matrix(.83376 0 0 .99871 93.082 -40.377)" filter="url(#a)" fill="#e4e4e4"/>
+<path stroke-linejoin="bevel" d="m140.52 430.17 0.004 5.9526 6.5366-0.071-6.5405-5.8816z" stroke="#999" stroke-width="1.4868" fill="none"/>
+<path stroke-linejoin="round" d="m135.35 449.85 1.94-4.3015 7.031-15.59-1.6664-0.12013-6.3189 0.0708-7.7648 17.048" fill-rule="evenodd" stroke="#fc0" stroke-width=".62085" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m128.58 446.88-0.36763 6.4772 2.6445 1.3682 4.4569-4.8237c-0.18592-1.1546-0.23823-2.3102-1.8439-1.9165-0.43539-0.83048-0.54558-1.9385-2.2184-1.2679-1.147-1.7646-1.9421-0.38553-2.6714 0.1627z" fill-rule="evenodd" stroke="url(#d)" stroke-width=".62057px" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m128.22 453.4-0.20381 4.0053 2.8649-2.6935c-0.848-1.4431-1.5962-2.1704-2.6611-1.3117z" fill-rule="evenodd" stroke="url(#e)" stroke-width=".62057px" fill="#715656"/>
+<path stroke-linejoin="round" d="m144.19 430.27-8.4128 18.593" fill-rule="evenodd" stroke="#c4734f" stroke-linecap="round" stroke-width=".62344" fill="#d9895b"/>
+<path d="m131.29 446.75-1.9197 6.0763" stroke="#000" stroke-width=".060868" fill="none"/>
+<path d="m133.53 448.1c-0.13785 0.14097-3.4132 5.2581-3.4132 5.2581" stroke="#000" stroke-width=".060868" fill="none"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/encrypted.svg b/freeplane/viewer-resources/images/icons/encrypted.svg
new file mode 100644
index 0000000..6ca99b8
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/encrypted.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg16036"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs16038">
+    <linearGradient
+       id="linearGradient8947">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8949" />
+      <stop
+         style="stop-color:#7c7c7c;stop-opacity:1"
+         offset="1"
+         id="stop8952" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9213">
+      <stop
+         id="stop9215"
+         offset="0"
+         style="stop-color:#8dd35f;stop-opacity:1" />
+      <stop
+         id="stop9217"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8947"
+       id="radialGradient9557"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3778857,0.9422794,-0.5281155,0.772258,69.63033,-333.22553)"
+       cx="453.1087"
+       cy="498.91754"
+       fx="453.1087"
+       fy="498.91754"
+       r="8.4835997" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9213"
+       id="linearGradient9559"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-74.950904,-42.904727)"
+       x1="517.95044"
+       y1="543.42651"
+       x2="501.47144"
+       y2="536.09662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9219"
+       id="linearGradient9561"
+       gradientUnits="userSpaceOnUse"
+       x1="475.91141"
+       y1="506.23492"
+       x2="486.7431"
+       y2="514.45044" />
+    <linearGradient
+       id="linearGradient9219"
+       inkscape:collect="always">
+      <stop
+         id="stop9221"
+         offset="0"
+         style="stop-color:#5aa02c;stop-opacity:1" />
+      <stop
+         id="stop9223"
+         offset="1"
+         style="stop-color:#e3f4d7;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="7.9549505"
+     inkscape:cy="7.9549505"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1022"
+     inkscape:window-height="643"
+     inkscape:window-x="817"
+     inkscape:window-y="153"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata16041">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g9540"
+       transform="translate(184.44208,-856.19903)">
+      <g
+         transform="matrix(0.5,0,0,0.5,-393.75162,619.39752)"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="E:\FreePlane_radna_mapa\images\encrypted.png"
+         id="g9355">
+        <path
+           style="fill:url(#radialGradient9557);fill-opacity:1;fill-rule:evenodd;stroke:#484848;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 431.55509,487.09257 -4.91963,0.0647 0.0431,-5.52379 c 0.11536,-3.08463 3.52785,-5.60063 7.85414,-5.56695 4.49448,-7e-4 7.98543,2.85343 8.06991,5.52379 l 0,5.56695 -4.87647,0 0,-5.1354 c -0.0703,-1.08812 -1.4942,-2.04658 -3.04466,-2.00699 -1.34254,-0.002 -3.08671,0.31826 -3.1696,2.0933 l 0.0432,4.98435 z"
+           id="path8937"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g9225">
+          <rect
+             y="487.20111"
+             x="424.04709"
+             height="17.901905"
+             width="21.143982"
+             id="rect8115"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9559);fill-opacity:1;fill-rule:nonzero;stroke:#225500;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <path
+             id="path8912"
+             d="m 434.60343,491.63642 c -1.13379,0 -2.03125,0.89746 -2.03125,2.03125 0,0.87514 0.54097,1.64183 1.3125,1.9375 l -0.40625,1.375 -1.09375,3.6875 2.21875,0 2.25,0 -1.15625,-3.6875 -0.40625,-1.375 c 0.80119,-0.28016 1.37499,-1.0411 1.375,-1.9375 0,-1.13379 -0.9287,-2.03126 -2.0625,-2.03125 z"
+             style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2d5016;stroke-width:0.66838199;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:connector-curvature="0" />
+          <circle
+             r="6.7778111"
+             cy="510.1373"
+             cx="481.84073"
+             transform="translate(-47.221669,-13.985247)"
+             id="path8919"
+             style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient9561);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+        </g>
+        <rect
+           style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           id="rect9066"
+           width="32"
+           height="32"
+           x="-450.61908"
+           y="-505.60303"
+           rx="0.16552438"
+           ry="0.18512595"
+           transform="scale(-1,-1)" />
+      </g>
+      <rect
+         y="856.19904"
+         x="-184.44208"
+         height="16"
+         width="16"
+         id="rect6193-0-23-7-8-2-38-5"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.85016513;marker:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/executable.svg b/freeplane/viewer-resources/images/icons/executable.svg
new file mode 100644
index 0000000..962d976
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/executable.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0598mm" width="9.0311mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.0001 32.10182" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="39.685" gradientUnits="userSpaceOnUse" y1="12.285" gradientTransform="matrix(.86831 0 0 .86831 516.57 525.9)" x2="34.534" x1="14.463">
+<stop stop-color="#8da6d8" offset="0"/>
+<stop stop-color="#b4c5e5" offset=".25"/>
+<stop stop-color="#d8e1f2" offset=".5"/>
+<stop stop-color="#92aada" offset=".75"/>
+<stop stop-color="#8ea7d8" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-521.14 -530.6)">
+<path style="color:#000000" d="m536.34 531.27c-0.3254 0.0241-0.64172 0.0725-0.96134 0.10938h-0.0241l-0.76471 4.1731c-1.2464 0.28385-2.419 0.76557-3.474 1.4202l-3.4302-2.4689c-0.92726 0.71989-1.7711 1.5595-2.5126 2.4689l2.3815 3.474c-0.72307 1.105-1.2669 2.3668-1.5731 3.6924-0.00004 0.008-0.00004 0.0213 0 0.0241l-4.1512 0.65545c-0.0761 0.61988-0.10938 1.2606-0.10938 1.9008 0 0.52389 0.014 1.0408 0.0656 1.5513l4.1512 0.74286c0.29525 1.4416 0.85611 2.7879 1.6387 3.9764l-2.4689 3.3866c0.7070 [...]
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/family.svg b/freeplane/viewer-resources/images/icons/family.svg
new file mode 100644
index 0000000..cb5022a
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/family.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.35" width="31.35" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.349999 31.35" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="e">
+<stop stop-color="#fae2b9" offset="0"/>
+<stop stop-color="#e9b45c" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="596.5" xlink:href="#e" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851"/>
+<linearGradient id="d" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fcc362" offset="0"/>
+<stop stop-color="#cb923a" offset="1"/>
+</linearGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="613.34" cx="131.66" gradientTransform="matrix(1.1987 .55359 -.33581 .72715 179.8 95.034)" r="9.493">
+<stop stop-color="#7ff44c" offset="0"/>
+<stop stop-color="#35981b" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 621.01 623.86)" r="9.2659">
+<stop stop-color="#636363" offset="0"/>
+<stop stop-color="#0e0d0c" offset="1"/>
+</radialGradient>
+<radialGradient id="h" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .58408 -.39157 .88132 285.97 22.248)" r="9.493">
+<stop stop-color="#fae" offset="0"/>
+<stop stop-color="#a08" offset="1"/>
+</radialGradient>
+<radialGradient id="i" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(1.0844 .8423 -.47902 .64241 159.52 28.537)" r="9.8135">
+<stop stop-color="#fb6239" offset="0"/>
+<stop stop-color="#850a0a" offset="1"/>
+</radialGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(-.51606 .23852 .15989 .35991 99.857 339.99)" r="9.493">
+<stop stop-color="#ffd5e5" offset="0"/>
+<stop stop-color="#ff2a7f" offset="1"/>
+</radialGradient>
+<radialGradient id="g" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(-.43344 .3557 .20254 .25701 145.54 343.09)" r="9.8135">
+<stop stop-color="#fcf87a" offset="0"/>
+<stop stop-color="#f3b60a" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-32.66 -658.67)">
+<g transform="translate(-147.7,156.41)">
+<rect rx=".134" ry=".13557" height="31.35" width="31.35" y="502.26" x="180.36" fill="none"/>
+<g transform="translate(.44108 -.94565)">
+<g transform="matrix(-.76144 0 0 .78758 205.64 97.484)">
+<g transform="matrix(1,0,0,1.0597,-113.08,-113.24)">
+<path fill-rule="evenodd" fill="#fff" d="m139.18 617.54-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path d="m139.23 617.64c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8954 1.1506-3.364 2.304-3.854 4.7608l0.0756 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.0861-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16577 2.5852-0.72557 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#196616" stroke-width="1px" fill="url(#b)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,102.35,-23.922)" stroke="#62340a" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m144.58 603.22-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56495 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.0285-2.7803 0.29214-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="1.0298px" fill="url(#c)"/>
+</g>
+<path d="m26.203 540.85c-0.119 1.985-0.21962 3.9701 0.21018 5.9551" fill-rule="evenodd" stroke="#196616" stroke-width="1px"/>
+</g>
+<g transform="matrix(-.76144 0 0 .77839 293.03 72.476)">
+<path fill-rule="evenodd" fill="#fff" d="m121.23 585.56-7.7588-8.1727c7.7008-0.67808 7.1398-0.18209 10.684-0.38917l-1.6535 1.2972c0.55908 2.5127 0.0333 4.9248-1.2719 7.2646z"/>
+<path stroke-linejoin="round" d="m121.27 585.66c-0.88882-2.7912-3.034-5.315-7.8591-8.3238-1.8955 1.1735-2.9064 3.6335-3.1674 5.2056l-0.61097 6.4322c2.732 2.1925 6.5631 2.405 9.8994 2.4663 5.0237-0.63126 6.362-2.1889 7.9347-3.6995-0.0855-1.6733-0.22163-3.3217-0.9111-6.4719-0.46374-1.595-1.4944-3.756-2.3383-4.3182-1.2035 0.86301-1.2922 0.83322-1.6625 1.3102-1.1956 2.7533-1.2977 4.9556-1.2847 7.3989z" fill-rule="evenodd" stroke="#504" stroke-linecap="round" stroke-width="1.0099px" fill="url [...]
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0826,84.396,-68.665)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m114.68 569.58c3.4231 1.1432 7.004 0.48751 10.569-0.42157l-0.0958 5.5502 1.4676 0.70626c0.62271-2.7299 0.9258-4.2553 0.63702-8.0089-1.1124-3.8571-3.953-7.028-9.136-6.9454-6.1727 0.0412-8.7306 4.9451-9.2728 7.0708-0.38606 1.592 0.20015 5.4901 0.50507 7.9529 0.25464 0.51861-0.7079 0.7698 3.1606 2.0825 1.7926-0.0594 1.7798-1.5036 2.0541-2.7276l0.11077-5.259z" fill-rule="evenodd" stroke="#79170a" stroke-linecap="round" stroke-width="1.0099px" fill="url(#i)"/>
+<path d="m121.29 585.4c0 0.49042 0.84072 5.6749 0.84072 5.6749" fill-rule="evenodd" stroke="#504" stroke-width="1px"/>
+</g>
+<g transform="matrix(1.2918,0,0,1.2918,-25.141,-205.73)">
+<path fill-rule="evenodd" fill="#fff" d="m167.12 570.03 3.1682-3.3375c-3.1444-0.27691-2.9154-0.0744-4.3627-0.15892l0.67518 0.52976c-0.22828 1.0261-0.0136 2.0111 0.51936 2.9666z"/>
+<path stroke-linejoin="round" d="m167.11 570.07c0.36293-1.1398 1.2389-2.1705 3.2091-3.3992 0.77396 0.47924 1.1867 1.4838 1.2934 2.1258l0.24947 2.6268c-1.1156 0.89536-2.6799 0.98212-4.0422 1.0072-2.0513-0.25779-2.5978-0.89389-3.2399-1.5108 0.0349-0.68333 0.0905-1.3565 0.37202-2.6429 0.18936-0.65133 0.61021-1.5338 0.95481-1.7634 0.49142 0.35244 0.52764 0.34027 0.67884 0.53506 0.48819 1.1244 0.52988 2.0237 0.52456 3.0215z" fill-rule="evenodd" stroke="#f06" stroke-linecap="round" stroke-widt [...]
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(-.44561 0 0 .44209 182.16 302.86)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m169.94 563.39c-1.5649 1.0382-3.2019 0.81116-4.5132 0.0225-0.39698 0.96786-0.1213 1.9449 0.12854 2.6959l-0.54076 1.3186c-0.28397-1.1076-0.71564-3.2935-0.42689-4.708 0.41197-1.5867 1.5368-2.9122 3.6533-2.9351 2.52-0.0506 3.5871 2.0443 3.7776 3.0664 0.18686 1.1511 0.0742 2.4475-0.0348 2.9709-0.29433 1.3308-0.19593 1.8301-1.3135 2.1373-0.73237-0.005-0.47711-0.97046-0.45777-2.217 0.0299-0.80388-0.0845-1.5838-0.27265-2.3514z" fill-rule="evenodd" stroke="#78442 [...]
+<path d="m167.15 570-0.25746 2.26" fill-rule="evenodd" stroke="#f06" stroke-width=".40833px"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/fema.svg b/freeplane/viewer-resources/images/icons/fema.svg
new file mode 100644
index 0000000..8e902a6
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/fema.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.689" width="31.35" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.349999 31.688899" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 316.91 -19.177)" r="9.493">
+<stop stop-color="#faa" offset="0"/>
+<stop stop-color="#f00" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fae2b9" offset="0"/>
+<stop stop-color="#e9b45c" offset="1"/>
+</linearGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(.98375 .93925 -.54764 .57359 250.7 -5.1697)" r="9.8135">
+<stop stop-color="#fcf87a" offset="0"/>
+<stop stop-color="#f3b60a" offset="1"/>
+</radialGradient>
+<linearGradient id="c" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fcc362" offset="0"/>
+<stop stop-color="#cb923a" offset="1"/>
+</linearGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="613.34" cx="131.66" gradientTransform="matrix(-.91276 .4433 .2557 .58228 14.509 138.23)" r="9.493">
+<stop stop-color="#25c7f0" offset="0"/>
+<stop stop-color="#0004d4" offset="1"/>
+</radialGradient>
+<radialGradient id="e" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(.16504 .95247 .62203 -.11154 -321.44 561.7)" r="9.2659">
+<stop stop-color="#636363" offset="0"/>
+<stop stop-color="#0e0d0c" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-299.36 -658.33)">
+<g transform="translate(99.673,183.55)">
+<g transform="translate(161.1,-62.715)">
+<path fill-rule="evenodd" fill="#ffce2c" d="m45.44 556.64 5.9079-6.4168c-5.8637-0.53239-5.4365-0.14297-8.1355-0.30556l1.2591 1.0185c-0.4257 1.9728-0.02539 3.8667 0.96851 5.7038z"/>
+<path d="m45.406 556.72c0.93816-1.6876 2.6152-4.2188 5.9842-6.5354 1.4433 0.9214 2.5615 1.8449 2.9346 3.8123l-0.05754 5.3251c-2.0803 1.7214-4.9974 1.8882-7.5379 1.9364-3.8253-0.49564-4.8443-1.7186-6.0418-2.9046-0.06557-1.6803-0.17975-2.7913 0.34524-5.2646 0.35311-1.2523 1.4864-2.7658 2.129-3.2072 0.9164 0.6776 0.98395 0.65421 1.2659 1.0287 0.12622 2.0701 0.55248 4.2116 0.97819 5.8092z" fill-rule="evenodd" stroke="#000080" stroke-width=".78086px" fill="url(#d)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(-.83097 0 0 .84997 73.483 42.978)" stroke="#62340a" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m41.333 545.18 1.1563-2.0841 1.3144 1.669c2.9225 0.87728 4.9748 0.72172 7.1151 0.67053l0.96395-1.1032c0.43018 1.9832-0.72368 4.1744 1.0769 4.5554 1.139-1.2467 1.3554-2.6312 1.5901-4.2296-0.02172-2.2264-0.22245-3.1237-1.5825-4.7999-1.1557-1.0636-2.3638-1.7395-4.8197-1.9612-3.9893-0.10828-6.946 2.4798-6.8144 7.283z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".80411px" fill="url(#e)"/>
+<path d="m45.367 556.39c0.09061 1.5 0.16723 2.9999-0.16004 4.4999" fill-rule="evenodd" stroke="#000080" stroke-width=".75853px"/>
+</g>
+<g transform="matrix(.75895 0 0 .75895 137.62 91.394)">
+<g transform="matrix(-1,0,0,1.02,260.21,-3.3037)">
+<path fill-rule="evenodd" fill="#fff" d="m152.17 533.15-7.7589-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path stroke-linejoin="round" d="m152.22 533.25c-0.88882-2.7368-3.034-5.2113-7.8591-8.1614-1.8955 1.1506-2.9063 3.5626-3.1674 5.1041l-0.61097 6.3068c2.732 2.1497 6.5631 2.358 9.8994 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273-0.0855-1.6406-0.22162-3.2569-0.9111-6.3456-0.46374-1.5638-1.4944-3.6827-2.3383-4.234-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-1.1956 2.6996-1.2977 4.8589-1.2847 7.2546z" fill-rule="evenodd" stroke="#a00" stroke-linecap="round" stroke-width="1px" fill="url(#f)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,115.34,-108.32)" stroke="#62340a" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m145.37 516.88c3.6029 2.8024 7.6446 2.5929 11.008 0.97331 0.76758 2.3963 0.10114 4.3418-0.6646 6.0874l1.1826 1.6864c0.92314-2.5919 2.0843-5.8192 1.6737-9.2618-0.67553-3.8798-3.1449-7.28-8.3049-7.766-6.1388-0.63449-9.1782 4.1598-9.8554 6.5661-0.69519 2.7157-0.68967 5.84-0.53245 7.1144 0.44166 3.2436 0.0978 4.4181 2.7609 5.3808 1.7881 0.13806 1.3659-2.2245 1.5778-5.2106 0.0942-1.9292 0.53545-3.7717 1.154-5.5699z" fill-rule="evenodd" stroke="#784421" stroke- [...]
+</g>
+<path d="m108.1 540.43-0.63054 5.5348" fill-rule="evenodd" stroke="#a00" stroke-width="1px"/>
+</g>
+<rect rx=".134" ry=".13557" height="31.35" width="31.35" y="474.94" x="199.69" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/female1.svg b/freeplane/viewer-resources/images/icons/female1.svg
new file mode 100644
index 0000000..f5f8bb9
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/female1.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="31.35" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.349999 32.001788" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fae2b9" offset="0"/>
+<stop stop-color="#e9b45c" offset="1"/>
+</linearGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 338.32 -22.046)" r="9.493">
+<stop stop-color="#fae" offset="0"/>
+<stop stop-color="#a08" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(.98375 .93925 -.54764 .57359 272.1 -8.0385)" r="9.8135">
+<stop stop-color="#fb6239" offset="0"/>
+<stop stop-color="#850a0a" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-72.273 -658.02)">
+<g transform="translate(1.0195,143.8)">
+<g transform="matrix(1,0,0,1.0199,-83.686,-1.0015)">
+<path fill-rule="evenodd" fill="#fff" d="m173.58 530.28-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55908 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path stroke-linejoin="round" d="m173.62 530.38c-0.88882-2.7368-3.034-5.2113-7.8591-8.1614-1.8955 1.1506-2.9064 3.5626-3.1674 5.1041l-0.61097 6.3068c2.732 2.1497 6.5631 2.358 9.8994 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273-0.0855-1.6406-0.22163-3.2569-0.9111-6.3456-0.46374-1.5638-1.4944-3.6827-2.3383-4.234-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-1.1956 2.6996-1.2977 4.8589-1.2847 7.2546z" fill-rule="evenodd" stroke="#504" stroke-linecap="round" stroke-width="1px" fill="url(#b)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,136.75,-111.18)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m167.24 514.24c3.2743 1.488 6.906 1.2406 10.551 0.74446l-0.71387 5.3975 1.3798 0.84857c0.92314-2.5919 1.3944-4.0451 1.5258-7.7341-0.67554-3.8798-3.1449-7.28-8.3049-7.766-6.1388-0.63449-9.2274 3.8642-10.003 5.8762-0.56112 1.509-0.41309 5.3713-0.38461 7.8043 0.19524 0.53316-0.7893 0.6727 2.9088 2.3746 1.7881 0.13806 1.9363-1.2706 2.3453-2.4332l0.69631-5.1122z" fill-rule="evenodd" stroke="#79170a" stroke-linecap="round" stroke-width="1px" fill="url(#c)"/>
+</g>
+<path d="m89.957 539.66c0 0.49042 0.84072 5.6749 0.84072 5.6749" fill-rule="evenodd" stroke="#504" stroke-width="1px"/>
+<rect rx=".134" ry=".13557" height="31.35" width="31.35" y="514.54" x="71.254" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/female2.svg b/freeplane/viewer-resources/images/icons/female2.svg
new file mode 100644
index 0000000..2447604
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/female2.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="31.35" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.349999 32.002456" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 316.91 -19.177)" r="9.493">
+<stop stop-color="#faa" offset="0"/>
+<stop stop-color="#f00" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fae2b9" offset="0"/>
+<stop stop-color="#e9b45c" offset="1"/>
+</linearGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(.98375 .93925 -.54764 .57359 250.7 -5.1697)" r="9.8135">
+<stop stop-color="#fcf87a" offset="0"/>
+<stop stop-color="#f3b60a" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-103.95 -658.02)">
+<g transform="translate(-26.107,187.68)">
+<g transform="translate(34.75,-44.558)">
+<g transform="matrix(-1,0,0,1.02,260.21,-3.3037)">
+<path fill-rule="evenodd" fill="#fff" d="m152.17 533.15-7.7589-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path stroke-linejoin="round" d="m152.22 533.25c-0.88882-2.7368-3.034-5.2113-7.8591-8.1614-1.8955 1.1506-2.9063 3.5626-3.1674 5.1041l-0.61097 6.3068c2.732 2.1497 6.5631 2.358 9.8994 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273-0.0855-1.6406-0.22162-3.2569-0.9111-6.3456-0.46374-1.5638-1.4944-3.6827-2.3383-4.234-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-1.1956 2.6996-1.2977 4.8589-1.2847 7.2546z" fill-rule="evenodd" stroke="#a00" stroke-linecap="round" stroke-width="1px" fill="url(#c)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,115.34,-108.32)" stroke="#62340a" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m145.37 516.88c3.6029 2.8024 7.6446 2.5929 11.008 0.97331 0.76758 2.3963 0.10114 4.3418-0.6646 6.0874l1.1826 1.6864c0.92314-2.5919 2.0843-5.8192 1.6737-9.2618-0.67553-3.8798-3.1449-7.28-8.3049-7.766-6.1388-0.63449-9.1782 4.1598-9.8554 6.5661-0.69519 2.7157-0.68967 5.84-0.53245 7.1144 0.44166 3.2436 0.0978 4.4181 2.7609 5.3808 1.7881 0.13806 1.3659-2.2245 1.5778-5.2106 0.0942-1.9292 0.53545-3.7717 1.154-5.5699z" fill-rule="evenodd" stroke="#784421" stroke- [...]
+</g>
+<path d="m108.1 540.43-0.63054 5.5348" fill-rule="evenodd" stroke="#a00" stroke-width="1px"/>
+</g>
+<rect rx=".134" ry=".13557" height="31.35" width="31.35" y="470.67" x="130.06" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/females.svg b/freeplane/viewer-resources/images/icons/females.svg
new file mode 100644
index 0000000..dc5a18e
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/females.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.014" width="31.996" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.996123 32.014396" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c">
+<stop stop-color="#fae2b9" offset="0"/>
+<stop stop-color="#e9b45c" offset="1"/>
+</linearGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 316.91 -19.177)" r="9.493">
+<stop stop-color="#faa" offset="0"/>
+<stop stop-color="#f00" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="596.5" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851"/>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(.98375 .93925 -.54764 .57359 250.7 -5.1697)" r="9.8135">
+<stop stop-color="#fcf87a" offset="0"/>
+<stop stop-color="#f3b60a" offset="1"/>
+</radialGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 338.32 -22.046)" r="9.493">
+<stop stop-color="#fae" offset="0"/>
+<stop stop-color="#a08" offset="1"/>
+</radialGradient>
+<radialGradient id="e" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(.98375 .93925 -.54764 .57359 272.1 -8.0385)" r="9.8135">
+<stop stop-color="#fb6239" offset="0"/>
+<stop stop-color="#850a0a" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-138.2 -658)">
+<g transform="matrix(.79696 0 0 .79696 52.195 129.81)">
+<g transform="matrix(-1,0,0,1,204.71,148.54)">
+<g transform="matrix(1,0,0,1.0199,-83.686,-1.0015)">
+<path fill-rule="evenodd" fill="#fff" d="m173.58 530.28-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55908 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path stroke-linejoin="round" d="m173.62 530.38c-0.88882-2.7368-3.034-5.2113-7.8591-8.1614-1.8955 1.1506-2.9064 3.5626-3.1674 5.1041l-0.61097 6.3068c2.732 2.1497 6.5631 2.358 9.8994 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273-0.0855-1.6406-0.22163-3.2569-0.9111-6.3456-0.46374-1.5638-1.4944-3.6827-2.3383-4.234-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-1.1956 2.6996-1.2977 4.8589-1.2847 7.2546z" fill-rule="evenodd" stroke="#504" stroke-linecap="round" stroke-width="1px" fill="url(#d)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,136.75,-111.18)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m167.24 514.24c3.2743 1.488 6.906 1.2406 10.551 0.74446l-0.71387 5.3975 1.3798 0.84857c0.92314-2.5919 1.3944-4.0451 1.5258-7.7341-0.67554-3.8798-3.1449-7.28-8.3049-7.766-6.1388-0.63449-9.2274 3.8642-10.003 5.8762-0.56112 1.509-0.41309 5.3713-0.38461 7.8043 0.19524 0.53316-0.7893 0.6727 2.9088 2.3746 1.7881 0.13806 1.9363-1.2706 2.3453-2.4332l0.69631-5.1122z" fill-rule="evenodd" stroke="#79170a" stroke-linecap="round" stroke-width="1px" fill="url(#e)"/>
+</g>
+<path d="m89.957 539.66c0 0.49042 0.84072 5.6749 0.84072 5.6749" fill-rule="evenodd" stroke="#504" stroke-width="1px"/>
+</g>
+<g transform="translate(27.138,156.03)">
+<g transform="matrix(-1,0,0,1.02,260.21,-3.3037)">
+<path fill-rule="evenodd" fill="#fff" d="m152.17 533.15-7.7589-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path stroke-linejoin="round" d="m152.22 533.25c-0.88882-2.7368-3.034-5.2113-7.8591-8.1614-1.8955 1.1506-2.9063 3.5626-3.1674 5.1041l-0.61097 6.3068c2.732 2.1497 6.5631 2.358 9.8994 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273-0.0855-1.6406-0.22162-3.2569-0.9111-6.3456-0.46374-1.5638-1.4944-3.6827-2.3383-4.234-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-1.1956 2.6996-1.2977 4.8589-1.2847 7.2546z" fill-rule="evenodd" stroke="#a00" stroke-linecap="round" stroke-width="1px" fill="url(#f)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,115.34,-108.32)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m145.37 516.88c3.6029 2.8024 7.6446 2.5929 11.008 0.97331 0.76758 2.3963 0.10114 4.3418-0.6646 6.0874l1.1826 1.6864c0.92314-2.5919 2.0843-5.8192 1.6737-9.2618-0.67553-3.8798-3.1449-7.28-8.3049-7.766-6.1388-0.63449-9.1782 4.1598-9.8554 6.5661-0.69519 2.7157-0.68967 5.84-0.53245 7.1144 0.44166 3.2436 0.0978 4.4181 2.7609 5.3808 1.7881 0.13806 1.3659-2.2245 1.5778-5.2106 0.0942-1.9292 0.53545-3.7717 1.154-5.5699z" fill-rule="evenodd" stroke="#784421" stroke- [...]
+</g>
+<path d="m108.1 540.43-0.63054 5.5348" fill-rule="evenodd" stroke="#a00" stroke-width="1px"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag-black.svg b/freeplane/viewer-resources/images/icons/flag-black.svg
new file mode 100644
index 0000000..96ebce8
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag-black.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.034" width="32.03" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029921 32.034438" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.2989,-1.6129,1.9019,1.5317,-1112.5,284.58)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -83.17 -115.21)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -83.17 -115.21)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -9.0262 -142.51)" x2="10.713" x1="5.5534"/>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 1.1215 -140.55)" x2="10.713" x1="5.5534"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-172.38 -528.98)">
+<g transform="translate(-73.591,144.11)">
+<path d="m249.85 407.14-3.3109-5.7503c0.46008-10.872 11.715-3.1293 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#b)"/>
+<path d="m249.58 406.87c0.90135-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.1242"/>
+<path d="m260.66 386.46 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="474.89" x="-1.14" fill="url(#d)"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="476.85" x="9.0077" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m351.47 530.6a1.1493 1.1992 0 0 1 -1.149 1.1992 1.1493 1.1992 0 0 1 -1.1495 -1.1986 1.1493 1.1992 0 0 1 1.1484 -1.1998 1.1493 1.1992 0 0 1 1.1501 1.1981" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(1.5355,0,0,1.4794,-277.23,-398.25)" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".1" fill="url(#f)"/>
+<path d="m246.52 401.57 6.7254 11.922" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag-blue.svg b/freeplane/viewer-resources/images/icons/flag-blue.svg
new file mode 100644
index 0000000..927577a
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag-blue.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.034" width="32.03" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029921 32.034438" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -193.67 -114)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -193.67 -114)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -103.55 -207.14)" x2="10.713" x1="5.5534"/>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.2989,-1.6129,1.9019,1.5317,-1112.5,284.58)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -93.404 -205.18)" x2="10.713" x1="5.5534"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-27.331 -528.99)">
+<g transform="translate(-108.14,142.9)">
+<path d="m139.35 408.36-3.3109-5.7503c0.46008-10.872 11.715-3.1293 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#b)"/>
+<path d="m139.08 408.09c0.90135-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.1242" fill="#0000c0"/>
+<path d="m150.16 387.68 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="410.26" x="-95.665" fill="url(#d)"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="412.23" x="-85.518" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m351.47 530.6a1.1493 1.1992 0 0 1 -1.149 1.1992 1.1493 1.1992 0 0 1 -1.1495 -1.1986 1.1493 1.1992 0 0 1 1.1484 -1.1998 1.1493 1.1992 0 0 1 1.1501 1.1981" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(1.5355,0,0,1.4794,-387.73,-397.03)" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".1" fill="url(#f)"/>
+<path d="m136.02 402.78 6.7254 11.922" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag-green.svg b/freeplane/viewer-resources/images/icons/flag-green.svg
new file mode 100644
index 0000000..f958131
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag-green.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.034" width="32.03" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029921 32.034438" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="g" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.2989,-1.6129,1.9019,1.5317,-1112.5,284.58)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -107.15 -116.43)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -107.15 -116.43)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -28.754 -157.73)" x2="10.713" x1="5.5534"/>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -18.607 -155.77)" x2="10.713" x1="5.5534"/>
+<linearGradient id="f" y2="649.55" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -18.607 -155.77)" x2="10.713" x1="5.5534">
+<stop stop-color="#500" offset="0"/>
+<stop stop-color="#500" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-136.12 -528.99)">
+<g transform="translate(-85.87,145.33)">
+<path d="m225.87 405.93-3.3109-5.7503c0.46008-10.872 11.715-3.1293 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#b)"/>
+<path d="m225.6 405.66c0.90135-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.1242" fill="#00c000"/>
+<path d="m236.68 385.25 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="459.67" x="-20.868" fill="url(#d)"/>
+<rect stroke-linejoin="round" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" stroke="url(#f)" stroke-linecap="round" y="461.63" x="-10.72" stroke-width=".050039" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m351.47 530.6a1.1493 1.1992 0 0 1 -1.149 1.1992 1.1493 1.1992 0 0 1 -1.1495 -1.1986 1.1493 1.1992 0 0 1 1.1484 -1.1998 1.1493 1.1992 0 0 1 1.1501 1.1981" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(1.5355,0,0,1.4794,-301.21,-399.46)" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".1" fill="url(#g)"/>
+<path d="m222.54 400.35 6.7254 11.922" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag-orange.svg b/freeplane/viewer-resources/images/icons/flag-orange.svg
new file mode 100644
index 0000000..cc55153
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag-orange.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.034" width="32.03" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029921 32.034438" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.2989,-1.6129,1.9019,1.5317,-1112.5,284.58)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -143 -75.142)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -143 -75.142)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(1.01,-2.425e-8,-1.1619e-8,1.0044,-76.86,-177.88)" x2="10.713" x1="5.5534"/>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -71.054 -143.69)" x2="10.713" x1="5.5534"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-208.64 -528.99)">
+<g transform="translate(22.504,104.04)">
+<path d="m190.02 447.22-3.3109-5.7503c0.46008-10.872 11.715-3.1294 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#b)"/>
+<path d="m189.75 446.95c0.90135-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.1242" fill="#f76200"/>
+<path d="m200.83 426.54 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.79961 -.60053 .5228 .85245 0 0)" height="6.7049" width="3.49" y="471.26" x="-68.635" fill="url(#d)"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="473.71" x="-63.168" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m351.47 530.6a1.1493 1.1992 0 0 1 -1.149 1.1992 1.1493 1.1992 0 0 1 -1.1495 -1.1986 1.1493 1.1992 0 0 1 1.1484 -1.1998 1.1493 1.1992 0 0 1 1.1501 1.1981" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(1.5355,0,0,1.4794,-337.06,-358.17)" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".1" fill="url(#f)"/>
+<path d="m186.69 441.64 6.7254 11.922" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag-pink.svg b/freeplane/viewer-resources/images/icons/flag-pink.svg
new file mode 100644
index 0000000..7152a9d
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag-pink.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.034" width="32.03" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029921 32.034438" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.2989,-1.6129,1.9019,1.5317,-1112.5,284.58)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -132.35 -112.79)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -132.35 -112.79)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -52.101 -169.75)" x2="10.713" x1="5.5534"/>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -41.953 -167.79)" x2="10.713" x1="5.5534"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-99.856 -528.98)">
+<g transform="translate(-96.935,141.68)">
+<path d="m200.67 409.57-3.3109-5.7503c0.46008-10.872 11.715-3.1293 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#b)"/>
+<path d="m200.4 409.3c0.90134-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.1242" fill="#b820b8"/>
+<path d="m211.48 388.89 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="447.65" x="-44.215" fill="url(#d)"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="449.61" x="-34.067" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m351.47 530.6a1.1493 1.1992 0 0 1 -1.149 1.1992 1.1493 1.1992 0 0 1 -1.1495 -1.1986 1.1493 1.1992 0 0 1 1.1484 -1.1998 1.1493 1.1992 0 0 1 1.1501 1.1981" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(1.5355,0,0,1.4794,-326.41,-395.82)" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".1" fill="url(#f)"/>
+<path d="m197.34 403.99 6.7255 11.922" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag-yellow.svg b/freeplane/viewer-resources/images/icons/flag-yellow.svg
new file mode 100644
index 0000000..6fed8b3
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag-yellow.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.034" width="32.03" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029921 32.034438" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.2989,-1.6129,1.9019,1.5317,-1112.5,284.58)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -161.19 -111.57)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -161.19 -111.57)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -77.249 -185.89)" x2="10.713" x1="5.5534"/>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.9684 0 0 .95528 -67.101 -183.93)" x2="10.713" x1="5.5534"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-63.591 -528.99)">
+<g transform="translate(-104.36,140.47)">
+<path d="m171.83 410.79-3.3109-5.7503c0.46008-10.872 11.715-3.1293 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#b)"/>
+<path d="m171.56 410.52c0.90135-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.1242" fill="#ff0"/>
+<path d="m182.64 390.11 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="431.51" x="-69.363" fill="url(#d)"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="433.47" x="-59.215" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m351.47 530.6a1.1493 1.1992 0 0 1 -1.149 1.1992 1.1493 1.1992 0 0 1 -1.1495 -1.1986 1.1493 1.1992 0 0 1 1.1484 -1.1998 1.1493 1.1992 0 0 1 1.1501 1.1981" stroke-opacity=".83871" fill-rule="evenodd" transform="matrix(1.5355,0,0,1.4794,-355.25,-394.6)" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".1" fill="url(#f)"/>
+<path d="m168.5 405.21 6.73 11.92" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/flag.svg b/freeplane/viewer-resources/images/icons/flag.svg
new file mode 100644
index 0000000..cdddc59
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/flag.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0412mm" width="9.0396mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.029925 32.035831" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="540.08" gradientUnits="userSpaceOnUse" y1="536.28" gradientTransform="matrix(.98143 0 0 .94556 -69.384 -194.09)" x2="352.45" x1="353.3">
+<stop stop-color="#b3b3b3" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".97345" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="546.02" gradientUnits="userSpaceOnUse" y1="551.42" gradientTransform="matrix(.98143 0 0 .94556 -69.384 -194.09)" x2="346.26" x1="349.41">
+<stop offset="0"/>
+<stop stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="e" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.96839 0 0 .95528 44.695 -198.07)" x2="10.713" x1="5.5534"/>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</linearGradient>
+<linearGradient id="f" y2="649.55" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="650.17" gradientTransform="matrix(.96839 0 0 .95528 54.841 -196.11)" x2="10.713" x1="5.5534"/>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="529.99" cx="350.44" gradientTransform="matrix(1.9945 -2.3861 2.9204 2.266 -1971.7 -56.109)" r="1.2118">
+<stop stop-color="#1a1a1a" offset="0"/>
+<stop stop-color="#ff4000" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-259.76 -306)">
+<path d="m263.64 328.27-3.3109-5.7503c0.46008-10.872 11.715-3.1293 15.142-13.072l3.6715 6.6495" fill-rule="evenodd" stroke="#000" stroke-width="1.1242" fill="url(#c)"/>
+<path d="m263.37 328c0.90135-9.6709 14.665-5.5931 15.338-12.505l2.9849 5.421c-1.0212 7.7257-13.285 3.8114-14.62 13.685l-3.7032-6.6008z" fill-rule="evenodd" stroke="url(#d)" stroke-width="1.1242" fill="#c00000"/>
+<path d="m274.45 307.59 16.338 29.438" stroke="#000" stroke-linecap="round" stroke-width="1.9912" fill="none"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="419.33" x="52.58" fill="url(#e)"/>
+<rect fill-rule="evenodd" transform="matrix(.80588 -.59207 .53117 .84726 0 0)" height="6.377" width="3.3462" y="421.3" x="62.727" fill="url(#f)"/>
+<path stroke-linejoin="round" d="m276.24 307.85a1.7648 1.7741 0 0 1 -1.7643 1.7741 1.7648 1.7741 0 0 1 -1.7651 -1.7732 1.7648 1.7741 0 0 1 1.7634 -1.775 1.7648 1.7741 0 0 1 1.766 1.7725" stroke-opacity=".83871" fill-rule="evenodd" stroke="#1a1a1a" stroke-linecap="round" stroke-width=".15072" fill="url(#b)"/>
+<path d="m260.31 322.69 6.7254 11.922" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/folder.svg b/freeplane/viewer-resources/images/icons/folder.svg
new file mode 100644
index 0000000..1af0f60
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/folder.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.558" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 32.557533" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#06f" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="b" style="color-interpolation-filters:sRGB" height="1.6302" width="1.1482" y="-.31509" x="-.074113">
+<feGaussianBlur stdDeviation="0.76171525"/>
+</filter>
+<linearGradient id="c" y2="611.35" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="635.18" gradientTransform="matrix(1.0081 0 0 1.0081 .0070938 -6.8157)" x2="198.84" x1="206.07"/>
+<linearGradient id="d" y2="621.16" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="632.79" gradientTransform="matrix(1.0081 0 0 1.0081 .0070938 -6.8157)" x2="199.92" x1="206.07"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-250.38 -336.99)">
+<g transform="translate(129.13,-238.74)">
+<g transform="matrix(1.118,0,0,1.118,-94.952,-105.81)">
+<path d="m195.14 637.73-0.73121-24.903 1.2342-0.0609 1.2614-2.6509 7.9738 0.0685 2.0086 2.8694 14.088 0.12187-0.59162 20.807-25.243 3.7479z" stroke-opacity=".70930" fill-rule="evenodd" stroke="#00005c" stroke-width="1.008" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m220.38 633.99c-1.1478 0.28694-25.251 3.7302-25.251 3.7302l0.48747-16.069h7.2599l2.2955-4.591h15.068l0.1396 16.929z" stroke-opacity=".70930" fill-rule="evenodd" stroke="#00005c" stroke-linecap="round" stroke-width="1.008" fill="url(#d)"/>
+<rect stroke-linejoin="round" fill-opacity=".88372" transform="matrix(.99183 -.12759 0 1 0 0)" height="3.5461" width="15.601" stroke="#fff" stroke-linecap="round" y="655.38" x="202.73" stroke-width=".88657" fill="#fff"/>
+<path d="m195.96 620.76h6.7456l2.1723-4.4589 15.206-0.00001" stroke-opacity=".68605" filter="url(#b)" stroke="#000" stroke-width="1px" fill="none"/>
+</g>
+<rect rx=".16552" ry=".18513" height="32" width="32" y="575.73" x="121.25" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/forward.svg b/freeplane/viewer-resources/images/icons/forward.svg
new file mode 100644
index 0000000..63b8276
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/forward.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.5447mm" width="9.0312mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000202 33.81966" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="377.6" gradientUnits="userSpaceOnUse" y1="388.92" gradientTransform="matrix(-1.3013 0 0 1.2399 596.19 -28.941)" x2="142.38" x1="160.7">
+<stop stop-color="#0d56c0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-384 -432.6)">
+<path d="m415.36 449.52-15.091-15.381-0.065 9.1262-15.574-0.27816v12.824l15.574 0.17337v8.8842l15.156-15.349z" stroke-opacity=".72674" fill-rule="evenodd" stroke="#027" stroke-width="1.2702px" fill="url(#a)"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/freemind_butterfly.svg b/freeplane/viewer-resources/images/icons/freemind_butterfly.svg
new file mode 100644
index 0000000..7594e00
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/freemind_butterfly.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b">
+<stop stop-color="#ffab21" offset="0"/>
+<stop stop-color="#ff6718" offset="1"/>
+</linearGradient>
+<linearGradient id="c">
+<stop stop-color="#ff6718" stop-opacity="0" offset="0"/>
+<stop stop-color="#d14c0e" stop-opacity=".63354" offset=".75"/>
+<stop stop-color="#702f0d" offset="1"/>
+</linearGradient>
+<linearGradient id="k">
+<stop stop-color="#fff" stop-opacity="0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<radialGradient id="h" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="524.13" cx="371.02" gradientTransform="matrix(.83195 .20044 -.068989 .62593 527.03 41.199)" r="30.833"/>
+<radialGradient id="i" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="540.91" cx="387.82" gradientTransform="matrix(.90561 .15677 -.16029 .9412 544.55 -102)" r="22.426"/>
+<radialGradient id="j" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="535.2" cx="420.07" gradientTransform="matrix(.84724 .15291 -.12579 .83423 551.17 -42.111)" r="23.404"/>
+<linearGradient id="d" y2="561.28" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="544.53" gradientTransform="matrix(.90561 .15677 -.15467 .90822 541.49 -84.04)" x2="373.32" x1="382.03"/>
+<linearGradient id="e" y2="555.8" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="533.05" gradientTransform="matrix(.84724 .15291 -.13859 .91911 557.09 -88.61)" x2="437.01" x1="420.74"/>
+<linearGradient id="a" y2="513.58" xlink:href="#k" gradientUnits="userSpaceOnUse" y1="535.96" x2="396.2" x1="397.71"/>
+<linearGradient id="f" y2="506.03" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="531.37" gradientTransform="matrix(1.0443 .31582 -.3089 1.1264 -200.92 -658.11)" x2="358.54" x1="371.05"/>
+<radialGradient id="l" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="507.45" cx="436.42" gradientTransform="matrix(.83096 .17505 -.11497 .78756 552.74 -34.638)" r="27.776"/>
+<radialGradient id="m" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="507.45" cx="436.42" gradientTransform="matrix(.83096 .17505 -.11497 .78756 552.57 -34.634)" r="27.776"/>
+<linearGradient id="g" y2="487.9" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="511.6" gradientTransform="matrix(.83096 .17505 -.14658 1.0041 567.47 -142.81)" x2="445.93" x1="447.85"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-27.604 -784.41)">
+<g transform="matrix(.125 0 0 .125 57.641 763.73)">
+<g opacity="0.98" transform="matrix(2.4936,0,0,2.6414,-2176.9,-909.36)">
+<path d="m402.14 530.93a2.8571 18.214 0 0 1 -2.8571 18.214 2.8571 18.214 0 0 1 -2.8572 -18.214 2.8571 18.214 0 0 1 2.8572 -18.214 2.8571 18.214 0 0 1 2.8571 18.214z" transform="matrix(1.0829 .20652 -.048795 .93099 418.98 -115.56)" stroke="#523500" stroke-width="3.4288" fill="#523500"/>
+<path d="m824.19 457.69s-20.304 0.81814-27.27-1.4303c-9.2597-2.9886-18.498-34.266-17.789-36.42 1.5845-4.8084 14.576 0.4985 26.063 8.9381s21.797 20.208 18.996 28.913z" fill-rule="evenodd" stroke="#523500" stroke-width="3.8334" fill="url(#h)"/>
+<path d="m824.06 454.04s-55.488-2.8634-32.857 29.151c14.635 20.704 39.116-10.047 32.857-29.151z" fill-rule="evenodd" stroke="#523500" stroke-width="3.5413" fill="url(#i)"/>
+<path d="m826.4 453.67s51.725 4.9628 26.758 33.827c-16.146 18.667-34.949-15.58-26.758-33.827z" fill-rule="evenodd" stroke="#523500" stroke-width="3.442" fill="url(#j)"/>
+<path d="m402.14 530.93a2.8571 18.214 0 0 1 -2.8571 18.214 2.8571 18.214 0 0 1 -2.8572 -18.214 2.8571 18.214 0 0 1 2.8572 -18.214 2.8571 18.214 0 0 1 2.8571 18.214z" transform="matrix(1.0565 .25327 -.077025 1.0115 443.57 -176.69)" stroke="#523500" stroke-width="3.4288" fill="#523500"/>
+<path d="m824.19 457.69s-20.304 0.81814-27.27-1.4303c-9.2597-2.9886-18.498-34.266-17.789-36.42 1.5845-4.8084 14.576 0.4985 26.063 8.9381s21.797 20.208 18.996 28.913z" fill-rule="evenodd" stroke="#523500" stroke-width="3.8334" fill="url(#h)"/>
+<path d="m824.06 454.04s-55.488-2.8634-32.857 29.151c14.635 20.704 39.116-10.047 32.857-29.151z" fill-rule="evenodd" stroke="#523500" stroke-width="3.5413" fill="url(#i)"/>
+<path d="m826.4 453.67s51.725 4.9628 26.758 33.827c-16.146 18.667-34.949-15.58-26.758-33.827z" fill-rule="evenodd" stroke="#523500" stroke-width="3.442" fill="url(#j)"/>
+<path fill-rule="evenodd" fill="url(#d)" d="m824.06 454.04s-55.488-2.8634-32.857 29.151c14.635 20.704 39.116-10.047 32.857-29.151z"/>
+<path fill-rule="evenodd" fill="url(#e)" d="m826.4 453.67s51.725 4.9628 26.758 33.827c-16.146 18.667-34.949-15.58-26.758-33.827z"/>
+<path fill-rule="evenodd" fill="url(#d)" d="m824.06 454.04s-55.488-2.8634-32.857 29.151c14.635 20.704 39.116-10.047 32.857-29.151z"/>
+<path fill-rule="evenodd" fill="url(#e)" d="m826.4 453.67s51.725 4.9628 26.758 33.827c-16.146 18.667-34.949-15.58-26.758-33.827z"/>
+<path opacity="0.317" d="m450 546.86a57.5 31.5 0 0 1 -57.5 31.5 57.5 31.5 0 0 1 -57.5 -31.5 57.5 31.5 0 0 1 57.5 -31.5 57.5 31.5 0 0 1 57.5 31.5z" transform="matrix(.35767 -.052524 .18194 .24531 568 350.62)" fill="url(#a)"/>
+<g transform="matrix(.76742 -.11079 .096779 1.001 775.47 400.41)">
+<path fill-rule="evenodd" fill="url(#f)" d="m55.49 63.363s-26.194-2.0818-34.867-5.288c-11.529-4.262-19.516-36.394-18.336-38.415 2.6335-4.512 18.669 2.564 32.383 12.514 13.714 9.949 25.5 23.011 20.82 31.189z"/>
+<path fill-rule="evenodd" fill="url(#f)" d="m55.49 63.363s-26.194-2.0818-34.867-5.288c-11.529-4.262-19.516-36.394-18.336-38.415 2.6335-4.512 18.669 2.564 32.383 12.514 13.714 9.949 25.5 23.011 20.82 31.189z"/>
+<path opacity="0.317" d="m450 546.86a57.5 31.5 0 0 1 -57.5 31.5 57.5 31.5 0 0 1 -57.5 -31.5 57.5 31.5 0 0 1 57.5 -31.5 57.5 31.5 0 0 1 57.5 31.5z" transform="matrix(.42363 .063304 .12073 .36356 -205.11 -182.15)" fill="url(#a)"/>
+<path opacity="0.317" d="m450 546.86a57.5 31.5 0 0 1 -57.5 31.5 57.5 31.5 0 0 1 -57.5 -31.5 57.5 31.5 0 0 1 57.5 -31.5 57.5 31.5 0 0 1 57.5 31.5z" transform="matrix(.42363 .063304 .12073 .36356 -205.11 -182.15)" fill="url(#a)"/>
+</g>
+<path d="m827.41 453.2s21.808 5.393 28.896 4.4258c8.8441-1.2069 21.132-30.972 20.601-33.316-1.1866-5.2314-14.517-2.5794-26.606 3.5808-12.089 6.1603-19.89 16.032-22.89 25.309z" fill-rule="evenodd" stroke="#523500" stroke-width="3.569" fill="url(#l)"/>
+<path d="m827.91 452.9s21.14 5.6882 28.227 4.721c8.8441-1.2069 21.132-30.972 20.601-33.316-1.1866-5.2314-14.15-2.0494-26.606 3.5809-10.439 4.7184-21.259 15.496-22.222 25.014z" fill-rule="evenodd" stroke="#523500" stroke-width="3.569" fill="url(#m)"/>
+<path fill-rule="evenodd" fill="url(#g)" d="m827.9 454.33s20.113 5.2864 27.2 4.3193c8.8441-1.2069 21.132-30.972 20.601-33.316-1.1866-5.2314-14.517-2.5794-26.606 3.5809s-23.276 15.96-21.195 25.416z"/>
+<path fill-rule="evenodd" fill="url(#g)" d="m827.9 454.33s20.113 5.2864 27.2 4.3193c8.8441-1.2069 21.132-30.972 20.601-33.316-1.1866-5.2314-14.517-2.5794-26.606 3.5809s-18.364 16.142-21.195 25.416z"/>
+<path opacity="0.317" d="m450 546.86a57.5 31.5 0 0 1 -57.5 31.5 57.5 31.5 0 0 1 -57.5 -31.5 57.5 31.5 0 0 1 57.5 -31.5 57.5 31.5 0 0 1 57.5 31.5z" transform="matrix(.30774 -.057423 .15528 .27163 654.15 310.79)" fill="url(#a)"/>
+<path opacity="0.317" d="m450 546.86a57.5 31.5 0 0 1 -57.5 31.5 57.5 31.5 0 0 1 -57.5 -31.5 57.5 31.5 0 0 1 57.5 -31.5 57.5 31.5 0 0 1 57.5 31.5z" transform="matrix(.29986 -.057423 .1513 .27163 658.95 310.79)" fill="url(#a)"/>
+<path opacity="0.317" d="m450 546.86a57.5 31.5 0 0 1 -57.5 31.5 57.5 31.5 0 0 1 -57.5 -31.5 57.5 31.5 0 0 1 57.5 -31.5 57.5 31.5 0 0 1 57.5 31.5z" transform="matrix(.35767 -.052524 .18194 .24531 568 350.62)" fill="url(#a)"/>
+</g>
+<rect opacity="0.98" rx=".67902" ry=".73835" height="256" width="256" y="165.46" x="-240.3" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-0.svg b/freeplane/viewer-resources/images/icons/full-0.svg
new file mode 100644
index 0000000..59300ac
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-0.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-29.78 -265.59)">
+<g transform="translate(-357.87,-205.13)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".58721" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 328.36 422.4)" stroke="#000" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="497.32166" x="395.40472" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="497.32166" x="395.40472" font-family="Arial" fill="#ffffff">0</tspan>
+</text>
+<rect rx=".10339" ry=".11603" height="32" width="32" y="470.72" x="387.65" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-1.svg b/freeplane/viewer-resources/images/icons/full-1.svg
new file mode 100644
index 0000000..37cd1ea
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-1.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#4d0033" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-70.575 -265.64)">
+<g transform="translate(-197.33,206.91)">
+<g transform="translate(124.87,-183.44)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".59355" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 83.717 193.83)" stroke="#4d004d" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="268.59009" x="150.03484" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="268.59009" x="150.03484" font-family="Arial" fill="#ffffff">1</tspan>
+</text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-2.svg b/freeplane/viewer-resources/images/icons/full-2.svg
new file mode 100644
index 0000000..f5b7445
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-2.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.3772,-1.014,1.5479,-2.1022,282.85,984.73)" r="54.705">
+<stop stop-color="#625b18" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-111.35 -265.64)">
+<g transform="translate(-156.06,161.86)">
+<g transform="translate(89.629,-174.06)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".63372" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 118.46 229.5)" stroke="#847a2d" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="304.07571" x="185.70526" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="304.07571" x="185.70526" font-family="Arial" fill="#ffffff">2</tspan>
+</text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-3.svg b/freeplane/viewer-resources/images/icons/full-3.svg
new file mode 100644
index 0000000..721bb15
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-3.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.215 -.79202 1.0429 -1.6 355.68 809.73)" r="54.705">
+<stop stop-color="#2c807f" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-152.12 -265.64)">
+<g transform="translate(11.675,-13.308)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".59355" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 81.129 230.61)" stroke="#2c807f" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="305.55426" x="148.0018" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="305.55426" x="148.0018" font-family="Arial" fill="#ffffff">3</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-4.svg b/freeplane/viewer-resources/images/icons/full-4.svg
new file mode 100644
index 0000000..32578c9
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-4.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#007100" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-192.9 -265.64)">
+<g transform="translate(51.155,-48.239)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".59355" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 82.423 265.54)" stroke="#007100" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="339.74612" x="148.18663" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="339.74612" x="148.18663" font-family="Arial" fill="#ffffff">4</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-5.svg b/freeplane/viewer-resources/images/icons/full-5.svg
new file mode 100644
index 0000000..72f7b4c
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-5.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="229.55" cx="268.68" gradientTransform="matrix(-1.2041 -.81777 1.0542 -1.5523 350.2 805.59)" r="54.705">
+<stop stop-color="#2d2e7e" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-233.67 -265.64)">
+<g transform="translate(19.849,23.656)">
+<g transform="translate(-1.6634 -.36964)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".69677" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 156.17 194.01)" stroke="#2d2e7e" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="268.7749" x="222.85426" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="268.7749" x="222.85426" font-family="Arial" fill="#ffffff">5</tspan>
+</text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-6.svg b/freeplane/viewer-resources/images/icons/full-6.svg
new file mode 100644
index 0000000..230a61b
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-6.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="237.03" cx="258.02" gradientTransform="matrix(-1.2432 -.92657 1.1605 -1.557 317.03 838.16)" r="54.625">
+<stop stop-color="#500" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-274.45 -265.64)">
+<g transform="translate(95.739,24.026)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".80645" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 119.39 193.27)" stroke="#75000d" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="268.03558" x="186.07492" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="268.03558" x="186.07492" font-family="Arial" fill="#ffffff">6</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-7.svg b/freeplane/viewer-resources/images/icons/full-7.svg
new file mode 100644
index 0000000..22ae662
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-7.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2135 -.79436 1.0776 -1.6462 347.3 821)" r="54.705">
+<stop stop-color="#85982b" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-315.22 -265.64)">
+<g transform="translate(136.51,-47.869)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".59355" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 119.39 265.17)" stroke="#85982b" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="340.85507" x="186.62936" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="340.85507" x="186.62936" font-family="Arial" fill="#ffffff">7</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-8.svg b/freeplane/viewer-resources/images/icons/full-8.svg
new file mode 100644
index 0000000..5a82060
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-8.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#e65d00" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-356 -265.65)">
+<g transform="translate(142.73,-15.895)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".59355" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 153.95 233.2)" stroke="#e65d00" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="307.58731" x="221.00606" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="307.58731" x="221.00606" font-family="Arial" fill="#ffffff">8</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/full-9.svg b/freeplane/viewer-resources/images/icons/full-9.svg
new file mode 100644
index 0000000..08d5343
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/full-9.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#b11fa9" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-396.77 -265.64)">
+<g transform="translate(180.91,-48.609)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".59355" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 156.54 265.91)" stroke="#b11fa9" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="30px" space="preserve" y="340.85507" x="223.40872" font-family="Arial" fill="#ffffff">
+<tspan font-size="30px" y="340.85507" x="223.40872" font-family="Arial" fill="#ffffff">9</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/go.svg b/freeplane/viewer-resources/images/icons/go.svg
new file mode 100644
index 0000000..83b4f1b
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/go.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.007" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 32.006705" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="c" style="color-interpolation-filters:sRGB" height="1.1931" width="1.2009" y="-.096529" x="-.10044">
+<feGaussianBlur stdDeviation="0.33615137"/>
+</filter>
+<linearGradient id="a" y2="619.85" gradientUnits="userSpaceOnUse" y1="586.56" gradientTransform="matrix(1.1454,0,0,1.0743,-318.49,-169.32)" x2="424.05" x1="424.05">
+<stop stop-color="#161627" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="623.78" cx="423.23" gradientTransform="matrix(.6578 .0069657 -.006742 .63667 149.04 223.68)" r="2.9041">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#00d534" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-128.11 -165.1)">
+<g transform="translate(13.983,-371.14)">
+<g stroke-linecap="round" transform="translate(-37.111,74.137)">
+<rect stroke-linejoin="round" height="28.912" width="15.756" stroke="#000" y="462.64" x="159.36" stroke-width="1.0702" fill="#e6e6e6"/>
+<rect stroke-opacity=".80814" height="1.7332" width="3.5007" stroke="#000" y="492.06" x="165.49" stroke-width="0.633"/>
+<rect stroke-linejoin="round" stroke-opacity=".87097" height="25.895" width="12.251" stroke="#000" y="464.09" x="161.11" stroke-width=".55465" fill="url(#a)"/>
+<path d="m426.21 624.16a2.5541 2.6339 0 0 1 -2.5535 2.6339 2.5541 2.6339 0 0 1 -2.5547 -2.6326 2.5541 2.6339 0 0 1 2.5522 -2.6351 2.5541 2.6339 0 0 1 2.5559 2.6314" stroke-opacity=".87097" transform="matrix(1.1454,0,0,1.0743,-318.03,-193.67)" stroke="#000" stroke-width="0.7" fill="#999"/>
+<path d="m426.21 624.16a2.5541 2.6339 0 0 1 -2.5535 2.6339 2.5541 2.6339 0 0 1 -2.5547 -2.6326 2.5541 2.6339 0 0 1 2.5522 -2.6351 2.5541 2.6339 0 0 1 2.5559 2.6314" stroke-opacity=".87097" transform="matrix(1.1454,0,0,1.0743,-318.03,-201.79)" stroke="#000" stroke-width="0.7" fill="#999"/>
+<path d="m426.21 624.16a2.5541 2.6339 0 0 1 -2.5535 2.6339 2.5541 2.6339 0 0 1 -2.5547 -2.6326 2.5541 2.6339 0 0 1 2.5522 -2.6351 2.5541 2.6339 0 0 1 2.5559 2.6314" stroke-opacity=".53488" transform="matrix(1.5398,0,0,1.4442,-485.03,-416.43)" filter="url(#c)" stroke="#10d300" stroke-width="3.006" fill="url(#b)"/>
+</g>
+<rect rx=".16552" ry=".18513" height="32" width="32" y="536.24" x="114.13" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/gohome.svg b/freeplane/viewer-resources/images/icons/gohome.svg
new file mode 100644
index 0000000..48f4362
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/gohome.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.718" width="32.161" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.160941 31.717721" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="367.1" cx="200.91" gradientTransform="matrix(2.8768 -.75627 .2163 .80308 -539.12 111.62)" r="15.933">
+<stop stop-color="#d40000" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="366.31" cx="205.98" gradientTransform="matrix(1.0042 0 0 .54903 -85.24 53.372)" r="15.933">
+<stop stop-color="#e60000" offset="0"/>
+<stop stop-color="#e60000" stop-opacity=".76991" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="385.62" gradientUnits="userSpaceOnUse" y1="369.93" gradientTransform="matrix(1.0042 0 0 .99212 -85.24 -108.93)" x2="212.66" x1="201.54">
+<stop stop-color="#ccc" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".9292" offset="1"/>
+</linearGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="383.99" cx="205.39" gradientTransform="matrix(-2.2027,2.9065,-2.101,-1.554,1378.5,267.51)" r="4.9421">
+<stop stop-color="#ff7f2a" offset="0"/>
+<stop stop-color="#ff7f2a" stop-opacity="0" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-188.99 -106.95)">
+<g transform="translate(83.37,-138.62)">
+<path d="m107.69 276.72 3.542-3.6872-0.0475 3.6637-3.4945 0.0235z" stroke-opacity=".77907" fill-rule="evenodd" stroke="#0a0" stroke-linecap="square" stroke-miterlimit="4.7" stroke-width=".99816" fill="#4a0"/>
+<path d="m106.12 259.99 15.219-13.752 15.776 13.569s-2.3635 3.398-3.2916 2.2978c-0.92802-1.1002-12.67-10.916-12.67-10.916l-12.435 11.552-2.5984-2.7505z" stroke-opacity=".84302" fill-rule="evenodd" stroke="url(#c)" stroke-linecap="round" stroke-width=".99816px" fill="url(#b)"/>
+<path d="m112.18 277.24 0.0643-17.07 8.909-8.6181 9.837 8.2514 0.1392 17.437" stroke-opacity=".84302" fill-rule="evenodd" stroke="#4d4d4d" stroke-width=".99816px" fill="url(#a)"/>
+<path d="m108.67 261.94 12.457-11.711 12.796 11.261" stroke-opacity=".65698" stroke="#501616" stroke-width="1.1978" fill="none"/>
+<path d="m111.65 254.33v-3.6105h-1.0278v-1.5796l3.9972 0.11283-0.11421 1.4668h-0.79944l-0.11421 2.0309" stroke-opacity=".81395" fill-rule="evenodd" stroke="#800000" stroke-linecap="round" stroke-width=".49908" fill="#782121"/>
+<path d="m116.91 277.29v-12.693h9.0223v12.656" fill-rule="evenodd" stroke="#520" stroke-width=".89834" fill="url(#d)"/>
+<path d="m209.64 371.13a2.888 2.888 0 0 1 -2.888 2.888 2.888 2.888 0 0 1 -2.888 -2.888 2.888 2.888 0 0 1 2.888 -2.888 2.888 2.888 0 0 1 2.888 2.888z" stroke-opacity=".81395" transform="matrix(.74641 0 0 .7374 -32.695 -14.871)" stroke="#520" stroke-linecap="round" stroke-width=".40363" fill="#d35f5f"/>
+<path d="m203.39 383.73a0.52078 0.52078 0 0 1 -0.52078 0.52078 0.52078 0.52078 0 0 1 -0.52078 -0.52078 0.52078 0.52078 0 0 1 0.52078 -0.52079 0.52078 0.52078 0 0 1 0.52078 0.52079z" stroke-opacity=".81395" transform="matrix(1.0042 0 0 .99212 -85.145 -109.12)" stroke="#520" stroke-linecap="round" stroke-width="0.3" fill="#d35f5f"/>
+<path d="m132.16 275.8 4.3341-5.8792-4.4149-0.0153 0.0808 5.8945z" stroke-opacity=".77907" fill-rule="evenodd" stroke="#0a0" stroke-linecap="square" stroke-miterlimit="4.7" stroke-width=".99816" fill="#4a0"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/group.svg b/freeplane/viewer-resources/images/icons/group.svg
new file mode 100644
index 0000000..416b0b6
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/group.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.026" width="31.973" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.972613 32.025554" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="f">
+<stop stop-color="#fcc362" offset="0"/>
+<stop stop-color="#cb923a" offset="1"/>
+</linearGradient>
+<linearGradient id="e" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fae2b9" offset="0"/>
+<stop stop-color="#e9b45c" offset="1"/>
+</linearGradient>
+<linearGradient id="a" y2="596.5" xlink:href="#f" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851"/>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 539.57 612.17)" r="9.2659">
+<stop stop-color="#bc830a" offset="0"/>
+<stop stop-color="#85510a" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="613.34" cx="131.66" gradientTransform="matrix(1.1987 .55359 -.33581 .72715 179.8 95.034)" r="9.493">
+<stop stop-color="#7ff44c" offset="0"/>
+<stop stop-color="#35981b" offset="1"/>
+</radialGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 621.01 623.86)" r="9.2659">
+<stop stop-color="#636363" offset="0"/>
+<stop stop-color="#0e0d0c" offset="1"/>
+</radialGradient>
+<radialGradient id="h" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .58408 -.39157 .88132 285.97 22.248)" r="9.493">
+<stop stop-color="#fae" offset="0"/>
+<stop stop-color="#a08" offset="1"/>
+</radialGradient>
+<radialGradient id="i" gradientUnits="userSpaceOnUse" cy="562.53" cx="207.66" gradientTransform="matrix(1.0844 .8423 -.47902 .64241 159.52 28.537)" r="9.8135">
+<stop stop-color="#fb6239" offset="0"/>
+<stop stop-color="#850a0a" offset="1"/>
+</radialGradient>
+<radialGradient id="g" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 222.49 53.521)" r="9.493">
+<stop stop-color="#2ad4ff" offset="0"/>
+<stop stop-color="#0000d4" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-341.41 -657.98)">
+<g transform="matrix(-.76144 0 0 .75563 445.63 242.08)">
+<g transform="matrix(-1,0,0,1,176.51,34.757)">
+<g transform="matrix(-1,0,0,1.0597,104.2,-101.01)">
+<path fill-rule="evenodd" fill="#fff" d="m57.746 605.85-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.03335 4.8287-1.2719 7.1229z"/>
+<path d="m57.79 605.94c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8955 1.1506-3.364 2.304-3.854 4.7608l0.07557 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.08611-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16578 2.5852-0.72558 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#000080" stroke-width="1px" fill="url(#g)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,20.916,-35.618)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m63.139 591.53-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56496 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.02852-2.7803 0.29215-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#6e3d0b" stroke-linecap="round" stroke-width="1.0298px" fill="url(#b)"/>
+</g>
+<path d="m46.38 540.78c-0.23094 2.1926-0.39211 4.3155-0.07006 5.9551" fill-rule="evenodd" stroke="#045" stroke-width="1px"/>
+</g>
+<g transform="translate(81.254,39.365)">
+<g transform="matrix(1,0,0,1.0597,-113.08,-113.24)">
+<path fill-rule="evenodd" fill="#fff" d="m139.18 617.54-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path d="m139.23 617.64c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8954 1.1506-3.364 2.304-3.854 4.7608l0.0756 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.0861-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16577 2.5852-0.72557 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#196616" stroke-width="1px" fill="url(#c)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,102.35,-23.922)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m144.58 603.22-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56495 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.0285-2.7803 0.29214-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="1.0298px" fill="url(#d)"/>
+</g>
+<path d="m26.203 540.85c-0.119 1.985-0.21962 3.9701 0.21018 5.9551" fill-rule="evenodd" stroke="#196616" stroke-width="1px"/>
+</g>
+<g transform="translate(.84072 .84072)">
+<path fill-rule="evenodd" fill="#fff" d="m121.23 585.56-7.7588-8.1727c7.7008-0.67808 7.1398-0.18209 10.684-0.38917l-1.6535 1.2972c0.55908 2.5127 0.0333 4.9248-1.2719 7.2646z"/>
+<path stroke-linejoin="round" d="m121.27 585.66c-0.88882-2.7912-3.034-5.315-7.8591-8.3238-1.8955 1.1735-2.9064 3.6335-3.1674 5.2056l-0.61097 6.4322c2.732 2.1925 6.5631 2.405 9.8994 2.4663 5.0237-0.63126 6.362-2.1889 7.9347-3.6995-0.0855-1.6733-0.22163-3.3217-0.9111-6.4719-0.46374-1.595-1.4944-3.756-2.3383-4.3182-1.2035 0.86301-1.2922 0.83322-1.6625 1.3102-1.1956 2.7533-1.2977 4.9556-1.2847 7.3989z" fill-rule="evenodd" stroke="#504" stroke-linecap="round" stroke-width="1.0099px" fill="url [...]
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0826,84.396,-68.665)" stroke="#62340a" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m114.68 569.58c3.4231 1.1432 7.004 0.48751 10.569-0.42157l-0.0958 5.5502 1.4676 0.70626c0.62271-2.7299 0.9258-4.2553 0.63702-8.0089-1.1124-3.8571-3.953-7.028-9.136-6.9454-6.1727 0.0412-8.7306 4.9451-9.2728 7.0708-0.38606 1.592 0.20015 5.4901 0.50507 7.9529 0.25464 0.51861-0.7079 0.7698 3.1606 2.0825 1.7926-0.0594 1.7798-1.5036 2.0541-2.7276l0.11077-5.259z" fill-rule="evenodd" stroke="#79170a" stroke-linecap="round" stroke-width="1.0099px" fill="url(#i)"/>
+<path d="m121.29 585.4c0 0.49042 0.84072 5.6749 0.84072 5.6749" fill-rule="evenodd" stroke="#504" stroke-width="1px"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/help.svg b/freeplane/viewer-resources/images/icons/help.svg
new file mode 100644
index 0000000..2231029
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/help.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.017" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 32.016566" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="264.23" cx="536.24" gradientTransform="matrix(-1.7071 -2.3772 1.0271 -.7085 1180.2 1726.3)" r="3.8484">
+<stop stop-color="#000d68" stop-opacity=".85841" offset="0"/>
+<stop stop-color="#00f" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="232.5" gradientUnits="userSpaceOnUse" y1="241.86" gradientTransform="matrix(1.0114 0 0 .90319 -272.19 75.264)" x2="549.7" x1="532.35">
+<stop stop-color="#000080" offset="0"/>
+<stop stop-color="#8afbf9" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-31.612 -34.324)">
+<g transform="translate(-220.7,-248.7)">
+<g stroke-linejoin="round" stroke-linecap="round" stroke="#000">
+<path d="m538.71 264.85a3.2882 2.9594 0 0 1 -3.2882 2.9594 3.2882 2.9594 0 0 1 -3.2882 -2.9594 3.2882 2.9594 0 0 1 3.2882 -2.9594 3.2882 2.9594 0 0 1 3.2882 2.9594z" stroke-opacity=".99419" transform="matrix(.66685 0 0 .71834 -89.987 122.26)" stroke-width="1.1205" fill="url(#b)"/>
+<path d="m266.96 308.37c-0.9234-0.24184-1.3784-0.80089-1.5662-1.5011-0.0343-0.96617-0.13636-1.9706 1.2029-3.3269 1.4516-1.4701 3.7746-3.3412 5.082-5.3305s2.0762-2.9774 1.721-5.3751c-0.4097-1.8726-1.4077-3.7167-4.3783-4.2937-3.1263-0.35508-6.4167-0.15378-7.3005 2.9911 0.0725 0.97846 0.2638 1.6211 1.3708 3.1578 0.55071 0.77652 0.13596 1.7352-1.1463 1.6768-1.8296-0.65854-2.2793-1.184-3.295-2.2401-1.0184-1.2272-1.4692-2.8344-1.0598-4.4101 0.67124-2.1121 2.1221-3.9861 6.0845-5.4393 3.851-1.22 [...]
+</g>
+</g>
+<rect rx=".16552" ry=".18513" height="32" width="32" y="34.33" x="31.612" fill="none"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/hourglass.svg b/freeplane/viewer-resources/images/icons/hourglass.svg
new file mode 100644
index 0000000..e6c0831
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/hourglass.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c">
+<stop stop-color="#5eb0f4" offset="0"/>
+<stop stop-color="#e1f1fc" offset=".31867"/>
+<stop stop-color="#70c0fc" offset=".66466"/>
+<stop stop-color="#1f8df2" offset="1"/>
+</linearGradient>
+<linearGradient id="b">
+<stop stop-color="#784421" offset="0"/>
+<stop stop-color="#deaa87" offset=".26588"/>
+<stop stop-color="#81614f" offset=".66466"/>
+<stop stop-color="#784421" offset="1"/>
+</linearGradient>
+<linearGradient id="d">
+<stop stop-color="#fcbe0a" offset="0"/>
+<stop stop-color="#fef0bc" offset=".26588"/>
+<stop stop-color="#f5cc37" offset=".66466"/>
+<stop stop-color="#e4dd9a" offset="1"/>
+</linearGradient>
+<filter id="a" style="color-interpolation-filters:sRGB">
+<feGaussianBlur stdDeviation="0.20039625"/>
+</filter>
+<filter id="e" style="color-interpolation-filters:sRGB" height="1.0662" width="1.645" y="-.033077" x="-.32250">
+<feGaussianBlur stdDeviation="0.067523875"/>
+</filter>
+<linearGradient id="f" y2="540.78" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="540.78" gradientTransform="translate(-.10201)" x2="150.69" x1="135.26"/>
+<linearGradient id="g" y2="533.99" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="533.99" gradientTransform="matrix(1.0069 0 0 .76084 -.98835 127.97)" x2="150.3" x1="135.22"/>
+<linearGradient id="h" y2="540.78" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="540.78" gradientTransform="matrix(1 0 0 -1 -.10201 1091.5)" x2="150.69" x1="135.26"/>
+<linearGradient id="i" y2="533.99" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="533.99" gradientTransform="matrix(1,0,0,-0.77997,3.4735e-5,973.79)" x2="150.3" x1="135.22"/>
+<linearGradient id="j" y2="550.89" xlink:href="#d" gradientUnits="userSpaceOnUse" y1="550.89" gradientTransform="translate(-50.134,1.838)" x2="198.25" x1="187.63"/>
+<linearGradient id="k" y2="550.25" xlink:href="#d" gradientUnits="userSpaceOnUse" y1="550.89" gradientTransform="translate(-50.134,1.838)" x2="198.2" x1="187.63"/>
+<linearGradient id="l" y2="554.12" gradientUnits="userSpaceOnUse" y1="544.85" x2="142.86" x1="142.86">
+<stop stop-color="#f3d95f" offset="0"/>
+<stop stop-color="#fcbf0d" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-107.63 -600.22)">
+<g transform="translate(59.014,63.936)">
+<rect rx=".16552" ry=".18513" height="32" width="32" y="536.28" x="48.62" fill="none"/>
+<g fill-rule="evenodd" transform="matrix(.92276 0 0 1.1165 -67.219 -57.109)">
+<path stroke-linejoin="round" d="m142.25 545.72-6.5891-4.8861v-5.0024h14.426l-0.11633 5.0024-6.51 4.9117" stroke="#520" stroke-linecap="round" stroke-width=".75" fill="url(#f)"/>
+<path d="m133.8 536.14v-3.7905h18.155v3.7771" stroke="#502d16" stroke-width=".87528px" fill="url(#g)"/>
+<path stroke-linejoin="round" d="m142.25 545.79-6.5891 4.8861v5.0024h14.426l-0.11633-5.0024-6.51-4.8605" stroke="#520" stroke-linecap="round" stroke-width=".75" fill="url(#h)"/>
+<path d="m133.86 555.35v3.8858h18.03v-3.872" stroke="#502d16" stroke-width=".88316px" fill="url(#i)"/>
+<path d="m136.17 555.32 1.3275-2.7975 5.2588-3.5165 5.3098 3.7207 1.0722 2.5932" transform="matrix(1 0 0 .90566 0 52.399)" filter="url(#a)" fill="url(#j)"/>
+<path d="m148.28 553.39c-3.9656-0.87083-7.9756-0.59701-12.408 0.96413l6.8027-5.6589 5.6057 4.6948z" transform="matrix(1 0 0 -.90566 .19716 1042.8)" filter="url(#a)" fill="url(#k)"/>
+<path filter="url(#e)" fill="url(#l)" d="m142.86 550.51 0.25124-5.2512-0.5025 0.00001"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/idea.svg b/freeplane/viewer-resources/images/icons/idea.svg
new file mode 100644
index 0000000..36859ba
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/idea.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999255 32.000302"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="idea.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     id="namedview54"
+     showgrid="false"
+     inkscape:zoom="7.3244156"
+     inkscape:cx="-10.982508"
+     inkscape:cy="15.973971"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a">
+      <stop
+         stop-color="#ff0"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <radialGradient
+       id="e"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="555.96002"
+       cx="590.34998"
+       gradientTransform="matrix(0.21292,0.0953,-0.10701,0.2263,-54.27,83.778)"
+       r="70.341003" />
+    <radialGradient
+       id="f"
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       cy="537.34003"
+       cx="591.22998"
+       gradientTransform="matrix(0.28922,-0.032886,0.027893,0.23219,-174.31,156.18)"
+       r="65.042999" />
+    <linearGradient
+       id="b"
+       y2="586.45001"
+       gradientUnits="userSpaceOnUse"
+       y1="586.45001"
+       gradientTransform="matrix(0.13686,0,0,0.13315,-45.888,192.68)"
+       x2="457.60999"
+       x1="389.95001">
+      <stop
+         stop-color="#999"
+         offset="0"
+         id="stop14" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop16" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="665.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="665.35999"
+       gradientTransform="matrix(0.13686,0,0,0.13315,-45.888,192.3)"
+       x2="433.81"
+       x1="378.31">
+      <stop
+         stop-color="#1a1a1a"
+         offset="0"
+         id="stop19" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop21" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="287.59"
+       gradientUnits="userSpaceOnUse"
+       y1="284.45001"
+       gradientTransform="matrix(1.0375,0.046482,-0.047777,1.0093,-252.27,-42.549)"
+       x2="265.32999"
+       x1="261.89999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop24" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop26" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata28">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.0001083,0,0,0.99308173,-230.97856,-33.925561)"
+     id="g30">
+    <g
+       transform="translate(235.02,-218.82)"
+       id="g32">
+      <path
+         d="m 11.933,278.39 c -1.0852,0.005 -1.0937,0.003 -3.2632,0.0167 -0.54306,2.5e-4 -0.88785,-0.21306 -1.236,-0.65741 -0.48832,-0.56154 -0.29938,-2.1106 -0.44905,-3.1664 -1.0639,-4.6615 -2.3635,-5.337 -4.0415,-9.5033 -0.87895,-2.6014 -0.58151,-5.131 1.1248,-7.6975 0.95998,-1.2347 2.9088,-4.0308 7.8649,-4.0942 4.9561,0.0635 6.9049,2.8595 7.8649,4.0942 1.7063,2.5665 1.9995,5.0961 1.1205,7.6975 -1.579,3.8434 -2.9967,4.7584 -4.0415,9.5033 -0.14968,1.0557 0.03926,2.6048 -0.44906,3.1664 - [...]
+         id="path34"
+         inkscape:connector-curvature="0"
+         style="fill:url(#e);fill-rule:evenodd;stroke:#000000;stroke-width:0.61000001" />
+      <path
+         d="m 11.916,277.77 c -0.62989,0.003 -1.5016,0.002 -3.246,0.0125 -0.36984,1.8e-4 -0.43859,-0.0492 -0.72277,-0.41192 -0.0069,-0.009 -0.01403,-0.0168 -0.02138,-0.025 -0.029407,-0.0338 -0.17022,-0.46964 -0.20101,-1.0277 -0.030784,-0.55808 -0.01698,-1.2182 -0.10264,-1.8224 -0.00236,-0.014 -0.00522,-0.0278 -0.00855,-0.0416 -1.052,-4.8083 -2.7331,-5.9201 -4.0715,-9.6115 -0.80537,-2.4183 -0.54857,-4.6734 1.0392,-7.0817 0.00359,-0.005 0.00923,-0.012 0.012838,-0.0166 0.94076,-1.2125 3.071 [...]
+         id="path36"
+         inkscape:connector-curvature="0"
+         style="fill:url(#f);fill-rule:evenodd;stroke:#1a1a1a;stroke-width:0.13499001px;stroke-opacity:0.87791" />
+      <path
+         d="m 11.446,277.64 -0.04947,-6.7412 c -0.98477,-0.37663 -5.7435,-3.1882 -3.0176,-5.9678 1.3337,-0.95166 2.6403,0.60207 2.9172,1.444 0.50706,1.5415 0.27911,0.84068 0.56267,2.0212 0.28358,1.1805 0.1234,-1.0584 0.71977,-2.2938 0.67836,-1.4053 2.1595,-2.8007 3.3691,-1.9896 2.9459,2.5889 -4.0892,6.8739 -3.7102,6.786 l 0.14841,6.7379 -0.93991,0.003 z"
+         id="path38"
+         inkscape:connector-curvature="0"
+         style="fill:url(#b);fill-rule:evenodd;stroke:#000000;stroke-width:0.21597999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.40116003" />
+      <path
+         d="m 11.066,269.8 c -0.41627,-0.006 -1.594,-1.0398 -2.1898,-2.0707 -0.39298,-0.57027 -0.80023,-1.7191 0.18419,-2.1105 0.79306,-0.0493 1.2362,0.8973 1.3916,1.2743 0.48023,0.82497 0.56454,1.8724 0.61395,2.9069 z"
+         id="path40"
+         inkscape:connector-curvature="0"
+         style="fill:#ffec00;fill-opacity:0.94902003;fill-rule:evenodd;stroke:#000000;stroke-width:0.21597999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.40116003" />
+      <path
+         d="m 12.581,269.4 c 0.02995,-0.30427 0.60312,-2.2845 0.83908,-2.8074 0.35211,-1.1445 1.0765,-1.9025 1.8214,-1.7123 0.98349,0.96353 -0.07294,2.0526 -0.28652,2.3096 -0.79132,0.97949 -1.5827,1.7084 -2.374,2.2101 z"
+         id="path42"
+         inkscape:connector-curvature="0"
+         style="fill:#ffed00;fill-opacity:0.70196001;fill-rule:evenodd;stroke:#000000;stroke-width:0.21597999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.40116003" />
+      <path
+         d="m 438.47,693.53 a 17.278,5.7594 0 0 1 -8.6446,4.9888 17.278,5.7594 0 0 1 -17.284,-0.003 17.278,5.7594 0 0 1 -8.628,-4.992"
+         transform="matrix(0.13426,0,0,0.23942,-44.722,117.54)"
+         id="path44"
+         inkscape:connector-curvature="0"
+         style="fill:#1a1a1a;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.87209" />
+      <path
+         d="m 15.249,283.41 -6.8197,0 c -0.72815,-0.4591 -0.8578,-0.95244 -0.034269,-1.5003 -1.0892,-0.82288 -0.39153,-1.1345 0,-1.5337 -0.81447,-0.63389 -0.60788,-1.1436 0.034269,-1.6004 l 6.7854,0 c 0.51505,0.43546 0.87086,0.9019 0.03427,1.6004 0.24508,0.40474 1.0227,0.60223 0,1.5003 0.40485,0.44143 1.0956,0.74878 0,1.5337 z"
+         id="path46"
+         inkscape:connector-curvature="0"
+         style="fill:url(#c);fill-rule:evenodd;stroke:#000000;stroke-width:0.28347999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99418999" />
+      <path
+         d="m 8.4636,280.31 6.8197,0.0333"
+         id="path48"
+         inkscape:connector-curvature="0"
+         style="fill:#424242;fill-opacity:0.81568998;fill-rule:evenodd;stroke:#333333;stroke-width:0.13499001px" />
+      <path
+         d="m 8.4978,281.91 6.6141,-0.0333"
+         id="path50"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#333333;stroke-width:0.13499001px" />
+      <path
+         d="m 4.1509,264.9 c -0.47254,-1.8754 -0.18998,-4.2085 1.1805,-6.5985 2.1046,-3.4734 5.1925,-3.1292 7.0951,-3.1662 -2.8352,3.1934 -5.2726,6.1317 -8.2755,9.7646 z"
+         id="path52"
+         inkscape:connector-curvature="0"
+         style="fill:url(#d);fill-rule:evenodd" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/image.svg b/freeplane/viewer-resources/images/icons/image.svg
new file mode 100644
index 0000000..d98fece
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/image.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26.005"
+   width="31.983"
+   version="1.1"
+   viewBox="0 0 31.983439 26.005018"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="image.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1062"
+     inkscape:window-height="716"
+     id="namedview62"
+     showgrid="false"
+     inkscape:zoom="9.0751781"
+     inkscape:cx="-0.75748261"
+     inkscape:cy="12.892309"
+     inkscape:window-x="841"
+     inkscape:window-y="172"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="298.92"
+       gradientUnits="userSpaceOnUse"
+       y1="310.62"
+       x2="112.73"
+       x1="111.93"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#0d2e2e"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#0d2e2e"
+         stop-opacity="0"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="7.1091"
+       gradientUnits="userSpaceOnUse"
+       y1="24.627"
+       gradientTransform="matrix(0.84426804,0,0,-0.63982192,-2.908368,28.807686)"
+       x2="21.933"
+       x1="21.933">
+      <stop
+         stop-color="#acf"
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#04a"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       y2="302.84"
+       gradientUnits="userSpaceOnUse"
+       y1="302.84"
+       x2="118.52"
+       x1="105.51"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#37c837"
+         offset="0"
+         id="stop17" />
+      <stop
+         stop-color="#165016"
+         offset="1"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       y2="300.78"
+       gradientUnits="userSpaceOnUse"
+       y1="303.64"
+       x2="112.37"
+       x1="112.29"
+       gradientTransform="matrix(2.0152,0,0,2.113437,-209.7888,-631.17642)">
+      <stop
+         stop-color="#b9d7ff"
+         offset="0"
+         id="stop22" />
+      <stop
+         stop-color="#3c8dff"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4561">
+    <path
+       style="color:#000000;fill:url(#a);stroke:#0d2e2e;stroke-width:0.74587476;stroke-opacity:0.52548996"
+       d="m 1.182488,0.38195871 29.615379,0 c 0.453944,0 0.819381,0.38325067 0.819381,0.85932349 L 31.495932,24.586307 c -0.01008,0.735138 -0.569757,0.899289 -1.154467,0.909455 L 1.1815207,25.62299 c -0.4539238,0 -0.81938032,-0.38325 -0.81938032,-0.859302 l 0,-23.5225537 c 0,-0.47607287 0.36545652,-0.85932353 0.81938032,-0.85932353 z"
+       id="path34"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 2.834952,22.932331 26.219767,0 0,-8.319122 -26.219767,0 0,8.319122 z"
+       id="path36"
+       style="fill:url(#b)"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 2.834952,3.0871581 26.219767,0 0,11.5408449 -26.219767,0 0,-11.5408449 z"
+       id="path38"
+       style="fill:url(#c)"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#d)"
+       d="m 3.177536,3.6155173 0,11.1297817 c 16.26085,0.530536 14.567075,-6.9825843 25.576918,-6.9825843 l 0,-4.3517781 z"
+       id="path40"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.05;fill:#e8f52f;stroke:none;stroke-width:1.24858904"
+       inkscape:connector-curvature="0"
+       id="path44"
+       d="m 13.678712,8.9433991 c 0,2.4277219 -1.902587,4.5243909 -4.3336698,4.5243909 -2.3253837,0 -4.3336697,-1.986318 -4.3336697,-4.5243909 0,-2.427722 1.9025867,-4.524391 4.3336697,-4.524391 2.3253838,0 4.3336698,1.986318 4.3336698,4.524391 z" />
+    <path
+       style="opacity:0.2083;fill:#ecf751;stroke:none;stroke-width:1.24858904"
+       inkscape:connector-curvature="0"
+       id="path46"
+       d="m 13.255915,8.9433991 c 0,2.2070199 -1.691188,4.0829869 -3.9108728,4.0829869 -2.1139852,0 -3.9108726,-1.765616 -3.9108726,-4.0829869 0,-2.20702 1.6911881,-4.082987 3.9108726,-4.082987 2.1139848,0 3.9108728,1.765616 3.9108728,4.082987 z" />
+    <path
+       style="opacity:0.3667;fill:#f0f972;stroke:none;stroke-width:1.24858904"
+       inkscape:connector-curvature="0"
+       id="path48"
+       d="m 12.833118,8.9433991 c 0,1.9863179 -1.585489,3.6415829 -3.4880758,3.6415829 -1.9025867,0 -3.4880756,-1.655265 -3.4880756,-3.6415829 0,-1.986318 1.5854889,-3.641583 3.4880756,-3.641583 1.9025868,0 3.4880758,1.655265 3.4880758,3.641583 z" />
+    <path
+       style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.24858904"
+       inkscape:connector-curvature="0"
+       id="path50"
+       d="m 12.410321,8.9433991 c 0,1.7656159 -1.374091,3.2001789 -3.0652788,3.2001789 -1.6911882,0 -3.0652786,-1.434563 -3.0652786,-3.2001789 0,-1.765616 1.3740904,-3.200179 3.0652786,-3.200179 1.6911878,0 3.0652788,1.434563 3.0652788,3.200179 z" />
+    <path
+       style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.24858904"
+       inkscape:connector-curvature="0"
+       id="path52"
+       d="m 11.987524,8.9433991 c 0,1.5449139 -1.162692,2.7587749 -2.6424818,2.7587749 -1.4797897,0 -2.6424815,-1.213861 -2.6424815,-2.7587749 0,-1.544914 1.1626918,-2.758775 2.6424815,-2.758775 1.4797898,0 2.6424818,1.213861 2.6424818,2.758775 z" />
+    <path
+       style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.24858904"
+       inkscape:connector-curvature="0"
+       id="path54"
+       d="m 11.564727,8.9433991 c 0,1.3242119 -1.056993,2.3173709 -2.2196848,2.3173709 -1.1626919,0 -2.2196845,-1.10351 -2.2196845,-2.3173709 0,-1.213861 1.0569926,-2.317371 2.2196845,-2.317371 1.1626918,0 2.2196848,1.10351 2.2196848,2.317371 z" />
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1.24858904;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path56"
+       d="m 11.14193,8.9433991 c 0,1.1035099 -0.845594,1.9863179 -1.9025871,1.9863179 -1.0569926,0 -1.9025867,-0.882808 -1.9025867,-1.9863179 0,-1.10351 0.8455941,-1.986318 1.9025867,-1.986318 1.0569931,0 1.9025871,0.882808 1.9025871,1.986318 z" />
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.48301995"
+       d="m 2.593128,2.2206489 26.761856,0 c 0.09935,0 0.28773,0.084115 0.28773,0.1885186 l 0,20.8010805 c -0.0018,0.357087 0.01411,0.447246 -0.195474,0.459462 L 2.5926847,23.629343 c -0.099551,0 -0.1797559,0.104192 -0.1797559,0 l 0,-21.2210209 c 0,-0.1041924 0.080205,-0.1885186 0.1797559,-0.1885186 z"
+       id="path58"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;opacity:0.84658999;fill:none;stroke:#4f4f4f;stroke-width:0.74587476"
+       height="19.143723"
+       width="25.536613"
+       y="3.4675949"
+       x="3.1976929"
+       id="rect60" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/info.svg b/freeplane/viewer-resources/images/icons/info.svg
new file mode 100644
index 0000000..7ed14ce
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/info.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#00f" offset="0"/>
+<stop stop-color="#fff2ff" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-390.44 -34.371)">
+<g transform="translate(34.5,-348.23)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".58333" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 296.62 334.26)" stroke="#1b1fa9" stroke-width="6.8381" fill="url(#a)"/>
+<text font-size="28.522px" font-family="Arial" space="preserve" y="407.64105" x="367.91541" font-weight="bold" line-height="100%" fill="#ffffff">
+<tspan y="407.64105" x="367.91541">i</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/internet.svg b/freeplane/viewer-resources/images/icons/internet.svg
new file mode 100644
index 0000000..96b841e
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/internet.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000216 32.000217" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#69f931" offset="0"/>
+<stop stop-color="#f1fee4" stop-opacity=".043478" offset="1"/>
+</linearGradient>
+<filter id="b" style="color-interpolation-filters:sRGB" height="1.3909" width="1.102" y="-.19547" x="-.051002">
+<feGaussianBlur stdDeviation="8.8998435"/>
+</filter>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="610.38" cx="351.84" gradientTransform="matrix(1.2586 0 0 .24468 -90.988 447.73)" r="174.5">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</radialGradient>
+<radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="218.3" cx="305.9" gradientTransform="matrix(.1007 1.0897 -2.0556 .18997 721.02 -132.84)" r="86.902"/>
+<radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="428.09" cx="415.86" gradientTransform="matrix(-.36185 1.5532 -2.5863 -.60254 1686.8 53.041)" r="82.42"/>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="416.94" cx="303.89" gradientTransform="matrix(.93426 0 0 1 22.813 -2.8005e-7)" r="224.11">
+<stop stop-color="#b2d8f5" offset="0"/>
+<stop stop-color="#729ec0" stop-opacity="0" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-323.47 -458.36)">
+<g transform="translate(-18.433 .642)">
+<path style="color:#000000" fill="#59f" d="m564.38 441.46a224.11 224.11 0 0 1 -224.11 224.11 224.11 224.11 0 0 1 -224.11 -224.11 224.11 224.11 0 0 1 224.11 -224.11 224.11 224.11 0 0 1 224.11 224.11z" transform="matrix(.071394 0 0 .071394 333.61 442.2)"/>
+<path style="color:#000000" fill="url(#c)" d="m564.38 441.46a224.11 224.11 0 0 1 -224.11 224.11 224.11 224.11 0 0 1 -224.11 -224.11 224.11 224.11 0 0 1 224.11 -224.11 224.11 224.11 0 0 1 224.11 224.11z" transform="matrix(.071394 0 0 .071394 333.61 442.2)"/>
+<path style="color:#000000" d="m177.34 551.54c38.421 55.056 102.22 91.062 174.5 91.062 72.287 0.00002 136.09-35.994 174.5-91.062-47.253 30.092-108.07 48.188-174.5 48.188-66.415-0.00001-127.24-18.103-174.5-48.188z" transform="matrix(.063689 0 0 .063689 335.49 446.67)" filter="url(#b)" fill="url(#d)"/>
+<g fill-rule="evenodd" transform="matrix(.071394 0 0 .071394 332.78 442.07)">
+<g fill="#226e00">
+<path d="m370.98 650.97 13.38-8.5143-6.374-6.6664 17.929-37.121c-1.1969-10.768-0.18329-20.588 3.0408-30.408l-9.7306-6.0816-16.175-2.4326-2.3624-12.818-9.368-7.5435-0.67838-10.093-11.555-10.292 1.8479-10.947 8.8535-2.7484-10.701-10.631 10.339-7.9061 8.5143-1.8245-7.5903-8.7833 11.847-9.4616c2.0778-8.5533 5.1031-15.843 10.023-23.765l-0.29237-12.116 4.2103-0.31579 4.5729-9.1224 10.07-1.5087 15.204 3.0408-0.31579 5.4501 15.45-1.4619 19.531 8.1751 7.9061 7.298 12.771 0.60816c7.049 5.4342 11.7 [...]
+<path d="m341.68 438.79c-3.1579-6.9473-13.59-9.858-18.947-15.158l-1.8947-11.368c-6.9473 0.94735-12.947 1.2631-19.894-0.94736-0.73683-2.421-1.4737-4.842-2.2105-7.263l-12-6.9473-7.5788 6.6315c-16.842-1.7894-15.368-7.6841-34.421-19.579l-0.94735-13.263c-3.4736-8.3157-5.9999-16.631-13.263-24l0.31579-9.1578-5.0526-2.8421v17.684l7.5788 10.421 0.31579 8.842c-10.631-14.421-13.684-27.263-13.895-42.315-4.0828-9.9813-3.4736-6.9473-3.4736-6.9473l0.31579-10.737c3.2631-13.052 7.4736-20.421 20.21-33.473 [...]
+</g>
+<path fill="url(#e)" d="m348.94 323.53c-10.316-9.9999-17.025-17.005-36.947-18-19.538-0.95986-31.421 10.826-48.315 18-11.319 4.8066-27.368 7.9999-36.315 7.2631l-8.2104-10.737c-2.9473-11.368 9.5788-27.473 20.526-36.947l2.5263-12c6.5262-8.2104 13.308-15.868 22.421-20.842 10.889-5.9438 23.684-9.1578 41.684-13.263l26.21-3.1578-19.263 10.737 0.31578 6.6315 24 8.2104c5.5789 5.6841 10.526 10.421 16.737 11.368l8.842 0.31578-3.7894-11.052 6.9473-3.7894-5.9999-10.421 11.368 4.421 11.052-0.31579 9.1 [...]
+<path fill="url(#f)" d="m377.05 543v-15.158l-16.421-10.105 6.3157-6.3157 0.63157-16.737 7.2631 0.31578-3.4736-22.421 6.6315-3.1578 19.894-38.21 6.6315 3.1578 25.263-3.1578 10.105 10.421 21.473 4.7368 14.526 9.1578 7.2631 12 3.1578 15.158 19.579 12 9.7893 0.63157 9.7893 13.895c-14.631 13.789-30.577 29.587-52.42 36.631-12.324 3.9743-26.96 3.7859-38.21 9.7893-10.645 5.6806-18.947 13.684-27.473 25.263l-4.421-16.737c-9.8946-5.7894-19.789-11.895-25.894-21.158z"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/internet_warning.svg b/freeplane/viewer-resources/images/icons/internet_warning.svg
new file mode 100644
index 0000000..9ba9e93
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/internet_warning.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000216 32.000217" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="b" style="color-interpolation-filters:sRGB" height="1.3909" width="1.102" y="-.19547" x="-.051002">
+<feGaussianBlur stdDeviation="8.8998435"/>
+</filter>
+<linearGradient id="a">
+<stop stop-color="#69f931" offset="0"/>
+<stop stop-color="#f1fee4" stop-opacity=".043478" offset="1"/>
+</linearGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="416.94" cx="303.89" gradientTransform="matrix(.93426 0 0 1 22.813 -2.8006e-7)" r="224.11">
+<stop stop-color="#b2d8f5" offset="0"/>
+<stop stop-color="#729ec0" stop-opacity="0" offset="1"/>
+</radialGradient>
+<radialGradient id="e" gradientUnits="userSpaceOnUse" cy="610.38" cx="351.84" gradientTransform="matrix(1.2586 0 0 .24468 -90.988 447.73)" r="174.5">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#fff" stop-opacity="0" offset="1"/>
+</radialGradient>
+<radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="218.3" cx="305.9" gradientTransform="matrix(.1007 1.0897 -2.0556 .18997 721.02 -132.84)" r="86.902"/>
+<radialGradient id="g" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="428.09" cx="415.86" gradientTransform="matrix(-.36185 1.5532 -2.5863 -.60254 1686.8 53.041)" r="82.42"/>
+<linearGradient id="c" y2="443.74" gradientUnits="userSpaceOnUse" y1="417.96" x2="105.75" x1="93.539">
+<stop stop-color="#fff468" offset="0"/>
+<stop stop-color="#f2e154" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-280.94 -458.36)">
+<g transform="translate(-11.05,-2.0736)">
+<g transform="matrix(2,0,0,2,1440.4,-787.16)">
+<path style="color:#000000" fill="#59f" d="m564.38 441.46a224.11 224.11 0 0 1 -224.11 224.11 224.11 224.11 0 0 1 -224.11 -224.11 224.11 224.11 0 0 1 224.11 -224.11 224.11 224.11 0 0 1 224.11 224.11z" transform="matrix(.035697 0 0 .035697 -578.35 616.04)"/>
+<path style="color:#000000" fill="url(#d)" d="m564.38 441.46a224.11 224.11 0 0 1 -224.11 224.11 224.11 224.11 0 0 1 -224.11 -224.11 224.11 224.11 0 0 1 224.11 -224.11 224.11 224.11 0 0 1 224.11 224.11z" transform="matrix(.035697 0 0 .035697 -578.35 616.04)"/>
+<path style="color:#000000" d="m177.34 551.54c38.421 55.056 102.22 91.062 174.5 91.062 72.287 0.00002 136.09-35.994 174.5-91.062-47.253 30.092-108.07 48.188-174.5 48.188-66.415-0.00001-127.24-18.103-174.5-48.188z" transform="matrix(.031844 0 0 .031844 -577.4 618.27)" filter="url(#b)" fill="url(#e)"/>
+<g fill-rule="evenodd" transform="matrix(.035697 0 0 .035697 -578.76 615.97)">
+<g fill="#226e00">
+<path d="m370.98 650.97 13.38-8.5143-6.374-6.6664 17.929-37.121c-1.1969-10.768-0.18329-20.588 3.0408-30.408l-9.7306-6.0816-16.175-2.4326-2.3624-12.818-9.368-7.5435-0.67838-10.093-11.555-10.292 1.8479-10.947 8.8535-2.7484-10.701-10.631 10.339-7.9061 8.5143-1.8245-7.5903-8.7833 11.847-9.4616c2.0778-8.5533 5.1031-15.843 10.023-23.765l-0.29237-12.116 4.2103-0.31579 4.5729-9.1224 10.07-1.5087 15.204 3.0408-0.31579 5.4501 15.45-1.4619 19.531 8.1751 7.9061 7.298 12.771 0.60816c7.049 5.4342 11.7 [...]
+<path d="m341.68 438.79c-3.1579-6.9473-13.59-9.858-18.947-15.158l-1.8947-11.368c-6.9473 0.94735-12.947 1.2631-19.894-0.94736-0.73683-2.421-1.4737-4.842-2.2105-7.263l-12-6.9473-7.5788 6.6315c-16.842-1.7894-15.368-7.6841-34.421-19.579l-0.94735-13.263c-3.4736-8.3157-5.9999-16.631-13.263-24l0.31579-9.1578-5.0526-2.8421v17.684l7.5788 10.421 0.31579 8.842c-10.631-14.421-13.684-27.263-13.895-42.315-4.0828-9.9813-3.4736-6.9473-3.4736-6.9473l0.31579-10.737c3.2631-13.052 7.4736-20.421 20.21-33.473 [...]
+</g>
+<path fill="url(#f)" d="m348.94 323.53c-10.316-9.9999-17.025-17.005-36.947-18-19.538-0.95986-31.421 10.826-48.315 18-11.319 4.8066-27.368 7.9999-36.315 7.2631l-8.2104-10.737c-2.9473-11.368 9.5788-27.473 20.526-36.947l2.5263-12c6.5262-8.2104 13.308-15.868 22.421-20.842 10.889-5.9438 23.684-9.1578 41.684-13.263l26.21-3.1578-19.263 10.737 0.31578 6.6315 24 8.2104c5.5789 5.6841 10.526 10.421 16.737 11.368l8.842 0.31578-3.7894-11.052 6.9473-3.7894-5.9999-10.421 11.368 4.421 11.052-0.31579 9.1 [...]
+<path fill="url(#g)" d="m377.05 543v-15.158l-16.421-10.105 6.3157-6.3157 0.63157-16.737 7.2631 0.31578-3.4736-22.421 6.6315-3.1578 19.894-38.21 6.6315 3.1578 25.263-3.1578 10.105 10.421 21.473 4.7368 14.526 9.1578 7.2631 12 3.1578 15.158 19.579 12 9.7893 0.63157 9.7893 13.895c-14.631 13.789-30.577 29.587-52.42 36.631-12.324 3.9743-26.96 3.7859-38.21 9.7893-10.645 5.6806-18.947 13.684-27.473 25.263l-4.421-16.737c-9.8946-5.7894-19.789-11.895-25.894-21.158z"/>
+</g>
+</g>
+<path stroke-linejoin="round" d="m109.84 449.93c-1.5382 0.79665-36.555-21.615-36.476-23.346 0.0792-1.7305 36.997-20.85 38.456-19.916 1.459 0.93383-0.44182 42.465-1.9801 43.262z" stroke-opacity=".98834" transform="matrix(.40185 -.25182 .25368 .39793 165.05 339.9)" stroke="#d45500" stroke-linecap="round" stroke-width="2.1139" fill="url(#c)"/>
+<text font-size="17.023px" space="preserve" transform="scale(1.0487 .95354)" y="513.42676" x="295.78354" font-family="'Arial Rounded MT Bold'" fill="#333333">
+<tspan font-size="17.023px" y="513.42676" x="295.78354" font-family="'Arial Rounded MT Bold'" fill="#333333">!</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/kaddressbook.svg b/freeplane/viewer-resources/images/icons/kaddressbook.svg
new file mode 100644
index 0000000..d1007e3
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/kaddressbook.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.694" width="31.975" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.974631 31.694322" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#00c1ff" offset="0"/>
+<stop stop-color="#000083" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="331.1" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="333.71" gradientTransform="matrix(1.0425 .22384 -.18089 .93822 -8.5985 -108.83)" x2="434.02" x1="437.85"/>
+<radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="342.87" cx="426.43" gradientTransform="matrix(1.0657 .034538 -.011714 1.0078 -76.179 -52.215)" r="5.9413"/>
+<radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="338.06" cx="423.44" gradientTransform="matrix(1.9614 1.2513 -.57542 .78087 -265 -490.63)" r="6.8047"/>
+<radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="319.95" cx="438.93" gradientTransform="matrix(1.0425 .22384 -.24138 1.252 10.716 -209.01)" r="5.2539"/>
+<radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="317.57" cx="433.67" gradientTransform="matrix(1.0425 .22384 -.29005 1.5044 26.16 -289.11)" r="4.7513"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-205.89 -337.29)">
+<g stroke-opacity=".83140" fill-rule="evenodd" transform="translate(-156.95,57.033)" stroke="#005">
+<path stroke-linejoin="bevel" d="m378.26 303.88c0.23687 4.3848-1.1266 5.5461-3.0433 6.8131 3.8146-0.78994 9.4422-3.3702 13.481-7.6532 4.0795-4.3259 5.608-11.598 5.4309-13.725 0.46876 2.2248-2.7712 4.897-6.0034 5.0559-2.1146 5.4916-5.1589 7.907-9.8655 9.5094z" stroke-width="1.0869px" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m376.11 300.57-9.6728 9.5425c2.3175 1.2246 7.2046 2.4548 10.197-0.45505 2.3894-2.3238 1.5722-7.4511-0.52382-9.0875z" stroke-width="1.0093px" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m366.23 310-2.8881-2.4767 10.413-8.9311 2.3228 1.9722-9.8476 9.4356z" stroke-width="1.0093px" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m391.32 282.65-8.2493 10.711c2.4527 1.0306 7.1834 2.1729 10.063-1.8128 2.5592-3.5418 0.48188-7.4342-1.8141-8.8987z" stroke-width="1.0093px" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m383.04 293.33-2.6051-1.8046 7.334-10.762 3.608 1.8891-8.3368 10.678z" stroke-width="1.0093px" fill="url(#f)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/kmail.svg b/freeplane/viewer-resources/images/icons/kmail.svg
new file mode 100644
index 0000000..9ae0069
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/kmail.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.005" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 32.005" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#b7c4c8" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="549.51" gradientUnits="userSpaceOnUse" y1="578.68" gradientTransform="matrix(1 0 0 .32048 -223.95 315.05)" x2="371.91" x1="371.91">
+<stop stop-color="#4b769c" offset="0"/>
+<stop stop-color="#4b769c" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="489.83" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="572.58" gradientTransform="matrix(.2495 0 0 .2495 123.34 448.09)" x2="336.1" x1="315.11"/>
+<linearGradient id="d" y2="508.67" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="508.67" gradientTransform="matrix(.2495 0 0 .2495 123.34 448.09)" x2="337.92" x1="296.72"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-295.34 -336.99)">
+<g transform="translate(163.38,-131.51)">
+<rect height="10.255" width="32" y="490.25" x="131.96" fill="url(#b)"/>
+<g transform="translate(-66.336,-99.684)">
+<path stroke-linejoin="round" d="m220.51 577.65h-4.2557v-2.5866h4.2557v2.5866z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".15179px" fill="#9c6531"/>
+<path stroke-linejoin="round" d="m220.55 584.56h-4.2464v-2.9188h4.2464v2.9188z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".16107px" fill="#9c6531"/>
+<path stroke-linejoin="round" d="m214.2 568.39 7.7468 8.958 7.241-0.0364-7.8133-8.9944-7.1745 0.0728z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".24950px" fill="#ef9846"/>
+<path stroke-linejoin="round" d="m216.27 577.71 5.4701 6.1135 6.9507 0.008-5.9604-6.1056-6.4605-0.0159z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".23803px" fill="#ef9846"/>
+<path stroke-linejoin="round" d="m229.23 581.42h-7.2347v-4.1106h7.2347v4.1106z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".24950px" fill="#de8e42"/>
+<path stroke-linejoin="round" d="m216.31 584.67 5.6984 6.6535 7.241-0.0364-6.405-6.6899-6.5343 0.0728z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".24950px" fill="#ef9846"/>
+<path stroke-linejoin="round" d="m228.75 587.75h-6.9515v-3.9497h6.9515v3.9497z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".23973px" fill="#de8e42"/>
+<path stroke-linejoin="round" d="m222 577.44-7.8259-8.9643-0.0728 17.91 7.8924 9.007 0.006-4.019-5.7612-6.6624-0.0427-3.173 5.5541 6.2118 0.0126-3.8483-5.5603-6.218-0.049-2.6672 5.8766 6.3699-0.0301-3.9462z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".24950px" fill="#f7cb5a"/>
+<g transform="matrix(.99451 -.10462 .10462 .99451 -57.773 24.863)">
+<path stroke-linejoin="round" d="m216.9 575.17-15.127 17.429-4.275-11.181 10.03-12.99 9.3722 6.7414z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".5" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m202.1 592.11 14.634-16.771-13.154 2.4664-1.4798 14.305z" stroke="#000" stroke-linecap="round" stroke-width=".5" fill="none"/>
+<path stroke-linejoin="round" d="m207.52 568.43-2.9596 10.359-7.0703 2.7952 10.03-13.154z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".5" fill="url(#d)"/>
+</g>
+<path stroke-linejoin="round" d="m229.23 595.48h-7.2347v-4.1106h7.2347v4.1106z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".24950px" fill="#de8e42"/>
+</g>
+<rect height="32" width="32" y="468.5" x="131.96" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/knotify.svg b/freeplane/viewer-resources/images/icons/knotify.svg
new file mode 100644
index 0000000..1c90d7b
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/knotify.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.149" width="31.927" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.927478 32.148559" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#edc009" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="539.12" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="539.15" x2="107.93" x1="99.829"/>
+<linearGradient id="b" y2="539.12" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="539.23" x2="107.93" x1="100.15"/>
+<linearGradient id="d" y2="540.17" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="530.55" gradientTransform="matrix(.923 0 0 1.0133 -28.198 -241.26)" x2="133.49" x1="128.5"/>
+<linearGradient id="e" y2="534.96" gradientUnits="userSpaceOnUse" y1="534.96" gradientTransform="matrix(.923 0 0 1.0133 -28.427 -241.26)" x2="127.06" x1="125.23">
+<stop stop-color="#454837" offset="0"/>
+<stop stop-color="#454837" stop-opacity=".90265" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-227.5 -107.1)">
+<g stroke-linecap="round" transform="translate(163.36,-176.99)">
+<path stroke-linejoin="round" d="m107.08 539.12a5.0309 1.8322 0 0 1 -5.0309 1.8322 5.0309 1.8322 0 0 1 -5.0309 -1.8322 5.0309 1.8322 0 0 1 5.0309 -1.8322 5.0309 1.8322 0 0 1 5.0309 1.8322z" stroke-opacity=".97674" transform="matrix(.81083 -.49048 .35727 1.1131 -206.33 -240.61)" stroke="#45463e" stroke-width="1.6991" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m107.08 539.12a5.0309 1.8322 0 0 1 -5.0309 1.8322 5.0309 1.8322 0 0 1 -5.0309 -1.8322 5.0309 1.8322 0 0 1 5.0309 -1.8322 5.0309 1.8322 0 0 1 5.0309 1.8322z" stroke-opacity=".97674" transform="matrix(.81083 -.49048 .35727 1.1131 -194.81 -245.84)" stroke="#45463e" stroke-width="1.6991" fill="url(#b)"/>
+<path d="m84.957 285.79-0.22931 15.419m-11.924 5.2864 0.05733-14.789" stroke-opacity=".97674" stroke="#45463e" stroke-width="1.644" fill="none"/>
+<path d="m73.892 291.07 10.032-5.0347" stroke-opacity=".97674" fill-rule="evenodd" stroke="#45463e" stroke-width="3.8683" fill="#4d4d4d"/>
+<path stroke-linejoin="round" d="m107.08 539.12a5.0309 1.8322 0 0 1 -5.0309 1.8322 5.0309 1.8322 0 0 1 -5.0309 -1.8322 5.0309 1.8322 0 0 1 5.0309 -1.8322 5.0309 1.8322 0 0 1 5.0309 1.8322z" stroke-opacity=".93023" transform="matrix(.81083 -.49048 .35727 1.1131 -191.36 -238.04)" stroke="#454445" stroke-width="1.6991" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m88.291 292.45c10.462 7.2568 7.1815 11.045 4.8139 15.545 0.35995-5.1688 1.0838-10.027-4.8139-9.6769v-5.8686z" stroke-opacity=".94186" fill-rule="evenodd" stroke="#454837" stroke-width="1.0865px" fill="url(#d)"/>
+<path d="m88.06 308.94-0.11-16.3" stroke="url(#e)" stroke-width="1.6485" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/korn.svg b/freeplane/viewer-resources/images/icons/korn.svg
new file mode 100644
index 0000000..5f030f3
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/korn.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.003" width="32.136" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.136458 32.002563" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#434343" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="333.93" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="301.62" gradientTransform="matrix(.66 0 0 .76453 113.21 54.011)" x2="481.32" x1="483.29"/>
+<radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="311.28" cx="461.25" gradientTransform="matrix(-.029894 .20908 -1.4056 -.26967 868.94 280.55)" r="20.882"/>
+<linearGradient id="c" y2="299.76" gradientUnits="userSpaceOnUse" y1="314.5" gradientTransform="matrix(.66 0 0 .76453 113.21 54.011)" x2="469.29" x1="469.65">
+<stop stop-color="#d40000" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-340 -336.99)">
+<g transform="translate(-64.511,52.87)">
+<path stroke-linejoin="round" d="m425.46 315.77c0-1.0977 0.78309-17.03 0.78309-17.03 0.97427-4.3017 2.9374-6.1979 5.37-6.9523 2.3899 0.10792 3.749 2.3167 4.6767 5.9816l-0.0416 15.607-10.788 2.3937z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".71035px" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m431.51 291.7c-3.0334 1.1591-4.8741 3.4774-5.2764 7.3456l-0.79792 16.641-20.572-6.2204 0.59012-15.058c0.29368-2.2333 1.0663-5.796 4.5188-6.4669l21.538 3.7588z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".71035px" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m424.41 294.39-0.16455 5.6384c0.52382-1.9416 0.79466-3.0208 1.5357-4.1771l0.42856-2.1645-1.7998 0.70319z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".2131" fill="#383838"/>
+<path stroke-linejoin="round" d="m424.36 294.39-1.9197-0.38121-0.17849 5.5351 1.9578 0.51259 0.14037-5.6664z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".2131" fill="#3d3d3d"/>
+<path stroke-linejoin="round" d="m424.29 294.32c-0.21939 0-2.0173-0.37905-2.0173-0.37905l1.8211-0.65904 2.1242 0.38121-1.928 0.65688z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".2131" fill="#808080"/>
+<path stroke-linejoin="round" d="m428.86 307.41v1.7154c-0.14942 0.10659-0.73943 0.80665-0.7085 0.64583 0.0255-0.2826 0.10518-3.5049 0.10518-3.5049l0.60332 1.1436z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".2131" fill="#212020"/>
+<path stroke-linejoin="round" d="m424.3 296.74s-1.4949-0.10299-2.1871-0.34413c0.0558-2.5905 0.48385-5.7087 0.48682-8.6143l-2.0842-0.88949 0.0548-2.4143 3.6906 0.69566 0.0391 11.567z" stroke-opacity=".89535" fill-rule="evenodd" stroke="#800000" stroke-linecap="round" stroke-width=".71035px" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m461.44 311.29a0.33805 0.40566 0 0 1 -0.33804 0.40566 0.33805 0.40566 0 0 1 -0.33805 -0.40566 0.33805 0.40566 0 0 1 0.33805 -0.40566 0.33805 0.40566 0 0 1 0.33804 0.40566z" transform="matrix(.66 0 0 .76453 118.92 57.397)" stroke="#000" stroke-linecap="round" stroke-width="0.3"/>
+<path stroke-linejoin="round" d="m434.46 306.51v1.7154c-0.24371 0.27387-0.5116 0.52414-0.74355 0.76765 0.0323-0.28167 0.14022-3.6267 0.14022-3.6267l0.60333 1.1436z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".2131" fill="#212020"/>
+<path stroke-linejoin="round" d="m428.9 307.44c1.1382-0.25462 5.5248-0.98355 5.5248-0.98355l-0.58039-1.112-5.5956 0.93667 0.65116 1.1589z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width=".2131" fill="#4d4d4d"/>
+<text font-size="7.8289px" space="preserve" transform="matrix(.91774 .26972 0 1.0896 0 0)" y="172.46812" x="442.96512" font-family="'Bitstream Vera Sans Mono'" fill="#ffffff">
+<tspan y="172.46812" x="442.96512">MAIL</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/ksmiletris.svg b/freeplane/viewer-resources/images/icons/ksmiletris.svg
new file mode 100644
index 0000000..9812beb
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/ksmiletris.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#ff0" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#fdff00" offset="0"/>
+<stop stop-color="#ffd000" offset="1"/>
+</radialGradient>
+<radialGradient id="a" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="419.45" cx="127.13" gradientTransform="matrix(1,0,0,1.7307,0,-306.48)" r="2.2463"/>
+<linearGradient id="b" y2="214.96" gradientUnits="userSpaceOnUse" y1="271.12" x2="246.2" x1="315.83">
+<stop stop-color="#540" offset="0"/>
+<stop stop-color="#d4aa00" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-28.647 -724.73)">
+<g transform="translate(-109.52,310.95)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".79651" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 78.849 365.44)" stroke="#000" stroke-width="6.8381" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,-56.306,-32.386)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path stroke-linejoin="round" d="m145.11 432.72c4.9843 11.814 16.399 6.4438 17.991-0.14186" stroke="#000" stroke-linecap="round" stroke-width="1.2407" fill="none"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,-46.792,-32.33)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 78.809 365.4)" fill="url(#b)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/launch.svg b/freeplane/viewer-resources/images/icons/launch.svg
new file mode 100644
index 0000000..251b447
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/launch.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.001" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 32.001239" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="b">
+<stop stop-color="#f00" offset="0"/>
+<stop stop-color="#ff0" offset="1"/>
+</linearGradient>
+<linearGradient id="a">
+<stop stop-color="#b8b8b8" offset="0"/>
+<stop stop-color="#fff" stop-opacity=".94783" offset="1"/>
+</linearGradient>
+<radialGradient id="i" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="690.87" cx="251.69" gradientTransform="matrix(.63203 -.5744 .31238 .34372 -110.1 411.27)" r="4.1653"/>
+<linearGradient id="c" y2="617.23" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="617.23" gradientTransform="matrix(1.1339 .26263 -.26263 1.1339 222.83 -244.33)" x2="182.59" x1="178.85"/>
+<linearGradient id="d" y2="620.61" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="620.61" gradientTransform="matrix(1.1339 .26263 -.26263 1.1339 222.83 -244.33)" x2="188.44" x1="184.7"/>
+<linearGradient id="e" y2="608.8" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="608.8" gradientTransform="matrix(1.1339 .26263 -.26263 1.1339 222.83 -244.33)" x2="198.17" x1="177.54"/>
+<linearGradient id="f" y2="604.54" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="604.54" gradientTransform="matrix(1.1339 .26263 -.26263 1.1339 222.83 -244.33)" x2="191.76" x1="183.37"/>
+<linearGradient id="g" y2="608.88" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="608.88" gradientTransform="matrix(1.1339 .26263 -.26263 1.1339 222.83 -244.33)" x2="197.94" x1="190.61"/>
+<linearGradient id="h" y2="611.3" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="611.3" gradientTransform="matrix(1.1339 .26263 -.26263 1.1339 222.83 -244.33)" x2="193.06" x1="182.45"/>
+<radialGradient id="j" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="690.91" cx="250.63" gradientTransform="matrix(1.0222 .081193 -.069922 .88028 56.255 -123.76)" r="4.1653"/>
+<radialGradient id="k" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="690.91" cx="250.63" gradientTransform="matrix(1.0222 .081193 -.069922 .88028 62.109 -118.4)" r="4.1653"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-419.47 -107.12)">
+<g transform="translate(160.32,-375.71)">
+<path fill-rule="evenodd" fill="url(#i)" d="m263.6 501.95s-3.715 7.9578-3.6076 7.5024c0.1074-0.45549 7.0584-4.0626 7.0584-4.0626l-3.45-3.44z"/>
+<path stroke-linejoin="round" d="m265.79 501.5-1.6963 0.47681 2.8769 2.9127 0.53853-2.1639" fill-rule="evenodd" stroke="#000" stroke-width="1.0506" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m271.54 506.87-1.6963 0.47681 2.8768 2.9127 0.53855-2.164" fill-rule="evenodd" stroke="#000" stroke-width="1.0506" fill="url(#d)"/>
+<path stroke-linejoin="round" d="m289.51 483.36-3.48 0.0937-0.45872 0.73933-1.1676 0.15079-9.5149 10.332c-3.3475 0.89883-6.6883 1.7686-9.8458 1.8467l-1.7854 2.2942 11.958 11.418 1.9035-1.9552c0.14578-3.3842 0.90645-6.626 2.0284-9.7841l9.6233-10.123 0.19829-0.93502 0.80486-0.44058-0.26428-3.6361z" fill-rule="evenodd" stroke="#000" stroke-width="1.0506" fill="url(#e)"/>
+<path stroke-linejoin="round" d="m282.17 486.75-7.2391 7.8743c-1.1357 0.35543-2.537 0.64935-3.9461 0.94146l9.348-10.38 1.5889-0.0213 0.2483 1.5858z" fill-rule="evenodd" stroke="#000" stroke-width="1.0506" fill="url(#f)"/>
+<path stroke-linejoin="round" d="m277.92 503.15c0.18705-1.2942 0.73361-3.0228 1.3234-4.8036l7.2637-7.434 1.68 0.10932 0.0386 1.494-10.306 10.634z" fill-rule="evenodd" stroke="#000" stroke-width="1.0506" fill="url(#g)"/>
+<path stroke-linejoin="round" d="m283.71 489.44-3.0394 0.66276-12.56 13.124 2.421 2.3902 12.624-12.981 0.55457-3.1961z" fill-rule="evenodd" stroke="#000" stroke-width=".52528" fill="url(#h)"/>
+<path fill-rule="evenodd" fill="url(#j)" d="m263.6 501.95s-3.715 7.9578-3.6076 7.5024c0.1074-0.45549 7.0584-4.0626 7.0584-4.0626l-3.45-3.44z"/>
+<path fill-rule="evenodd" fill="url(#k)" d="m269.46 507.31s-3.715 7.9578-3.6076 7.5024c0.1074-0.45549 7.0584-4.0626 7.0584-4.0626l-3.45-3.44z"/>
+<path d="m273.9 499.53-4.6043 5.0244" stroke="#000" stroke-width="1.0506" fill="none"/>
+<rect rx=".16552" ry=".18513" height="32" width="32" y="482.83" x="259.15" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/licq.svg b/freeplane/viewer-resources/images/icons/licq.svg
new file mode 100644
index 0000000..155341f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/licq.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.991" width="29.253" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 29.253261 31.991283" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#00bf00" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(.99688 .078957 -.078957 .99688 -64.045 -52.331)" x2="590.72" x1="588.28"/>
+<linearGradient id="c" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(-.92376 .63311 -.44787 -1.0062 1241.7 474.84)" x2="590.72" x1="588.28"/>
+<linearGradient id="d" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(-.89388 -.39153 .44831 -.92236 840.47 1049.7)" x2="590.72" x1="588.28"/>
+<linearGradient id="e" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(-.30745 -.92144 .92855 -.32891 286.18 1112.8)" x2="590.72" x1="588.28"/>
+<linearGradient id="f" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(.50268 .83339 -.74126 .56515 514.87 -318.06)" x2="590.72" x1="588.28"/>
+<linearGradient id="g" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(.3486 -.91745 .93881 .39786 -110.36 800.52)" x2="590.72" x1="588.28"/>
+<linearGradient id="h" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(-.36302 .93443 -.93134 -.35736 1112.8 16.192)" x2="590.72" x1="588.28"/>
+<linearGradient id="i" y2="436.44" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="431.62" gradientTransform="matrix(.83427 -.55135 .55135 .83427 -236 395.31)" x2="590.72" x1="588.28"/>
+<radialGradient id="j" gradientUnits="userSpaceOnUse" cy="429.96" cx="599.22" gradientTransform="matrix(.58485 -.6645 .70371 .61935 -53.801 561.87)" r="5.2611">
+<stop stop-color="#b94606" stop-opacity=".99115" offset="0"/>
+<stop stop-color="#ffff06" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-71.786 -784.43)">
+<g transform="matrix(.86423 0 0 .86423 -344.56 435.47)">
+<path d="m493.4 421.82c-0.26796 0.87152-0.10076 2.3458 0.78007 3.3103-0.63591 1.5735-2.0814 2.6384-3.3004 3.7034-1.4851 1.0155-5.7401 3.5593-8.1132 0.17476-1.4115-3.427 0.94783-5.6094 3.9524-6.746 2.4057-0.59661 4.1992-0.66134 6.6811-0.44243z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#b)"/>
+<path d="m501.96 418.53c-0.53454-0.67373-1.3628-1.1181-2.2799-1.521 0.19984-2.3646 0.35674-4.9315 0.89579-6.8438 0.529-2.0952 2.1832-6.9739 6.9057-5.5265 3.5681 2.4472 2.7359 5.3139 0.6657 8.5322-1.9317 2.6839-3.8068 3.6267-6.1873 5.3592z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#c)"/>
+<path d="m503.38 422.23c0.1811-0.80676-0.31242-1.7445-0.50723-2.7086 1.1813-1.2936 3.0118-2.6726 4.542-3.2978 1.7581-0.4936 6.6576-1.5603 7.5825 2.4097 0.018 3.7051-2.9891 5.0302-6.2006 5.1566-2.4534-0.19678-3.1997-0.56385-5.4167-1.5598z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#d)"/>
+<path d="m502.13 425.72c0.67561-0.43987 1.0746-1.1128 1.4827-2.0015 1.7264 0.0703 4.0909 0.26705 5.5087 0.99054 1.4179 0.72349 5.4903 3.9186 3.239 7.1718s-5.7733 1.2422-7.5818-0.8252c-1.8086-2.0674-1.9033-3.0326-2.6486-5.3356z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#e)"/>
+<path d="m495.05 418.39c-0.48929 0.60984-0.96111 1.25-1.2358 2.2039-1.4562 0.49012-3.41 0.64146-4.8369 0.35324-1.5412-0.5286-5.7012-2.2732-4.6626-6.2684 1.6064-3.2659 4.4529-2.7842 6.9291-1.1373 1.7635 1.5159 2.5704 2.7596 3.8062 4.8485z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.1491" fill="url(#f)"/>
+<path d="m498.69 427.33c0.81142 0.13655 1.4036-0.0767 2.3543-0.45872 1.3421 1.1117 2.6114 3.4852 3.3041 4.9836 0.57229 1.7341 2.8047 7.1832-1.1048 8.331-3.6874 0.2243-5.1322-3.6545-5.4058-6.8653 0.0829-2.4692-0.0373-3.7137 0.85216-5.9906z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#g)"/>
+<path d="m498.51 416.84c-0.80834-0.10117-1.8301 0.43008-2.7838 0.72115-1.0564-1.5208-2.6039-3.2595-3.4178-4.6947-0.81399-1.4352-2.0401-6.2978 2.1722-7.8359 3.6869-0.38665 5.0288 2.0281 5.2503 5.2327-0.12269 2.4774-0.62855 3.9903-1.2208 6.5767z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#h)"/>
+<path d="m495.06 426.16c0.59908 0.55347 1.2285 1.0878 2.1721 1.4058 0.13446 1.8979 0.19218 3.7482-0.11302 5.3378-0.54543 1.7144-1.9338 6.4048-5.8873 5.198-3.2218-1.8322-2.7056-5.0044-1.0372-7.7495 1.5288-1.9509 2.7746-2.837 4.8654-4.1921z" stroke-opacity=".77326" fill-rule="evenodd" stroke="#006100" stroke-width="1.21" fill="url(#i)"/>
+<path stroke-linejoin="round" d="m603.41 428.36a5.1111 5.1852 0 0 1 -5.1111 5.1852 5.1111 5.1852 0 0 1 -5.1111 -5.1852 5.1111 5.1852 0 0 1 5.1111 -5.1852 5.1111 5.1852 0 0 1 5.1111 5.1852z" stroke-opacity=".86628" transform="matrix(.95776 0 0 .95776 -74.509 11.998)" stroke="#060" stroke-linecap="round" stroke-width=".7173" fill="url(#j)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/list.svg b/freeplane/viewer-resources/images/icons/list.svg
new file mode 100644
index 0000000..fac5ec6
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/list.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="31.656" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.655999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#b9150a" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="634.26" gradientUnits="userSpaceOnUse" y1="665.39" gradientTransform="matrix(1.0075 0 0 .99988 -81 -120.11)" x2="111.51" x1="137.93">
+<stop stop-color="#283c6d" offset="0"/>
+<stop stop-color="#136ec1" offset="1"/>
+</linearGradient>
+<radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19981 .1787 -.15894 .16574 241.58 572.22)" r="6.9383"/>
+<linearGradient id="d" y2="699.44" gradientUnits="userSpaceOnUse" y1="682.29" gradientTransform="matrix(.97347 0 0 .96895 -89.364 -132.93)" x2="149.98" x1="136.4">
+<stop stop-color="#fcfcfc" stop-opacity="0" offset="0"/>
+<stop stop-color="#b7d9fb" offset="1"/>
+</linearGradient>
+<radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.19981 .17871 -.14353 .14931 230.51 584.03)" r="6.9383"/>
+<radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="718.77" cx="160.44" gradientTransform="matrix(.1998 .17871 -.1504 .15662 235.45 578.78)" r="6.9383"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-116.59 -336.99)">
+<g transform="translate(84.059,-180.25)">
+<rect rx=".20723" ry=".20723" height="32" width="31.656" y="517.24" x="32.531" fill="none"/>
+<g transform="translate(-0.08905,-5.1498e-5)">
+<rect height="30.355" width="23.457" stroke="url(#c)" stroke-linecap="square" y="518.06" x="36.719" fill="#fff"/>
+<g transform="translate(-80.127,-120.19)">
+<path fill="url(#e)" d="m163.75 721.26a2.962 2.962 0 0 1 -2.962 2.962 2.962 2.962 0 0 1 -2.962 -2.962 2.962 2.962 0 0 1 2.962 -2.962 2.962 2.962 0 0 1 2.962 2.962z" transform="matrix(.64502 0 0 .67601 17.319 156.7)"/>
+<rect rx=".11266" ry=".18629" height="2.0194" width="12.869" y="643.28" x="124.36" fill="#0a67d7"/>
+</g>
+<rect height="29.416" width="22.665" y="518.53" x="37.115" fill="url(#d)"/>
+<g transform="translate(-80.127,-119.96)">
+<path fill="url(#b)" d="m163.75 721.26a2.962 2.962 0 0 1 -2.962 2.962 2.962 2.962 0 0 1 -2.962 -2.962 2.962 2.962 0 0 1 2.962 -2.962 2.962 2.962 0 0 1 2.962 2.962z" transform="matrix(.64502 0 0 .67601 17.319 168.01)"/>
+<rect rx=".11266" ry=".18629" height="2.0194" width="12.869" y="654.59" x="124.36" fill="#0a67d7"/>
+</g>
+<g transform="translate(-80.127,-120.08)">
+<path fill="url(#f)" d="m163.75 721.26a2.962 2.962 0 0 1 -2.962 2.962 2.962 2.962 0 0 1 -2.962 -2.962 2.962 2.962 0 0 1 2.962 -2.962 2.962 2.962 0 0 1 2.962 2.962z" transform="matrix(.64502 0 0 .67601 17.319 162.36)"/>
+<rect rx=".11266" ry=".18629" height="2.0194" width="12.869" y="648.93" x="124.36" fill="#0a67d7"/>
+</g>
+<g transform="translate(-80.127,-114.19)">
+<path fill="url(#b)" d="m163.75 721.26a2.962 2.962 0 0 1 -2.962 2.962 2.962 2.962 0 0 1 -2.962 -2.962 2.962 2.962 0 0 1 2.962 -2.962 2.962 2.962 0 0 1 2.962 2.962z" transform="matrix(.64502 0 0 .67601 17.319 168.01)"/>
+<rect rx=".11266" ry=".18629" height="2.0194" width="12.869" y="654.59" x="124.36" fill="#0a67d7"/>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/male1.svg b/freeplane/viewer-resources/images/icons/male1.svg
new file mode 100644
index 0000000..da1a9cd
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/male1.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.995" width="31.35" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.349999 31.994626" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 222.49 53.521)" r="9.493">
+<stop stop-color="#2ad4ff" offset="0"/>
+<stop stop-color="#006680" offset="1"/>
+</radialGradient>
+<linearGradient id="b" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fcc362" offset="0"/>
+<stop stop-color="#cb923a" offset="1"/>
+</linearGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 539.57 612.17)" r="9.2659">
+<stop stop-color="#bc830a" offset="0"/>
+<stop stop-color="#85510a" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-178.42 -658.01)">
+<g transform="translate(83.714,144.89)">
+<g transform="translate(61.092,-2.5222)">
+<g transform="matrix(-1,0,0,1.0597,104.2,-101.01)">
+<path fill-rule="evenodd" fill="#fff" d="m57.746 605.85-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.03335 4.8287-1.2719 7.1229z"/>
+<path d="m57.79 605.94c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8955 1.1506-3.364 2.304-3.854 4.7608l0.07557 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.08611-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16578 2.5852-0.72558 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#045" stroke-width="1px" fill="url(#c)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,20.916,-35.618)" stroke="#62340a" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m63.139 591.53-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56496 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.02852-2.7803 0.29215-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#6e3d0b" stroke-linecap="round" stroke-width="1.0298px" fill="url(#a)"/>
+</g>
+<path d="m46.38 540.78c-0.23094 2.1926-0.39211 4.3155-0.07006 5.9551" fill-rule="evenodd" stroke="#045" stroke-width="1px"/>
+</g>
+<rect rx=".134" ry=".13557" height="31.35" width="31.35" y="513.47" x="94.703" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/male2.svg b/freeplane/viewer-resources/images/icons/male2.svg
new file mode 100644
index 0000000..9cfda49
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/male2.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.005" width="31.35" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.349999 32.005222" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="c" y2="596.5" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851">
+<stop stop-color="#fcc362" offset="0"/>
+<stop stop-color="#cb923a" offset="1"/>
+</linearGradient>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="613.34" cx="131.66" gradientTransform="matrix(1.1987 .55359 -.33581 .72715 179.8 95.034)" r="9.493">
+<stop stop-color="#7ff44c" offset="0"/>
+<stop stop-color="#35981b" offset="1"/>
+</radialGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 621.01 623.86)" r="9.2659">
+<stop stop-color="#636363" offset="0"/>
+<stop stop-color="#0e0d0c" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-207.21 -658.01)">
+<g transform="translate(126.2,90.232)">
+<g transform="translate(73.407,51.975)">
+<g transform="matrix(1,0,0,1.0597,-113.08,-113.24)">
+<path fill-rule="evenodd" fill="#fff" d="m139.18 617.54-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path d="m139.23 617.64c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8954 1.1506-3.364 2.304-3.854 4.7608l0.0756 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.0861-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16577 2.5852-0.72557 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#196616" stroke-width="1px" fill="url(#a)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,102.35,-23.922)" stroke="#62340a" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m144.58 603.22-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56495 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.0285-2.7803 0.29214-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="1.0298px" fill="url(#b)"/>
+</g>
+<path d="m26.203 540.85c-0.119 1.985-0.21962 3.9701 0.21018 5.9551" fill-rule="evenodd" stroke="#196616" stroke-width="1px"/>
+</g>
+<rect rx=".134" ry=".13557" height="31.35" width="31.35" y="568.12" x="81.008" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/males.svg b/freeplane/viewer-resources/images/icons/males.svg
new file mode 100644
index 0000000..1ace026
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/males.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="38.247" width="38.045" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 38.044695 38.246734" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="e">
+<stop stop-color="#fcc362" offset="0"/>
+<stop stop-color="#cb923a" offset="1"/>
+</linearGradient>
+<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="602.05" cx="50.237" gradientTransform="matrix(1.2638 .57269 -.39157 .86413 222.49 53.521)" r="9.493">
+<stop stop-color="#2ad4ff" offset="0"/>
+<stop stop-color="#006680" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="596.5" xlink:href="#e" gradientUnits="userSpaceOnUse" y1="591.89" x2="34.085" x1="28.851"/>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 539.57 612.17)" r="9.2659">
+<stop stop-color="#bc830a" offset="0"/>
+<stop stop-color="#85510a" offset="1"/>
+</radialGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="613.34" cx="131.66" gradientTransform="matrix(1.1987 .55359 -.33581 .72715 179.8 95.034)" r="9.493">
+<stop stop-color="#7ff44c" offset="0"/>
+<stop stop-color="#35981b" offset="1"/>
+</radialGradient>
+<radialGradient id="d" gradientUnits="userSpaceOnUse" cy="587.32" cx="48.061" gradientTransform="matrix(-.21675 1.1894 -.81691 -.1393 621.01 623.86)" r="9.2659">
+<stop stop-color="#636363" offset="0"/>
+<stop stop-color="#0e0d0c" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-248.02 -651.76)">
+<g transform="translate(-55.764,-63.456)">
+<g transform="translate(282.9,205.82)">
+<g transform="matrix(-1,0,0,1.0597,104.2,-101.01)">
+<path fill-rule="evenodd" fill="#fff" d="m57.746 605.85-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.03335 4.8287-1.2719 7.1229z"/>
+<path d="m57.79 605.94c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8955 1.1506-3.364 2.304-3.854 4.7608l0.07557 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.08611-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16578 2.5852-0.72558 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#045" stroke-width="1px" fill="url(#f)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,20.916,-35.618)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m63.139 591.53-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56496 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.02852-2.7803 0.29215-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#6e3d0b" stroke-linecap="round" stroke-width="1.0298px" fill="url(#b)"/>
+</g>
+<path d="m46.38 540.78c-0.23094 2.1926-0.39211 4.3155-0.07006 5.9551" fill-rule="evenodd" stroke="#045" stroke-width="1px"/>
+</g>
+<g transform="matrix(-1,0,0,1,336.71,199.41)">
+<g transform="matrix(1,0,0,1.0597,-113.08,-113.24)">
+<path fill-rule="evenodd" fill="#fff" d="m139.18 617.54-7.7588-8.0132c7.7008-0.66485 7.1398-0.17854 10.684-0.38158l-1.6535 1.2719c0.55907 2.4637 0.0334 4.8287-1.2719 7.1229z"/>
+<path d="m139.23 617.64c-1.2321-2.1074-3.4345-5.2685-7.8591-8.1614-1.8954 1.1506-3.364 2.304-3.854 4.7608l0.0756 6.65c2.732 2.1497 6.5631 2.358 9.8995 2.4182 5.0237-0.61895 6.362-2.1462 7.9347-3.6273 0.0861-2.0983 0.23606-3.4857-0.45341-6.5744-0.46374-1.5638-1.9521-3.4539-2.796-4.0051-1.2035 0.84618-1.2922 0.81697-1.6625 1.2846-0.16577 2.5852-0.72557 5.2594-1.2847 7.2546z" fill-rule="evenodd" stroke="#196616" stroke-width="1px" fill="url(#c)"/>
+<path d="m37.935 591.89a6.6122 6.6122 0 0 1 -6.6107 6.6122 6.6122 6.6122 0 0 1 -6.6138 -6.6091 6.6122 6.6122 0 0 1 6.6075 -6.6154 6.6122 6.6122 0 0 1 6.6169 6.606" stroke-opacity=".72674" transform="matrix(1.0913,0,0,1.0614,102.35,-23.922)" stroke="#62340a" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m144.58 603.22-1.5186-2.6026-1.7262 2.0843c-3.8382 1.0955-6.5335 0.90128-9.3442 0.83735l-1.266-1.3777c-0.56495 2.4766 0.95041 5.213-1.4143 5.6888-1.4958-1.5569-1.78-3.2859-2.0882-5.2819 0.0285-2.7803 0.29214-3.9009 2.0783-5.9941 1.5178-1.3282 3.1044-2.1723 6.3298-2.4492 5.2391-0.13522 9.1222 3.0967 8.9494 9.095z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-width="1.0298px" fill="url(#d)"/>
+</g>
+<path d="m26.203 540.85c-0.119 1.985-0.21962 3.9701 0.21018 5.9551" fill-rule="evenodd" stroke="#196616" stroke-width="1px"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/messagebox_warning.svg b/freeplane/viewer-resources/images/icons/messagebox_warning.svg
new file mode 100644
index 0000000..34b5760
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/messagebox_warning.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="28.479" width="32.04" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.040335 28.479474" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="443.74" gradientUnits="userSpaceOnUse" y1="417.96" x2="105.75" x1="93.539">
+<stop stop-color="#fcf59f" offset="0"/>
+<stop stop-color="#fbbd0a" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-270.8 -37.833)">
+<g transform="translate(19.649,-281.31)">
+<path stroke-linejoin="round" d="m109.84 449.93c-1.5382 0.79665-36.555-21.615-36.476-23.346 0.0792-1.7305 36.997-20.85 38.456-19.916 1.459 0.93383-0.44182 42.465-1.9801 43.262z" stroke-opacity=".81395" transform="matrix(.58524 -.36673 .36945 .57952 51.646 125.47)" stroke="#d45500" stroke-linecap="round" stroke-width="2.891" fill="url(#a)"/>
+<text font-size="26px" space="preserve" y="344.12021" x="263.03073" font-family="'Arial Rounded MT Bold'" fill="#333333">
+<tspan font-size="26px" y="344.12021" x="263.03073" font-family="'Arial Rounded MT Bold'" fill="#333333">!</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/mindmap.png b/freeplane/viewer-resources/images/icons/mindmap.png
index 8f70fac..2e763ed 100644
Binary files a/freeplane/viewer-resources/images/icons/mindmap.png and b/freeplane/viewer-resources/images/icons/mindmap.png differ
diff --git a/freeplane/viewer-resources/images/icons/mindmap.svg b/freeplane/viewer-resources/images/icons/mindmap.svg
new file mode 100644
index 0000000..b251249
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/mindmap.svg
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="28.413"
+   width="32.006"
+   version="1.1"
+   viewBox="0 0 32.006244 28.413295"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mindmap.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1222"
+     inkscape:window-height="830"
+     id="namedview55"
+     showgrid="false"
+     inkscape:zoom="8.3060571"
+     inkscape:cx="-0.79197226"
+     inkscape:cy="14.2065"
+     inkscape:window-x="497"
+     inkscape:window-y="70"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="a"
+       y2="124.52"
+       gradientUnits="userSpaceOnUse"
+       y1="238.03"
+       x2="219.96"
+       x1="268.63"
+       gradientTransform="matrix(0.10362572,0,0,0.10395711,-10.559999,-7.377449)">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".99225"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4438">
+    <g
+       style="stroke:#ff6600"
+       id="g17"
+       transform="matrix(1.9609,0,0,1.9609,-349.58,-677.51102)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path19"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 186.01,354.4 c 1.308,-0.0185 2.106,-0.3557 2.878,-0.92391 0.77199,-0.56819 1.5135,-0.9051 2.622,-0.8176 -0.92664,-0.068 -1.7777,0.45059 -2.5221,1.1098 -0.75844,0.67299 -1.6346,1.4722 -2.9704,1.4911 l -0.007,-0.85943 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#ff6600;stroke-width:0.32962" />
+      <rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke-width:0.36881;stroke-linejoin:round"
+         id="rect21"
+         x="190.24001"
+         y="351.64001"
+         width="4.1717"
+         height="2.339"
+         ry="0.51581001"
+         rx="0.47172001" />
+    </g>
+    <g
+       style="stroke:#217867"
+       id="g23"
+       transform="matrix(-1.9609,0,0,1.9609,381.58078,-676.46182)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path25"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 186.2,353.12 c 1.4758,-0.012 2.3763,-0.23122 3.2473,-0.60058 0.87105,-0.36934 1.7077,-0.58834 2.9585,-0.53147 -1.0456,-0.0441 -2.0059,0.2929 -2.8458,0.72143 -0.85577,0.43747 -1.8444,0.95699 -3.3516,0.96928 l -0.008,-0.55866 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#165044;stroke-width:0.28229001" />
+      <rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke-width:0.36881;stroke-linejoin:round"
+         id="rect27"
+         x="190.24001"
+         y="350.82001"
+         width="4.1717"
+         height="2.339"
+         ry="0.51581001"
+         rx="0.47172001" />
+    </g>
+    <g
+       id="g29"
+       transform="matrix(2.5281884,0,0,2.5281884,-455.56861,-885.27238)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path31"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 185.11,355.09 c 1.4462,-0.0397 2.3285,-0.75973 3.1821,-1.9733 0.85355,-1.2136 1.6734,-1.9331 2.899,-1.7462 -1.0246,-0.14512 -1.9656,0.96238 -2.7886,2.3704 -0.83861,1.4374 -1.8074,3.1444 -3.2843,3.1847 l -0.008,-1.8356 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#000080" />
+      <rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.28604999;stroke-linejoin:round"
+         id="rect33"
+         x="189.44"
+         y="350.82001"
+         width="3.2356"
+         height="1.8142"
+         ry="0.40008"
+         rx="0.36587" />
+    </g>
+    <g
+       id="g35"
+       transform="matrix(-2.5281884,0,0,-2.5281884,486.68502,908.55894)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path37"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 185.44,355.37 c 1.394,0.0397 2.2445,0.763 3.0672,1.9818 0.82275,1.2188 1.613,1.9415 2.7944,1.7538 -0.98756,0.14576 -1.8946,-0.96653 -2.6879,-2.3806 -0.80833,-1.4436 -1.7421,-3.158 -3.1657,-3.1985 l -0.008,1.8435 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#ff0000" />
+      <rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.27259001;stroke-linejoin:round"
+         id="rect39"
+         x="188.87"
+         y="357.38"
+         width="3.2253001"
+         height="1.8536"
+         ry="0.40876001"
+         rx="0.36471" />
+    </g>
+    <path
+       style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#008000;stroke:#008000;stroke-width:0.2500026"
+       d="m 13.734561,19.524192 c 3.305048,0.07559 5.321602,1.448827 7.272113,3.763103 1.95067,2.314382 3.82437,3.686715 6.625478,3.330244 -2.341462,0.276769 -4.491957,-1.835321 -6.372978,-4.520603 -1.916535,-2.741165 -4.130447,-5.996615 -7.505781,-6.073532 l -0.01857,3.500523 z"
+       line-height="normal"
+       font-size="xx-small"
+       id="path43"
+       inkscape:connector-curvature="0" />
+    <rect
+       transform="scale(1,-1)"
+       rx="0.97040188"
+       ry="1.0611374"
+       height="4.8118267"
+       width="8.5818253"
+       y="-28.038099"
+       x="22.964619"
+       id="rect45"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#008000;stroke-width:0.7500078;stroke-linejoin:round" />
+    <g
+       id="g47"
+       transform="matrix(2.3956315,0,0,2.3956315,-426.42767,-830.53582)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path49"
+         font-size="xx-small"
+         line-height="normal"
+         d="m 185.76,355.22 c -1.5092,0.0318 -2.4299,0.61046 -3.3206,1.5856 -0.89073,0.97513 -1.7463,1.5533 -3.0253,1.4032 1.0692,0.11661 2.0512,-0.77329 2.91,-1.9046 0.87511,-1.155 1.886,-2.5266 3.4273,-2.559 l 0.008,1.4749 z"
+         style="color:#000000;font-size:xx-small;line-height:normal;text-indent:0;text-transform:none;block-progression:tb;fill:#d400aa" />
+      <rect
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#d400aa;stroke-width:0.27259001;stroke-linejoin:round"
+         id="rect51"
+         x="-181.85001"
+         y="356.48001"
+         width="3.2253001"
+         height="1.8536"
+         transform="scale(-1,1)"
+         rx="0.36471"
+         ry="0.40876001" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:61.54299927px;fill:url(#a);fill-rule:evenodd;stroke:#000080;stroke-width:0.97798371;stroke-opacity:0.99607999"
+       id="path53"
+       d="m 21.424079,15.483759 a 5.3062586,5.3232278 0 0 1 -5.306673,5.323644 5.3062586,5.3232278 0 0 1 -5.306673,-5.323644 5.3062586,5.3232278 0 0 1 5.306673,-5.323644 5.3062586,5.3232278 0 0 1 5.306673,5.323644 z"
+       font-size="61.543px" />
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/multiplication.svg b/freeplane/viewer-resources/images/icons/multiplication.svg
new file mode 100644
index 0000000..8c8fe49
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/multiplication.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="579.58" gradientUnits="userSpaceOnUse" y1="584.84" gradientTransform="translate(-30.808 .61288)" x2="436.28" x1="432.58">
+<stop stop-color="#04a" offset="0"/>
+<stop stop-color="#06f" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-100.03 -901.88)">
+<g transform="matrix(2,0,0,2,-769.05,-145.96)">
+<text style="word-spacing:0px;letter-spacing:0px" stroke-width=".25" font-family="Arial" space="preserve" transform="scale(1.0954 .91292)" stroke="#00112b" font-size="26.131px" y="589.43359" x="396.78329" font-weight="bold" line-height="125%" fill="#0044aa">
+<tspan y="589.43359" x="396.78329" stroke-width=".25">x</tspan>
+</text>
+<text style="word-spacing:0px;letter-spacing:0px" font-family="Arial" space="preserve" transform="scale(1.0954 .91292)" font-size="26.131px" y="589.43359" x="396.78329" font-weight="bold" line-height="125%" fill="url(#a)">
+<tspan y="589.43359" x="396.78329" fill="url(#a)">x</tspan>
+</text>
+<rect style="color:#000000" height="16" width="16" y="523.92" x="434.54" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/narrative.svg b/freeplane/viewer-resources/images/icons/narrative.svg
new file mode 100644
index 0000000..8735f33
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/narrative.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.65" width="31.127" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.126794 31.649595" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-26.99 -458.13)">
+<g transform="matrix(1.9841,0,0,1.9105,-134.12,329.21)">
+<path fill-rule="evenodd" fill="#fca" d="m85.015 79.022c-0.80502-2.5188-0.51479-4.4019 0.17682-6.3021 1.2291-2.9296 6.1719-2.7514 7.5223-0.86111s2.904 8.6026 0.31492 11.378c-3.8269 2.3747-6.5163-1.3147-8.0141-4.2145z"/>
+<g stroke="#000080">
+<path stroke-width="2.7879" fill="none" d="m82.117 68.945c1.1816 1.0313 2.058 1.7834 1.962 3.307-0.81404 3.783-0.45615 7.2435 0 10.677"/>
+<path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m89.409 67.979c-2.9819-0.06027-5.0719 1.5626-5.9819 4.2188 0.08318 0.83506-0.04193 1.0802 0.30227 1.3927 0.41206 0.37414 0.32125-0.14328 1.0617-0.81407 1.0358-1.4651 2.4966-2.6011 4.6552-2.5575 2.2789 0.04606 3.4736 1.0257 4.3065 2.6039 0.0047 0.0089-0.0047 0.02235 0 0.03125 0.65438 1.5778 0.82072 3.8058 0.375 5.5625-0.4507 1.7763-1.3211 2.958-2.9688 3.125-0.01258-0.000222-0.01879 0.000298-0.03125 0-0.5 [...]
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/negative.svg b/freeplane/viewer-resources/images/icons/negative.svg
new file mode 100644
index 0000000..ccdf836
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/negative.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.501" width="32.501" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.500853 32.500854" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="209.68" cx="231.3" gradientTransform="matrix(.75923 .68302 -.53818 .59822 170.55 -74.564)" r="54.625">
+<stop stop-color="#f7f7f7" offset="0"/>
+<stop stop-color="#7d7373" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-78.154 -205.79)">
+<g transform="matrix(1.0015,0,0,1.0015,-351.77,-287.97)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 370.21 444.93)" stroke="#870e0e" stroke-width="8.5352" fill="url(#a)"/>
+<text font-size="57.759px" space="preserve" transform="scale(1.1218 .89142)" y="586.23639" x="387.50137" font-family="Arial" fill="#800000">
+<tspan font-size="57.759px" y="586.23639" x="387.50137" font-family="Arial" fill="#800000">-</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/neutral.svg b/freeplane/viewer-resources/images/icons/neutral.svg
new file mode 100644
index 0000000..2edb2a0
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/neutral.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.5" width="32.5" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.499888 32.499889" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="209.68" cx="231.3" gradientTransform="matrix(.75923 .68302 -.53818 .59822 170.55 -74.564)" r="54.625">
+<stop stop-color="#f7f7f7" offset="0"/>
+<stop stop-color="#7d7373" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-121.7 -205.77)">
+<g transform="translate(-479.86,-47.452)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29291 0 0 .29291 542.4 205.06)" stroke="#000" stroke-width="8.5352" fill="url(#a)"/>
+<text font-size="29.334px" space="preserve" transform="scale(.99001 1.0101)" y="277.31198" x="615.92249" font-family="Arial" fill="#000000">
+<tspan font-size="29.334px" y="277.31198" x="615.92249" font-family="'Century Gothic'" fill="#000000">0</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/password.svg b/freeplane/viewer-resources/images/icons/password.svg
new file mode 100644
index 0000000..cea1526
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/password.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="29.858" width="32.012" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.012229 29.858152" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a">
+<stop stop-color="#b16200" offset="0"/>
+<stop stop-color="#ff0" stop-opacity=".99115" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="421.52" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="425.52" gradientTransform="matrix(.33314 -.038288 0 .43814 356.41 137.32)" x2="161.74" x1="159.3"/>
+<linearGradient id="c" y2="422.19" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="436.95" gradientTransform="matrix(.33314 -.038288 0 .43814 356.41 137.32)" x2="153.43" x1="145.53"/>
+<linearGradient id="d" y2="437.09" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="437.09" gradientTransform="matrix(.33314 -.038288 0 .43814 356.41 137.32)" x2="159.14" x1="154.24"/>
+<linearGradient id="e" y2="437.07" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="460.54" gradientTransform="matrix(.32012 -.062648 .042715 .40013 134.8 235.06)" x2="203.57" x1="214.48"/>
+<linearGradient id="f" y2="454.28" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="454.28" gradientTransform="matrix(.32012 -.062648 .042715 .40013 135.02 235.05)" x2="209.26" x1="204.26"/>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-265.81 -109.28)">
+<g transform="translate(-134.23,-200.5)">
+<path stroke-linejoin="round" d="m422.1 323.62c-0.33242 1.3616-0.656 2.3645-0.77011 4.8246l-20.424-15.104c-1.2811-1.6278-0.45393-3.5564 1.327-3.2941l19.867 13.574z" fill-rule="evenodd" stroke="#5d1001" stroke-linecap="round" stroke-width="0.497" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m401.73 314.19-0.0252 7.8987 1.1753 1.0453 0.0633-2.2349 1.163 1.0136-0.0128 2.2285 1.1501 1.0314-0.0128-2.492 1.3656 1.1567 0.0628 2.2198 1.4155 1.1172-0.11368-8.5151-6.231-4.4691z" fill-rule="evenodd" stroke="#5d1001" stroke-linecap="round" stroke-width=".45846" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m407.99 318.66 0.0318 8.4705 1.1996-0.43749-0.34613-7.4314-0.88534-0.60159z" fill-rule="evenodd" stroke="#5d1001" stroke-linecap="round" stroke-width=".45846" fill="url(#d)"/>
+<g transform="matrix(1.0109 .07645 -.07645 1.0109 232.96 -95.818)">
+<path stroke-linejoin="round" d="m222.44 394.55c-2.9362-1.0678-5.5677 2.2938-5.8718 7.5092-0.30406 5.2154 1.8336 10.324 4.7699 11.392 2.9362 1.0678 5.5586-2.31 5.8627-7.5254 0.30405-5.2154-1.8244-10.308-4.7607-11.376zm-0.71417 4.2462c1.0294 0.56254 2.2486 2.3614 2.2998 6.1632 0.0383 2.8438-1.0039 4.2475-2.437 4.1933-1.429-0.0541-2.0632-3.2231-2.1818-6.0611-0.0809-1.9355 0.55689-5.2868 2.319-4.2953z" stroke-opacity=".97674" stroke="#5d1001" stroke-linecap="round" stroke-width=".56846" fil [...]
+<path d="m220.72 398.77c-0.65546 3.5076-0.39239 6.4376 0.4341 10.061-0.7738-1.0051-1.3121-2.5904-1.4467-4.5765-0.13457-1.9861 0.032-3.8391 1.0126-5.4841z" fill-rule="evenodd" stroke="#5f1201" stroke-width=".36161px" fill="url(#f)"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/pencil.svg b/freeplane/viewer-resources/images/icons/pencil.svg
new file mode 100644
index 0000000..0c8ea8f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/pencil.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.992" width="32.009" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.009059 31.991662" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="446.77" gradientUnits="userSpaceOnUse" y1="440.75" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" x2="215.36" x1="209.71">
+<stop stop-color="#f70000" offset="0"/>
+<stop stop-color="#780000" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="449.6" gradientUnits="userSpaceOnUse" y1="456.24" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" x2="194.27" x1="202.53">
+<stop stop-color="#baa492" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="449.64" gradientUnits="userSpaceOnUse" y1="457.89" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" x2="193.04" x1="203.5">
+<stop offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="d" y2="462.65" gradientUnits="userSpaceOnUse" y1="458.87" gradientTransform="matrix(.99094 0 0 1.0073 134.73 -154.36)" x2="196.75" x1="193.01">
+<stop stop-color="#c00000" offset="0"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-304.22 -107.12)">
+<g transform="translate(-19.948,-172.53)">
+<path stroke-linejoin="round" d="m340.34 304.7 15.301-14.825 0.0255-9.7127-7.7193 0.11132-17.094 15.869" fill-rule="evenodd" stroke="#500" stroke-width="1.019" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m330.92 296.04-3.868 9.283 3.5794 3.6904 9.6367-4.2554c0.28336-1.8145 0.78302-3.5456-2.0093-3.9874-0.2834-1.4968 0.0987-3.1947-2.942-3.2724-0.96058-3.3215-2.9418-1.8004-4.3968-1.4582z" fill-rule="evenodd" stroke="url(#c)" stroke-width="1.0186px" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m327.03 305.38-2.3538 5.7552 5.9886-2.1372c-0.64013-2.659-1.4809-4.203-3.6348-3.618z" stroke-opacity=".83871" fill-rule="evenodd" stroke="#750000" stroke-width="1.0186px" fill="url(#d)"/>
+<path d="m355.75 289.96-15.04 14.8" stroke="#000" stroke-width=".39963" fill="none"/>
+<path d="m335.35 297.57-6.1721 7.7077" stroke="#000" stroke-width=".099907" fill="none"/>
+<path d="m338.29 300.98c-0.2939 0.11951-8.1706 5.5567-8.1706 5.5567" stroke="#000" stroke-width=".099907" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/penguin.svg b/freeplane/viewer-resources/images/icons/penguin.svg
new file mode 100644
index 0000000..1d53349
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/penguin.svg
@@ -0,0 +1,821 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.126" width="27.177" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 27.177386 32.126197" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-115.62 -784.29)">
+<g transform="translate(-325.19,467.09)">
+<path d="m465.34 338.72c-0.41463 1.7088-2.5192 5.2771-3.6374 6.8477-1.1182 1.5768-0.98004 2.9967-3.0469 2.4438-2.0606-0.55284-2.6386-0.45232-4.7683-0.32668-2.1171 0.12565-1.6585-0.0628-2.9841 0.534-1.3193 0.59682-5.7483-7.2372-6.1064-8.6947-0.35181-1.4575-0.52143-1.2816 0.39578-2.8584 0.91722-1.5769 1.0492-3.1349 2.2616-5.0447 1.2125-1.9161 2.6134-2.8899 2.5129-4.3536-0.39579-5.4342-0.70989-8.1481 1.7025-9.4046 2.2993-1.1936 4.2217-0.48374 4.9819-0.0754 0.32668 0.1759 0.99261 0.51515 1.4 [...]
+<path fill="#666" d="m451.81 325.5c0.37694-0.15076 0.3895-0.1382 0.64079-0.68476 0.20104-0.42091 0.30155-0.63451 0.29527-1.2753 0-0.62824-0.19475-0.84183-0.49002-1.2502-0.2827-0.3895-0.73503-0.40835-1.0177-0.35809-0.16334 0.0251-0.37694 0.23245-0.52143 0.54027-0.0942 0.20732-0.16963 0.47118-0.17591 0.74761-0.0188 0.74131 0.044 1.024 0.2136 1.5266 0.20103 0.59052 0.69105 0.89837 1.0554 0.75386z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#6d6d6d" d="m126.07 95.02c4.293-1.7168 4.436-1.5737 7.297-7.7974 2.289-4.7929 3.434-7.2252 3.362-14.522 0-7.1536-2.252-9.7364-5.579-14.236-3.295-4.3443-8.273-4.6185-11.489-4.0619-1.916 0.283-4.258 2.7284-5.941 6.127-1.16 2.3105-2.06 5.3371-2.131 8.5191-0.212 8.4382 0.532 11.667 2.463 17.386 2.286 6.7244 7.869 10.23 12.018 8.5843z"/>
+<path fill="#757575" d="m126.07 94.993c4.264-1.7057 4.406-1.5635 7.249-7.7468 2.274-4.7619 3.412-7.1785 3.341-14.428 0-7.1072-2.273-9.8248-5.544-14.143-3.349-4.2246-8.121-4.557-11.313-4.0198-1.961 0.2779-4.196 2.7926-5.905 6.062-1.242 2.245-2.177 5.2741-2.248 8.4701-0.207 8.3804 0.561 11.598 2.48 17.277 2.268 6.6807 7.817 10.163 11.94 8.5286z"/>
+<path fill="#7c7c7c" d="m126.07 94.966c4.236-1.6947 4.378-1.5533 7.202-7.6963 2.26-4.7308 3.389-7.1316 3.319-14.334 0-7.0608-2.293-9.9132-5.508-14.051-3.403-4.1049-7.969-4.4955-11.137-3.9777-2.006 0.273-4.133 2.8571-5.87 5.9971-1.323 2.1795-2.293 5.2111-2.363 8.4212-0.203 8.3225 0.588 11.528 2.495 17.168 2.25 6.6372 7.767 10.097 11.862 8.473z"/>
+<path fill="#848484" d="m126.07 94.94c4.209-1.6836 4.349-1.5431 7.155-7.6457 2.245-4.6998 3.367-7.0849 3.297-14.24 0-7.0144-2.313-10.002-5.472-13.959-3.457-3.9852-7.818-4.434-10.962-3.9356-2.049 0.268-4.07 2.9213-5.834 5.9321-1.404 2.1141-2.409 5.1481-2.479 8.3723-0.198 8.2646 0.617 11.459 2.511 17.058 2.232 6.5936 7.716 10.031 11.784 8.4174z"/>
+<path fill="#8c8c8c" d="m126.07 94.913c4.181-1.6725 4.321-1.5329 7.108-7.5952 2.23-4.6687 3.345-7.038 3.275-14.146 0-6.968-2.333-10.09-5.435-13.866-3.512-3.8655-7.667-4.3725-10.787-3.8935-2.094 0.263-4.008 2.9857-5.799 5.8672-1.484 2.0485-2.525 5.0851-2.594 8.3233-0.194 8.2068 0.644 11.39 2.526 16.948 2.214 6.55 7.665 9.9645 11.706 8.3617z"/>
+<path fill="#939393" d="m126.07 94.886c4.153-1.6614 4.291-1.5228 7.06-7.5447 2.215-4.6377 3.322-6.9913 3.253-14.051 0-6.9216-2.353-10.178-5.399-13.774-3.566-3.7458-7.515-4.311-10.611-3.8514-2.138 0.2579-3.946 3.0501-5.764 5.8023-1.565 1.983-2.64 5.022-2.709 8.2742-0.189 8.149 0.672 11.32 2.541 16.839 2.196 6.5063 7.614 9.8982 11.629 8.3061z"/>
+<path fill="#9b9b9b" d="m126.07 94.86c4.125-1.6503 4.263-1.5126 7.013-7.4942 2.2-4.6066 3.3-6.9444 3.231-13.957 0-6.8752-2.373-10.267-5.363-13.682-3.62-3.6261-7.363-4.2495-10.435-3.8093-2.183 0.253-3.884 3.1144-5.729 5.7373-1.646 1.9175-2.756 4.9591-2.825 8.2254-0.184 8.0911 0.701 11.251 2.557 16.73 2.178 6.4628 7.563 9.8319 11.551 8.2505z"/>
+<path fill="#a3a3a3" d="m126.07 94.833c4.097-1.6393 4.234-1.5025 6.966-7.4436 2.185-4.5756 3.278-6.8977 3.209-13.863 0-6.8288-2.393-10.355-5.326-13.59-3.676-3.5064-7.212-4.188-10.26-3.7672-2.228 0.248-3.822 3.1788-5.694 5.6723-1.726 1.8521-2.872 4.896-2.94 8.1765-0.18 8.0332 0.728 11.182 2.572 16.62 2.16 6.4192 7.512 9.7656 11.473 8.1948z"/>
+<path fill="#aaa" d="m126.07 94.806c4.07-1.6282 4.206-1.4922 6.919-7.3931 2.17-4.5445 3.256-6.8508 3.188-13.769 0-6.7824-2.414-10.444-5.291-13.497-3.73-3.3867-7.061-4.1265-10.085-3.7251-2.271 0.243-3.759 3.2431-5.657 5.6075-1.808 1.7865-2.989 4.833-3.057 8.1274-0.175 7.9754 0.757 11.112 2.589 16.51 2.142 6.3756 7.46 9.6993 11.394 8.1392z"/>
+<path fill="#b2b2b2" d="m126.07 94.779c4.041-1.617 4.176-1.4819 6.871-7.3424 2.155-4.5136 3.233-6.804 3.166-13.675 0-6.736-2.434-10.532-5.255-13.405-3.784-3.267-6.909-4.065-9.909-3.683-2.316 0.238-3.697 3.3074-5.622 5.5425-1.889 1.721-3.105 4.77-3.172 8.0785-0.171 7.9175 0.785 11.043 2.604 16.401 2.124 6.3319 7.409 9.6329 11.317 8.0834z"/>
+<path fill="#bababa" d="m126.07 94.753c4.014-1.6058 4.148-1.4718 6.824-7.2919 2.14-4.4825 3.211-6.7572 3.144-13.581 0-6.6896-2.454-10.62-5.218-13.313-3.839-3.1473-6.758-4.0035-9.734-3.6409-2.36 0.233-3.635 3.3719-5.587 5.4775-1.969 1.6556-3.221 4.707-3.288 8.0296-0.166 7.8597 0.813 10.974 2.62 16.292 2.106 6.2884 7.358 9.5667 11.239 8.0278z"/>
+<path fill="#c1c1c1" d="m126.07 94.726c3.986-1.5947 4.119-1.4615 6.777-7.2414 2.125-4.4514 3.189-6.7103 3.122-13.487 0-6.6433-2.474-10.709-5.182-13.22-3.893-3.0275-6.606-3.942-9.558-3.5988-2.405 0.228-3.573 3.4362-5.552 5.4126-2.05 1.59-3.337 4.6441-3.403 7.9806-0.162 7.8019 0.841 10.904 2.635 16.182 2.088 6.2448 7.307 9.5004 11.161 7.9722z"/>
+<path fill="#c9c9c9" d="m126.07 94.699c3.958-1.5837 4.091-1.4513 6.73-7.1908 2.111-4.4204 3.166-6.6636 3.1-13.393 0-6.5968-2.494-10.797-5.146-13.128-3.947-2.9079-6.454-3.8805-9.382-3.5567-2.45 0.223-3.51 3.5005-5.517 5.3477-2.131 1.5245-3.453 4.5809-3.519 7.9316-0.157 7.744 0.87 10.835 2.651 16.072 2.07 6.2012 7.257 9.4341 11.083 7.9165z"/>
+<path fill="#d1d1d1" d="m126.07 94.673c3.93-1.5726 4.061-1.4412 6.682-7.1403 2.096-4.3893 3.144-6.6167 3.078-13.298 0-6.5505-2.514-10.886-5.11-13.036-4.001-2.7881-6.303-3.8189-9.207-3.5146-2.493 0.2181-3.447 3.5649-5.481 5.2828-2.212 1.4589-3.569 4.5179-3.634 7.8827-0.153 7.6861 0.897 10.766 2.666 15.963 2.052 6.1576 7.206 9.3678 11.006 7.8609z"/>
+<path fill="#d8d8d8" d="m126.07 94.646c3.902-1.5616 4.033-1.4311 6.634-7.0898 2.082-4.3583 3.123-6.57 3.057-13.204 0-6.504-2.534-10.974-5.073-12.944-4.056-2.6685-6.152-3.7575-9.032-3.4725-2.538 0.213-3.385 3.6292-5.446 5.2177-2.292 1.3936-3.685 4.455-3.75 7.8338-0.148 7.6282 0.926 10.696 2.682 15.854 2.034 6.114 7.155 9.3015 10.928 7.8053z"/>
+<path fill="#e0e0e0" d="m126.07 94.619c3.875-1.5505 4.004-1.4208 6.587-7.0393 2.067-4.3272 3.1-6.5231 3.036-13.11 0-6.4576-2.555-11.062-5.038-12.851-4.11-2.5487-6-3.6959-8.856-3.4304-2.582 0.2081-3.323 3.6937-5.41 5.1529-2.374 1.328-3.802 4.3919-3.866 7.7847-0.144 7.5705 0.954 10.627 2.698 15.744 2.016 6.0703 7.103 9.2352 10.849 7.7496z"/>
+<path fill="#e8e8e8" d="m126.07 94.593c3.847-1.5393 3.976-1.4107 6.54-6.9887 2.052-4.2962 3.078-6.4764 3.014-13.016 0-6.4112-2.575-11.151-5.002-12.759-4.164-2.4291-5.848-3.6345-8.68-3.3883-2.627 0.203-3.261 3.7579-5.375 5.0879-2.455 1.2625-3.918 4.3289-3.981 7.7358-0.14 7.5126 0.981 10.558 2.713 15.634 1.998 6.0268 7.052 9.1689 10.771 7.694z"/>
+<path fill="#efefef" d="m126.07 94.566c3.818-1.5283 3.946-1.4005 6.492-6.9382 2.037-4.2651 3.056-6.4295 2.992-12.922 0-6.3648-2.595-11.239-4.965-12.667-4.22-2.3093-5.697-3.5729-8.505-3.3462-2.672 0.1981-3.199 3.8223-5.34 5.0229-2.535 1.1971-4.034 4.266-4.097 7.687-0.135 7.4547 1.01 10.488 2.729 15.525 1.98 5.9831 7.001 9.1026 10.694 7.6383z"/>
+<path fill="#f7f7f7" d="m126.07 94.539c3.791-1.5172 3.918-1.3902 6.445-6.8876 2.022-4.2341 3.034-6.3828 2.97-12.828 0-6.3184-2.615-11.328-4.929-12.574-4.274-2.1897-5.546-3.5115-8.33-3.3041-2.715 0.193-3.136 3.8866-5.304 4.9579-2.616 1.1316-4.15 4.203-4.212 7.638-0.131 7.3969 1.038 10.419 2.744 15.416 1.962 5.9396 6.95 9.0363 10.616 7.5827z"/>
+</g>
+<path fill="#fff" d="m451.81 325.45c0.32834-0.13141 0.33934-0.12042 0.55826-0.59657 0.17512-0.36673 0.26272-0.55284 0.25722-1.1111 0-0.54726-0.22991-0.9961-0.42693-1.0891-0.37764-0.18061-0.47065-0.30102-0.71147-0.28462-0.24083 0.0164-0.26822 0.34474-0.45975 0.42694-0.23532 0.093-0.37222 0.36122-0.37763 0.66216-0.011 0.64037 0.093 0.90309 0.24082 1.3355 0.16962 0.51445 0.60196 0.78267 0.91948 0.65677z"/>
+<path d="m451.46 322.94c0.18847 0 0.42719 0.12564 0.54028 0.29527 0.11936 0.16962 0.20731 0.40835 0.20731 0.67848 0 0.40207-0.044 0.84812-0.2827 0.98633-0.0754 0.044-0.23873 0.0817-0.33296 0.0817-0.2136 0-0.23245-0.13822-0.43348-0.34553-0.0691-0.0754-0.27642-0.43976-0.27642-0.74131 0-0.18847-0.044-0.45861 0.11936-0.69734 0.11308-0.1759 0.25757-0.25757 0.45861-0.25757z"/>
+<path d="m451.41 323.28c0.0736-0.11387 0.36839-0.0602 0.47554 0.17416 0.10723 0.23446 0.0871 0.74358 0.0134 0.77037-0.19423 0.0603-0.13402-0.2211-0.30146-0.47562-0.16744-0.24108-0.26124-0.35496-0.18751-0.46891z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#070707" d="m121.51 69.661c0.834-1.2885 4.169-0.6813 5.381 1.9707 1.214 2.6529 0.986 8.414 0.152 8.7171-2.198 0.6822-1.516-2.5019-3.411-5.3819-1.895-2.728-2.956-4.0165-2.122-5.3059z"/>
+<path fill="#0f0f0f" d="m121.57 69.716c0.823-1.2718 4.115-0.6725 5.312 1.9454 1.198 2.6189 0.973 8.306 0.15 8.6053-2.169 0.6735-1.497-2.4699-3.367-5.3128-1.871-2.693-2.918-3.9651-2.095-5.2379z"/>
+<path fill="#161616" d="m121.62 69.771c0.812-1.2554 4.062-0.6639 5.243 1.9201 1.182 2.5848 0.96 8.198 0.148 8.4932-2.141 0.6648-1.477-2.4376-3.323-5.2436-1.846-2.658-2.881-3.9136-2.068-5.1697z"/>
+<path fill="#1e1e1e" d="m121.67 69.826c0.801-1.2388 4.008-0.6551 5.174 1.8948 1.167 2.5509 0.947 8.09 0.146 8.3815-2.113 0.656-1.458-2.4057-3.28-5.1746-1.821-2.623-2.842-3.8621-2.04-5.1017z"/>
+<path fill="#262626" d="m121.73 69.881c0.791-1.2223 3.955-0.6465 5.105 1.8695 1.151 2.5167 0.935 7.982 0.144 8.2695-2.085 0.6472-1.438-2.3735-3.236-5.1055-1.797-2.5881-2.804-3.8106-2.013-5.0335z"/>
+<path fill="#2d2d2d" d="m121.78 69.936c0.78-1.2057 3.901-0.6377 5.036 1.8442 1.135 2.4828 0.922 7.874 0.142 8.1576-2.057 0.6386-1.419-2.3413-3.192-5.0363-1.773-2.5531-2.766-3.759-1.986-4.9655z"/>
+<path fill="#353535" d="m121.84 69.991c0.769-1.1891 3.848-0.629 4.967 1.8189 1.12 2.4487 0.909 7.766 0.14 8.0457-2.028 0.6298-1.399-2.3093-3.148-4.9672-1.749-2.518-2.729-3.7076-1.959-4.8974z"/>
+<path fill="#3d3d3d" d="m121.89 70.046c0.759-1.1725 3.794-0.6203 4.898 1.7936 1.104 2.4147 0.897 7.658 0.138 7.9339-2 0.621-1.38-2.2772-3.104-4.8982-1.725-2.483-2.691-3.656-1.932-4.8293z"/>
+<path fill="#444" d="m121.94 70.101c0.748-1.156 3.741-0.6116 4.829 1.7683 1.088 2.3806 0.884 7.55 0.136 7.822-1.972 0.6122-1.36-2.2452-3.061-4.8291-1.7-2.448-2.652-3.6046-1.904-4.7612z"/>
+<path fill="#4c4c4c" d="m122 70.156c0.737-1.1396 3.687-0.603 4.76 1.7429 1.073 2.3465 0.871 7.4421 0.134 7.7101-1.944 0.6035-1.341-2.213-3.017-4.76-1.676-2.413-2.614-3.5531-1.877-4.693z"/>
+<path fill="#545454" d="m122.05 70.212c0.727-1.1229 3.634-0.5942 4.691 1.7177 1.057 2.3125 0.859 7.334 0.132 7.5981-1.916 0.5948-1.321-2.1808-2.973-4.6908-1.652-2.378-2.577-3.5015-1.85-4.625z"/>
+<path fill="#5b5b5b" d="m122.11 70.267c0.716-1.1065 3.58-0.5856 4.622 1.6923 1.041 2.2785 0.846 7.2261 0.13 7.4863-1.887 0.5859-1.302-2.1489-2.929-4.6218-1.628-2.343-2.539-3.4501-1.823-4.5568z"/>
+<path fill="#636363" d="m122.16 70.322c0.705-1.0898 3.527-0.5768 4.553 1.6672 1.026 2.2443 0.833 7.1179 0.128 7.3743-1.859 0.5772-1.282-2.1167-2.885-4.5527-1.603-2.308-2.501-3.3985-1.796-4.4888z"/>
+<path fill="#6b6b6b" d="m122.21 70.377c0.694-1.0733 3.473-0.5682 4.484 1.6417 1.01 2.2104 0.82 7.0101 0.126 7.2625-1.831 0.5684-1.263-2.0847-2.842-4.4836-1.578-2.273-2.462-3.3471-1.768-4.4206z"/>
+<path fill="#727272" d="m122.27 70.432c0.684-1.0567 3.42-0.5594 4.414 1.6165 0.995 2.1763 0.809 6.902 0.125 7.1505-1.803 0.5598-1.243-2.0524-2.798-4.4144-1.554-2.238-2.425-3.2955-1.741-4.3526z"/>
+<path fill="#7a7a7a" d="m122.32 70.487c0.673-1.0402 3.366-0.5508 4.345 1.5911 0.98 2.1423 0.796 6.7941 0.123 7.0387-1.775 0.5509-1.224-2.0204-2.754-4.3454-1.53-2.203-2.387-3.244-1.714-4.2844z"/>
+<path fill="#828282" d="m122.38 70.542c0.662-1.0236 3.313-0.542 4.276 1.566 0.964 2.1081 0.783 6.6859 0.121 6.9267-1.746 0.5422-1.204-1.9884-2.71-4.2763-1.506-2.168-2.349-3.1926-1.687-4.2164z"/>
+<path fill="#898989" d="m122.43 70.597c0.652-1.0072 3.259-0.5334 4.207 1.5405 0.949 2.0741 0.771 6.5781 0.119 6.8148-1.718 0.5335-1.185-1.9561-2.666-4.2071-1.482-2.133-2.311-3.141-1.66-4.1482z"/>
+<path fill="#919191" d="m122.48 70.652c0.641-0.9905 3.206-0.5246 4.138 1.5154 0.933 2.04 0.758 6.4699 0.117 6.7028-1.69 0.5248-1.165-1.9241-2.623-4.138-1.457-2.098-2.273-3.0896-1.632-4.0802z"/>
+</g>
+<path fill="#999" d="m451.5 323.38c0.055-0.085 0.27503-0.045 0.35504 0.13 0.08 0.17504 0.065 0.55511 0.01 0.5751-0.14502 0.045-0.1-0.16508-0.22503-0.35503-0.12504-0.18001-0.19502-0.26508-0.14005-0.35007z"/>
+<path fill="#666" d="m455.71 325.58c0.94234-0.10052 1.2753-0.4649 1.4449-1.0994 0.15077-0.5654 0.15706-1.1936-0.26386-1.9287-0.39578-0.70362-0.62195-0.81669-1.1936-0.86067-0.87952-0.0754-1.2942 0.54027-1.4889 0.98004-0.20732 0.47745-0.16334 0.40835-0.15078 1.0115 0.0126 0.63451 0.20732 0.89837 0.4272 1.2942 0.21988 0.3895 1.1182 0.60938 1.225 0.6031z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#6d6d6d" d="m170.71 95.941c10.759-1.1312 14.618-5.3538 16.515-12.569 1.701-6.5252 1.691-13.673-3.096-21.9-4.433-7.7969-7.094-9.1116-13.568-9.6116-10.049-0.8608-14.669 5.9134-16.919 10.874-2.314 5.2736-1.892 4.6851-1.743 11.514 0.154 7.2717 2.316 10.263 4.834 14.801 2.52 4.4743 12.753 6.9641 13.977 6.8912z"/>
+<path fill="#757575" d="m170.72 95.9c10.717-1.1106 14.619-5.3795 16.468-12.538 1.675-6.5704 1.584-13.667-3.167-21.696-4.331-7.53-7.059-8.8634-13.456-9.3592-10.017-0.8578-14.506 5.6349-16.774 10.516-2.251 5.0753-1.913 4.6903-1.759 11.437 0.164 7.2713 2.258 10.231 4.772 14.77 2.52 4.4847 12.692 6.9443 13.916 6.8705z"/>
+<path fill="#7c7c7c" d="m170.72 95.858c10.675-1.0898 14.621-5.4052 16.423-12.507 1.648-6.6156 1.475-13.66-3.239-21.492-4.229-7.2629-7.025-8.615-13.344-9.1069-9.986-0.8546-14.342 5.3564-16.629 10.158-2.189 4.8769-1.934 4.6954-1.774 11.359 0.173 7.271 2.198 10.198 4.709 14.739 2.52 4.495 12.63 6.9246 13.854 6.8497z"/>
+<path fill="#848484" d="m170.73 95.817c10.634-1.069 14.623-5.431 16.377-12.476 1.622-6.6607 1.367-13.654-3.31-21.287-4.126-6.996-6.991-8.3667-13.232-8.8545-9.955-0.8514-14.179 5.0778-16.484 9.7996-2.127 4.6785-1.955 4.7005-1.79 11.281 0.184 7.2706 2.139 10.166 4.647 14.708 2.52 4.5053 12.568 6.9048 13.792 6.829z"/>
+<path fill="#8c8c8c" d="m170.73 95.775c10.593-1.0482 14.625-5.4567 16.332-12.444 1.595-6.706 1.258-13.647-3.382-21.083-4.024-6.7289-6.957-8.1184-13.12-8.6022-9.924-0.8483-14.016 4.7993-16.339 9.4415-2.065 4.4802-1.975 4.7057-1.806 11.204 0.194 7.2703 2.08 10.133 4.586 14.677 2.52 4.5158 12.505 6.8851 13.729 6.8083z"/>
+<path fill="#939393" d="m170.74 95.734c10.552-1.0275 14.628-5.4824 16.287-12.413 1.568-6.7511 1.149-13.64-3.453-20.879-3.922-6.4621-6.923-7.8702-13.009-8.3499-9.892-0.8452-13.853 4.5207-16.194 9.0833-2.003 4.2819-1.996 4.711-1.821 11.126 0.203 7.2699 2.02 10.1 4.523 14.646 2.52 4.5261 12.444 6.8651 13.667 6.7874z"/>
+<path fill="#9b9b9b" d="m170.74 95.692c10.51-1.0068 14.63-5.5082 16.241-12.382 1.542-6.7964 1.041-13.634-3.524-20.675-3.82-6.195-6.889-7.6218-12.897-8.0975-9.861-0.8419-13.69 4.2422-16.049 8.7253-1.941 4.0835-2.017 4.7161-1.837 11.048 0.214 7.2696 1.961 10.068 4.461 14.615 2.52 4.5364 12.382 6.8453 13.605 6.7667z"/>
+<path fill="#a3a3a3" d="m170.75 95.651c10.469-0.9859 14.632-5.5339 16.196-12.351 1.515-6.8416 0.932-13.627-3.596-20.471-3.718-5.9281-6.855-7.3736-12.785-7.8452-9.83-0.8389-13.527 3.9636-15.904 8.3672-1.879 3.8852-2.037 4.7212-1.852 10.97 0.223 7.2692 1.901 10.035 4.399 14.584 2.52 4.5468 12.319 6.8255 13.542 6.7459z"/>
+<path fill="#aaa" d="m170.75 95.609c10.427-0.9653 14.633-5.5597 16.149-12.32 1.489-6.8868 0.825-13.621-3.667-20.267-3.615-5.661-6.821-7.1252-12.673-7.5928-9.799-0.8357-13.364 3.6851-15.759 8.0091-1.816 3.6868-2.058 4.7264-1.868 10.893 0.233 7.2689 1.843 10.003 4.337 14.553 2.52 4.5571 12.257 6.8057 13.481 6.7252z"/>
+<path fill="#b2b2b2" d="m170.76 95.568c10.386-0.9446 14.635-5.5855 16.104-12.289 1.462-6.932 0.716-13.614-3.739-20.062-3.513-5.3941-6.786-6.8771-12.561-7.3406-9.767-0.8325-13.201 3.4065-15.614 7.651-1.754 3.4885-2.079 4.7316-1.883 10.815 0.243 7.2685 1.783 9.9701 4.274 14.522 2.52 4.5674 12.196 6.7859 13.419 6.7045z"/>
+<path fill="#bababa" d="m170.76 95.526c10.344-0.9237 14.637-5.6112 16.058-12.258 1.436-6.9772 0.608-13.607-3.81-19.858-3.41-5.127-6.752-6.6286-12.449-7.0881-9.736-0.8294-13.038 3.1279-15.469 7.2929-1.692 3.2902-2.099 4.7367-1.899 10.737 0.253 7.2682 1.724 9.9374 4.213 14.49 2.52 4.5778 12.133 6.7661 13.356 6.6837z"/>
+<path fill="#c1c1c1" d="m170.77 95.485c10.303-0.903 14.639-5.6369 16.013-12.227 1.409-7.0224 0.499-13.601-3.882-19.654-3.308-4.86-6.718-6.3803-12.337-6.8358-9.705-0.8262-12.875 2.8494-15.324 6.9348-1.63 3.0918-2.12 4.7419-1.914 10.66 0.262 7.2678 1.664 9.9048 4.15 14.459 2.52 4.5881 12.071 6.7464 13.294 6.6629z"/>
+<path fill="#c9c9c9" d="m170.77 95.444c10.262-0.8823 14.641-5.6627 15.967-12.196 1.383-7.0676 0.391-13.594-3.953-19.45-3.206-4.593-6.684-6.1321-12.225-6.5835-9.674-0.8231-12.711 2.5708-15.179 6.5767-1.568 2.8934-2.141 4.747-1.93 10.582 0.273 7.2674 1.605 9.8722 4.088 14.428 2.52 4.5985 12.009 6.7266 13.232 6.6422z"/>
+<path fill="#d1d1d1" d="m170.78 95.402c10.221-0.8616 14.643-5.6885 15.922-12.165 1.356-7.1127 0.282-13.588-4.025-19.246-3.103-4.326-6.649-5.8837-12.113-6.331-9.642-0.82-12.548 2.2923-15.034 6.2186-1.506 2.695-2.162 4.7521-1.945 10.504 0.282 7.2671 1.545 9.8396 4.025 14.397 2.52 4.6089 11.948 6.7068 13.17 6.6215z"/>
+<path fill="#d8d8d8" d="m170.78 95.361c10.179-0.8408 14.645-5.7142 15.876-12.134 1.33-7.158 0.174-13.581-4.096-19.042-3.001-4.0591-6.615-5.6355-12.001-6.0788-9.611-0.8168-12.385 2.0138-14.889 5.8605-1.444 2.4968-2.182 4.7573-1.961 10.426 0.292 7.2668 1.486 9.807 3.964 14.366 2.52 4.6192 11.885 6.6869 13.107 6.6007z"/>
+<path fill="#e0e0e0" d="m170.79 95.319c10.137-0.82 14.646-5.7399 15.83-12.102 1.303-7.2033 0.066-13.574-4.168-18.838-2.898-3.792-6.581-5.3871-11.889-5.8263-9.58-0.8137-12.222 1.7352-14.744 5.5023-1.381 2.2984-2.203 4.7625-1.977 10.349 0.303 7.2663 1.428 9.7743 3.902 14.335 2.52 4.6296 11.823 6.6671 13.046 6.5799z"/>
+<path fill="#e8e8e8" d="m170.79 95.278c10.096-0.7993 14.648-5.7657 15.785-12.071 1.276-7.2484-0.043-13.568-4.24-18.633-2.796-3.525-6.547-5.1389-11.777-5.5741-9.549-0.8105-12.059 1.4567-14.599 5.1443-1.319 2.1-2.224 4.7676-1.992 10.271 0.312 7.2661 1.368 9.7418 3.839 14.304 2.52 4.6399 11.761 6.6473 12.984 6.5592z"/>
+<path fill="#efefef" d="m170.8 95.236c10.055-0.7784 14.65-5.7914 15.739-12.04 1.25-7.2935-0.151-13.561-4.311-18.429-2.694-3.2579-6.512-4.8905-11.665-5.3216-9.517-0.8074-11.896 1.1781-14.454 4.7862-1.257 1.9017-2.244 4.7727-2.008 10.193 0.323 7.2657 1.309 9.7091 3.778 14.273 2.52 4.6502 11.699 6.6275 12.921 6.5384z"/>
+<path fill="#f7f7f7" d="m170.8 95.195c10.013-0.7578 14.652-5.8172 15.694-12.009 1.223-7.3388-0.26-13.555-4.383-18.225-2.591-2.991-6.478-4.6423-11.553-5.0694-9.486-0.8042-11.733 0.8996-14.309 4.4281-1.195 1.7033-2.265 4.7779-2.023 10.116 0.332 7.2653 1.249 9.6766 3.715 14.242 2.52 4.6606 11.637 6.6077 12.859 6.5177z"/>
+</g>
+<path fill="#fff" d="m455.71 325.51c0.8701-0.0643 1.2786-0.50982 1.3654-1.0451 0.10444-0.64429-0.0321-1.1821-0.38863-1.5724-0.21718-0.23767-0.56227-0.38339-0.99828-0.4203-0.82499-0.0699-1.0095 0.0542-1.2359 0.35512-0.0989 0.13132-0.19946 0.41735-0.17791 0.87587 0.0298 0.63389 0.10383 0.84147 0.31874 1.24 0.21988 0.40756 1.01 0.57482 1.1166 0.56688z"/>
+<path d="m455.63 322.92c0.47117 0 0.74759 0.42091 0.84183 0.9612 0.0377 0.245-0.0188 0.52771-0.16962 0.72247-0.16963 0.22615-0.47118 0.36437-0.71619 0.36437-0.23244 0-0.4963 0.0377-0.63451-0.15078-0.13821-0.19475-0.16962-0.62823-0.16962-0.93606 0-0.34553 0.10052-0.59054 0.27642-0.78529 0.13193-0.14449 0.37066-0.17591 0.57169-0.17591z"/>
+<path d="m455.66 323.11c0.0855-0.057 0.22791 0 0.39169 0.18516 0.17791 0.19937 0.25626 0.35599 0.0427 0.46985-0.16377 0.0855-0.21359-0.17083-0.31324-0.27763-0.15662-0.17085-0.29195-0.26342-0.12111-0.37738z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#070707" d="m170.23 67.735c0.96-0.6491 2.573 0 4.422 2.0905 2.009 2.2511 2.865 4.0195 0.482 5.3051-1.837 0.977-2.403-1.9289-3.525-3.1347-1.768-1.9261-3.296-2.9657-1.379-4.2609z"/>
+<path fill="#0f0f0f" d="m170.27 67.794c0.939-0.6451 2.534 0 4.356 2.059 1.978 2.2172 2.792 3.9588 0.474 5.2251-1.798 0.9739-2.358-1.8998-3.46-3.0875-1.742-1.8941-3.247-2.9122-1.37-4.1966z"/>
+<path fill="#161616" d="m170.31 67.852c0.919-0.6412 2.496 0 4.289 2.0275 1.948 2.1833 2.72 3.8984 0.467 5.1453-1.759 0.9709-2.313-1.8708-3.396-3.0402-1.715-1.8623-3.197-2.859-1.36-4.1326z"/>
+<path fill="#1e1e1e" d="m170.35 67.911c0.899-0.6372 2.457 0 4.222 1.9961 1.918 2.1494 2.648 3.8377 0.46 5.0653-1.719 0.9678-2.268-1.8417-3.331-2.9929-1.688-1.8305-3.147-2.8056-1.351-4.0685z"/>
+<path fill="#262626" d="m170.39 67.97c0.878-0.6332 2.418 0 4.155 1.9645 1.888 2.1155 2.576 3.7773 0.453 4.9855-1.68 0.9648-2.223-1.8127-3.266-2.9457-1.662-1.7986-3.098-2.7523-1.342-4.0043z"/>
+<path fill="#2d2d2d" d="m170.43 68.028c0.858-0.6294 2.379 0 4.089 1.933 1.857 2.0816 2.503 3.7166 0.445 4.9055-1.641 0.9617-2.178-1.7836-3.201-2.8984-1.636-1.7667-3.048-2.6989-1.333-3.9401z"/>
+<path fill="#353535" d="m170.47 68.087c0.837-0.6254 2.34 0 4.022 1.9015 1.827 2.0477 2.431 3.6562 0.438 4.8257-1.601 0.9587-2.133-1.7546-3.137-2.8512-1.608-1.7348-2.998-2.6456-1.323-3.876z"/>
+<path fill="#3d3d3d" d="m170.51 68.146c0.818-0.6215 2.302 0 3.956 1.87 1.797 2.0137 2.359 3.5955 0.431 4.7457-1.562 0.9556-2.088-1.7255-3.072-2.8039-1.582-1.7029-2.949-2.5922-1.315-3.8118z"/>
+<path fill="#444" d="m170.55 68.204c0.798-0.6174 2.263 0 3.889 1.8385 1.767 1.9799 2.287 3.5351 0.424 4.6659-1.523 0.9526-2.043-1.6965-3.007-2.7567-1.556-1.671-2.899-2.5389-1.306-3.7477z"/>
+<path fill="#4c4c4c" d="m170.59 68.263c0.777-0.6136 2.224 0 3.823 1.807 1.736 1.946 2.214 3.4745 0.416 4.5859-1.483 0.9495-1.998-1.6674-2.942-2.7095-1.529-1.6389-2.85-2.4854-1.297-3.6834z"/>
+<path fill="#545454" d="m170.63 68.322c0.757-0.6096 2.185 0 3.756 1.7755 1.706 1.9121 2.142 3.4139 0.409 4.5061-1.444 0.9465-1.953-1.6384-2.878-2.6623-1.502-1.607-2.799-2.4321-1.287-3.6193z"/>
+<path fill="#5b5b5b" d="m170.67 68.38c0.736-0.6055 2.146 0 3.689 1.7441 1.676 1.8782 2.07 3.3534 0.402 4.4261-1.405 0.9435-1.908-1.6093-2.813-2.6149-1.476-1.5752-2.75-2.3789-1.278-3.5553z"/>
+<path fill="#636363" d="m170.71 68.439c0.716-0.6017 2.108 0 3.622 1.7125 1.646 1.8443 1.998 3.2928 0.395 4.3463-1.365 0.9403-1.863-1.5803-2.748-2.5677-1.449-1.5433-2.701-2.3255-1.269-3.4911z"/>
+<path fill="#6b6b6b" d="m170.75 68.498c0.696-0.5978 2.069 0 3.556 1.681 1.615 1.8104 1.925 3.2323 0.387 4.2663-1.326 0.9374-1.818-1.5512-2.683-2.5204-1.423-1.5114-2.651-2.2722-1.26-3.4269z"/>
+<path fill="#727272" d="m170.79 68.556c0.675-0.5938 2.03 0 3.489 1.6495 1.585 1.7765 1.853 3.1717 0.38 4.1865-1.287 0.9342-1.774-1.5222-2.619-2.4733-1.396-1.4794-2.601-2.2187-1.25-3.3627z"/>
+<path fill="#7a7a7a" d="m170.83 68.615c0.655-0.5898 1.991 0 3.422 1.6179 1.555 1.7427 1.781 3.1113 0.373 4.1066-1.247 0.9313-1.729-1.4931-2.554-2.4259-1.369-1.4476-2.551-2.1655-1.241-3.2986z"/>
+<path fill="#828282" d="m170.87 68.674c0.634-0.5859 1.952 0 3.355 1.5865 1.525 1.7087 1.709 3.0506 0.366 4.0267-1.208 0.9281-1.684-1.4641-2.489-2.3787-1.343-1.4158-2.502-2.1121-1.232-3.2345z"/>
+<path fill="#898989" d="m170.9 68.732c0.615-0.5819 1.914 0 3.29 1.5551 1.494 1.6747 1.636 2.9901 0.358 3.9467-1.168 0.9252-1.639-1.435-2.424-2.3315-1.316-1.3838-2.453-2.0586-1.224-3.1703z"/>
+<path fill="#919191" d="m170.94 68.791c0.595-0.5779 1.875 0 3.223 1.5235 1.464 1.6409 1.564 2.9295 0.351 3.8669-1.129 0.922-1.594-1.406-2.36-2.2843-1.289-1.3519-2.402-2.0053-1.214-3.1061z"/>
+</g>
+<path fill="#999" d="m455.73 323.21c0.0501-0.0501 0.1602 0 0.27538 0.13019 0.12512 0.14021 0.13018 0.25032 0.03 0.33042-0.0951 0.0802-0.13516-0.12014-0.20025-0.19519-0.1102-0.11517-0.20531-0.17031-0.10514-0.26542z"/>
+<path fill="#666" d="m452.82 328.48c-0.8167 0.0314-2.1109-2.2554-2.1423-1.3067-0.0251 0.80413 0.0188 0.79157 0.0188 1.5706 0 0.52143-0.23873 0.55913-0.75388 1.3444-0.26386 0.41463-0.47117 0.86067-0.63451 1.313-0.10051 0.27014-0.19475 0.55284-0.27013 0.82926-0.0314 0.13821-0.088 0.28271-0.11937 0.42092-0.25757 0.94863-1.1748 2.1171-1.3884 3.0658-0.2136 0.94235-0.46489 1.5454-0.43348 2.8082 0.0314 1.2627 0.044 0.89837 0.4272 1.2125 0.37694 0.31412 0.76644 0.60938 1.3633 1.1371 0.62823 0.54 [...]
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#6d6d6d" d="m137.57 130.33c-9.281 0.353-23.746-25.511-24.242-15.179-0.316 8.755 0.1 8.678 0.03 17.247-0.15 5.87-2.953 6.637-8.726 15.481-3.013 4.763-5.2738 9.812-6.9926 14.877-0.9684 3.253-1.5602 6.422-2.43 9.526-0.4155 1.642-1.4969 3.187-2.1855 5.042-3.2526 10.78-13.544 24.182-15.96 34.878-2.4656 10.809-5.3697 17.694-4.9612 32.14 0.3665 14 0.3948 10.177 4.7738 13.817 4.2826 3.616 8.8385 7.069 15.662 13.102 7.1832 6.248 22.237 17.216 24.243 20.588 2.15 3.444 2.131 11.318 0.84 [...]
+<path fill="#757575" d="m137.55 131.42c-9.201 0.346-23.299-25.175-23.931-15.383-0.343 8.295-0.016 8.284-0.156 16.494-0.301 5.764-3.17 6.867-8.812 15.555-3.002 4.774-5.1477 9.76-6.7134 14.706-0.7847 3.41-0.8883 6.508-1.764 9.548-0.471 1.699-1.9857 3.133-3.0029 5.259-3.5532 10.688-13.623 24.1-16.009 34.62-2.4833 10.819-5.4115 17.677-4.9544 32.096 0.373 13.529 0.2855 10.058 4.6515 13.739 4.2452 3.632 8.8931 7.154 15.7 13.171 7.1663 6.233 22.298 17.224 24.294 20.585 2.14 3.432 2.173 11.404 0 [...]
+<path fill="#7c7c7c" d="m137.53 132.5c-9.122 0.338-22.853-24.838-23.622-15.586-0.37 7.833-0.131 7.89-0.341 15.741-0.452 5.657-3.387 7.096-8.899 15.628-2.99 4.785-5.0205 9.708-6.4331 14.535-0.6011 3.566-0.2165 6.594-1.098 9.57-0.5265 1.756-2.4745 3.08-3.8205 5.477-3.8538 10.596-13.703 24.017-16.057 34.361-2.501 10.829-5.4532 17.66-4.9476 32.052 0.3795 13.058 0.1763 9.939 4.5292 13.66 4.2078 3.649 8.9476 7.239 15.739 13.242 7.1494 6.217 22.358 17.232 24.345 20.581 2.13 3.42 2.216 11.49 0.9 [...]
+<path fill="#848484" d="m137.52 133.59c-9.043 0.331-22.407-24.502-23.312-15.79-0.398 7.373-0.247 7.496-0.527 14.988-0.602 5.551-3.604 7.326-8.985 15.702-2.98 4.796-4.8944 9.656-6.1538 14.364-0.4174 3.723 0.4554 6.679-0.432 9.592-0.582 1.813-2.9634 3.026-4.638 5.694-4.1544 10.504-13.782 23.935-16.105 34.103-2.5186 10.839-5.495 17.643-4.9408 32.008 0.386 12.586 0.067 9.82 4.407 13.582 4.1703 3.664 9.0021 7.324 15.777 13.311 7.1325 6.202 22.419 17.24 24.396 20.577 2.12 3.409 2.259 11.577 0. [...]
+<path fill="#8c8c8c" d="m137.5 134.67c-8.963 0.323-21.961-24.165-23.001-15.994-0.426 6.912-0.363 7.102-0.713 14.236-0.753 5.445-3.821 7.554-9.071 15.775-2.969 4.807-4.7683 9.604-5.8746 14.192-0.2337 3.881 1.1273 6.766 0.234 9.615-0.6375 1.87-3.4522 2.972-5.4554 5.911-4.455 10.413-13.862 23.853-16.153 33.845-2.5363 10.849-5.5367 17.626-4.9341 31.964 0.3926 12.115-0.0421 9.701 4.2848 13.504 4.1329 3.68 9.0566 7.409 15.815 13.38 7.1157 6.187 22.48 17.248 24.447 20.574 2.11 3.397 2.301 11.66 [...]
+<path fill="#939393" d="m137.48 135.76c-8.884 0.316-21.515-23.829-22.691-16.197-0.454 6.451-0.479 6.708-0.899 13.482-0.904 5.339-4.037 7.784-9.158 15.849-2.957 4.818-4.641 9.552-5.5943 14.021-0.0501 4.037 1.7993 6.852 0.9003 9.637-0.6933 1.928-3.9414 2.919-6.2733 6.129-4.7556 10.32-13.942 23.77-16.202 33.587-2.554 10.858-5.5785 17.608-4.9273 31.92 0.3991 11.643-0.1514 9.581 4.1625 13.424 4.0955 3.697 9.1112 7.494 15.853 13.451 7.0988 6.17 22.541 17.256 24.498 20.57 2.1 3.386 2.344 11.749 [...]
+<path fill="#9b9b9b" d="m137.46 136.84c-8.804 0.308-21.068-23.492-22.381-16.401-0.481 5.991-0.594 6.314-1.084 12.73-1.054 5.232-4.254 8.013-9.244 15.922-2.946 4.829-4.515 9.5-5.3151 13.85 0.1336 4.194 2.4711 6.937 1.5661 9.658-0.749 1.986-4.43 2.866-7.0905 6.347-5.0562 10.229-14.021 23.688-16.25 33.329-2.5717 10.868-5.6202 17.591-4.9205 31.876 0.4056 11.171-0.2606 9.462 4.0403 13.346 4.058 3.713 9.1656 7.579 15.891 13.52 7.082 6.155 22.601 17.264 24.548 20.567 2.091 3.374 2.387 11.835 1. [...]
+<path fill="#a3a3a3" d="m137.45 137.93c-8.726 0.301-20.622-23.156-22.071-16.604-0.509 5.529-0.71 5.919-1.271 11.976-1.204 5.126-4.47 8.243-9.329 15.996-2.935 4.84-4.389 9.448-5.0358 13.679 0.3168 4.351 3.1428 7.023 2.2318 9.68-0.804 2.043-4.9186 2.812-7.9077 6.564-5.3568 10.137-14.101 23.607-16.298 33.071-2.5893 10.878-5.662 17.574-4.9137 31.832 0.4121 10.7-0.3699 9.343 3.918 13.268 4.0207 3.728 9.2202 7.664 15.929 13.59 7.0651 6.139 22.661 17.271 24.599 20.562 2.081 3.363 2.43 11.922 1. [...]
+<path fill="#aaa" d="m137.43 139.01c-8.647 0.293-20.176-22.819-21.761-16.808-0.536 5.069-0.826 5.526-1.457 11.223-1.355 5.021-4.687 8.473-9.415 16.07-2.925 4.851-4.263 9.396-4.757 13.508 0.501 4.507 3.815 7.109 2.898 9.702-0.859 2.1-5.4072 2.759-8.725 6.782-5.6574 10.045-14.181 23.524-16.346 32.812-2.6069 10.888-5.7036 17.557-4.9068 31.788 0.4186 10.229-0.4792 9.224 3.7958 13.189 3.9832 3.745 9.2747 7.749 15.968 13.66 7.0483 6.124 22.722 17.28 24.651 20.559 2.07 3.351 2.472 12.008 1.255  [...]
+<path fill="#b2b2b2" d="m137.41 140.1c-8.567 0.286-19.729-22.483-21.45-17.012-0.564 4.608-0.942 5.132-1.643 10.471-1.505 4.914-4.904 8.701-9.502 16.143-2.913 4.862-4.136 9.344-4.476 13.336 0.684 4.665 4.486 7.195 3.564 9.725-0.915 2.157-5.8968 2.705-9.5432 6.999-5.958 9.953-14.26 23.442-16.395 32.554-2.6246 10.898-5.7454 17.54-4.9001 31.744 0.4252 9.757-0.5883 9.105 3.6736 13.111 3.9458 3.761 9.3292 7.834 16.006 13.729 7.0314 6.109 22.783 17.288 24.702 20.556 2.06 3.339 2.515 12.094 1.30 [...]
+<path fill="#bababa" d="m137.4 141.18c-8.488 0.279-19.283-22.146-21.141-17.215-0.591 4.147-1.057 4.737-1.828 9.717-1.656 4.808-5.121 8.931-9.588 16.217-2.902 4.873-4.01 9.292-4.197 13.165 0.868 4.822 5.158 7.281 4.23 9.747-0.971 2.215-6.3854 2.651-10.36 7.216-6.2586 9.861-14.34 23.36-16.443 32.297-2.6422 10.907-5.7871 17.522-4.8933 31.7 0.4317 9.285-0.6976 8.986 3.5513 13.032 3.9084 3.777 9.3838 7.919 16.044 13.799 7.0146 6.092 22.844 17.296 24.753 20.552 2.05 3.327 2.558 12.18 1.358 14. [...]
+<path fill="#c1c1c1" d="m137.38 142.27c-8.408 0.271-18.837-21.81-20.83-17.419-0.619 3.687-1.173 4.344-2.014 8.965-1.807 4.701-5.338 9.16-9.674 16.29-2.891 4.884-3.884 9.24-3.918 12.994 1.052 4.978 5.83 7.367 4.896 9.769-1.026 2.272-6.874 2.598-11.178 7.434-6.5592 9.769-14.42 23.277-16.491 32.038-2.6599 10.917-5.8289 17.505-4.8865 31.656 0.4382 8.814-0.8068 8.867 3.4291 12.953 3.8709 3.793 9.4382 8.004 16.082 13.869 6.9977 6.077 22.904 17.304 24.803 20.549 2.041 3.315 2.6 12.266 1.409 14. [...]
+<path fill="#c9c9c9" d="m137.36 143.35c-8.329 0.264-18.391-21.473-20.52-17.622-0.647 3.225-1.289 3.949-2.2 8.211-1.957 4.596-5.555 9.39-9.761 16.364-2.879 4.895-3.756 9.188-3.638 12.823 1.236 5.135 6.502 7.453 5.562 9.79-1.081 2.33-7.3626 2.545-11.995 7.652-6.8598 9.677-14.499 23.195-16.54 31.78-2.6776 10.927-5.8706 17.488-4.8797 31.612 0.4447 8.343-0.9161 8.748 3.3068 12.875 3.8335 3.809 9.4928 8.089 16.12 13.939 6.9809 6.061 22.965 17.311 24.854 20.544 2.031 3.304 2.643 12.353 1.461 14 [...]
+<path fill="#d1d1d1" d="m137.34 144.44c-8.25 0.256-17.945-21.137-20.21-17.826-0.675 2.765-1.405 3.555-2.386 7.459-2.108 4.489-5.772 9.619-9.847 16.437-2.869 4.906-3.63 9.136-3.358 12.652 1.419 5.292 7.174 7.538 6.228 9.812-1.137 2.387-7.8522 2.491-12.813 7.869-7.1604 9.586-14.579 23.114-16.588 31.522-2.6952 10.937-5.9124 17.471-4.8729 31.568 0.4512 7.871-1.0253 8.629 3.1845 12.797 3.7961 3.825 9.5474 8.174 16.158 14.008 6.964 6.046 23.026 17.32 24.905 20.541 2.021 3.292 2.686 12.439 1.51 [...]
+<path fill="#d8d8d8" d="m137.32 145.52c-8.17 0.249-17.498-20.8-19.9-18.03-0.702 2.304-1.521 3.162-2.571 6.706-2.259 4.383-5.989 9.848-9.933 16.511-2.858 4.917-3.504 9.084-3.079 12.48 1.603 5.449 7.846 7.625 6.894 9.835-1.193 2.444-8.341 2.438-13.63 8.087-7.461 9.493-14.658 23.031-16.636 31.263-2.7129 10.947-5.9541 17.454-4.8662 31.524 0.4578 7.4-1.1345 8.51 3.0624 12.718 3.7587 3.842 9.6018 8.259 16.196 14.078 6.9472 6.031 23.087 17.328 24.956 20.538 2.011 3.28 2.729 12.525 1.564 14.835- [...]
+<path fill="#e0e0e0" d="m137.31 146.61c-8.091 0.241-17.052-20.464-19.59-18.233-0.729 1.843-1.637 2.767-2.757 5.953-2.409 4.276-6.206 10.077-10.02 16.584-2.846 4.928-3.377 9.032-2.799 12.309 1.787 5.606 8.518 7.711 7.56 9.857-1.248 2.502-8.829 2.384-14.448 8.304-7.7616 9.402-14.738 22.949-16.684 31.006-2.7306 10.956-5.9959 17.436-4.8594 31.48 0.4643 6.928-1.2437 8.39 2.9401 12.639 3.7213 3.857 9.6564 8.344 16.235 14.148 6.9303 6.015 23.148 17.336 25.008 20.534 2 3.268 2.771 12.611 1.615 1 [...]
+<path fill="#e8e8e8" d="m137.29 147.69c-8.011 0.234-16.605-20.127-19.279-18.437-0.757 1.383-1.753 2.373-2.943 5.2-2.56 4.171-6.423 10.307-10.106 16.658-2.835 4.939-3.251 8.98-2.52 12.138 1.971 5.762 9.19 7.796 8.226 9.879-1.303 2.559-9.318 2.33-15.265 8.521-8.0622 9.31-14.818 22.867-16.733 30.748-2.7483 10.966-6.0376 17.419-4.8526 31.436 0.4708 6.456-1.353 8.271 2.8178 12.561 3.6839 3.873 9.7109 8.428 16.273 14.217 6.9135 5.999 23.208 17.344 25.058 20.53 1.991 3.257 2.814 12.698 1.666 14 [...]
+<path fill="#efefef" d="m137.27 148.78c-7.933 0.226-16.159-19.791-18.969-18.64-0.785 0.921-1.869 1.979-3.13 4.447-2.709 4.064-6.639 10.536-10.191 16.731-2.824 4.95-3.125 8.928-2.24 11.967 2.153 5.919 9.861 7.882 8.892 9.901-1.359 2.616-9.808 2.277-16.083 8.739-8.3628 9.218-14.897 22.784-16.781 30.489-2.7659 10.976-6.0794 17.402-4.8458 31.392 0.4773 5.985-1.4622 8.152 2.6956 12.482 3.6464 3.89 9.7654 8.514 16.311 14.288 6.8966 5.983 23.268 17.351 25.109 20.526 1.981 3.245 2.857 12.783 1.7 [...]
+<path fill="#f7f7f7" d="m137.26 149.86c-7.854 0.219-15.714-19.454-18.66-18.844-0.812 0.461-1.984 1.585-3.315 3.694-2.86 3.958-6.856 10.766-10.277 16.805-2.814 4.961-2.999 8.876-1.961 11.796 2.337 6.076 10.533 7.968 9.558 9.923-1.415 2.673-10.296 2.223-16.9 8.956-8.6634 9.126-14.977 22.702-16.829 30.231-2.7835 10.986-6.121 17.385-4.8389 31.348 0.4838 5.514-1.5715 8.033 2.5733 12.404 3.609 3.906 9.82 8.599 16.349 14.357 6.8798 5.968 23.329 17.36 25.16 20.523 1.971 3.233 2.899 12.869 1.77 1 [...]
+</g>
+<path fill="#fff" d="m452.79 330.38c-0.67831 0.0184-1.3321-1.6681-1.601-1.662-0.0733 0-0.18323 0.10392-0.30547 0.25662-0.26273 0.3361-0.61715 0.95936-0.90431 1.4727-0.24448 0.43382-0.25059 0.76993-0.14667 1.0143 0.21997 0.54385 0.97768 0.70274 0.89209 0.86774-0.12827 0.23829-0.94104 0.18934-1.5459 0.80047-0.78215 0.78826-1.3137 1.9737-1.4726 2.6153-0.24442 0.95936-0.53774 1.5154-0.42163 2.7314 0.0428 0.43994-0.14665 0.69053 0.21386 1.0754 0.31164 0.34221 0.8616 0.75772 1.4299 1.2588 0.59 [...]
+<path fill="#995900" d="m453.25 324.17c0.4586-0.0565 1.0868 0.0565 1.3758 0.27013 0.27014 0.20104 0.45861 0.30784 0.70362 0.38951 0.82298 0.27014 1.9035 0.39578 1.8533 1.137-0.0565 0.88581-0.31412 1.2816-1.0492 1.514-0.59053 0.18219-1.646 1.2062-2.4627 1.2062-0.36437 0-0.87324 0.0189-1.1685-0.0879-0.2827-0.10052-0.67849-0.57797-1.1434-0.96119-0.46489-0.37694-0.89837-0.77901-0.91093-1.3067-0.0189-0.55909 0.34552-0.74127 0.86067-1.1873 0.27014-0.23873 0.76016-0.63451 1.0994-0.81042 0.31411 [...]
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#9e5e00" d="m142.66 79.948c5.226-0.6443 12.384 0.6442 15.677 3.0781 3.078 2.2908 5.226 3.511 8.018 4.4384 9.374 3.0782 21.728 4.529 21.159 12.973-0.641 10.091-3.669 14.581-12.041 17.224-6.723 2.073-18.768 13.588-28.071 13.639-4.209 0.032-9.925 0.234-13.286-0.977-3.215-1.142-7.738-6.608-13.032-10.968-5.291-4.292-10.259-8.775-10.316-14.766-0.155-6.2531 3.911-8.4118 9.772-13.488 3.072-2.7107 8.595-7.3034 12.464-9.3334 3.563-1.8023 5.933-1.3903 9.656-1.8197z"/>
+<path fill="#a36400" d="m142.77 80.041c5.196-0.6405 12.313 0.6406 15.587 3.0604 3.06 2.2776 5.196 3.4938 7.971 4.4128 9.317 3.0603 21.642 4.5219 21.079 12.914-0.634 10.029-3.737 14.474-12.058 17.095-6.677 2.058-18.672 13.353-27.918 13.455-4.243 0.064-9.842 0.252-13.181-0.946-3.19-1.132-7.699-6.592-12.96-10.921-5.254-4.264-10.222-8.621-10.192-14.555-0.093-6.0985 3.863-8.3281 9.68-13.369 3.048-2.6853 8.478-7.3349 12.328-9.3786 3.527-1.8048 5.963-1.3407 9.664-1.7677z"/>
+<path fill="#a86a00" d="m142.88 80.134c5.165-0.6368 12.241 0.6368 15.496 3.0425 3.042 2.2643 5.165 3.4768 7.925 4.3871 9.259 3.0425 21.554 4.515 20.997 12.855-0.627 9.967-3.805 14.367-12.074 16.966-6.632 2.043-18.577 13.118-27.766 13.27-4.276 0.096-9.759 0.27-13.075-0.914-3.165-1.122-7.661-6.576-12.887-10.873-5.217-4.236-10.185-8.468-10.069-14.345-0.03-5.9441 3.815-8.2444 9.589-13.249 3.023-2.6601 8.361-7.3663 12.191-9.4241 3.49-1.807 5.994-1.2909 9.673-1.7153z"/>
+<path fill="#ad7000" d="m142.99 80.228c5.135-0.633 12.17 0.6331 15.406 3.0247 3.024 2.251 5.135 3.4597 7.878 4.3615 9.202 3.0246 21.467 4.508 20.917 12.796-0.62 9.905-3.874 14.26-12.091 16.838-6.587 2.027-18.481 12.881-27.613 13.085-4.309 0.128-9.676 0.288-12.969-0.883-3.14-1.113-7.623-6.561-12.816-10.826-5.18-4.208-10.148-8.315-9.945-14.135 0.032-5.7886 3.767-8.1597 9.497-13.129 3-2.6349 8.244-7.3978 12.056-9.4695 3.453-1.8093 6.023-1.2412 9.68-1.6631z"/>
+<path fill="#b27500" d="m143.1 80.321c5.105-0.6293 12.098 0.6294 15.314 3.0069 3.007 2.2378 5.105 3.4425 7.832 4.3358 9.145 3.0068 21.38 4.501 20.837 12.736-0.614 9.844-3.943 14.154-12.109 16.71-6.541 2.012-18.385 12.646-27.46 12.901-4.342 0.159-9.592 0.305-12.863-0.852-3.115-1.103-7.584-6.545-12.743-10.779-5.143-4.18-10.112-8.161-9.821-13.924 0.093-5.6341 3.718-8.076 9.405-13.009 2.975-2.6095 8.127-7.4292 11.919-9.5148 3.417-1.8117 6.053-1.1915 9.689-1.6109z"/>
+<path fill="#b77b00" d="m143.21 80.414c5.074-0.6255 12.026 0.6257 15.223 2.9891 2.99 2.2246 5.075 3.4255 7.786 4.3102 9.088 2.9889 21.292 4.494 20.756 12.677-0.607 9.783-4.011 14.047-12.126 16.581-6.496 1.997-18.289 12.411-27.307 12.716-4.376 0.192-9.51 0.324-12.758-0.82-3.09-1.093-7.546-6.529-12.67-10.731-5.106-4.152-10.075-8.008-9.698-13.714 0.155-5.4795 3.671-7.9923 9.314-12.89 2.95-2.5843 8.009-7.4608 11.782-9.5601 3.38-1.8141 6.083-1.1419 9.698-1.5588z"/>
+<path fill="#bc8100" d="m143.32 80.508c5.044-0.6218 11.955 0.622 15.133 2.9713 2.972 2.2113 5.045 3.4084 7.739 4.2845 9.031 2.9711 21.206 4.487 20.675 12.619-0.599 9.721-4.079 13.94-12.142 16.453-6.451 1.981-18.193 12.174-27.154 12.531-4.409 0.223-9.427 0.341-12.652-0.789-3.065-1.083-7.508-6.513-12.599-10.684-5.069-4.124-10.038-7.855-9.574-13.503 0.217-5.3251 3.623-7.9086 9.222-12.77 2.927-2.5589 7.893-7.4922 11.647-9.6054 3.343-1.8165 6.112-1.0922 9.705-1.5066z"/>
+<path fill="#c18700" d="m143.43 80.601c5.014-0.6181 11.882 0.6183 15.042 2.9535 2.954 2.198 5.014 3.3912 7.693 4.2589 8.973 2.9531 21.118 4.4799 20.594 12.56-0.593 9.659-4.148 13.833-12.159 16.324-6.406 1.966-18.098 11.939-27.002 12.347-4.442 0.255-9.343 0.359-12.546-0.758-3.04-1.074-7.469-6.498-12.526-10.636-5.032-4.096-10.001-7.702-9.45-13.294 0.278-5.1696 3.574-7.824 9.13-12.65 2.902-2.5336 7.775-7.5236 11.51-9.6509 3.307-1.8187 6.142-1.0424 9.714-1.4543z"/>
+<path fill="#c68c00" d="m143.54 80.694c4.984-0.6143 11.811 0.6146 14.952 2.9357 2.936 2.1848 4.984 3.3742 7.646 4.2332 8.916 2.9354 21.031 4.473 20.514 12.501-0.586 9.597-4.217 13.726-12.176 16.195-6.36 1.951-18.002 11.704-26.849 12.162-4.476 0.287-9.26 0.377-12.441-0.726-3.015-1.064-7.43-6.482-12.454-10.589-4.995-4.068-9.964-7.548-9.326-13.083 0.34-5.015 3.526-7.7402 9.038-12.53 2.878-2.5083 7.659-7.555 11.374-9.6962 3.271-1.8211 6.172-0.9927 9.722-1.4021z"/>
+<path fill="#cc9200" d="m143.65 80.787c4.953-0.6104 11.739 0.6111 14.861 2.918 2.918 2.1716 4.954 3.3571 7.6 4.2075 8.858 2.9176 20.943 4.466 20.433 12.441-0.579 9.536-4.285 13.62-12.193 16.067-6.315 1.936-17.906 11.468-26.696 11.978-4.509 0.319-9.178 0.395-12.335-0.695-2.99-1.054-7.393-6.466-12.382-10.542-4.958-4.04-9.927-7.395-9.203-12.872 0.402-4.8606 3.478-7.6565 8.947-12.411 2.854-2.4829 7.541-7.5865 11.238-9.7414 3.233-1.8236 6.201-0.9431 9.73-1.3501z"/>
+<path fill="#d19800" d="m143.76 80.881c4.924-0.6068 11.668 0.6073 14.771 2.9001 2.9 2.1583 4.923 3.3399 7.553 4.1819 8.801 2.8997 20.856 4.459 20.352 12.382-0.572 9.475-4.353 13.513-12.209 15.939-6.27 1.921-17.811 11.232-26.544 11.793-4.542 0.351-9.094 0.413-12.229-0.664-2.965-1.044-7.354-6.45-12.31-10.494-4.921-4.012-9.89-7.242-9.078-12.662 0.463-4.7061 3.429-7.5729 8.854-12.292 2.83-2.4577 7.425-7.618 11.102-9.7868 3.197-1.8259 6.231-0.8934 9.738-1.2978z"/>
+<path fill="#d69e00" d="m143.87 80.974c4.893-0.603 11.596 0.6036 14.679 2.8823 2.883 2.1451 4.894 3.3229 7.508 4.1562 8.743 2.8819 20.769 4.4521 20.271 12.323-0.565 9.413-4.422 13.406-12.227 15.81-6.224 1.906-17.714 10.997-26.39 11.608-4.576 0.383-9.011 0.431-12.124-0.632-2.94-1.035-7.315-6.435-12.237-10.447-4.884-3.984-9.853-7.088-8.955-12.452 0.525-4.5505 3.381-7.4881 8.763-12.171 2.805-2.4324 7.307-7.6494 10.965-9.8321 3.161-1.8283 6.261-0.8437 9.747-1.2456z"/>
+<path fill="#dba300" d="m143.98 81.067c4.863-0.5993 11.525 0.5999 14.589 2.8645 2.865 2.1318 4.864 3.3057 7.461 4.1306 8.686 2.864 20.682 4.445 20.191 12.264-0.558 9.351-4.491 13.299-12.244 15.681-6.179 1.891-17.618 10.762-26.237 11.424-4.609 0.415-8.929 0.449-12.018-0.601-2.915-1.025-7.278-6.419-12.166-10.399-4.847-3.956-9.816-6.935-8.831-12.242 0.588-4.3961 3.333-7.4044 8.671-12.052 2.782-2.4071 7.191-7.6808 10.83-9.8776 3.123-1.8305 6.291-0.7938 9.754-1.1933z"/>
+<path fill="#e0a900" d="m144.09 81.161c4.832-0.5955 11.453 0.5962 14.498 2.8467 2.847 2.1185 4.833 3.2887 7.415 4.1049 8.628 2.8462 20.594 4.4381 20.11 12.206-0.552 9.289-4.559 13.192-12.261 15.553-6.134 1.875-17.523 10.525-26.085 11.239-4.642 0.446-8.845 0.466-11.912-0.57-2.89-1.015-7.239-6.403-12.093-10.352-4.81-3.928-9.779-6.782-8.708-12.031 0.65-4.2416 3.285-7.3208 8.58-11.932 2.757-2.3818 7.073-7.7123 10.693-9.923 3.087-1.8328 6.321-0.7442 9.763-1.1411z"/>
+<path fill="#e5af00" d="m144.2 81.254c4.803-0.5918 11.382 0.5925 14.408 2.8289 2.829 2.1053 4.803 3.2716 7.368 4.0793 8.571 2.8282 20.507 4.431 20.029 12.146-0.544 9.228-4.627 13.086-12.277 15.425-6.089 1.86-17.427 10.29-25.932 11.054-4.676 0.479-8.762 0.485-11.807-0.538-2.865-1.005-7.2-6.387-12.021-10.305-4.773-3.9-9.742-6.628-8.583-11.82 0.711-4.087 3.236-7.2371 8.487-11.813 2.733-2.3565 6.957-7.7438 10.557-9.9682 3.051-1.8353 6.351-0.6946 9.771-1.089z"/>
+<path fill="#eab500" d="m144.31 81.347c4.772-0.5881 11.31 0.5888 14.317 2.8111 2.811 2.0921 4.773 3.2544 7.321 4.0536 8.514 2.8105 20.42 4.424 19.949 12.087-0.537 9.167-4.696 12.979-12.294 15.296-6.043 1.845-17.331 10.055-25.779 10.87-4.709 0.51-8.68 0.502-11.701-0.507-2.84-0.996-7.163-6.372-11.949-10.257-4.736-3.872-9.706-6.475-8.46-11.611 0.773-3.932 3.188-7.1523 8.396-11.692 2.709-2.3311 6.839-7.7752 10.421-10.014 3.013-1.8377 6.38-0.6448 9.779-1.0368z"/>
+<path fill="#efba00" d="m144.42 81.441c4.741-0.5843 11.238 0.5851 14.226 2.7933 2.793 2.0788 4.742 3.2374 7.275 4.028 8.456 2.7925 20.333 4.417 19.868 12.028-0.531 9.105-4.765 12.872-12.311 15.168-5.998 1.829-17.236 9.818-25.627 10.685-4.742 0.542-8.596 0.52-11.595-0.476-2.815-0.986-7.124-6.356-11.876-10.21-4.699-3.844-9.669-6.322-8.337-11.4 0.835-3.777 3.14-7.0687 8.305-11.573 2.684-2.3059 6.722-7.8067 10.284-10.059 2.977-1.84 6.41-0.5952 9.788-0.9846z"/>
+<path fill="#f4c000" d="m144.53 81.534c4.712-0.5804 11.166 0.5815 14.136 2.7756 2.775 2.0655 4.712 3.2203 7.228 4.0023 8.399 2.7748 20.246 4.4101 19.788 11.969-0.524 9.043-4.833 12.765-12.328 15.039-5.953 1.814-17.14 9.583-25.474 10.5-4.775 0.574-8.513 0.538-11.489-0.444-2.79-0.976-7.086-6.34-11.805-10.162-4.662-3.816-9.632-6.169-8.212-11.19 0.896-3.623 3.091-6.985 8.212-11.454 2.661-2.2806 6.605-7.838 10.149-10.104 2.94-1.8423 6.439-0.5454 9.795-0.9324z"/>
+<path fill="#f9c600" d="m144.64 81.627c4.681-0.5768 11.094 0.5777 14.044 2.7577 2.758 2.0523 4.683 3.2031 7.183 3.9767 8.341 2.7568 20.158 4.403 19.706 11.91-0.516 8.981-4.901 12.658-12.345 14.91-5.907 1.799-17.043 9.348-25.32 10.316-4.809 0.606-8.43 0.556-11.384-0.413-2.765-0.966-7.047-6.324-11.732-10.115-4.625-3.788-9.595-6.015-8.089-10.979 0.958-3.468 3.043-6.9012 8.121-11.334 2.636-2.2553 6.488-7.8696 10.012-10.15 2.904-1.8447 6.469-0.4957 9.804-0.8802z"/>
+</g>
+<path fill="#fc0" d="m453.44 324.34c0.40582-0.05 0.9618 0.0501 1.2176 0.23907 0.23907 0.17792 0.4059 0.278 0.62264 0.34474 0.72282 0.239 1.7513 0.38358 1.7124 1.034-0.0445 0.77831-0.43365 1.0952-1.0786 1.2898-0.51149 0.15566-1.4788 0.79506-2.196 0.88397-0.42248 0.0557-0.72831 0.0501-0.98405-0.0333-0.23908-0.0834-0.61157-0.5504-1.0174-0.87839-0.40032-0.32807-0.83397-0.51148-0.69498-0.93964 0.089-0.28907 0.26133-0.59478 0.70057-0.97843 0.22791-0.19457 0.55589-0.6894 0.86172-0.88955 0.25016 [...]
+<path fill="#fc0" d="m453.51 324.59c0.0879 0.1822 0.31412 0.20732 0.46489 0.28899 0.1445 0.0817 0.22617 0.10052 0.28271 0.0691 0.12564-0.0691 0.0314-0.29527-0.0942-0.37694-0.11936-0.0817-0.70362-0.10051-0.65336 0.0188z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#f9c600" d="m145.72 84.628c0.982 2.035 3.508 2.3157 5.193 3.2281 1.614 0.9123 2.526 1.1228 3.158 0.7719 1.403-0.7719 0.35-3.2983-1.053-4.2106-1.333-0.9123-7.86-1.1228-7.298 0.2106z"/>
+<path fill="#f4c000" d="m145.86 84.65c0.957 1.9822 3.418 2.2555 5.058 3.1442 1.572 0.8886 2.461 1.0936 3.076 0.7518 1.367-0.7518 0.342-3.2125-1.025-4.1012-1.299-0.8885-7.656-1.0935-7.109 0.2052z"/>
+<path fill="#efba00" d="m146 84.671c0.932 1.9294 3.327 2.1954 4.924 3.0604 1.53 0.8649 2.394 1.0644 2.993 0.7317 1.331-0.7317 0.333-3.1268-0.998-3.9917-1.264-0.8648-7.451-1.0644-6.919 0.1996z"/>
+<path fill="#eab500" d="m146.15 84.693c0.906 1.8764 3.235 2.1353 4.788 2.9765 1.488 0.8412 2.329 1.0352 2.912 0.7116 1.294-0.7116 0.323-3.0411-0.971-3.8822-1.229-0.841-7.247-1.0352-6.729 0.1941z"/>
+<path fill="#e5af00" d="m146.29 84.714c0.881 1.8236 3.144 2.0751 4.653 2.8926 1.447 0.8175 2.264 1.0059 2.83 0.6914 1.257-0.6914 0.314-2.9552-0.943-3.7727-1.195-0.8173-7.043-1.006-6.54 0.1887z"/>
+<path fill="#e0a900" d="m146.43 84.736c0.855 1.7706 3.052 2.0148 4.518 2.8085 1.404 0.7939 2.198 0.9769 2.747 0.6714 1.221-0.6714 0.306-2.8694-0.916-3.6633-1.16-0.7935-6.838-0.9767-6.349 0.1834z"/>
+<path fill="#dba300" d="m146.58 84.758c0.83 1.7176 2.962 1.9545 4.383 2.7247 1.363 0.7701 2.132 0.9476 2.666 0.6512 1.184-0.6512 0.296-2.7837-0.889-3.5538-1.125-0.7697-6.634-0.9476-6.16 0.1779z"/>
+<path fill="#d69e00" d="m146.72 84.779c0.804 1.6649 2.871 1.8944 4.249 2.6408 1.32 0.7465 2.066 0.9185 2.583 0.6312 1.148-0.6312 0.287-2.698-0.861-3.4444-1.091-0.746-6.43-0.9183-5.971 0.1724z"/>
+<path fill="#d19800" d="m146.86 84.801c0.778 1.612 2.779 1.8342 4.113 2.557 1.279 0.7227 2.001 0.8891 2.501 0.611 1.112-0.611 0.278-2.6122-0.833-3.3349-1.057-0.7222-6.226-0.8892-5.781 0.1669z"/>
+<path fill="#cc9200" d="m147 84.822c0.753 1.559 2.688 1.7741 3.979 2.473 1.236 0.6991 1.935 0.8601 2.419 0.591 1.075-0.591 0.269-2.5264-0.807-3.2255-1.02-0.698-6.02-0.859-5.59 0.162z"/>
+<path fill="#c68c00" d="m147.14 84.844c0.727 1.5061 2.596 1.7138 3.843 2.3891 1.195 0.6752 1.869 0.8308 2.337 0.5708 1.039-0.5708 0.26-2.4407-0.779-3.116-0.987-0.6748-5.817-0.8308-5.401 0.1561z"/>
+<path fill="#c18700" d="m147.29 84.866c0.702 1.4531 2.506 1.6536 3.709 2.3052 1.152 0.6515 1.803 0.8015 2.254 0.5507 1.002-0.5507 0.251-2.3549-0.751-3.0065-0.953-0.651-5.613-0.8016-5.212 0.1506z"/>
+<path fill="#bc8100" d="m147.43 84.887c0.677 1.4004 2.415 1.5935 3.574 2.2214 1.111 0.6279 1.738 0.7724 2.173 0.5307 0.965-0.5307 0.241-2.2693-0.725-2.8972-0.917-0.6273-5.408-0.7724-5.022 0.1451z"/>
+<path fill="#b77b00" d="m147.57 84.909c0.651 1.3475 2.323 1.5332 3.439 2.1375 1.068 0.6042 1.672 0.7432 2.09 0.5106 0.929-0.5106 0.233-2.1835-0.697-2.7877-0.883-0.6036-5.204-0.7432-4.832 0.1396z"/>
+<path fill="#b27500" d="m147.71 84.93c0.626 1.2944 2.232 1.4729 3.304 2.0534 1.027 0.5806 1.606 0.7141 2.008 0.4906 0.893-0.4906 0.224-2.0978-0.669-2.6783-0.849-0.5797-5-0.714-4.643 0.1343z"/>
+<path fill="#ad7000" d="m147.86 84.952c0.6 1.2416 2.14 1.4127 3.168 1.9696 0.985 0.5568 1.541 0.6847 1.927 0.4703 0.856-0.4703 0.214-2.0119-0.643-2.5688-0.813-0.556-4.795-0.6847-4.452 0.1289z"/>
+<path fill="#a86a00" d="m148 84.974c0.575 1.1887 2.05 1.3526 3.034 1.8856 0.943 0.5332 1.475 0.6557 1.844 0.4503 0.82-0.4503 0.205-1.9262-0.615-2.4593-0.779-0.5322-4.591-0.6556-4.263 0.1234z"/>
+<path fill="#a36400" d="m148.14 84.995c0.549 1.1358 1.959 1.2925 2.899 1.8019 0.901 0.5094 1.41 0.6264 1.763 0.4301 0.783-0.4301 0.196-1.8405-0.588-2.3499-0.744-0.5084-4.387-0.6263-4.074 0.1179z"/>
+<path fill="#9e5e00" d="m148.28 85.017c0.523 1.083 1.867 1.2323 2.764 1.7179 0.859 0.4858 1.343 0.5972 1.68 0.4101 0.746-0.4101 0.187-1.7547-0.56-2.2404-0.71-0.4848-4.183-0.5972-3.884 0.1124z"/>
+</g>
+<path fill="#995900" d="m453.76 324.63c0.0435 0.0899 0.15497 0.10226 0.22939 0.14258 0.0713 0.0403 0.11151 0.0496 0.13944 0.034 0.0619-0.034 0.0155-0.14562-0.0465-0.18593-0.0589-0.0402-0.3471-0.0496-0.32232 0.009z"/>
+<path fill="#fc0" d="m452.2 324.82c-0.0284 0.071 0.17032 0.20583 0.2697 0.11353 0.10654-0.0922 0.23428-0.1774 0.27695-0.20584 0.19161-0.12782 0.12067-0.22005-0.19877-0.16325-0.31952 0.0568-0.31952 0.18454-0.34788 0.25556z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#f9c600" d="m130.53 87.276c-0.317 0.7941 1.907 2.3043 3.019 1.2709 1.193-1.0326 2.623-1.9861 3.101-2.3045 2.145-1.431 1.351-2.4636-2.225-1.8277-3.578 0.636-3.578 2.0661-3.895 2.8613z"/>
+<path fill="#f4c000" d="m130.59 87.266c-0.31 0.7754 1.861 2.2499 2.948 1.2409 1.164-1.0081 2.56-1.939 3.027-2.2498 2.094-1.3973 1.319-2.4053-2.173-1.7845-3.492 0.621-3.492 2.0171-3.802 2.7934z"/>
+<path fill="#efba00" d="m130.65 87.256c-0.302 0.7565 1.817 2.1952 2.877 1.2107 1.136-0.9836 2.498-1.892 2.953-2.1951 2.044-1.3634 1.287-2.347-2.119-1.7412-3.408 0.6059-3.408 1.9682-3.711 2.7256z"/>
+<path fill="#eab500" d="m130.71 87.245c-0.295 0.7376 1.772 2.1406 2.805 1.1807 1.108-0.9593 2.436-1.8451 2.88-2.1407 1.993-1.3293 1.255-2.2886-2.067-1.6977-3.323 0.5908-3.323 1.9192-3.618 2.6577z"/>
+<path fill="#e5af00" d="m130.76 87.235c-0.287 0.7187 1.726 2.086 2.733 1.1505 1.08-0.9348 2.374-1.7981 2.807-2.086 1.942-1.2955 1.223-2.2303-2.015-1.6545-3.238 0.5757-3.238 1.8702-3.525 2.59z"/>
+<path fill="#e0a900" d="m130.82 87.225c-0.28 0.7 1.681 2.0314 2.661 1.1205 1.052-0.9103 2.313-1.751 2.733-2.0314 1.892-1.2616 1.191-2.1719-1.961-1.6112-3.153 0.5607-3.153 1.8212-3.433 2.5221z"/>
+<path fill="#dba300" d="m130.88 87.214c-0.272 0.6811 1.636 1.9768 2.591 1.0904 1.023-0.8859 2.25-1.7041 2.659-1.9768 1.841-1.2277 1.159-2.1136-1.909-1.568-3.068 0.5457-3.068 1.7724-3.341 2.4544z"/>
+<path fill="#d69e00" d="m130.94 87.204c-0.264 0.6622 1.591 1.9223 2.519 1.0603 0.995-0.8614 2.188-1.6571 2.586-1.9223 1.789-1.1937 1.127-2.0552-1.856-1.5246-2.984 0.5307-2.984 1.7235-3.249 2.3866z"/>
+<path fill="#d19800" d="m131 87.194c-0.257 0.6433 1.546 1.8675 2.447 1.03 0.967-0.8369 2.126-1.6099 2.513-1.8675 1.738-1.1599 1.095-1.9969-1.804-1.4814-2.899 0.5156-2.899 1.6745-3.156 2.3189z"/>
+<path fill="#cc9200" d="m131.06 87.183c-0.25 0.6246 1.5 1.813 2.375 1 0.939-0.8125 2.064-1.5629 2.439-1.8129 1.688-1.126 1.063-1.9386-1.75-1.438-2.814 0.5005-2.814 1.6255-3.064 2.2509z"/>
+<path fill="#c68c00" d="m131.12 87.173c-0.241 0.6057 1.456 1.7584 2.304 0.97 0.911-0.7881 2.002-1.5161 2.366-1.7585 1.637-1.092 1.031-1.8801-1.698-1.3946-2.729 0.4854-2.729 1.5765-2.972 2.1831z"/>
+<path fill="#c18700" d="m131.18 87.163c-0.234 0.5869 1.41 1.7038 2.233 0.9399 0.882-0.7636 1.939-1.469 2.292-1.7038 1.586-1.0582 0.999-1.8218-1.645-1.3514-2.645 0.4704-2.645 1.5275-2.88 2.1153z"/>
+<path fill="#bc8100" d="m131.24 87.153c-0.227 0.5679 1.365 1.6492 2.161 0.9097 0.854-0.7392 1.877-1.422 2.218-1.6492 1.536-1.0243 0.967-1.7635-1.592-1.3082-2.56 0.4554-2.56 1.4787-2.787 2.0477z"/>
+<path fill="#b77b00" d="m131.29 87.142c-0.22 0.5491 1.32 1.5946 2.089 0.8797 0.826-0.7147 1.815-1.375 2.145-1.5947 1.485-0.9903 0.935-1.7051-1.539-1.2648-2.475 0.4404-2.475 1.4298-2.695 1.9798z"/>
+<path fill="#b27500" d="m131.35 87.132c-0.211 0.5303 1.275 1.54 2.018 0.8495 0.797-0.6902 1.753-1.3279 2.072-1.54 1.434-0.9564 0.903-1.6467-1.487-1.2215-2.39 0.4253-2.39 1.3808-2.603 1.912z"/>
+<path fill="#ad7000" d="m131.41 87.122c-0.204 0.5115 1.23 1.4855 1.946 0.8194 0.769-0.6657 1.691-1.2809 1.998-1.4853 1.384-0.9226 0.871-1.5885-1.434-1.1783-2.305 0.4103-2.305 1.3319-2.51 1.8442z"/>
+<path fill="#a86a00" d="m131.47 87.111c-0.197 0.4925 1.184 1.4307 1.875 0.7893 0.74-0.6414 1.628-1.234 1.924-1.4309 1.333-0.8886 0.839-1.53-1.381-1.1348-2.221 0.3951-2.221 1.2828-2.418 1.7764z"/>
+<path fill="#a36400" d="m131.53 87.101c-0.189 0.4737 1.139 1.3762 1.803 0.7593 0.712-0.617 1.566-1.1871 1.851-1.3763 1.281-0.8547 0.807-1.4717-1.329-1.0915-2.135 0.3801-2.135 1.2339-2.325 1.7085z"/>
+<path fill="#9e5e00" d="m131.59 87.091c-0.181 0.4548 1.095 1.3216 1.732 0.7291 0.684-0.5925 1.504-1.14 1.778-1.3216 1.23-0.8209 0.775-1.4134-1.276-1.0483-2.051 0.365-2.051 1.1849-2.234 1.6408z"/>
+</g>
+<path fill="#995900" d="m452.3 324.8c-0.0152 0.038 0.0915 0.11055 0.14484 0.061 0.0572-0.0496 0.12582-0.0954 0.14868-0.11054 0.10296-0.0687 0.0648-0.11824-0.10671-0.0877-0.17154 0.0305-0.17154 0.0991-0.18681 0.13725z"/>
+<path fill="#fc0" d="m452.55 326.71c-0.02 0.24938 0.55345-0.37397 0.58836-0.42885 0.0748-0.13463 0.32415-0.51354 0.36402-0.67312 0.0748-0.27923 0.2095-0.48365 0.12469-0.77788-0.0299-0.0948-0.23934-0.11972-0.3341-0.0599-0.26927 0.1596-0.22939 0.35409-0.25932 0.53357-0.0997 0.50859-0.44875 1.0222-0.48365 1.4061z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#ffcc02" d="m134.82 108.44c-0.219 2.787 6.178-4.188 6.567-4.802 0.833-1.506 3.614-5.7448 4.057-7.5289 0.83-3.1213 2.332-5.4081 1.38-8.6944-0.336-1.0585-2.677-1.3337-3.735-0.6632-3.006 1.7879-2.557 3.9606-2.889 5.9667-1.105 5.6851-4.997 11.431-5.38 15.722z"/>
+<path fill="#ffcc05" d="m135.08 107.99c-0.209 2.715 6.014-4.091 6.392-4.69 0.81-1.469 3.512-5.6031 3.941-7.3421 0.805-3.0428 2.264-5.2733 1.331-8.4741-0.329-1.0308-2.61-1.2952-3.64-0.6404-2.926 1.7469-2.486 3.8632-2.805 5.8186-1.069 5.5412-4.852 11.146-5.219 15.328z"/>
+<path fill="#ffcc07" d="m135.35 107.54c-0.199 2.645 5.849-3.993 6.216-4.577 0.786-1.431 3.41-5.4614 3.825-7.1554 0.779-2.9641 2.197-5.1385 1.282-8.2535-0.322-1.0033-2.543-1.257-3.545-0.6177-2.847 1.7058-2.414 3.7658-2.722 5.6703-1.031 5.3975-4.705 10.861-5.056 14.933z"/>
+<path fill="#ffcd0a" d="m135.62 107.1c-0.189 2.573 5.684-3.896 6.04-4.465 0.762-1.394 3.309-5.3197 3.709-6.9687 0.753-2.8855 2.129-5.0036 1.234-8.033-0.316-0.9757-2.478-1.2187-3.451-0.5949-2.767 1.6647-2.342 3.6684-2.639 5.522-0.994 5.2536-4.559 10.577-4.893 14.54z"/>
+<path fill="#ffcd0c" d="m135.89 106.65c-0.179 2.503 5.519-3.798 5.865-4.351 0.738-1.357 3.207-5.179 3.594-6.7831 0.726-2.8067 2.06-4.8687 1.184-7.8125-0.308-0.948-2.411-1.1802-3.356-0.5719-2.687 1.6235-2.271 3.5709-2.556 5.3737-0.957 5.1097-4.413 10.291-4.731 14.145z"/>
+<path fill="#ffcd0f" d="m136.16 106.21c-0.169 2.431 5.354-3.701 5.689-4.239 0.715-1.32 3.106-5.0373 3.478-6.5964 0.7-2.7281 1.992-4.7339 1.135-7.5919-0.301-0.9205-2.344-1.142-3.261-0.5492-2.608 1.5824-2.199 3.4736-2.472 5.2255-0.92 4.9658-4.268 10.006-4.569 13.751z"/>
+<path fill="#ffcd11" d="m136.43 105.76c-0.159 2.361 5.19-3.603 5.514-4.126 0.691-1.282 3.004-4.8956 3.362-6.4096 0.674-2.6495 1.924-4.5991 1.087-7.3715-0.295-0.8929-2.278-1.1036-3.167-0.5265-2.528 1.5414-2.128 3.3763-2.389 5.0773-0.883 4.822-4.122 9.7213-4.407 13.356z"/>
+<path fill="#ffce14" d="m136.7 105.31c-0.149 2.289 5.025-3.505 5.338-4.014 0.667-1.245 2.902-4.7539 3.247-6.223 0.647-2.5708 1.855-4.4642 1.037-7.151-0.287-0.8652-2.211-1.0652-3.072-0.5036-2.448 1.5003-2.056 3.2789-2.306 4.9291-0.845 4.6782-3.976 9.4365-4.244 12.962z"/>
+<path fill="#ffce16" d="m136.96 104.87c-0.139 2.219 4.86-3.407 5.162-3.9 0.643-1.208 2.801-4.6132 3.131-6.0373 0.622-2.4921 1.787-4.3293 0.988-6.9304-0.28-0.8377-2.145-1.0269-2.977-0.4808-2.368 1.4591-1.984 3.1814-2.223 4.7807-0.808 4.5344-3.83 9.1518-4.081 12.568z"/>
+<path fill="#ffce19" d="m137.23 104.42c-0.129 2.147 4.696-3.31 4.987-3.788 0.62-1.1705 2.699-4.4715 3.015-5.8505 0.596-2.4135 1.719-4.1946 0.94-6.7101-0.274-0.81-2.079-0.9885-2.883-0.458-2.289 1.4181-1.913 3.084-2.139 4.6325-0.771 4.3905-3.685 8.8661-3.92 12.174z"/>
+<path fill="#ffce1c" d="m137.5 103.97c-0.119 2.076 4.531-3.213 4.811-3.676 0.596-1.1331 2.598-4.3298 2.9-5.6638 0.569-2.3349 1.65-4.0597 0.89-6.4895-0.266-0.7825-2.012-0.9502-2.788-0.4353-2.209 1.3769-1.841 2.9866-2.056 4.4843-0.734 4.2466-3.539 8.5813-3.757 11.78z"/>
+<path fill="#ffcf1e" d="m137.77 103.53c-0.109 2.005 4.366-3.115 4.636-3.5626 0.572-1.0959 2.496-4.1886 2.784-5.4776 0.543-2.2561 1.582-3.9247 0.841-6.2689-0.259-0.7549-1.945-0.9118-2.693-0.4124-2.129 1.3357-1.77 2.8891-1.973 4.3359-0.696 4.1028-3.393 8.2966-3.595 11.386z"/>
+<path fill="#ffcf21" d="m138.04 103.08c-0.099 1.934 4.201-3.018 4.46-3.4503 0.548-1.0587 2.394-4.0471 2.668-5.2912 0.517-2.1775 1.515-3.7899 0.793-6.0485-0.253-0.7272-1.879-0.8734-2.599-0.3895-2.05 1.2946-1.698 2.7917-1.89 4.1877-0.659 3.959-3.246 8.0118-3.432 10.992z"/>
+<path fill="#ffcf23" d="m138.31 102.63c-0.089 1.863 4.036-2.9194 4.284-3.337 0.525-1.0215 2.293-3.9057 2.552-5.1047 0.491-2.0989 1.447-3.6551 0.744-5.828-0.246-0.6997-1.813-0.8352-2.504-0.3668-1.97 1.2535-1.626 2.6943-1.806 4.0395-0.622 3.8151-3.101 7.7266-3.27 10.597z"/>
+<path fill="#ffcf26" d="m138.58 102.19c-0.079 1.792 3.872-2.8223 4.108-3.2248 0.502-0.9842 2.192-3.7643 2.438-4.9182 0.464-2.0203 1.378-3.5203 0.694-5.6075-0.238-0.6721-1.746-0.7968-2.41-0.3441-1.889 1.2125-1.554 2.5971-1.722 3.8913-0.585 3.6712-2.955 7.4418-3.108 10.203z"/>
+<path fill="#ffd028" d="m138.84 101.74c-0.069 1.721 3.707-2.7242 3.932-3.1115 0.478-0.947 2.091-3.6228 2.322-4.7319 0.439-1.9415 1.31-3.3853 0.646-5.3869-0.232-0.6445-1.68-0.7584-2.316-0.3212-1.81 1.1713-1.482 2.4996-1.639 3.743-0.548 3.5273-2.809 7.1568-2.945 9.8085z"/>
+<path fill="#ffd02b" d="m139.11 101.3c-0.059 1.65 3.543-2.627 3.757-2.9993 0.454-0.9097 1.989-3.4813 2.206-4.5454 0.413-1.8629 1.242-3.2505 0.597-5.1664-0.225-0.6169-1.613-0.7201-2.221-0.2984-1.73 1.1302-1.411 2.4022-1.556 3.5947-0.51 3.3835-2.663 6.8718-2.783 9.4148z"/>
+<path fill="#ffd02d" d="m139.38 100.85c-0.049 1.579 3.378-2.5288 3.581-2.886 0.431-0.8726 1.887-3.3399 2.091-4.359 0.386-1.7842 1.173-3.1156 0.548-4.9459-0.218-0.5893-1.547-0.6818-2.127-0.2757-1.65 1.0892-1.339 2.3048-1.472 3.4465-0.474 3.2398-2.518 6.587-2.621 9.0201z"/>
+<path fill="#ffd030" d="m139.65 100.4c-0.039 1.508 3.212-2.4317 3.405-2.7738 0.407-0.8352 1.786-3.1985 1.975-4.1725 0.36-1.7056 1.105-2.9808 0.499-4.7254-0.211-0.5617-1.481-0.6434-2.032-0.2529-1.57 1.0481-1.267 2.2074-1.389 3.2983-0.436 3.0959-2.372 6.3019-2.458 8.6263z"/>
+</g>
+<path fill="#ffd133" d="m453.02 325.93c-0.003 0.12535 0.26595-0.20365 0.28183-0.23218 0.0334-0.0696 0.14694-0.26674 0.16221-0.3478 0.0291-0.14196 0.0905-0.24832 0.0393-0.39308-0.0178-0.0466-0.12338-0.0528-0.16901-0.0201-0.1301 0.0879-0.10436 0.18409-0.11395 0.27484-0.0348 0.25757-0.19423 0.52501-0.20034 0.71828z"/>
+<path fill="#fc0" d="m454.53 325.67c-0.27643 0.30151-0.47118 0.5905-0.62823 0.78525-0.16334 0.20103-0.56541 0.43976-0.36438 0.67221 0.16962 0.20731 0.86696-0.16963 1.4072-0.57169 0.53399-0.40207 1.3695-0.76012 0.96119-1.2187-0.2136-0.23243-0.71618-0.18217-0.91093-0.0565-0.15078 0.0942-0.23873 0.1445-0.46489 0.3895z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#ffcc02" d="m157.38 97.144c-3.118 3.3781-5.313 6.6281-7.086 8.8091-1.841 2.249-6.375 4.945-4.13 7.534 1.893 2.31 9.724-1.943 15.795-6.469 6.001-4.525 15.38-8.5742 10.82-13.682-2.386-2.5883-8.022-1.9977-10.209-0.5839-1.692 1.0616-2.665 1.6698-5.19 4.3914z"/>
+<path fill="#ffcc05" d="m157.52 97.297c-3.069 3.2997-5.226 6.4877-6.973 8.6187-1.81 2.193-6.271 4.85-4.085 7.364 1.843 2.243 9.513-1.943 15.463-6.386 5.882-4.442 15.064-8.4368 10.623-13.396-2.323-2.5127-7.835-1.9073-9.978-0.5199-1.655 1.0433-2.593 1.6835-5.05 4.3188z"/>
+<path fill="#ffcc07" d="m157.65 97.451c-3.019 3.2212-5.139 6.3472-6.859 8.4282-1.78 2.138-6.166 4.754-4.04 7.194 1.794 2.176 9.302-1.942 15.131-6.303 5.762-4.359 14.748-8.2994 10.427-13.11-2.261-2.437-7.649-1.8169-9.747-0.4557-1.619 1.0248-2.522 1.6973-4.912 4.2462z"/>
+<path fill="#ffcd0a" d="m157.79 97.604c-2.97 3.1428-5.052 6.2068-6.745 8.2378-1.749 2.082-6.062 4.659-3.994 7.023 1.743 2.111 9.09-1.941 14.798-6.219 5.643-4.276 14.432-8.162 10.231-12.824-2.199-2.3613-7.463-1.7266-9.517-0.3915-1.582 1.0063-2.451 1.711-4.773 4.1735z"/>
+<path fill="#ffcd0c" d="m157.92 97.758c-2.92 3.0653-4.965 6.0663-6.631 8.0473-1.718 2.027-5.957 4.564-3.949 6.853 1.693 2.044 8.878-1.94 14.466-6.136 5.524-4.194 14.116-8.0245 10.034-12.538-2.137-2.2857-7.276-1.6362-9.285-0.3275-1.546 0.988-2.38 1.7248-4.635 4.101z"/>
+<path fill="#ffcd0f" d="m158.06 97.911c-2.871 2.9868-4.879 5.9258-6.518 7.8568-1.687 1.971-5.853 4.468-3.903 6.683 1.642 1.978 8.666-1.94 14.133-6.053 5.404-4.111 13.801-7.8871 9.838-12.252-2.075-2.21-7.089-1.5458-9.054-0.2633-1.51 0.9696-2.309 1.7385-4.496 4.0284z"/>
+<path fill="#ffcd11" d="m158.2 98.065c-2.821 2.9084-4.792 5.7854-6.404 7.6664-1.657 1.916-5.748 4.373-3.858 6.512 1.592 1.912 8.455-1.938 13.801-5.969 5.285-4.028 13.485-7.7497 9.641-11.966-2.012-2.1344-6.902-1.4556-8.823-0.1993-1.473 0.9512-2.237 1.7523-4.357 3.9558z"/>
+<path fill="#ffce14" d="m158.33 98.218c-2.771 2.83-4.705 5.645-6.29 7.476-1.626 1.86-5.644 4.278-3.813 6.342 1.542 1.845 8.244-1.938 13.469-5.886 5.166-3.945 13.169-7.6123 9.445-11.68-1.95-2.0587-6.716-1.3651-8.592-0.1351-1.437 0.9327-2.166 1.766-4.219 3.8831z"/>
+<path fill="#ffce16" d="m158.47 98.372c-2.722 2.7525-4.617 5.5045-6.176 7.2855-1.595 1.805-5.539 4.182-3.767 6.172 1.491 1.779 8.032-1.937 13.136-5.803 5.047-3.862 12.853-7.4749 9.249-11.394-1.888-1.9831-6.53-1.2749-8.362-0.0711-1.4 0.9144-2.095 1.7798-4.08 3.8106z"/>
+<path fill="#ffce19" d="m158.6 98.525c-2.673 2.6741-4.531 5.3641-6.063 7.0951-1.564 1.749-5.435 4.087-3.722 6.001 1.441 1.713 7.821-1.936 12.804-5.719 4.927-3.78 12.537-7.3375 9.052-11.108-1.825-1.9075-6.343-1.1844-8.13-0.0069-1.364 0.896-2.024 1.7935-3.941 3.7379z"/>
+<path fill="#ffce1c" d="m158.74 98.678c-2.623 2.5956-4.444 5.2246-5.949 6.9046-1.534 1.693-5.33 3.992-3.676 5.831 1.39 1.646 7.609-1.935 12.471-5.636 4.808-3.697 12.221-7.2001 8.856-10.822-1.763-1.8318-6.157-1.0941-7.9 0.0571-1.327 0.8776-1.952 1.8073-3.802 3.6654z"/>
+<path fill="#ffcf1e" d="m158.88 98.832c-2.573 2.5172-4.357 5.0842-5.835 6.7142-1.503 1.638-5.226 3.896-3.631 5.661 1.34 1.58 7.397-1.935 12.139-5.553 4.689-3.614 11.905-7.0628 8.659-10.536-1.701-1.7562-5.97-1.0039-7.668 0.1211-1.291 0.8593-1.881 1.8211-3.664 3.5928z"/>
+<path fill="#ffcf21" d="m159.01 98.985c-2.523 2.4397-4.27 4.9437-5.721 6.5237-1.472 1.582-5.121 3.801-3.586 5.491 1.291 1.513 7.186-1.934 11.807-5.47 4.569-3.531 11.589-6.9254 8.463-10.25-1.639-1.6806-5.784-0.9134-7.438 0.1853-1.254 0.8408-1.809 1.8348-3.525 3.5202z"/>
+<path fill="#ffcf23" d="m159.15 99.139c-2.475 2.3612-4.184 4.8032-5.608 6.3332-1.441 1.527-5.017 3.706-3.54 5.32 1.24 1.447 6.974-1.933 11.474-5.386 4.45-3.448 11.273-6.788 8.267-9.9643-1.577-1.6048-5.598-0.823-7.207 0.2495-1.218 0.8223-1.739 1.8485-3.386 3.4476z"/>
+<path fill="#ffcf26" d="m159.29 99.292c-2.425 2.2828-4.097 4.6628-5.494 6.1428-1.411 1.471-4.912 3.61-3.495 5.15 1.19 1.381 6.763-1.932 11.142-5.303 4.331-3.366 10.957-6.6506 8.07-9.6783-1.514-1.5292-5.411-0.7328-6.976 0.3135-1.182 0.804-1.667 1.8622-3.247 3.375z"/>
+<path fill="#ffd028" d="m159.42 99.446c-2.375 2.2044-4.009 4.5224-5.38 5.9524-1.38 1.416-4.808 3.515-3.449 4.98 1.139 1.314 6.551-1.932 10.809-5.22 4.211-3.283 10.641-6.5131 7.874-9.3923-1.452-1.4537-5.225-0.6424-6.745 0.3775-1.146 0.7857-1.596 1.8761-3.109 3.3024z"/>
+<path fill="#ffd02b" d="m159.56 99.599c-2.325 2.1269-3.922 4.3819-5.266 5.7619-1.349 1.36-4.703 3.42-3.404 4.809 1.089 1.248 6.34-1.93 10.477-5.136 4.092-3.2 10.325-6.3757 7.677-9.1064-1.389-1.3779-5.038-0.5521-6.513 0.4417-1.11 0.7672-1.525 1.8898-2.971 3.2298z"/>
+<path fill="#ffd02d" d="m159.7 99.752c-2.276 2.0485-3.836 4.2415-5.153 5.5715-1.318 1.305-4.599 3.324-3.359 4.639 1.039 1.182 6.129-1.93 10.145-5.053 3.973-3.117 10.009-6.2383 7.481-8.8205-1.327-1.3022-4.852-0.4617-6.283 0.5059-1.073 0.7487-1.453 1.9034-2.831 3.1571z"/>
+<path fill="#ffd030" d="m159.83 99.906c-2.227 1.97-3.749 4.101-5.039 5.381-1.288 1.249-4.494 3.229-3.313 4.469 0.988 1.115 5.916-1.929 9.812-4.97 3.854-3.034 9.693-6.1009 7.285-8.5345-1.266-1.2267-4.666-0.3713-6.052 0.5699-1.037 0.7304-1.383 1.9172-2.693 3.0846z"/>
+</g>
+<path fill="#ffd133" d="m454.77 325.94c-0.18995 0.16508-0.31952 0.34561-0.42972 0.45293-0.10968 0.1041-0.38305 0.27337-0.28515 0.37502 0.0818 0.0915 0.49779-0.16823 0.82717-0.42632 0.32581-0.25758 0.81818-0.52034 0.61846-0.71972-0.10497-0.10043-0.39081-0.0245-0.50791 0.0553-0.0872 0.0621-0.11439 0.16849-0.22285 0.26277z"/>
+<path fill="#fc0" d="m452.25 327.67c0.30783 0.0314 0.59054 0.044 0.779 0.044 0.47746 0 1.1183-0.20104 1.7465-0.52143 0.61566-0.3204 0.80413-0.44605 1.2439-0.70362 0.42092-0.25129 0.91722-0.57165 0.72875-0.66588-0.18847-0.10052-0.40835 0.006-1.0177 0.38946-0.59054 0.37065-0.9235 0.54656-1.5769 0.83554-0.25129 0.11308-0.6408 0.27014-0.90465 0.28271-0.2513 0.0126-0.59054 0.006-0.78529 0.006-0.23245 0-0.534-0.0942-0.77901-0.20103 0-0.006 0.56541 0.53399 0.56541 0.53399z"/>
+<path fill="#b27f19" d="m451.71 327.5c-0.42091-0.22616-0.98004-0.52143-1.0931-0.95491-0.006-0.0314 0.0817-0.0817 0.11936-0.0691l0.97376 1.024z"/>
+<path fill="#af7c19" d="m451.71 327.5c-0.4272-0.22616-0.97376-0.52143-1.0806-0.93606-0.006-0.0314 0.0754-0.0817 0.11937-0.0628 0.32039 0.32039 0.24501 0.23872 0.96119 0.99888z"/>
+<path fill="#aa7716" d="m451.7 327.5c-0.4272-0.23244-0.9612-0.52771-1.0617-0.92978-0.006-0.0314 0.0754-0.0817 0.12564-0.0565 0.30155 0.30783 0.26386 0.26386 0.93607 0.98632z"/>
+<path fill="#a87516" d="m451.7 327.49c-0.43348-0.22616-0.95491-0.52771-1.0554-0.91093 0-0.0314 0.0754-0.0817 0.13193-0.0503 0.2827 0.28898 0.2827 0.27642 0.9235 0.96119z"/>
+<path fill="#a37014" d="m451.7 327.48c-0.4272-0.22616-0.94863-0.52143-1.0366-0.89837-0.006-0.0251 0.0754-0.0754 0.13193-0.044 0.27014 0.27642 0.30155 0.29527 0.90466 0.94235z"/>
+<path fill="#a06d14" d="m451.7 327.48c-0.43348-0.22617-0.94235-0.52144-1.024-0.87953-0.006-0.0314 0.0691-0.0817 0.13193-0.0377 0.25757 0.25757 0.3204 0.31411 0.89209 0.91722z"/>
+<path fill="#9b6811" d="m451.7 327.48c-0.43977-0.23245-0.93607-0.52772-1.0115-0.87324-0.006-0.0251 0.0691-0.0754 0.13821-0.0314 0.23873 0.24501 0.33925 0.33297 0.87325 0.90466z"/>
+<path fill="#961" d="m451.69 327.47c-0.43976-0.23244-0.9235-0.52771-0.9926-0.85439-0.006-0.0251 0.0628-0.0754 0.13821-0.0251 0.22616 0.22616 0.35809 0.34553 0.85439 0.87952z"/>
+<path fill="#966311" d="m451.69 327.47c-0.44604-0.22616-0.91721-0.52771-0.98632-0.83555 0-0.0314 0.0628-0.0817 0.14449-0.0251 0.20732 0.21359 0.37694 0.37065 0.84183 0.86067z"/>
+<path fill="#915e0f" d="m451.69 327.47c-0.45232-0.23244-0.91093-0.53399-0.97375-0.82926 0-0.0251 0.0628-0.0754 0.15077-0.0126 0.18847 0.19475 0.39579 0.38322 0.82298 0.84183z"/>
+<path fill="#8e5b0f" d="m451.69 327.46c-0.45233-0.23245-0.89837-0.534-0.95491-0.81042 0-0.0251 0.0565-0.0754 0.15078-0.0126 0.1759 0.18218 0.41463 0.40206 0.80413 0.82298z"/>
+<path fill="#89560a" d="m451.69 327.45c-0.45233-0.23245-0.89837-0.52772-0.94235-0.79786-0.006-0.0251 0.0566-0.0754 0.15078 0 0.16334 0.15706 0.43348 0.42092 0.79157 0.79786z"/>
+<path fill="#87540a" d="m451.68 327.45c-0.45233-0.23244-0.88581-0.52771-0.9235-0.779-0.006-0.0251 0.0503-0.0754 0.15077 0 0.15078 0.14449 0.45233 0.43976 0.77273 0.779z"/>
+<path fill="#824f07" d="m451.68 327.45c-0.45861-0.23872-0.87952-0.53399-0.91094-0.77272-0.006-0.0188 0.0503-0.0691 0.15706 0.0126 0.13193 0.12564 0.47117 0.45232 0.75388 0.76015z"/>
+<path fill="#7f4c07" d="m451.68 327.44c-0.46489-0.23244-0.87324-0.53399-0.90465-0.75387 0-0.0251 0.0502-0.0754 0.16334 0.0126 0.11308 0.11308 0.49002 0.47746 0.74131 0.74131z"/>
+<path fill="#7c4907" d="m451.67 327.43c-0.46489-0.23245-0.86068-0.534-0.88581-0.73503 0-0.0251 0.044-0.0754 0.16334 0.0189 0.10052 0.0942 0.50887 0.49002 0.72247 0.71618z"/>
+<path fill="#774405" d="m451.67 327.43c-0.47118-0.23873-0.8544-0.54028-0.87324-0.72875 0-0.0188 0.044-0.0691 0.16962 0.0251 0.0817 0.0817 0.52771 0.50887 0.70362 0.70362z"/>
+<path fill="#754205" d="m451.67 327.43c-0.47746-0.23873-0.84812-0.54028-0.86068-0.7099 0-0.0251 0.0377-0.0754 0.16962 0.0314 0.0691 0.0628 0.54656 0.52771 0.69106 0.67849z"/>
+<path fill="#703d02" d="m451.67 327.42c-0.47117-0.23873-0.84183-0.534-0.84183-0.69734-0.006-0.0188 0.0377-0.0691 0.16963 0.0377 0.0565 0.0503 0.5654 0.54656 0.6722 0.65965z"/>
+<path fill="#6d3a02" d="m451.67 327.42c-0.47745-0.23244-0.83554-0.53399-0.83554-0.67849 0-0.0188 0.0377-0.0691 0.1759 0.044 0.0377 0.0314 0.58426 0.55913 0.65964 0.63451z"/>
+<path fill="#683500" d="m451.66 327.42c-0.47745-0.23872-0.82298-0.54028-0.8167-0.6722 0-0.0189 0.0377-0.0691 0.18219 0.0503 0.0188 0.0188 0.6031 0.58426 0.63451 0.62195z"/>
+<path fill="#630" d="m451.66 327.41c-0.48374-0.23872-0.8167-0.54027-0.80413-0.65336 0-0.0188 0.0314-0.0691 0.18218 0.0565 0.006 0 0.62195 0.59681 0.62195 0.59681z"/>
+<path fill="#c93" d="m452.21 327.64s-0.32668-0.0754-0.47117-0.11936c0 0-0.99889-1.0429-0.99261-1.0429 0.1445 0.0565 0.50259 0.39579 0.65965 0.534 0.0565 0.0503 0.18847 0.12565 0.33924 0.16962 0.006 0 0.46489 0.45861 0.46489 0.45861z"/>
+<path fill="#c69330" d="m452.21 327.64s-0.33924-0.0754-0.48374-0.12564c0 0-0.98004-1.0177-0.97375-1.0177 0.14449 0.0565 0.50258 0.39579 0.65964 0.52772 0.0565 0.0503 0.19475 0.12564 0.33924 0.16962 0.006 0 0.45861 0.44604 0.45861 0.44604z"/>
+<path fill="#c18e2d" d="m452.2 327.64s-0.34553-0.0817-0.49002-0.13821c0 0-0.95491-0.9926-0.94863-0.9926 0.13821 0.0565 0.4963 0.3895 0.65336 0.52143 0.0565 0.0503 0.19475 0.13193 0.34553 0.16962 0.006 0 0.43976 0.43976 0.43976 0.43976z"/>
+<path fill="#bc892b" d="m452.2 327.63s-0.35809-0.0817-0.50258-0.13821c0 0-0.93607-0.98004-0.92979-0.98004 0.13821 0.0628 0.49631 0.39579 0.64708 0.52143 0.0628 0.0503 0.20732 0.13193 0.35181 0.17591 0.006 0 0.43348 0.42091 0.43348 0.42091z"/>
+<path fill="#b78428" d="m452.19 327.63s-0.35809-0.0879-0.50887-0.15077c0 0-0.91722-0.95491-0.91093-0.95491 0.13821 0.0628 0.4963 0.39578 0.64707 0.52143 0.0628 0.044 0.2136 0.12564 0.3581 0.16962 0.006 0 0.41463 0.41463 0.41463 0.41463z"/>
+<path fill="#b27f26" d="m452.19 327.62s-0.37066-0.0879-0.52143-0.15706c0 0-0.89209-0.92978-0.88581-0.92978 0.13193 0.0628 0.49002 0.39579 0.6408 0.51515 0.0628 0.044 0.21359 0.13193 0.35809 0.16962 0.006 0 0.40835 0.40207 0.40835 0.40207z"/>
+<path fill="#af7c26" d="m452.19 327.62s-0.38322-0.0879-0.534-0.16962c0 0-0.87324-0.90466-0.86696-0.90466 0.13193 0.0628 0.49002 0.38951 0.6408 0.50887 0.0628 0.044 0.21988 0.13193 0.36437 0.16962 0.006 0 0.39579 0.39579 0.39579 0.39579z"/>
+<path fill="#aa7723" d="m452.19 327.62s-0.38951-0.088-0.54028-0.16963c0 0-0.8544-0.8858-0.84811-0.8858 0.13192 0.0628 0.49002 0.3895 0.64079 0.50258 0.0628 0.044 0.22616 0.13193 0.36437 0.16963 0.006 0 0.38323 0.38322 0.38323 0.38322z"/>
+<path fill="#a57221" d="m452.19 327.61s-0.40207-0.0879-0.55285-0.1759c0 0-0.82926-0.86696-0.82298-0.86696 0.12565 0.0691 0.48374 0.39579 0.62823 0.50259 0.0691 0.044 0.23245 0.13821 0.37694 0.1759 0.006 0 0.37066 0.36437 0.37066 0.36437z"/>
+<path fill="#a06d1e" d="m452.19 327.61s-0.41464-0.0942-0.56541-0.18846c0 0-0.81042-0.84183-0.80414-0.84183 0.12565 0.0691 0.48374 0.3895 0.62823 0.4963 0.0691 0.044 0.23873 0.13821 0.37694 0.1759 0.006 0 0.36438 0.35809 0.36438 0.35809z"/>
+<path fill="#9b681c" d="m452.18 327.6s-0.42091-0.0942-0.57169-0.19475c0 0-0.79157-0.8167-0.78529-0.8167 0.12565 0.0691 0.48374 0.3895 0.62824 0.49002 0.0691 0.044 0.24501 0.13821 0.38322 0.17591 0.006 0 0.34552 0.34552 0.34552 0.34552z"/>
+<path fill="#966316" d="m452.18 327.6s-0.42719-0.10051-0.59053-0.20103c0 0-0.76016-0.79785-0.75388-0.79785 0.12565 0.0754 0.47745 0.3895 0.62195 0.49002 0.0691 0.0377 0.24501 0.13821 0.38322 0.16962 0.006 0 0.33924 0.33924 0.33924 0.33924z"/>
+<path fill="#915e14" d="m452.18 327.6s-0.43348-0.10052-0.59682-0.20732c0 0-0.74131-0.77272-0.73503-0.77272 0.12565 0.0754 0.47746 0.3895 0.62195 0.48374 0.0691 0.0377 0.25129 0.13821 0.3895 0.16962 0.006 0 0.3204 0.32668 0.3204 0.32668z"/>
+<path fill="#8c5911" d="m452.18 327.6s-0.44604-0.1068-0.60938-0.21988c0 0-0.72247-0.7476-0.71619-0.7476 0.12565 0.0754 0.47746 0.38323 0.62195 0.47746 0.0691 0.0377 0.25758 0.13821 0.38951 0.16962 0.006 0 0.31411 0.3204 0.31411 0.3204z"/>
+<path fill="#87540f" d="m452.18 327.59s-0.45861-0.1068-0.62195-0.22617c0 0-0.69733-0.72874-0.69105-0.72874 0.11936 0.0817 0.47117 0.3895 0.60938 0.47745 0.0754 0.0377 0.26386 0.1445 0.40207 0.17591 0.006 0 0.30155 0.30155 0.30155 0.30155z"/>
+<path fill="#824f0c" d="m452.17 327.59s-0.46489-0.1068-0.62823-0.22617c0 0-0.67849-0.7099-0.67221-0.7099 0.11936 0.0817 0.47117 0.3895 0.60938 0.47117 0.0754 0.0377 0.27014 0.1445 0.40207 0.17591 0.006 0 0.28899 0.28899 0.28899 0.28899z"/>
+<path fill="#7f4c0c" d="m452.17 327.59s-0.47746-0.1068-0.6408-0.23873c0 0-0.65964-0.68477-0.65336-0.68477 0.11937 0.0817 0.47118 0.38322 0.60939 0.46489 0.0754 0.0377 0.27642 0.14449 0.40835 0.1759 0.006 0 0.27642 0.28271 0.27642 0.28271z"/>
+<path fill="#7a470a" d="m452.17 327.58s-0.49002-0.1068-0.65336-0.24501c0 0-0.63451-0.65964-0.62823-0.65964 0.11308 0.0817 0.46489 0.38322 0.6031 0.45861 0.0754 0.0377 0.27642 0.15077 0.40835 0.1759 0.006 0 0.27014 0.27014 0.27014 0.27014z"/>
+<path fill="#754207" d="m452.16 327.58s-0.49002-0.11308-0.65965-0.25757c0 0-0.61566-0.63451-0.60938-0.63451 0.11308 0.0817 0.46489 0.38322 0.6031 0.4586 0.0754 0.0314 0.28271 0.1445 0.41463 0.16963 0.006 0 0.2513 0.26385 0.2513 0.26385z"/>
+<path fill="#703d05" d="m452.16 327.57s-0.50259-0.11308-0.67221-0.25757c0 0-0.59682-0.62195-0.59054-0.62195 0.11308 0.088 0.46489 0.3895 0.59682 0.45861 0.0817 0.0314 0.29527 0.14449 0.42092 0.1759 0.006 0 0.24501 0.24501 0.24501 0.24501z"/>
+<path fill="#6b3802" d="m452.16 327.57s-0.50886-0.11936-0.67849-0.27014c0 0-0.57169-0.59682-0.5654-0.59682 0.1068 0.088 0.45861 0.38322 0.59053 0.45233 0.0817 0.0314 0.29527 0.15077 0.4272 0.1759 0.006 0 0.22616 0.23873 0.22616 0.23873z"/>
+<path fill="#630" d="m452.16 327.57s-0.52143-0.11936-0.69105-0.27642c0 0-0.55284-0.57169-0.54656-0.57169 0.1068 0.0879 0.45861 0.38322 0.59054 0.44604 0.0817 0.0314 0.30155 0.15078 0.42719 0.17591 0.006 0 0.21988 0.22616 0.21988 0.22616z"/>
+<path fill="#f7c400" d="m452.24 327.67c0.30783 0.0314 0.59682 0.044 0.78528 0.044 0.47746 0 1.112-0.20103 1.7402-0.51515 0.60939-0.3204 0.79786-0.44604 1.2313-0.70362 0.42091-0.24501 0.9235-0.56537 0.73503-0.65959-0.18847-0.10053-0.40207 0.0125-1.0115 0.38945-0.59053 0.37066-0.92978 0.55285-1.5768 0.83555-0.2513 0.11308-0.63452 0.27014-0.89837 0.28271-0.2513 0.0126-0.59054 0.006-0.78529 0.006-0.23245 0-0.52772-0.0942-0.77273-0.20104 0-0.006 0.55285 0.52144 0.55285 0.52144z"/>
+<path fill="#efbc00" d="m452.23 327.66c0.31412 0.0377 0.60939 0.044 0.80414 0.044 0.47117 0 1.0994-0.20103 1.7214-0.51515 0.61567-0.31412 0.79157-0.43976 1.2313-0.69105 0.42092-0.2513 0.9235-0.56541 0.73503-0.65961s-0.39578 0.0188-1.0052 0.39575c-0.59053 0.36437-0.93606 0.55284-1.5706 0.82926-0.25758 0.11309-0.63452 0.27014-0.89837 0.28271-0.2513 0.0126-0.59054 0.006-0.77901 0.006-0.23245 0-0.52771-0.0942-0.77272-0.19475 0-0.006 0.53399 0.50258 0.53399 0.50258z"/>
+<path fill="#e8b500" d="m452.23 327.65c0.31411 0.0377 0.61567 0.044 0.81042 0.044 0.47117 0 1.0931-0.20104 1.7151-0.50887 0.60938-0.31412 0.78529-0.43976 1.2188-0.69105 0.42092-0.24501 0.9235-0.55913 0.74132-0.64704-0.18847-0.10051-0.39579 0.0189-0.99889 0.38946-0.58425 0.36438-0.94235 0.55913-1.5706 0.82927-0.25129 0.11308-0.62823 0.26385-0.89208 0.2827-0.2513 0.0126-0.58426 0.006-0.77901 0.006-0.23245 0-0.52143-0.0942-0.76016-0.19475 0-0.006 0.51515 0.49002 0.51515 0.49002z"/>
+<path fill="#e2af00" d="m452.22 327.65c0.31411 0.0377 0.62195 0.0377 0.8167 0.0377 0.47117 0 1.0868-0.19475 1.7088-0.50886 0.60939-0.30784 0.77273-0.43348 1.2125-0.67849 0.41463-0.24501 0.9235-0.55284 0.74131-0.64704-0.18847-0.0942-0.3895 0.0251-0.9926 0.39575-0.58426 0.35809-0.94863 0.55284-1.5643 0.82298-0.25757 0.11308-0.62823 0.26386-0.89208 0.27642-0.2513 0.0188-0.58426 0.0126-0.77901 0.0126-0.22616 0-0.51515-0.0942-0.75388-0.19475 0-0.006 0.50259 0.48374 0.50259 0.48374z"/>
+<path fill="#dba800" d="m452.21 327.65c0.3204 0.0377 0.63452 0.0377 0.82927 0.0377 0.47117 0 1.0806-0.19475 1.7025-0.50258 0.6031-0.30784 0.76644-0.43348 1.1999-0.67849 0.41464-0.23873 0.92978-0.54656 0.7476-0.64076-0.18847-0.0942-0.38322 0.0314-0.98632 0.39575-0.58426 0.35809-0.95492 0.55912-1.5643 0.82298-0.25757 0.11308-0.62195 0.26386-0.8858 0.27642-0.2513 0.0188-0.58426 0.0126-0.77901 0.0126-0.22616 0-0.50887-0.0942-0.7476-0.19475 0-0.006 0.48374 0.47117 0.48374 0.47117z"/>
+<path fill="#d3a000" d="m452.2 327.64c0.32668 0.044 0.6408 0.0377 0.84183 0.0377 0.47117 0 1.068-0.19475 1.6837-0.50258 0.60938-0.30156 0.76644-0.42092 1.1999-0.66593 0.41463-0.24501 0.92978-0.54656 0.74131-0.64075-0.18219-0.0942-0.37066 0.0314-0.97376 0.40202-0.58425 0.35181-0.96119 0.55913-1.558 0.82299-0.26386 0.11308-0.62195 0.25757-0.8858 0.27013-0.2513 0.0188-0.58426 0.0126-0.77273 0.0126-0.22616 0-0.50887-0.0879-0.74759-0.18847 0-0.006 0.47117 0.45233 0.47117 0.45233z"/>
+<path fill="#c90" d="m452.19 327.64c0.32668 0.044 0.64708 0.0377 0.84811 0.0377 0.47117 0 1.0617-0.19475 1.6774-0.4963 0.6031-0.30156 0.75387-0.42092 1.1874-0.66593 0.41463-0.23873 0.93607-0.54028 0.7476-0.62819-0.18219-0.0942-0.37066 0.0314-0.96748 0.39575-0.58425 0.3518-0.96747 0.5654-1.558 0.82298-0.25758 0.11308-0.61567 0.25129-0.87952 0.27014-0.2513 0.0188-0.58426 0.0126-0.77273 0.0126-0.22616 0-0.50258-0.0879-0.74131-0.18847 0-0.006 0.45861 0.43976 0.45861 0.43976z"/>
+<path fill="#c49100" d="m452.18 327.63c0.33297 0.044 0.65965 0.0377 0.86068 0.0377 0.47117 0 1.0554-0.19476 1.6711-0.49002 0.6031-0.30156 0.7476-0.42092 1.1748-0.66593 0.41464-0.23244 0.93607-0.534 0.75388-0.6219-0.18219-0.0942-0.36437 0.0377-0.96119 0.39574-0.57797 0.35181-0.97376 0.57169-1.5517 0.82298-0.26386 0.11308-0.61567 0.25129-0.87952 0.27014-0.2513 0.0188-0.57798 0.0126-0.77273 0.0126-0.22616 0-0.4963-0.0879-0.72875-0.18847 0-0.006 0.43348 0.4272 0.43348 0.4272z"/>
+<path fill="#bc8900" d="m452.18 327.62c0.33296 0.0503 0.66593 0.0377 0.87324 0.0377 0.46489 0 1.0429-0.19475 1.6522-0.49002 0.6031-0.29527 0.74759-0.41463 1.1748-0.65336 0.41463-0.23872 0.93606-0.53399 0.75388-0.6219-0.18219-0.0942-0.35809 0.0439-0.95491 0.40202-0.57798 0.34553-0.98004 0.57169-1.5517 0.8167-0.26386 0.11308-0.60939 0.25129-0.87324 0.27014-0.2513 0.0188-0.57798 0.0126-0.76645 0.0126-0.22616 0-0.4963-0.088-0.72874-0.18219 0-0.006 0.42091 0.40835 0.42091 0.40835z"/>
+<path fill="#b58200" d="m452.17 327.62c0.33296 0.0503 0.67221 0.0377 0.87952 0.0377 0.46489 0 1.0366-0.19475 1.646-0.48374 0.6031-0.29527 0.73503-0.41463 1.1622-0.65336 0.41464-0.23244 0.94235-0.52771 0.76016-0.61563-0.18218-0.0879-0.35181 0.0502-0.94863 0.40203-0.57797 0.34553-0.98632 0.57798-1.5454 0.8167-0.27014 0.11309-0.60939 0.2513-0.87324 0.27014-0.2513 0.0188-0.57798 0.0126-0.76645 0.0126-0.22616 0-0.49002-0.0879-0.72246-0.18219 0-0.006 0.40835 0.39579 0.40835 0.39579z"/>
+<path fill="#af7c00" d="m452.16 327.62c0.33925 0.0503 0.67849 0.0251 0.89209 0.0251 0.46489 0 1.0366-0.18219 1.6397-0.47746 0.59682-0.28899 0.72875-0.40835 1.156-0.64079 0.40835-0.23245 0.94234-0.52144 0.76016-0.60934-0.18219-0.0942-0.35181 0.0502-0.93607 0.40202-0.58425 0.34553-0.9926 0.57169-1.5517 0.81042-0.26385 0.11308-0.59682 0.24501-0.86067 0.26385-0.25129 0.0188-0.58426 0.0126-0.77273 0.0126-0.21988 0-0.48373-0.0817-0.71618-0.17591 0-0.006 0.3895 0.38951 0.3895 0.38951z"/>
+<path fill="#a87500" d="m452.15 327.61c0.33925 0.0503 0.68477 0.0251 0.89837 0.0251 0.46489 0 1.0303-0.18218 1.6334-0.47117 0.59682-0.28899 0.71618-0.40835 1.1434-0.64079 0.40835-0.22617 0.94863-0.51515 0.76644-0.60306-0.18218-0.0879-0.34552 0.0565-0.92978 0.40202-0.58425 0.34553-0.99889 0.57797-1.5454 0.81042-0.27014 0.11308-0.59682 0.24501-0.86067 0.26386-0.25129 0.0188-0.58426 0.0126-0.77273 0.0126-0.21988 0-0.47745-0.0817-0.7099-0.1759 0-0.006 0.37694 0.37693 0.37694 0.37693z"/>
+<path fill="#a06d00" d="m452.14 327.6c0.33924 0.0565 0.69105 0.0251 0.91093 0.0251 0.45861 0 1.0177-0.18219 1.6146-0.47117 0.59682-0.28271 0.71618-0.40207 1.1434-0.62823 0.40835-0.23245 0.94863-0.51515 0.76644-0.60307-0.18219-0.088-0.33925 0.0628-0.9235 0.40832-0.58426 0.33924-1.0052 0.57797-1.5454 0.80413-0.27014 0.11308-0.59054 0.24501-0.85439 0.26386-0.25129 0.0189-0.58426 0.0126-0.76644 0.0126-0.21988 0-0.47746-0.0817-0.7099-0.16962 0-0.006 0.36437 0.35809 0.36437 0.35809z"/>
+<path fill="#960" d="m452.13 327.6c0.34553 0.0565 0.70362 0.0251 0.9235 0.0251 0.45861 0 1.0115-0.18219 1.6083-0.46489 0.59682-0.28271 0.70991-0.40207 1.1308-0.62823 0.40835-0.22617 0.94863-0.50887 0.77272-0.59682-0.18218-0.0879-0.33296 0.0691-0.91721 0.40835-0.57798 0.33924-1.0114 0.58425-1.5392 0.80413-0.27642 0.11309-0.59054 0.24501-0.85439 0.26386-0.25129 0.0188-0.57797 0.0126-0.76644 0.0126-0.21988 0-0.47118-0.0817-0.69734-0.16963 0-0.006 0.33924 0.34553 0.33924 0.34553z"/>
+<path fill="#915e00" d="m452.12 327.59c0.34553 0.0565 0.7099 0.0251 0.92978 0.0251 0.45861 0 1.0052-0.18219 1.602-0.45861 0.59054-0.28271 0.69734-0.40207 1.1182-0.62823 0.40835-0.21988 0.95491-0.50259 0.77901-0.58426-0.18219-0.0879-0.33296 0.0691-0.91094 0.40207-0.57797 0.33925-1.0177 0.59054-1.5392 0.80414-0.27014 0.11308-0.58426 0.23872-0.84811 0.26385-0.25129 0.0188-0.57797 0.0126-0.76644 0.0126-0.21988 0-0.46489-0.0817-0.69106-0.16962 0-0.006 0.32668 0.33296 0.32668 0.33296z"/>
+<path fill="#895600" d="m452.12 327.59c0.35181 0.0628 0.71618 0.0251 0.94235 0.0251 0.4586 0 0.9926-0.18218 1.5831-0.4586 0.59682-0.27643 0.69733-0.38951 1.1182-0.61567 0.40835-0.22616 0.95491-0.50258 0.77272-0.58425-0.1759-0.0879-0.3204 0.0691-0.89837 0.40835-0.57797 0.33296-1.024 0.59053-1.5329 0.80413-0.27642 0.11308-0.58426 0.23245-0.84811 0.25758-0.25129 0.0188-0.57797 0.0126-0.76016 0.0126-0.21988 0-0.46489-0.0754-0.69106-0.16334 0-0.006 0.31412 0.31412 0.31412 0.31412z"/>
+<path fill="#824f00" d="m452.11 327.58c0.35809 0.0628 0.72874 0.0251 0.95491 0.0251 0.4586 0 0.98632-0.18218 1.5769-0.45232 0.59053-0.27643 0.69105-0.38951 1.1057-0.61567 0.40835-0.21988 0.96119-0.4963 0.77901-0.57797-0.17591-0.0879-0.31412 0.0754-0.89209 0.40835-0.57797 0.33296-1.0303 0.59682-1.5329 0.80413-0.27642 0.11308-0.57798 0.23245-0.84183 0.25758-0.25129 0.0188-0.57797 0.0126-0.76016 0.0126-0.21988 0-0.45861-0.0754-0.68477-0.16334 0-0.006 0.29527 0.30155 0.29527 0.30155z"/>
+<path fill="#7c4900" d="m452.1 327.58c0.35809 0.0628 0.73503 0.0188 0.9612 0.0188 0.4586 0 0.98004-0.1759 1.5706-0.45233 0.59054-0.27014 0.67849-0.38322 1.0994-0.6031 0.40206-0.21988 0.96119-0.49002 0.779-0.57797-0.1759-0.0816-0.30783 0.0817-0.8858 0.41463-0.57797 0.32668-1.0366 0.59054-1.5266 0.79786-0.28271 0.11308-0.57798 0.23244-0.84183 0.25129-0.25129 0.0251-0.57797 0.0188-0.76016 0.0188-0.2136 0-0.45233-0.0754-0.67849-0.16334 0-0.006 0.2827 0.29527 0.2827 0.29527z"/>
+<path fill="#754200" d="m452.09 327.57c0.35809 0.0628 0.74131 0.0188 0.96748 0.0188 0.4586 0 0.97375-0.17591 1.5643-0.44605 0.58426-0.27014 0.67221-0.38322 1.0868-0.6031 0.40207-0.2136 0.96119-0.48374 0.78529-0.56541-0.17591-0.0879-0.30783 0.0817-0.87952 0.40835-0.57169 0.32668-1.0429 0.59682-1.5266 0.79786-0.27642 0.11308-0.57169 0.22616-0.83554 0.25129-0.25129 0.0251-0.57169 0.0189-0.76016 0.0189-0.2136 0-0.44605-0.0754-0.66593-0.16334 0-0.006 0.26386 0.2827 0.26386 0.2827z"/>
+<path fill="#6d3a00" d="m452.08 327.57c0.36437 0.0691 0.75387 0.0188 0.98632 0.0188 0.45232 0 0.96119-0.17591 1.5454-0.44605 0.59053-0.26386 0.66592-0.37694 1.0868-0.59054 0.40206-0.21988 0.96119-0.48373 0.78528-0.5654-0.1759-0.0816-0.30155 0.088-0.87324 0.41463-0.57169 0.3204-1.0491 0.59682-1.5203 0.79157-0.2827 0.11308-0.57169 0.22616-0.83554 0.25129-0.25129 0.0251-0.57169 0.0189-0.75388 0.0189-0.2136 0-0.44604-0.0754-0.66592-0.15706 0-0.006 0.24501 0.26386 0.24501 0.26386z"/>
+<path fill="#630" d="m452.07 327.56c0.36438 0.0691 0.76016 0.0189 0.99261 0.0189 0.45232 0 0.95491-0.17591 1.5392-0.43976 0.58426-0.26386 0.65965-0.37694 1.0743-0.59054 0.40207-0.2136 0.96747-0.47746 0.79157-0.55913-0.17591-0.0816-0.29527 0.0942-0.86696 0.41464-0.57169 0.32039-1.0554 0.6031-1.5203 0.79157-0.2827 0.11308-0.56541 0.22616-0.82926 0.25129-0.25129 0.0251-0.57169 0.0188-0.75388 0.0188-0.2136 0-0.43976-0.0754-0.65964-0.15706 0-0.006 0.23244 0.25129 0.23244 0.25129z"/>
+<path fill="#fff" d="m455.12 332c0.0754-0.24501 2.5192-0.82298 2.9213-0.63452 0.39578 0.18847 2.293 2.9464 1.9538 3.0972-0.33924 0.1445-1.068-0.91721-2.1297-1.4072-1.0617-0.49002-2.8208-0.80414-2.7454-1.0554z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#f9f9f9" d="m164.84 169.62c0.848-2.761 28.145-9.076 32.69-6.997 4.476 2.079 25.768 32.897 21.944 34.591-3.824 1.625-11.965-10.346-23.941-15.874-11.975-5.527-31.541-8.89-30.693-11.72z"/>
+<path fill="#f4f4f4" d="m165.66 169.68c0.832-2.714 27.418-8.72 31.9-6.722 4.417 1.998 25.258 32.026 21.497 33.685-3.76 1.594-11.69-10.18-23.474-15.619-11.783-5.438-30.755-8.565-29.923-11.344z"/>
+<path fill="#efefef" d="m166.48 169.74c0.815-2.668 26.691-8.364 31.11-6.447 4.358 1.917 24.746 31.155 21.05 32.779-3.697 1.563-11.417-10.014-23.008-15.364-11.591-5.349-29.968-8.239-29.152-10.968z"/>
+<path fill="#eaeaea" d="m167.31 169.79c0.8-2.621 25.964-8.009 30.32-6.173 4.299 1.837 24.235 30.285 20.603 31.874-3.633 1.532-11.142-9.847-22.541-15.109-11.399-5.261-29.181-7.914-28.382-10.592z"/>
+<path fill="#e5e5e5" d="m168.13 169.85c0.783-2.573 25.236-7.652 29.53-5.897 4.239 1.756 23.723 29.414 20.155 30.968-3.569 1.501-10.867-9.681-22.074-14.854-11.206-5.172-28.395-7.589-27.611-10.217z"/>
+<path fill="#e0e0e0" d="m168.96 169.91c0.768-2.527 24.51-7.296 28.74-5.622 4.18 1.675 23.212 28.543 19.708 30.063-3.505 1.469-10.592-9.516-21.607-14.6-11.014-5.083-27.608-7.263-26.841-9.841z"/>
+<path fill="#dbdbdb" d="m169.78 169.96c0.751-2.48 23.782-6.941 27.95-5.347 4.12 1.593 22.701 27.671 19.26 29.157-3.441 1.438-10.318-9.349-21.14-14.345-10.822-4.994-26.822-6.938-26.07-9.465z"/>
+<path fill="#d6d6d6" d="m170.61 170.02c0.735-2.433 23.056-6.585 27.16-5.073 4.061 1.513 22.19 26.801 18.813 28.252-3.377 1.407-10.043-9.183-20.673-14.09-10.629-4.906-26.035-6.612-25.3-9.089z"/>
+<path fill="#d1d1d1" d="m171.43 170.08c0.719-2.387 22.328-6.229 26.37-4.798 4.001 1.432 21.678 25.93 18.365 27.346-3.313 1.376-9.768-9.017-20.206-13.835-10.437-4.817-25.248-6.287-24.529-8.713z"/>
+<path fill="#ccc" d="m172.26 170.13c0.703-2.339 21.602-5.873 25.58-4.522 3.942 1.351 21.167 25.059 17.918 26.44-3.249 1.345-9.493-8.851-19.739-13.58-10.245-4.728-24.462-5.962-23.759-8.338z"/>
+<path fill="#c6c6c6" d="m173.08 170.19c0.687-2.292 20.874-5.517 24.79-4.247 3.882 1.27 20.655 24.188 17.47 25.535-3.185 1.314-9.219-8.685-19.272-13.326-10.052-4.639-23.675-5.636-22.988-7.962z"/>
+<path fill="#c1c1c1" d="m173.9 170.25c0.671-2.246 20.148-5.161 24-3.973 3.823 1.19 20.145 23.318 17.023 24.63-3.121 1.283-8.944-8.519-18.805-13.071-9.86-4.551-22.889-5.311-22.218-7.586z"/>
+<path fill="#bcbcbc" d="m174.73 170.3c0.654-2.199 19.42-4.805 23.21-3.698 3.764 1.108 19.633 22.446 16.576 23.724-3.058 1.252-8.67-8.353-18.339-12.816-9.668-4.462-22.102-4.985-21.447-7.21z"/>
+<path fill="#b7b7b7" d="m175.55 170.36c0.639-2.152 18.694-4.45 22.42-3.423 3.705 1.027 19.122 21.575 16.129 22.818-2.994 1.221-8.395-8.186-17.872-12.561-9.476-4.373-21.315-4.66-20.677-6.834z"/>
+<path fill="#b2b2b2" d="m176.38 170.42c0.622-2.105 17.966-4.093 21.63-3.147 3.645 0.946 18.61 20.704 15.681 21.912-2.93 1.19-8.121-8.02-17.405-12.306-9.283-4.284-20.529-4.335-19.906-6.459z"/>
+<path fill="#adadad" d="m177.2 170.48c0.607-2.058 17.239-3.737 20.84-2.873 3.586 0.866 18.099 19.834 15.234 21.008-2.866 1.158-7.846-7.855-16.938-12.052-9.091-4.196-19.742-4.009-19.136-6.083z"/>
+<path fill="#a8a8a8" d="m178.03 170.53c0.59-2.011 16.512-3.382 20.05-2.598 3.526 0.785 17.588 18.963 14.786 20.102-2.802 1.127-7.571-7.688-16.471-11.797-8.899-4.107-18.956-3.684-18.365-5.707z"/>
+<path fill="#a3a3a3" d="m178.85 170.59c0.574-1.965 15.785-3.026 19.26-2.323 3.467 0.704 17.077 18.092 14.339 19.196-2.738 1.096-7.296-7.522-16.004-11.542-8.706-4.018-18.169-3.358-17.595-5.331z"/>
+<path fill="#9e9e9e" d="m179.68 170.65c0.558-1.918 15.058-2.67 18.47-2.048 3.407 0.623 16.565 17.221 13.891 18.29-2.674 1.065-7.022-7.356-15.537-11.287-8.514-3.929-17.382-3.033-16.824-4.955z"/>
+</g>
+<path fill="#999" d="m456.56 332.1c0.0473-0.16325 1.2504-0.20191 1.5426-0.1547 0.29213 0.0473 1.4008 1.4266 1.173 1.5169-0.22774 0.0902-0.58871-0.62736-1.3149-0.96259-0.72613-0.33514-1.4481-0.23628-1.4008-0.39962z"/>
+<path fill="#fff" d="m452.04 335.76c0.25129 0.0126 0.0126 1.4198 0.0126 2.871s0.19475 1.9601 0.0126 2.1423c-0.18219 0.18219-0.4963-0.47117-0.4963-1.9224s0.21988-3.1035 0.47117-3.0909z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#f9f9f9" d="m128.7 213.01c2.783 0.162 0.11 16.052 0.097 32.419-0.012 16.367 2.187 22.207 0.164 24.238-2.02 2.028-5.561-5.384-5.546-21.753 0.012-16.367 2.502-35.065 5.285-34.904z"/>
+<path fill="#f4f4f4" d="m128.67 213.4c2.686 0.179 0.076 15.832 0.051 31.933-0.024 16.102 2.142 21.952 0.184 23.924-1.953 1.968-5.434-5.367-5.405-21.473 0.025-16.102 2.485-34.563 5.17-34.384z"/>
+<path fill="#efefef" d="m128.64 213.8c2.588 0.197 0.041 15.612 0.004 31.448s2.097 21.695 0.204 23.61c-1.886 1.907-5.308-5.351-5.263-21.195 0.037-15.836 2.467-34.059 5.055-33.863z"/>
+<path fill="#eaeaea" d="m128.61 214.19c2.491 0.214 0.007 15.391-0.043 30.962-0.049 15.571 2.052 21.439 0.224 23.296-1.818 1.848-5.181-5.334-5.122-20.915 0.049-15.571 2.45-33.557 4.941-33.343z"/>
+<path fill="#e5e5e5" d="m128.58 214.58c2.394 0.231-0.027 15.171-0.089 30.477-0.061 15.306 2.007 21.182 0.244 22.982-1.751 1.787-5.054-5.319-4.98-20.637 0.061-15.305 2.431-33.053 4.825-32.822z"/>
+<path fill="#e0e0e0" d="m128.55 214.97c2.297 0.249-0.062 14.951-0.135 29.991-0.075 15.041 1.961 20.926 0.263 22.668-1.683 1.727-4.928-5.302-4.839-20.357 0.074-15.04 2.414-32.551 4.711-32.302z"/>
+<path fill="#dbdbdb" d="m128.52 215.36c2.2 0.266-0.095 14.731-0.181 29.506-0.087 14.775 1.916 20.669 0.283 22.354-1.616 1.667-4.801-5.286-4.697-20.078 0.086-14.776 2.396-32.048 4.595-31.782z"/>
+<path fill="#d6d6d6" d="m128.5 215.75c2.102 0.283-0.13 14.51-0.228 29.02-0.099 14.51 1.87 20.413 0.302 22.04-1.548 1.607-4.673-5.269-4.555-19.799 0.099-14.51 2.379-31.545 4.481-31.261z"/>
+<path fill="#d1d1d1" d="m128.47 216.14c2.005 0.301-0.165 14.29-0.275 28.535-0.111 14.245 1.825 20.156 0.322 21.725-1.48 1.548-4.546-5.252-4.413-19.519 0.11-14.245 2.361-31.042 4.366-30.741z"/>
+<path fill="#ccc" d="m128.44 216.53c1.908 0.318-0.198 14.07-0.321 28.049-0.124 13.98 1.78 19.9 0.342 21.412-1.413 1.487-4.42-5.237-4.272-19.241 0.123-13.979 2.344-30.539 4.251-30.22z"/>
+<path fill="#c6c6c6" d="m128.41 216.92c1.811 0.335-0.233 13.85-0.368 27.564-0.136 13.714 1.735 19.643 0.362 21.097-1.345 1.427-4.293-5.22-4.13-18.961 0.135-13.714 2.326-30.036 4.136-29.7z"/>
+<path fill="#c1c1c1" d="m128.38 217.31c1.714 0.353-0.267 13.629-0.414 27.078-0.148 13.449 1.69 19.387 0.382 20.784-1.278 1.367-4.166-5.204-3.989-18.682 0.148-13.449 2.308-29.534 4.021-29.18z"/>
+<path fill="#bcbcbc" d="m128.35 217.7c1.616 0.37-0.301 13.409-0.461 26.593-0.161 13.184 1.645 19.13 0.402 20.469-1.211 1.307-4.04-5.187-3.847-18.403 0.16-13.183 2.29-29.03 3.906-28.659z"/>
+<path fill="#b7b7b7" d="m128.32 218.1c1.519 0.387-0.336 13.189-0.508 26.107-0.173 12.919 1.6 18.874 0.422 20.156-1.143 1.246-3.913-5.171-3.706-18.124 0.172-12.919 2.273-28.528 3.792-28.139z"/>
+<path fill="#b2b2b2" d="m128.29 218.49c1.422 0.405-0.37 12.969-0.554 25.622-0.185 12.653 1.555 18.617 0.442 19.841-1.076 1.187-3.786-5.155-3.564-17.845 0.184-12.653 2.255-28.024 3.676-27.618z"/>
+<path fill="#adadad" d="m128.26 218.88c1.325 0.422-0.404 12.748-0.601 25.136-0.198 12.388 1.51 18.361 0.462 19.528-1.008 1.126-3.66-5.139-3.423-17.566 0.197-12.388 2.238-27.522 3.562-27.098z"/>
+<path fill="#a8a8a8" d="m128.23 219.27c1.228 0.439-0.438 12.528-0.647 24.651-0.21 12.123 1.465 18.104 0.482 19.213-0.941 1.066-3.533-5.122-3.281-17.286 0.209-12.123 2.22-27.019 3.446-26.578z"/>
+<path fill="#a3a3a3" d="m128.2 219.66c1.13 0.457-0.472 12.308-0.694 24.165-0.222 11.858 1.419 17.848 0.501 18.9-0.873 1.006-3.405-5.106-3.139-17.008 0.222-11.857 2.203-26.516 3.332-26.057z"/>
+<path fill="#9e9e9e" d="m128.17 220.05c1.033 0.474-0.507 12.088-0.741 23.68s1.374 17.591 0.521 18.585c-0.805 0.946-3.278-5.089-2.997-16.728 0.233-11.592 2.184-26.013 3.217-25.537z"/>
+</g>
+<path fill="#999" d="m451.99 336.44c0.0817 0.0429-0.0472 1.0355-0.0687 2.0239-0.0215 0.98833 0.11596 1.5126 0.0472 1.5942-0.0644 0.0773-0.27502-0.44264-0.2492-1.4352 0.0215-0.98833 0.18908-2.2259 0.27067-2.1828z"/>
+<path fill="#fff" d="m452.59 331.88c0.15148 0.0168 1.0852-0.19353 1.1189-0.10941 0.0336 0.0674-0.58042 0.25242-0.78233 0.46271-0.0673 0.0673-0.24396 0.22712-0.35329 0.21028-0.0841-0.008-0.13463-0.18507-0.2608-0.3197-0.30286-0.30277-0.4963-0.27756-0.43741-0.39535 0.0504-0.0925 0.45425 0.12617 0.71496 0.15147z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#fbfbfb" d="m135.08 168.2c1.7 0.188 12.176-2.171 12.554-1.227 0.377 0.755-6.512 2.832-8.778 5.191-0.754 0.755-2.737 2.549-3.964 2.36-0.943-0.094-1.51-2.077-2.926-3.587-3.398-3.397-5.568-3.115-4.907-4.436 0.566-1.038 5.096 1.415 8.021 1.699z"/>
+<path fill="#f8f8f8" d="m135.12 168.24c1.663 0.184 11.914-2.124 12.283-1.201 0.369 0.739-6.372 2.771-8.589 5.08-0.738 0.739-2.678 2.494-3.878 2.309-0.924-0.092-1.478-2.032-2.864-3.51-3.325-3.324-5.448-3.048-4.802-4.341 0.554-1.015 4.987 1.385 7.85 1.663z"/>
+<path fill="#f5f5f5" d="m135.17 168.28c1.626 0.18 11.652-2.078 12.014-1.175 0.361 0.723-6.232 2.711-8.4 4.969-0.723 0.722-2.62 2.439-3.794 2.258-0.903-0.09-1.446-1.987-2.801-3.433-3.252-3.251-5.329-2.981-4.696-4.245 0.541-0.993 4.877 1.354 7.677 1.626z"/>
+<path fill="#f2f2f2" d="m135.21 168.32c1.59 0.176 11.391-2.031 11.745-1.148 0.352 0.706-6.093 2.649-8.212 4.856-0.707 0.707-2.561 2.385-3.709 2.208-0.883-0.088-1.413-1.943-2.738-3.356-3.179-3.178-5.209-2.914-4.591-4.15 0.529-0.971 4.768 1.324 7.505 1.59z"/>
+<path fill="#efefef" d="m135.26 168.36c1.554 0.172 11.13-1.985 11.475-1.122 0.345 0.69-5.953 2.589-8.023 4.745-0.69 0.69-2.503 2.33-3.624 2.157-0.863-0.086-1.381-1.898-2.675-3.279-3.106-3.105-5.09-2.847-4.486-4.055 0.518-0.948 4.659 1.294 7.333 1.554z"/>
+<path fill="#ebebeb" d="m135.3 168.4c1.517 0.168 10.868-1.938 11.206-1.096 0.336 0.674-5.813 2.528-7.835 4.634-0.674 0.674-2.444 2.275-3.539 2.106-0.842-0.084-1.348-1.853-2.611-3.202-3.033-3.032-4.971-2.78-4.381-3.959 0.505-0.926 4.549 1.263 7.16 1.517z"/>
+<path fill="#e8e8e8" d="m135.35 168.44c1.48 0.164 10.606-1.892 10.935-1.069 0.329 0.657-5.673 2.467-7.646 4.522-0.658 0.657-2.385 2.22-3.453 2.055-0.823-0.082-1.316-1.809-2.549-3.124-2.96-2.96-4.851-2.714-4.276-3.865 0.493-0.904 4.44 1.233 6.989 1.481z"/>
+<path fill="#e5e5e5" d="m135.39 168.48c1.444 0.16 10.345-1.845 10.666-1.043 0.32 0.641-5.533 2.406-7.458 4.41-0.641 0.642-2.326 2.166-3.368 2.005-0.802-0.08-1.284-1.764-2.486-3.047-2.887-2.887-4.732-2.647-4.17-3.769 0.481-0.882 4.33 1.202 6.816 1.444z"/>
+<path fill="#e2e2e2" d="m135.44 168.52c1.408 0.156 10.084-1.799 10.397-1.017 0.312 0.625-5.394 2.345-7.27 4.299-0.625 0.625-2.267 2.111-3.283 1.954-0.782-0.078-1.251-1.719-2.423-2.97-2.814-2.814-4.612-2.58-4.065-3.674 0.469-0.859 4.221 1.172 6.644 1.408z"/>
+<path fill="#dfdfdf" d="m135.48 168.56c1.371 0.152 9.822-1.751 10.127-0.99 0.304 0.609-5.253 2.285-7.081 4.188-0.609 0.609-2.208 2.056-3.198 1.903-0.761-0.076-1.218-1.675-2.36-2.893-2.741-2.741-4.492-2.513-3.959-3.579 0.456-0.837 4.111 1.142 6.471 1.371z"/>
+<path fill="#dbdbdb" d="m135.53 168.6c1.335 0.148 9.561-1.704 9.858-0.963 0.296 0.592-5.114 2.223-6.893 4.076-0.592 0.593-2.149 2.001-3.113 1.853-0.741-0.074-1.186-1.631-2.297-2.817-2.668-2.667-4.373-2.446-3.854-3.483 0.445-0.815 4.002 1.111 6.299 1.334z"/>
+<path fill="#d8d8d8" d="m135.57 168.64c1.298 0.144 9.299-1.658 9.587-0.937 0.288 0.576-4.973 2.163-6.704 3.964-0.576 0.577-2.091 1.947-3.027 1.803-0.721-0.072-1.154-1.586-2.235-2.74-2.595-2.594-4.253-2.379-3.748-3.388 0.432-0.792 3.892 1.081 6.127 1.298z"/>
+<path fill="#d5d5d5" d="m135.62 168.68c1.261 0.14 9.037-1.611 9.318-0.911 0.28 0.56-4.834 2.102-6.515 3.853-0.561 0.561-2.033 1.892-2.943 1.752-0.701-0.07-1.121-1.541-2.172-2.663-2.522-2.521-4.133-2.312-3.643-3.292 0.42-0.77 3.783 1.05 5.955 1.261z"/>
+<path fill="#d2d2d2" d="m135.66 168.72c1.225 0.136 8.776-1.565 9.049-0.884 0.271 0.543-4.694 2.041-6.327 3.741-0.545 0.544-1.974 1.837-2.858 1.701-0.68-0.068-1.089-1.497-2.109-2.585-2.449-2.449-4.014-2.246-3.537-3.198 0.407-0.748 3.673 1.02 5.782 1.225z"/>
+<path fill="#cfcfcf" d="m135.71 168.76c1.189 0.132 8.515-1.518 8.779-0.858 0.264 0.527-4.554 1.98-6.138 3.63-0.528 0.528-1.915 1.782-2.773 1.65-0.66-0.066-1.056-1.452-2.046-2.508-2.376-2.376-3.894-2.179-3.432-3.103 0.396-0.725 3.564 0.99 5.61 1.189z"/>
+<path fill="#ccc" d="m135.75 168.8c1.152 0.128 8.253-1.472 8.51-0.832 0.255 0.511-4.415 1.92-5.95 3.518-0.512 0.512-1.856 1.728-2.688 1.6-0.64-0.064-1.023-1.407-1.983-2.431-2.303-2.303-3.774-2.112-3.327-3.007 0.384-0.703 3.455 0.959 5.438 1.152z"/>
+<path fill="#c8c8c8" d="m135.8 168.84c1.115 0.124 7.991-1.425 8.239-0.805 0.248 0.494-4.274 1.858-5.761 3.406-0.496 0.496-1.797 1.673-2.602 1.549-0.62-0.062-0.992-1.363-1.921-2.354-2.23-2.23-3.655-2.045-3.221-2.912 0.371-0.681 3.345 0.929 5.266 1.116z"/>
+<path fill="#c5c5c5" d="m135.84 168.88c1.079 0.12 7.73-1.379 7.97-0.779 0.239 0.478-4.135 1.798-5.573 3.295-0.479 0.479-1.738 1.618-2.517 1.498-0.6-0.06-0.959-1.318-1.858-2.277-2.157-2.157-3.535-1.978-3.116-2.816 0.36-0.659 3.236 0.898 5.094 1.079z"/>
+<path fill="#c2c2c2" d="m135.89 168.92c1.043 0.116 7.469-1.332 7.701-0.753 0.231 0.462-3.995 1.737-5.385 3.184-0.463 0.463-1.68 1.563-2.432 1.447-0.579-0.058-0.926-1.273-1.795-2.2-2.084-2.084-3.415-1.911-3.01-2.721 0.347-0.636 3.126 0.868 4.921 1.043z"/>
+</g>
+<path fill="#bfbfbf" d="m452.67 331.95c0.0878 0.01 0.62884-0.11212 0.64839-0.0633 0.0195 0.0389-0.33637 0.14623-0.45337 0.26804-0.039 0.039-0.14144 0.13167-0.20479 0.1219-0.0488-0.005-0.078-0.10724-0.15112-0.18525-0.17547-0.17546-0.28759-0.16089-0.25348-0.22913 0.0292-0.0536 0.26325 0.0731 0.41437 0.0878z"/>
+<path d="m455.69 318.53c-0.13934 0.18593-0.2478 1.4794 0.0929 1.6266 0.34082 0.13933 1.7815-0.31762 1.735-0.61192-0.0697-0.47248-0.67386-0.96817-0.99147-1.1154-0.26333-0.13166-0.69707-0.0851-0.83651 0.1007z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#050505" d="m170.75 15.404c-1.558 2.0792-2.787 16.525 1.026 18.173 3.813 1.5628 19.805-3.5882 19.283-6.8861-0.786-5.2858-7.442-10.799-10.989-12.434-2.956-1.4633-7.76-0.9317-9.32 1.1466z"/>
+<path fill="#0a0a0a" d="m170.96 15.638c-1.52 2.0273-2.734 16.095 0.986 17.705 3.72 1.5285 19.192-3.5363 18.681-6.7592-0.773-5.1567-7.16-10.502-10.614-12.085-2.895-1.4175-7.533-0.8875-9.053 1.1392z"/>
+<path fill="#0f0f0f" d="m171.17 15.873c-1.481 1.9755-2.681 15.665 0.946 17.236 3.629 1.4944 18.581-3.4845 18.081-6.6323-0.762-5.0274-6.88-10.206-10.241-11.735-2.833-1.3718-7.305-0.8432-8.786 1.1317z"/>
+<path fill="#141414" d="m171.38 16.108c-1.442 1.9237-2.628 15.235 0.907 16.767 3.536 1.4603 17.968-3.4325 17.479-6.5054-0.749-4.8981-6.599-9.9087-9.867-11.386-2.771-1.3259-7.076-0.7989-8.519 1.1243z"/>
+<path fill="#191919" d="m171.59 16.342c-1.403 1.8721-2.575 14.805 0.867 16.299 3.444 1.426 17.356-3.3808 16.878-6.3785-0.737-4.769-6.318-9.612-9.493-11.037-2.709-1.2803-6.848-0.7547-8.252 1.1167z"/>
+<path fill="#1e1e1e" d="m171.8 16.576c-1.364 1.8201-2.522 14.375 0.828 15.83 3.351 1.3917 16.744-3.329 16.276-6.2516-0.724-4.6398-6.037-9.3152-9.119-10.688-2.647-1.2346-6.619-0.7105-7.985 1.1093z"/>
+<path fill="#232323" d="m172.01 16.811c-1.326 1.7683-2.47 13.945 0.788 15.361 3.258 1.3576 16.131-3.277 15.674-6.1247-0.711-4.5106-5.755-9.0184-8.745-10.339-2.585-1.1887-6.391-0.6663-7.717 1.1019z"/>
+<path fill="#282828" d="m172.22 17.046c-1.287 1.7166-2.417 13.515 0.748 14.893 3.166 1.3234 15.52-3.2253 15.073-5.9978-0.699-4.3814-5.474-8.7217-8.371-9.9895-2.523-1.143-6.163-0.6219-7.45 1.0945z"/>
+<path fill="#2d2d2d" d="m172.43 17.28c-1.248 1.6647-2.363 13.085 0.709 14.424 3.073 1.2892 14.907-3.1733 14.471-5.8709-0.686-4.2522-5.193-8.4248-7.996-9.6402-2.462-1.0972-5.935-0.5777-7.184 1.087z"/>
+<path fill="#333" d="m172.64 17.514c-1.209 1.6129-2.31 12.656 0.67 13.955 2.98 1.255 14.295-3.1215 13.869-5.7439-0.673-4.1231-4.912-8.1281-7.622-9.291-2.4-1.0515-5.707-0.5335-6.917 1.0795z"/>
+<path fill="#383838" d="m172.85 17.749c-1.17 1.5612-2.257 12.226 0.63 13.487 2.888 1.2208 13.683-3.0697 13.268-5.6171-0.661-3.9938-4.631-7.8312-7.248-8.9418-2.338-1.0058-5.478-0.4892-6.65 1.0721z"/>
+<path fill="#3d3d3d" d="m173.06 17.984c-1.132 1.5093-2.205 11.796 0.59 13.018 2.795 1.1866 13.071-3.0177 12.666-5.4902-0.648-3.8645-4.349-7.5343-6.874-8.5925-2.276-0.96-5.25-0.4451-6.382 1.0646z"/>
+<path fill="#424242" d="m173.27 18.218c-1.093 1.4575-2.152 11.366 0.551 12.55 2.703 1.1524 12.458-2.966 12.065-5.3633-0.636-3.7354-4.069-7.2376-6.501-8.2434-2.214-0.9142-5.022-0.4007-6.115 1.0572z"/>
+<path fill="#474747" d="m173.48 18.452c-1.054 1.4057-2.099 10.936 0.511 12.081 2.611 1.1182 11.847-2.9141 11.464-5.2365-0.624-3.6061-3.788-6.9408-6.127-7.8941-2.152-0.8685-4.793-0.3565-5.848 1.0497z"/>
+<path fill="#4c4c4c" d="m173.69 18.687c-1.016 1.3539-2.046 10.506 0.472 11.612 2.518 1.084 11.234-2.8622 10.862-5.1095-0.611-3.477-3.507-6.644-5.753-7.545-2.09-0.8227-4.565-0.3122-5.581 1.0423z"/>
+<path fill="#515151" d="m173.9 18.922c-0.977 1.3021-1.992 10.076 0.433 11.144 2.425 1.0497 10.621-2.8105 10.26-4.9826-0.598-3.3479-3.226-6.3473-5.378-7.1958-2.029-0.7771-4.337-0.268-5.315 1.0348z"/>
+<path fill="#565656" d="m174.11 19.156c-0.939 1.2503-1.94 9.6458 0.392 10.675 2.333 1.0156 10.01-2.7585 9.659-4.8557-0.586-3.2186-2.944-6.0504-5.004-6.8466-1.967-0.7312-4.109-0.2238-5.047 1.0274z"/>
+<path fill="#5b5b5b" d="m174.32 19.39c-0.9 1.1986-1.887 9.2159 0.353 10.206 2.24 0.9815 9.397-2.7067 9.057-4.7287-0.573-3.0895-2.663-5.7537-4.63-6.4975-1.905-0.6854-3.881-0.1794-4.78 1.02z"/>
+<path fill="#606060" d="m174.53 19.625c-0.861 1.1467-1.834 8.7859 0.314 9.7376 2.147 0.9472 8.785-2.6548 8.455-4.6019-0.56-2.9602-2.382-5.4568-4.256-6.1482-1.843-0.6397-3.652-0.1352-4.513 1.0125z"/>
+</g>
+<path fill="#666" d="m456.06 318.94c-0.0717 0.0955-0.1554 0.72909 0.0239 0.80875 0.17931 0.0797 0.71313-0.22712 0.68529-0.39047-0.0478-0.24701-0.18332-0.45023-0.33872-0.50597-0.1554-0.0518-0.29876-0.008-0.37048 0.0877z"/>
+<path d="m458.07 326.68c-0.0644 0.0787 0.0501 0.72988 0.47222 1.1592 0.42222 0.42214 0.6798 0.42214 0.85151 0.23611 0.32913-0.35059 0.0644-0.6798-0.13594-0.90875-0.20034-0.22896-0.45791-0.15025-0.69411-0.37921-0.23611-0.22895-0.40067-0.21464-0.49368-0.10732z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#050505" d="m197.82 108.58c-0.733 0.895 0.569 8.3 5.37 13.182 4.801 4.801 7.73 4.801 9.683 2.685 3.742-3.987 0.732-7.73-1.546-10.334s-5.207-1.709-7.893-4.312c-2.685-2.604-4.557-2.441-5.614-1.221z"/>
+<path fill="#0a0a0a" d="m197.89 108.65c-0.727 0.888 0.565 8.235 5.328 13.079 4.764 4.763 7.67 4.763 9.607 2.664 3.714-3.956 0.727-7.67-1.534-10.253-2.26-2.584-5.166-1.696-7.831-4.279-2.664-2.583-4.521-2.422-5.57-1.211z"/>
+<path fill="#0f0f0f" d="m197.96 108.72c-0.721 0.881 0.561 8.17 5.286 12.976 4.726 4.725 7.609 4.725 9.532 2.642 3.684-3.924 0.72-7.609-1.522-10.172-2.243-2.563-5.126-1.682-7.77-4.244-2.643-2.563-4.485-2.403-5.526-1.202z"/>
+<path fill="#141414" d="m198.03 108.79c-0.715 0.874 0.557 8.105 5.244 12.872 4.689 4.688 7.549 4.688 9.456 2.622 3.655-3.893 0.715-7.549-1.51-10.091-2.224-2.543-5.085-1.669-7.707-4.211-2.622-2.543-4.45-2.384-5.483-1.192z"/>
+<path fill="#191919" d="m198.1 108.85c-0.71 0.867 0.551 8.04 5.202 12.769 4.65 4.65 7.488 4.65 9.379 2.601 3.626-3.862 0.71-7.489-1.497-10.011s-5.044-1.655-7.646-4.177c-2.601-2.522-4.414-2.364-5.438-1.182z"/>
+<path fill="#1e1e1e" d="m198.17 108.92c-0.703 0.86 0.547 7.975 5.16 12.666 4.613 4.612 7.428 4.612 9.304 2.579 3.596-3.83 0.703-7.427-1.485-9.929-2.189-2.502-5.004-1.642-7.585-4.143-2.579-2.502-4.378-2.346-5.394-1.173z"/>
+<path fill="#232323" d="m198.24 108.99c-0.697 0.853 0.543 7.91 5.118 12.562 4.576 4.575 7.367 4.575 9.228 2.559 3.567-3.8 0.698-7.367-1.473-9.848-2.171-2.482-4.963-1.629-7.522-4.11s-4.343-2.326-5.351-1.163z"/>
+<path fill="#282828" d="m198.31 109.05c-0.692 0.846 0.538 7.845 5.076 12.459 4.537 4.537 7.306 4.537 9.152 2.538 3.537-3.769 0.692-7.307-1.461-9.768-2.154-2.461-4.922-1.615-7.461-4.076-2.538-2.461-4.307-2.307-5.306-1.153z"/>
+<path fill="#2d2d2d" d="m198.38 109.12c-0.686 0.839 0.534 7.78 5.034 12.356 4.5 4.499 7.246 4.499 9.076 2.516 3.509-3.737 0.687-7.246-1.449-9.686-2.135-2.441-4.881-1.602-7.399-4.042-2.516-2.441-4.271-2.288-5.262-1.144z"/>
+<path fill="#333" d="m198.45 109.19c-0.68 0.832 0.53 7.715 4.992 12.253 4.463 4.462 7.186 4.462 9.001 2.496 3.479-3.706 0.68-7.186-1.437-9.606-2.118-2.42-4.841-1.588-7.337-4.008s-4.236-2.269-5.219-1.135z"/>
+<path fill="#383838" d="m198.52 109.25c-0.675 0.825 0.525 7.65 4.95 12.15 4.424 4.425 7.124 4.425 8.924 2.475 3.45-3.675 0.675-7.125-1.425-9.525-2.099-2.4-4.799-1.575-7.275-3.975-2.474-2.399-4.2-2.25-5.174-1.125z"/>
+<path fill="#3d3d3d" d="m198.59 109.32c-0.669 0.818 0.52 7.585 4.908 12.047 4.387 4.387 7.064 4.387 8.849 2.453 3.42-3.643 0.669-7.064-1.413-9.443-2.082-2.38-4.759-1.562-7.214-3.941-2.453-2.38-4.164-2.231-5.13-1.116z"/>
+<path fill="#424242" d="m198.66 109.39c-0.663 0.811 0.516 7.52 4.866 11.944 4.35 4.349 7.004 4.349 8.773 2.432 3.391-3.612 0.663-7.004-1.401-9.363s-4.718-1.548-7.151-3.907-4.129-2.212-5.087-1.106z"/>
+<path fill="#474747" d="m198.73 109.46c-0.657 0.804 0.512 7.455 4.824 11.84 4.312 4.312 6.944 4.312 8.698 2.412 3.361-3.582 0.657-6.944-1.389-9.282-2.046-2.339-4.678-1.535-7.09-3.874-2.411-2.338-4.093-2.192-5.043-1.096z"/>
+<path fill="#4c4c4c" d="m198.8 109.52c-0.652 0.797 0.507 7.39 4.782 11.737 4.274 4.274 6.882 4.274 8.621 2.39 3.332-3.55 0.652-6.883-1.377-9.201-2.028-2.318-4.636-1.521-7.028-3.839-2.39-2.318-4.057-2.174-4.998-1.087z"/>
+<path fill="#515151" d="m198.87 109.59c-0.646 0.79 0.503 7.325 4.74 11.634 4.237 4.236 6.822 4.236 8.545 2.369 3.304-3.519 0.646-6.822-1.364-9.12s-4.596-1.508-6.966-3.806c-2.369-2.298-4.022-2.154-4.955-1.077z"/>
+<path fill="#565656" d="m198.94 109.66c-0.64 0.783 0.499 7.26 4.698 11.53 4.199 4.199 6.762 4.199 8.47 2.349 3.274-3.488 0.64-6.762-1.352-9.039-1.993-2.278-4.556-1.495-6.905-3.773-2.348-2.277-3.986-2.135-4.911-1.067z"/>
+<path fill="#5b5b5b" d="m199.01 109.72c-0.635 0.776 0.494 7.195 4.656 11.427 4.161 4.161 6.701 4.161 8.393 2.327 3.245-3.456 0.635-6.701-1.34-8.958s-4.514-1.481-6.842-3.738-3.951-2.116-4.867-1.058z"/>
+<path fill="#606060" d="m199.08 109.79c-0.629 0.769 0.489 7.13 4.614 11.324 4.124 4.123 6.64 4.123 8.318 2.306 3.215-3.425 0.629-6.641-1.328-8.877-1.957-2.237-4.474-1.469-6.781-3.705-2.306-2.236-3.915-2.097-4.823-1.048z"/>
+</g>
+<path fill="#666" d="m458.19 326.79c-0.0544 0.0665 0.0423 0.61645 0.39892 0.97908 0.35652 0.35652 0.57414 0.35652 0.71915 0.19937 0.278-0.29614 0.0544-0.57413-0.11482-0.76749-0.16919-0.19344-0.3868-0.12695-0.58626-0.32031-0.19938-0.19335-0.33846-0.18131-0.41699-0.0906z"/>
+<path d="m451.38 321.34c-0.0628 0.18847 0.76016 0.44604 0.94234 0.60939 0.24501 0.21987 0.26386 0.65336 0.55285 0.47745 0.18847-0.11309 0.044-0.36438-0.30155-0.7476-0.50887-0.5654-1.1371-0.49629-1.1936-0.33924z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#050505" d="m121.59 47.579c-0.716 2.0732 8.275 4.8998 10.336 6.7407 2.745 2.4567 2.961 7.2487 6.146 5.3129 2.095-1.2543 0.45-4.0721-3.342-8.2806-5.575-6.2024-12.492-5.5041-13.14-3.773z"/>
+<path fill="#0a0a0a" d="m122.08 47.776c-0.71 1.9866 7.839 4.6878 9.873 6.4977 2.683 2.3932 2.898 7.0093 5.956 5.1535 2.029-1.2125 0.395-3.968-3.227-7.9929-5.32-5.9249-11.953-5.3205-12.602-3.6583z"/>
+<path fill="#0f0f0f" d="m122.56 47.973c-0.705 1.8997 7.403 4.4755 9.41 6.2544 2.62 2.3297 2.836 6.7699 5.765 4.9943 1.964-1.1707 0.342-3.864-3.112-7.7055-5.063-5.6473-11.414-5.1366-12.063-3.5432z"/>
+<path fill="#141414" d="m123.05 48.169c-0.701 1.8129 6.966 4.2633 8.946 6.0112 2.557 2.2663 2.773 6.5306 5.575 4.8352 1.898-1.129 0.287-3.7601-2.998-7.418-4.807-5.3698-10.874-4.9528-11.523-3.4284z"/>
+<path fill="#191919" d="m123.54 48.366c-0.696 1.7263 6.53 4.0513 8.483 5.768 2.494 2.203 2.71 6.2913 5.385 4.676 1.833-1.0872 0.232-3.6559-2.884-7.1305-4.551-5.0922-10.335-4.7689-10.984-3.3135z"/>
+<path fill="#1e1e1e" d="m124.03 48.563c-0.692 1.6394 6.093 3.8391 8.02 5.5248 2.43 2.1396 2.646 6.0518 5.193 4.5167 1.768-1.0455 0.179-3.552-2.769-6.8429-4.294-4.8147-9.795-4.5852-10.444-3.1986z"/>
+<path fill="#232323" d="m124.52 48.759c-0.686 1.5528 5.657 3.627 7.557 5.2817 2.367 2.0762 2.583 5.8125 5.003 4.3576 1.702-1.0038 0.124-3.448-2.654-6.5556-4.039-4.5371-9.256-4.4013-9.906-3.0837z"/>
+<path fill="#282828" d="m125 48.956c-0.681 1.466 5.221 3.4147 7.094 5.0383 2.304 2.0128 2.52 5.5733 4.813 4.1984 1.637-0.9619 0.07-3.344-2.54-6.2679-3.79-4.26-8.72-4.218-9.37-2.969z"/>
+<path fill="#2d2d2d" d="m125.49 49.153c-0.677 1.3793 4.784 3.2027 6.63 4.7953 2.242 1.9493 2.457 5.3338 4.623 4.0392 1.571-0.9203 0.015-3.24-2.426-5.9805-3.526-3.9821-8.177-4.0339-8.827-2.854z"/>
+<path fill="#333" d="m125.98 49.35c-0.672 1.2924 4.348 2.9904 6.167 4.552 2.179 1.8859 2.394 5.0944 4.432 3.88 1.506-0.8785-0.038-3.1361-2.311-5.693-3.269-3.7046-7.637-3.8501-8.288-2.739z"/>
+<path fill="#383838" d="m126.47 49.546c-0.668 1.2058 3.911 2.7784 5.703 4.3088 2.116 1.8227 2.331 4.8552 4.242 3.7208 1.441-0.8367-0.093-3.032-2.197-5.4054-3.013-3.427-7.098-3.6662-7.748-2.6242z"/>
+<path fill="#3d3d3d" d="m126.96 49.743c-0.662 1.1189 3.475 2.5662 5.24 4.0656 2.053 1.7592 2.268 4.6158 4.052 3.5616 1.375-0.7951-0.147-2.9281-2.082-5.1181-2.757-3.1493-6.559-3.4823-7.21-2.5091z"/>
+<path fill="#424242" d="m127.45 49.94c-0.657 1.0322 3.039 2.354 4.777 3.8224 1.99 1.6957 2.206 4.3764 3.861 3.4023 1.31-0.7532-0.201-2.824-1.967-4.8304-2.501-2.8719-6.019-3.2987-6.671-2.3943z"/>
+<path fill="#474747" d="m127.94 50.136c-0.653 0.9455 2.602 2.1419 4.313 3.5792 1.927 1.6323 2.143 4.1371 3.671 3.2431 1.244-0.7114-0.255-2.72-1.853-4.543-2.244-2.5942-5.48-3.1148-6.131-2.2793z"/>
+<path fill="#4c4c4c" d="m128.42 50.333c-0.648 0.8587 2.166 1.9297 3.85 3.336 1.864 1.5689 2.08 3.8977 3.481 3.084 1.179-0.6698-0.31-2.6161-1.739-4.2555-1.988-2.3168-4.94-2.9311-5.592-2.1645z"/>
+<path fill="#515151" d="m128.91 50.53c-0.644 0.772 1.729 1.7176 3.386 3.0928 1.802 1.5056 2.017 3.6584 3.29 2.9247 1.114-0.6279-0.364-2.512-1.624-3.9679-1.732-2.0393-4.4-2.7473-5.052-2.0496z"/>
+<path fill="#565656" d="m129.4 50.726c-0.638 0.6852 1.293 1.5054 2.923 2.8496 1.739 1.4422 1.954 3.419 3.1 2.7656 1.048-0.5863-0.418-2.408-1.509-3.6805-1.476-1.7617-3.862-2.5634-4.514-1.9347z"/>
+<path fill="#5b5b5b" d="m129.89 50.923c-0.633 0.5984 0.857 1.2932 2.46 2.6063 1.676 1.3788 1.891 3.1797 2.91 2.6065 0.983-0.5445-0.473-2.3041-1.395-3.393-1.22-1.4841-3.322-2.3796-3.975-1.8198z"/>
+<path fill="#606060" d="m130.38 51.12c-0.629 0.5117 0.42 1.0811 1.996 2.3632 1.613 1.3153 1.828 2.9403 2.72 2.4471 0.917-0.5027-0.527-2.1999-1.281-3.1054-0.963-1.2066-2.782-2.1959-3.435-1.7049z"/>
+</g>
+<path fill="#666" d="m452.23 321.68c-0.0545 0.0371-0.001 0.0758 0.13376 0.18498 0.13524 0.10924 0.154 0.23568 0.22066 0.19964 0.0743-0.0402-0.0507-0.18289-0.10173-0.24588-0.0617-0.0811-0.19572-0.17557-0.25269-0.13874z"/>
+<path d="m455.74 321.27c-0.006 0.0942 0.25757 0.15078 0.4272 0.2136 0.16962 0.0565 0.50258 0.28269 0.65964 0.45861 0.15706 0.16962 0.4963 0.6722 0.57169 0.54028 0.0754-0.11938-0.17591-0.4649-0.24501-0.6094-0.0691-0.14448-0.28271-0.4586-0.62195-0.5654-0.29527-0.0879-0.78529-0.11309-0.79157-0.0377z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#060606" d="m171.38 46.667c-0.071 1.0503 2.869 1.6847 4.758 2.3876 1.89 0.6329 5.598 3.1606 7.346 5.1221 1.746 1.893 5.534 7.493 6.375 6.0268 0.839-1.3278-1.936-5.1736-2.739-6.7955-0.8-1.6217-3.175-5.0904-6.952-6.3006-3.281-0.9959-8.717-1.2806-8.788-0.4404z"/>
+<path fill="#0c0c0c" d="m171.68 46.744c-0.071 1.0204 2.785 1.6413 4.62 2.3271 1.836 0.6178 5.435 3.0811 7.131 4.9882 1.692 1.842 5.381 7.282 6.198 5.8616 0.814-1.2876-1.856-5.0192-2.67-6.607-0.808-1.5875-3.109-4.9249-6.776-6.1214-3.177-0.9836-8.433-1.265-8.503-0.4485z"/>
+<path fill="#131313" d="m171.99 46.821c-0.071 0.9907 2.702 1.5979 4.483 2.2666 1.781 0.6027 5.271 3.0018 6.915 4.8543 1.639 1.791 5.228 7.071 6.022 5.6966 0.788-1.2475-1.776-4.865-2.602-6.4187-0.816-1.5532-3.044-4.7592-6.599-5.9419-3.075-0.9716-8.149-1.2495-8.219-0.4569z"/>
+<path fill="#191919" d="m172.3 46.897c-0.07 0.961 2.618 1.5546 4.345 2.2063 1.727 0.5876 5.109 2.9223 6.7 4.7204 1.586 1.74 5.075 6.8599 5.845 5.5314 0.764-1.2073-1.696-4.7106-2.532-6.2303-0.824-1.519-2.979-4.5935-6.424-5.7625-2.971-0.9594-7.865-1.2341-7.934-0.4653z"/>
+<path fill="#1f1f1f" d="m172.61 46.974c-0.07 0.9312 2.535 1.5112 4.207 2.1457 1.672 0.5725 4.946 2.843 6.486 4.5865 1.531 1.689 4.921 6.649 5.668 5.3662 0.738-1.167-1.616-4.5562-2.464-6.0417-0.832-1.4847-2.914-4.428-6.247-5.5833-2.869-0.9472-7.582-1.2185-7.65-0.4734z"/>
+<path fill="#262626" d="m172.92 47.051c-0.069 0.9014 2.451 1.4679 4.069 2.0853 1.618 0.5574 4.784 2.7635 6.271 4.4526 1.478 1.638 4.768 6.438 5.492 5.201 0.713-1.1268-1.537-4.4018-2.396-5.8533-0.839-1.4504-2.848-4.2623-6.07-5.4038-2.766-0.9351-7.299-1.2031-7.366-0.4818z"/>
+<path fill="#2c2c2c" d="m173.23 47.127c-0.069 0.8718 2.368 1.4246 3.931 2.0249 1.564 0.5423 4.621 2.6842 6.056 4.3187 1.424 1.587 4.615 6.227 5.315 5.0359 0.688-1.0865-1.456-4.2475-2.326-5.6648-0.848-1.4162-2.783-4.0968-5.895-5.2245-2.662-0.923-7.015-1.1876-7.081-0.4902z"/>
+<path fill="#333" d="m173.54 47.204c-0.068 0.8421 2.285 1.3812 3.794 1.9645 1.51 0.5271 4.458 2.6048 5.842 4.1848 1.37 1.536 4.461 6.0159 5.138 4.8708 0.662-1.0465-1.377-4.0932-2.258-5.4764-0.856-1.382-2.718-3.9312-5.718-5.0452-2.56-0.9108-6.732-1.172-6.798-0.4985z"/>
+<path fill="#393939" d="m173.85 47.281c-0.067 0.8122 2.202 1.3378 3.656 1.9039 1.456 0.5121 4.296 2.5254 5.627 4.0509 1.317 1.485 4.308 5.805 4.961 4.7057 0.638-1.0062-1.296-3.9389-2.189-5.288-0.863-1.3478-2.652-3.7656-5.542-4.8659-2.456-0.8986-6.448-1.1564-6.513-0.5066z"/>
+<path fill="#3f3f3f" d="m174.16 47.358c-0.067 0.7825 2.118 1.2944 3.518 1.8435 1.402 0.497 4.133 2.4459 5.412 3.917 1.263 1.434 4.155 5.5939 4.785 4.5404 0.612-0.966-1.217-3.7845-2.12-5.0995-0.872-1.3134-2.587-3.5999-5.366-4.6864-2.353-0.8865-6.165-1.1411-6.229-0.515z"/>
+<path fill="#464646" d="m174.46 47.434c-0.066 0.7528 2.035 1.2512 3.38 1.7831 1.348 0.4819 3.971 2.3666 5.198 3.7831 1.209 1.383 4.001 5.383 4.607 4.3753 0.588-0.9258-1.136-3.6301-2.051-4.911-0.879-1.2792-2.522-3.4344-5.19-4.5071-2.25-0.8744-5.881-1.1256-5.944-0.5234z"/>
+<path fill="#4c4c4c" d="m174.77 47.511c-0.066 0.723 1.951 1.2078 3.242 1.7226 1.293 0.4668 3.808 2.2871 4.983 3.6492 1.155 1.332 3.848 5.172 4.431 4.2101 0.562-0.8856-1.057-3.4758-1.983-4.7226-0.887-1.245-2.456-3.2688-5.013-4.3278-2.147-0.8621-5.598-1.11-5.66-0.5315z"/>
+<path fill="#525252" d="m175.08 47.588c-0.066 0.6932 1.868 1.1644 3.105 1.6621 1.238 0.4517 3.644 2.2078 4.767 3.5153 1.102 1.281 3.695 4.961 4.254 4.0451 0.537-0.8455-0.976-3.3215-1.913-4.5342-0.896-1.2107-2.391-3.1032-4.838-4.1485-2.043-0.85-5.313-1.0944-5.375-0.5398z"/>
+<path fill="#595959" d="m175.39 47.664c-0.065 0.6636 1.784 1.1211 2.967 1.6018 1.184 0.4365 3.482 2.1283 4.552 3.3814 1.049 1.2299 3.542 4.7499 4.078 3.8799 0.512-0.8053-0.897-3.1672-1.845-4.3458-0.903-1.1765-2.326-2.9375-4.661-3.969-1.941-0.8379-5.03-1.079-5.091-0.5483z"/>
+<path fill="#5f5f5f" d="m175.7 47.741c-0.065 0.6338 1.701 1.0778 2.829 1.5413 1.13 0.4215 3.319 2.049 4.338 3.2475 0.994 1.179 3.388 4.539 3.9 3.7147 0.487-0.7649-0.816-3.0127-1.776-4.1572-0.911-1.1423-2.26-2.772-4.485-3.7897-1.837-0.8258-4.746-1.0636-4.806-0.5566z"/>
+<path fill="#666" d="m176.01 47.818c-0.064 0.604 1.617 1.0344 2.691 1.4808 1.076 0.4063 3.157 1.9695 4.123 3.1136 0.941 1.1279 3.235 4.328 3.724 3.5495 0.462-0.7248-0.737-2.8584-1.707-3.9687-0.919-1.108-2.195-2.6065-4.309-3.6105-1.734-0.8136-4.463-1.048-4.522-0.5647z"/>
+<path fill="#6c6c6c" d="m176.32 47.894c-0.064 0.5743 1.534 0.9911 2.553 1.4204 1.022 0.3913 2.994 1.8902 3.908 2.9797 0.887 1.077 3.082 4.117 3.548 3.3844 0.436-0.6845-0.657-2.704-1.639-3.7803-0.927-1.0738-2.13-2.4408-4.132-3.4311-1.632-0.8014-4.18-1.0325-4.238-0.5731z"/>
+<path fill="#727272" d="m176.63 47.971c-0.063 0.5446 1.451 0.9477 2.416 1.36 0.968 0.3762 2.831 1.8108 3.694 2.8458 0.833 1.026 2.928 3.9059 3.37 3.2193 0.411-0.6445-0.577-2.5498-1.569-3.592-0.936-1.0395-2.065-2.2751-3.957-3.2517-1.528-0.7892-3.896-1.0169-3.954-0.5814z"/>
+<path fill="#797979" d="m176.94 48.048c-0.062 0.5147 1.368 0.9043 2.278 1.2994 0.913 0.3611 2.669 1.7314 3.479 2.7119 0.78 0.975 2.775 3.695 3.194 3.0542 0.386-0.6042-0.497-2.3954-1.501-3.4035-0.943-1.0053-1.999-2.1096-3.78-3.0723-1.425-0.7772-3.613-1.0015-3.67-0.5897z"/>
+</g>
+<path fill="#7f7f7f" d="m456.28 321.41c-0.005 0.0423 0.11203 0.0751 0.18672 0.10811 0.075 0.0302 0.21866 0.14413 0.2848 0.22494 0.0633 0.0806 0.22878 0.30398 0.26324 0.25207 0.0315-0.0492-0.0364-0.19554-0.12494-0.28053-0.083-0.0847-0.16875-0.16962-0.31447-0.25242-0.11535-0.0667-0.29047-0.086-0.29535-0.0522z"/>
+<path fill="#995900" d="m465.35 340.2c0.3895 0.56541-0.0126 1.3004 0.27014 1.7528 0.46489 0.74132 1.401 1.4889 1.759 1.6962 0.25758 0.15705 0.62195 0.30783 0.60939 0.76644-0.0188 0.52143-0.27642 0.65964-0.42092 0.80413-0.28898 0.28899-1.7465 1.0114-2.714 1.6711-1.2188 0.83554-1.6397 1.2062-2.0355 1.602-0.61567 0.61567-1.1999 0.82299-2.136 0.82299-0.93607 0-1.357-0.19475-1.646-0.45233-0.28899-0.25129-0.60938-0.89209-0.57797-1.847 0.0251-0.94863 0.32668-1.8156 0.47117-3.2919 0.0628-0.63451 [...]
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#9e5e00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.12 11.556-31.259 19.008-13.885 9.371-18.903 13.54-23.522 17.903-6.912 6.739-13.414 9.083-23.915 9.018-10.411-0.047-15.116-2.181-18.414-5.119-3.297-2.866-6.93-9.965-6.613-20.578 0.205-10.85 3.701-20.682 5.256-37.278 0.666-7.38 0.407-16.304 0.335-24.375-0.076-10.069-0.072-18.627 2.084-19.923 3.8 [...]
+<path fill="#a36400" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.225 11.52-31.413 18.864-13.803 9.166-19.016 13.256-23.717 17.446-6.768 6.422-13.075 8.734-23.35 8.604-10.094-0.094-14.681-2.131-17.964-5.054-3.283-2.852-6.876-9.706-6.602-19.988 0.122-10.828 3.657-20.556 5.112-36.828 0.612-7.488 0.165-16.336 0.021-24.487-0.151-10.058-0.288-18.605 1.865-19.901  [...]
+<path fill="#a86a00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.329 11.484-31.568 18.72-13.72 8.961-19.127 12.971-23.911 16.989-6.624 6.105-12.737 8.384-22.785 8.19-9.777-0.141-14.245-2.081-17.514-4.99-3.269-2.837-6.822-9.446-6.591-19.397 0.039-10.807 3.614-20.43 4.968-36.378 0.558-7.596-0.076-16.369-0.292-24.598-0.227-10.048-0.504-18.584 1.645-19.88 3.888 [...]
+<path fill="#ad7000" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.433 11.448-31.723 18.576-13.637 8.756-19.238 12.687-24.106 16.532-6.48 5.788-12.398 8.035-22.219 7.776-9.461-0.188-13.809-2.031-17.064-4.925-3.254-2.823-6.768-9.187-6.581-18.807-0.043-10.785 3.572-20.304 4.824-35.928 0.504-7.704-0.316-16.401-0.604-24.71-0.303-10.037-0.72-18.562 1.425-19.858 3. [...]
+<path fill="#b27500" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.538 11.412-31.878 18.432-13.554 8.55-19.35 12.402-24.3 16.074-6.336 5.472-12.06 7.686-21.654 7.362-9.144-0.234-13.374-1.98-16.614-4.86-3.24-2.808-6.714-8.928-6.57-18.216-0.126-10.764 3.528-20.178 4.68-35.478 0.45-7.812-0.558-16.434-0.918-24.822-0.378-10.026-0.936-18.54 1.206-19.836 3.888-2.43  [...]
+<path fill="#b77b00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.642 11.376-32.033 18.288-13.471 8.345-19.461 12.118-24.494 15.617-6.192 5.155-11.722 7.337-21.089 6.948-8.827-0.281-12.938-1.929-16.164-4.795-3.225-2.794-6.66-8.669-6.559-17.626-0.209-10.742 3.485-20.052 4.536-35.028 0.396-7.92-0.799-16.466-1.231-24.933-0.454-10.015-1.152-18.519 0.986-19.815 3 [...]
+<path fill="#bc8100" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.747 11.34-32.187 18.144-13.389 8.14-19.574 11.834-24.689 15.16-6.048 4.838-11.383 6.988-20.524 6.534-8.51-0.328-12.503-1.879-15.714-4.73-3.211-2.78-6.606-8.41-6.548-17.036-0.292-10.72 3.441-19.926 4.392-34.578 0.342-8.028-1.041-16.498-1.545-25.045-0.529-10.004-1.368-18.497 0.767-19.793 3.888-2 [...]
+<path fill="#c18700" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.851 11.304-32.342 18-13.306 7.935-19.685 11.549-24.883 14.703-5.904 4.521-11.045 6.638-19.959 6.12-8.193-0.375-12.067-1.829-15.264-4.666-3.197-2.765-6.552-8.15-6.537-16.445-0.375-10.699 3.398-19.8 4.248-34.128 0.288-8.136-1.282-16.531-1.858-25.156-0.605-9.994-1.584-18.476 0.547-19.772 3.888-2. [...]
+<path fill="#c68c00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-20.955 11.268-32.497 17.856-13.223 7.73-19.796 11.265-25.078 14.246-5.76 4.204-10.706 6.289-19.393 5.706-7.877-0.422-11.631-1.779-14.814-4.601-3.182-2.751-6.498-7.891-6.527-15.855-0.457-10.677 3.356-19.674 4.104-33.678 0.234-8.244-1.522-16.563-2.17-25.268-0.681-9.983-1.8-18.454 0.327-19.75 3.888- [...]
+<path fill="#cc9200" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.06 11.232-32.652 17.712-13.14 7.524-19.908 10.98-25.272 13.788-5.616 3.888-10.368 5.94-18.828 5.292-7.56-0.468-11.196-1.728-14.364-4.536-3.168-2.736-6.444-7.632-6.516-15.264-0.54-10.656 3.312-19.548 3.96-33.228 0.18-8.352-1.764-16.596-2.484-25.38-0.756-9.972-2.016-18.432 0.108-19.728 3.888-2.4 [...]
+<path fill="#d19800" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.164 11.196-32.807 17.568-13.057 7.319-20.019 10.696-25.466 13.331-5.472 3.571-10.03 5.591-18.263 4.878-7.243-0.515-10.76-1.677-13.914-4.471-3.153-2.722-6.39-7.373-6.505-14.674-0.623-10.634 3.269-19.422 3.816-32.778 0.126-8.46-2.005-16.628-2.797-25.491-0.832-9.961-2.232-18.411-0.112-19.707 3.88 [...]
+<path fill="#d69e00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.269 11.16-32.961 17.424-12.975 7.114-20.132 10.412-25.661 12.874-5.328 3.254-9.691 5.242-17.698 4.464-6.926-0.562-10.325-1.627-13.464-4.406-3.139-2.708-6.336-7.114-6.494-14.084-0.706-10.612 3.225-19.296 3.672-32.328 0.072-8.568-2.247-16.66-3.111-25.603-0.907-9.95-2.448-18.389-0.331-19.685 3.88 [...]
+<path fill="#dba300" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.373 11.124-33.116 17.28-12.892 6.909-20.243 10.127-25.855 12.417-5.184 2.937-9.353 4.892-17.133 4.05-6.609-0.609-9.889-1.577-13.014-4.342-3.125-2.693-6.282-6.854-6.483-13.493-0.789-10.591 3.182-19.17 3.528-31.878 0.018-8.676-2.488-16.693-3.424-25.714-0.983-9.94-2.664-18.368-0.551-19.664 3.888- [...]
+<path fill="#e0a900" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.477 11.088-33.271 17.136-12.809 6.704-20.354 9.843-26.05 11.96-5.04 2.62-9.014 4.543-16.567 3.636-6.293-0.656-9.453-1.527-12.564-4.277-3.11-2.679-6.228-6.595-6.473-12.903-0.871-10.569 3.14-19.044 3.384-31.428-0.036-8.784-2.728-16.725-3.736-25.826-1.059-9.929-2.88-18.346-0.771-19.642 3.888-2.39 [...]
+<path fill="#e5af00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.582 11.052-33.426 16.992-12.726 6.498-20.466 9.558-26.244 11.502-4.896 2.304-8.676 4.194-16.002 3.222-5.976-0.702-9.018-1.476-12.114-4.212-3.096-2.664-6.174-6.336-6.462-12.312-0.954-10.548 3.096-18.918 3.24-30.978-0.09-8.892-2.97-16.758-4.05-25.938-1.134-9.918-3.096-18.324-0.99-19.62 3.888-2.3 [...]
+<path fill="#eab500" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.686 11.016-33.581 16.848-12.643 6.293-20.577 9.274-26.438 11.045-4.752 1.987-8.338 3.845-15.437 2.808-5.659-0.749-8.582-1.425-11.664-4.147-3.081-2.65-6.12-6.077-6.451-11.722-1.037-10.526 3.053-18.792 3.096-30.528-0.144-9-3.211-16.79-4.363-26.049-1.21-9.907-3.312-18.303-1.21-19.599 3.888-2.39 4 [...]
+<path fill="#efba00" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.791 10.98-33.735 16.704-12.561 6.088-20.69 8.99-26.633 10.588-4.608 1.67-7.999 3.496-14.872 2.394-5.342-0.796-8.147-1.375-11.214-4.082-3.067-2.636-6.066-5.818-6.44-11.132-1.12-10.504 3.009-18.666 2.952-30.078-0.198-9.108-3.453-16.822-4.677-26.161-1.285-9.896-3.528-18.281-1.429-19.577 3.888-2.3 [...]
+<path fill="#f4c000" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.895 10.944-33.89 16.56-12.478 5.883-20.801 8.705-26.827 10.131-4.464 1.353-7.661 3.146-14.307 1.98-5.025-0.843-7.711-1.325-10.764-4.018-3.053-2.621-6.012-5.558-6.429-10.541-1.203-10.483 2.966-18.54 2.808-29.628-0.252-9.216-3.694-16.855-4.99-26.272-1.361-9.886-3.744-18.26-1.649-19.556 3.888-2.3 [...]
+<path fill="#f9c600" d="m281.23 263.53c4.464 6.48-0.144 14.904 3.096 20.088 5.328 8.496 16.056 17.064 20.16 19.44 2.952 1.8 7.128 3.528 6.984 8.784-0.216 5.976-3.168 7.56-4.824 9.216-3.312 3.312-21.999 10.908-34.045 16.416-12.395 5.678-20.912 8.421-27.022 9.674-4.32 1.036-7.322 2.797-13.741 1.566-4.709-0.89-7.275-1.275-10.314-3.953-3.038-2.607-5.958-5.299-6.419-9.951-1.285-10.461 2.924-18.414 2.664-29.178-0.306-9.324-3.934-16.887-5.302-26.384-1.437-9.875-3.96-18.238-1.869-19.534 3.888-2. [...]
+</g>
+<path fill="#fc0" d="m465.35 340.2c0.3895 0.56541-0.0126 1.3004 0.27014 1.7528 0.46489 0.74132 1.401 1.4889 1.759 1.6962 0.25758 0.15705 0.62195 0.30783 0.60939 0.76644-0.0188 0.52143-0.27642 0.65964-0.42092 0.80413-0.28898 0.28899-1.9287 0.94863-2.9841 1.4198-1.0743 0.47746-1.8344 0.7099-2.3747 0.80414-0.36438 0.0628-0.60939 0.2136-1.1497 0.10052-0.38322-0.0817-0.59682-0.1068-0.86067-0.33925-0.26386-0.22616-0.51515-0.43976-0.55913-0.8167-0.11936-0.91093 0.25129-1.5957 0.21988-2.5066-0.0 [...]
+<path fill="#fc0" d="m459.47 341.36c-0.0619-0.0224-0.343-1.327-0.19117-1.4169 0.29239-0.17424 0.37109-0.20243 0.73093-0.20243 0.35983 0 0.5285 0.0282 0.64097 0.14057 0.1855 0.18559-0.10122 0.58478-0.21369 0.69725-0.32607 0.32048-0.90518 0.80405-0.96704 0.78153z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#ffcc02" d="m214.09 276.28c-0.77-0.325-4.102-14.718-2.368-15.742 3.344-1.991 4.279-2.211 8.322-2.211 4.124 0 5.976 0.269 7.282 1.602 2.106 2.136-1.119 6.573-2.398 7.852-3.727 3.663-10.081 8.812-10.838 8.499z"/>
+<path fill="#ffcc05" d="m214.32 275.81c-0.832-0.393-4.273-14.229-2.546-15.247 3.338-1.984 4.305-2.101 8.268-2.101 4.124 0 5.896 0.214 7.217 1.592 2.087 2.146-1.076 6.444-2.346 7.714-3.718 3.653-9.788 8.409-10.593 8.042z"/>
+<path fill="#ffcc07" d="m214.54 275.33c-0.892-0.461-4.443-13.739-2.722-14.751 3.332-1.977 4.33-1.991 8.213-1.991 4.124 0 5.815 0.159 7.152 1.582 2.068 2.156-1.034 6.315-2.294 7.575-3.708 3.644-9.495 8.007-10.349 7.585z"/>
+<path fill="#ffcd0a" d="m214.77 274.85c-0.954-0.528-4.614-13.249-2.9-14.254 3.326-1.972 4.356-1.882 8.158-1.882 4.124 0 5.735 0.104 7.089 1.572 2.048 2.166-0.993 6.187-2.243 7.437-3.699 3.634-9.202 7.604-10.104 7.127z"/>
+<path fill="#ffcd0c" d="m215 274.38c-1.015-0.596-4.785-12.759-3.077-13.758 3.319-1.965 4.382-1.772 8.103-1.772 4.124 0 5.654 0.049 7.024 1.563 2.029 2.175-0.951 6.057-2.191 7.298-3.689 3.624-8.909 7.201-9.859 6.669z"/>
+<path fill="#ffcd0f" d="m215.23 273.9c-1.076-0.663-4.956-12.269-3.254-13.261 3.312-1.959 4.407-1.663 8.048-1.663 4.124 0 5.574-0.006 6.959 1.553 2.011 2.185-0.908 5.929-2.139 7.159-3.679 3.615-8.615 6.799-9.614 6.212z"/>
+<path fill="#ffcd11" d="m215.46 273.42c-1.137-0.731-5.126-11.779-3.431-12.765 3.306-1.952 4.433-1.553 7.994-1.553 4.124 0 5.493-0.061 6.895 1.543 1.991 2.194-0.867 5.8-2.088 7.021-3.67 3.605-8.322 6.396-9.37 5.754z"/>
+<path fill="#ffce14" d="m215.69 272.94c-1.198-0.799-5.297-11.29-3.608-12.27 3.299-1.946 4.459-1.443 7.939-1.443 4.124 0 5.412-0.116 6.83 1.533 1.972 2.204-0.825 5.671-2.037 6.883-3.659 3.595-8.028 5.993-9.124 5.297z"/>
+<path fill="#ffce16" d="m215.92 272.47c-1.26-0.867-5.468-10.8-3.786-11.773 3.293-1.94 4.485-1.334 7.884-1.334 4.124 0 5.332-0.171 6.766 1.524 1.953 2.213-0.783 5.542-1.985 6.743-3.65 3.586-7.735 5.591-8.879 4.84z"/>
+<path fill="#ffce19" d="m216.15 271.99c-1.321-0.934-5.639-10.311-3.963-11.277 3.286-1.933 4.51-1.225 7.829-1.225 4.124 0 5.252-0.225 6.702 1.515 1.933 2.223-0.741 5.413-1.934 6.605-3.64 3.576-7.442 5.187-8.634 4.382z"/>
+<path fill="#ffce1c" d="m216.38 271.51c-1.382-1.002-5.809-9.821-4.14-10.781 3.28-1.926 4.537-1.115 7.775-1.115 4.124 0 5.171-0.279 6.637 1.505 1.914 2.233-0.699 5.284-1.882 6.467-3.631 3.566-7.149 4.784-8.39 3.924z"/>
+<path fill="#ffcf1e" d="m216.6 271.04c-1.443-1.069-5.98-9.331-4.317-10.284 3.273-1.921 4.562-1.006 7.72-1.006 4.124 0 5.09-0.334 6.572 1.495 1.895 2.243-0.657 5.156-1.83 6.328-3.621 3.557-6.856 4.382-8.145 3.467z"/>
+<path fill="#ffcf21" d="m216.83 270.56c-1.505-1.137-6.151-8.841-4.495-9.788 3.268-1.914 4.588-0.896 7.666-0.896 4.124 0 5.009-0.389 6.508 1.486 1.875 2.251-0.616 5.026-1.779 6.189-3.612 3.547-6.563 3.979-7.9 3.009z"/>
+<path fill="#ffcf23" d="m217.06 270.08c-1.566-1.204-6.322-8.351-4.672-9.292 3.261-1.907 4.613-0.786 7.61-0.786 4.124 0 4.93-0.444 6.444 1.476 1.856 2.261-0.573 4.897-1.727 6.051-3.602 3.537-6.27 3.576-7.655 2.551z"/>
+<path fill="#ffcf26" d="m217.29 269.61c-1.627-1.273-6.492-7.862-4.849-8.796 3.255-1.901 4.64-0.677 7.556-0.677 4.124 0 4.849-0.499 6.379 1.466 1.837 2.271-0.531 4.769-1.675 5.912-3.593 3.528-5.977 3.174-7.411 2.095z"/>
+<path fill="#ffd028" d="m217.52 269.13c-1.688-1.341-6.663-7.372-5.026-8.3 3.248-1.895 4.665-0.567 7.501-0.567 4.124 0 4.768-0.554 6.315 1.456 1.817 2.281-0.49 4.64-1.624 5.774-3.583 3.518-5.684 2.771-7.166 1.637z"/>
+<path fill="#ffd02b" d="m217.75 268.65c-1.749-1.408-6.834-6.882-5.203-7.804 3.241-1.888 4.69-0.457 7.446-0.457 4.124 0 4.687-0.609 6.25 1.447 1.798 2.29-0.448 4.51-1.572 5.635-3.573 3.509-5.391 2.368-6.921 1.179z"/>
+<path fill="#ffd02d" d="m217.98 268.18c-1.811-1.476-7.005-6.392-5.381-7.307 3.235-1.882 4.717-0.348 7.392-0.348 4.124 0 4.607-0.664 6.186 1.437 1.778 2.3-0.406 4.382-1.522 5.496-3.563 3.5-5.097 1.966-6.675 0.722z"/>
+<path fill="#ffd030" d="m218.2 267.7c-1.871-1.543-7.175-5.902-5.557-6.811 3.228-1.875 4.742-0.238 7.336-0.238 4.124 0 4.527-0.719 6.122 1.427 1.759 2.31-0.364 4.253-1.47 5.358-3.553 3.49-4.804 1.563-6.431 0.264z"/>
+</g>
+<path fill="#ffd133" d="m459.87 340.52c-0.16866-0.14057-0.64097-0.47231-0.5004-0.55101 0.28113-0.16308 0.41602-0.0113 0.63538-0.0113 0.35984 0 0.38793-0.0674 0.5285 0.12373 0.15182 0.20234-0.0281 0.35984-0.12373 0.45538-0.30922 0.30373-0.3936 0.1013-0.53975-0.0168z"/>
+<path fill="#fc0" d="m465.27 340.27c0.32651 0.47641-0.005 1.1134 0.23018 1.4934-0.59411-0.54595-0.86713-0.7708-1.6861 0.0321 0.22485-0.3265 0.27302-0.54595 0.41219-0.8564 0.0963-0.21412 0.37999-0.83502 0.43889-0.83502 0.0535 0 0.41219-0.11779 0.60484 0.16587z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#ffcc02" d="m280.33 264.41c3.655 5.335 0.035 12.601 2.578 16.723-6.668-6.097-9.729-8.666-18.908 0.323 2.421-3.528 3.026-6.095 4.606-9.593 1.122-2.461 4.243-9.301 4.951-9.31 0.627-0.007 4.616-1.318 6.773 1.857z"/>
+<path fill="#ffcc05" d="m280.29 264.45c3.568 5.21 0.132 12.442 2.518 16.332-6.527-5.937-9.52-8.499-18.492 0.278 2.266-3.315 2.922-5.934 4.487-9.372 1.14-2.468 4.132-9.032 4.873-9.051 0.641-0.014 4.508-1.285 6.614 1.813z"/>
+<path fill="#ffcc07" d="m280.25 264.48c3.479 5.085 0.227 12.282 2.456 15.939-6.386-5.777-9.31-8.331-18.076 0.233 2.111-3.1 2.819-5.772 4.37-9.15 1.157-2.475 4.021-8.763 4.794-8.792 0.656-0.02 4.399-1.253 6.456 1.77z"/>
+<path fill="#ffcd0a" d="m280.21 264.52c3.392 4.96 0.323 12.123 2.396 15.548-6.245-5.617-9.101-8.164-17.66 0.188 1.955-2.887 2.716-5.611 4.251-8.929 1.176-2.482 3.91-8.494 4.716-8.533 0.67-0.027 4.291-1.22 6.297 1.726z"/>
+<path fill="#ffcd0c" d="m280.17 264.56c3.305 4.835 0.419 11.964 2.335 15.155-6.104-5.457-8.891-7.996-17.244 0.143 1.8-2.673 2.613-5.449 4.133-8.707 1.194-2.489 3.799-8.225 4.637-8.274 0.685-0.034 4.183-1.188 6.139 1.683z"/>
+<path fill="#ffcd0f" d="m280.13 264.6c3.218 4.71 0.516 11.805 2.275 14.764-5.963-5.298-8.682-7.829-16.828 0.098 1.644-2.46 2.51-5.288 4.015-8.486 1.212-2.496 3.687-7.956 4.558-8.015 0.699-0.04 4.075-1.155 5.98 1.639z"/>
+<path fill="#ffcd11" d="m280.09 264.63c3.13 4.585 0.612 11.645 2.215 14.372-5.822-5.138-8.473-7.662-16.412 0.052 1.489-2.245 2.406-5.125 3.896-8.264 1.23-2.503 3.576-7.687 4.48-7.756 0.713-0.047 3.967-1.122 5.821 1.596z"/>
+<path fill="#ffce14" d="m280.05 264.67c3.043 4.46 0.708 11.487 2.154 13.98-5.681-4.978-8.263-7.494-15.996 0.008 1.334-2.032 2.303-4.964 3.779-8.043 1.247-2.51 3.464-7.418 4.401-7.497 0.727-0.053 3.858-1.09 5.662 1.552z"/>
+<path fill="#ffce16" d="m280.02 264.71c2.956 4.335 0.804 11.327 2.094 13.588-5.54-4.818-8.054-7.327-15.58-0.037 1.178-1.819 2.2-4.803 3.66-7.822 1.266-2.517 3.353-7.149 4.323-7.238 0.741-0.06 3.75-1.057 5.503 1.509z"/>
+<path fill="#ffce19" d="m279.98 264.75c2.869 4.21 0.901 11.168 2.034 13.196-5.399-4.658-7.845-7.159-15.164-0.082 1.022-1.605 2.096-4.641 3.542-7.6 1.283-2.524 3.241-6.88 4.244-6.979 0.755-0.067 3.642-1.025 5.344 1.465z"/>
+<path fill="#ffce1c" d="m279.94 264.78c2.782 4.084 0.997 11.008 1.973 12.804-5.258-4.498-7.635-6.992-14.748-0.127 0.867-1.391 1.994-4.48 3.424-7.379 1.302-2.531 3.13-6.611 4.166-6.72 0.769-0.073 3.533-0.992 5.185 1.422z"/>
+<path fill="#ffcf1e" d="m279.9 264.82c2.694 3.96 1.093 10.85 1.913 12.412-5.117-4.338-7.426-6.825-14.332-0.172 0.712-1.177 1.89-4.318 3.306-7.157 1.319-2.538 3.018-6.342 4.086-6.461 0.784-0.08 3.426-0.959 5.027 1.378z"/>
+<path fill="#ffcf21" d="m279.86 264.86c2.606 3.834 1.188 10.69 1.852 12.02-4.976-4.178-7.217-6.658-13.916-0.217 0.556-0.964 1.786-4.157 3.187-6.936 1.337-2.545 2.908-6.073 4.008-6.202 0.799-0.086 3.318-0.927 4.869 1.335z"/>
+<path fill="#ffcf23" d="m279.82 264.9c2.519 3.71 1.285 10.531 1.791 11.628-4.835-4.018-7.007-6.49-13.5-0.262 0.401-0.75 1.684-3.995 3.07-6.714 1.355-2.552 2.796-5.804 3.929-5.943 0.813-0.093 3.209-0.894 4.71 1.291z"/>
+<path fill="#ffcf26" d="m279.78 264.93c2.432 3.584 1.381 10.371 1.731 11.236-4.694-3.858-6.798-6.323-13.084-0.307 0.245-0.536 1.58-3.833 2.951-6.493 1.373-2.559 2.685-5.535 3.851-5.684 0.827-0.1 3.101-0.862 4.551 1.248z"/>
+<path fill="#ffd028" d="m279.74 264.97c2.344 3.46 1.477 10.213 1.671 10.845-4.553-3.699-6.589-6.156-12.668-0.353 0.089-0.322 1.477-3.671 2.832-6.271 1.392-2.566 2.574-5.266 3.773-5.425 0.841-0.106 2.993-0.829 4.392 1.204z"/>
+<path fill="#ffd02b" d="m279.7 265.01c2.257 3.334 1.573 10.053 1.61 10.452-4.412-3.539-6.379-5.988-12.252-0.397-0.065-0.109 1.374-3.51 2.715-6.05 1.409-2.573 2.462-4.997 3.694-5.166 0.855-0.113 2.884-0.796 4.233 1.161z"/>
+<path fill="#ffd02d" d="m279.66 265.05c2.17 3.21 1.67 9.894 1.55 10.061-4.271-3.379-6.17-5.821-11.836-0.442-0.221 0.104 1.27-3.349 2.596-5.829 1.427-2.58 2.351-4.728 3.616-4.907 0.869-0.119 2.776-0.764 4.074 1.117z"/>
+<path fill="#ffd030" d="m279.63 265.08c2.082 3.084 1.766 9.735 1.49 9.668-4.13-3.219-5.961-5.653-11.42-0.487-0.377 0.318 1.167-3.187 2.478-5.607 1.445-2.587 2.239-4.459 3.536-4.648 0.884-0.126 2.669-0.731 3.916 1.074z"/>
+</g>
+<path fill="#ffd133" d="m465.21 340.34c0.17407 0.25818 0.16247 0.83555 0.12469 0.80946-0.34806-0.26691-0.5018-0.47868-0.96015-0.0464-0.0464 0.0464 0.0928-0.26403 0.20592-0.46995 0.12765-0.22634 0.18568-0.3656 0.30173-0.38296 0.0784-0.0116 0.22337-0.061 0.32781 0.0899z"/>
+<path fill="#fc0" d="m465.54 342.03c0.52143 0.68477 1.4889 1.4198 1.8344 1.6208 0.2513 0.14449 0.61567 0.31411 0.60939 0.76644-0.0126 0.51515-0.27642 0.65964-0.42092 0.80413-0.28898 0.28899-1.935 0.95491-2.9841 1.4198-1.068 0.47118-1.8407 0.71619-2.3747 0.80414-0.3581 0.0565-0.61567 0.20732-1.1497 0.10052-0.37693-0.0754-0.6031-0.11309-0.86067-0.33925-0.25758-0.21988-0.52143-0.45232-0.55913-0.8167-0.1068-0.90465 0.3204-1.4763 0.73503-2.2616 0.33925-0.62823 1.024-0.75388 1.4512-0.69733 1.5 [...]
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#ffcc02" d="m283.41 284.55c5.962 7.83 17.024 16.234 20.975 18.533 2.873 1.652 7.04 3.591 6.968 8.763-0.144 5.89-3.161 7.542-4.813 9.195-3.304 3.304-22.34 10.993-34.24 16.089-12.259 5.175-20.648 7.873-26.802 8.958-4.077 0.684-7.156 2.394-13.258 1.177-4.303-0.856-6.766-1.232-9.707-3.811-2.938-2.51-5.756-4.962-6.184-9.118-1.211-10.34 3.365-16.657 8.044-25.65 3.889-7.375 11.791-8.434 16.665-7.778 17.513 2.415 16.206-8.959 21.019-13.772 4.453-4.453 17.167-8.045 21.333-2.586z"/>
+<path fill="#ffcc05" d="m283.36 284.62c5.948 7.811 16.983 16.195 20.925 18.488 2.866 1.648 7.023 3.583 6.951 8.743-0.143 5.876-3.153 7.524-4.801 9.173-3.297 3.296-22.504 11.043-34.28 15.907-12.278 4.949-20.201 7.538-26.388 8.699-4.051 0.721-7.256 2.413-13.341 1.202-4.286-0.846-6.618-1.167-9.55-3.733-2.924-2.501-5.536-4.741-5.959-8.877-1.198-10.312 3.058-16.394 7.664-25.379 3.89-7.551 11.845-8.229 16.698-7.564 17.458 2.454 15.996-9.278 20.797-14.08 4.443-4.443 17.127-8.026 21.284-2.579z"/>
+<path fill="#ffcc07" d="m283.3 284.7c5.934 7.792 16.944 16.157 20.876 18.445 2.859 1.644 7.006 3.574 6.934 8.722-0.143 5.862-3.145 7.507-4.79 9.151-3.288 3.289-22.668 11.093-34.319 15.725-12.298 4.724-19.753 7.203-25.974 8.441-4.024 0.756-7.357 2.431-13.423 1.226-4.269-0.837-6.472-1.102-9.393-3.655-2.911-2.492-5.317-4.519-5.735-8.635-1.185-10.285 2.75-16.132 7.284-25.11 3.891-7.725 11.9-8.023 16.731-7.349 17.403 2.494 15.785-9.598 20.575-14.388 4.433-4.432 17.087-8.007 21.234-2.573z"/>
+<path fill="#ffcd0a" d="m283.25 284.77c5.92 7.774 16.904 16.119 20.826 18.401 2.853 1.641 6.99 3.566 6.919 8.702-0.143 5.848-3.138 7.489-4.779 9.129-3.281 3.281-22.832 11.143-34.359 15.543-12.317 4.498-19.306 6.868-25.56 8.182-3.997 0.793-7.457 2.45-13.506 1.251-4.252-0.828-6.325-1.036-9.236-3.577-2.897-2.482-5.096-4.298-5.51-8.393-1.172-10.257 2.443-15.869 6.904-24.84 3.892-7.901 11.955-7.818 16.763-7.135 17.349 2.533 15.576-9.917 20.355-14.696 4.422-4.422 17.046-7.988 21.183-2.567z"/>
+<path fill="#ffcd0c" d="m283.2 284.84c5.906 7.756 16.864 16.081 20.777 18.358 2.847 1.636 6.973 3.557 6.902 8.681-0.142 5.834-3.131 7.471-4.767 9.107-3.273 3.273-22.996 11.193-34.399 15.361-12.337 4.273-18.858 6.533-25.147 7.924-3.97 0.829-7.556 2.468-13.587 1.276-4.235-0.82-6.179-0.972-9.079-3.5-2.883-2.473-4.877-4.076-5.287-8.152-1.158-10.229 2.137-15.606 6.524-24.569 3.894-8.076 12.01-7.612 16.797-6.92 17.293 2.571 15.366-10.237 20.133-15.005 4.412-4.411 17.006-7.969 21.133-2.561z"/>
+<path fill="#ffcd0f" d="m283.15 284.92c5.892 7.737 16.824 16.043 20.728 18.314 2.84 1.633 6.957 3.549 6.886 8.66-0.142 5.821-3.124 7.454-4.756 9.086-3.266 3.266-23.161 11.243-34.439 15.179-12.356 4.047-18.411 6.198-24.733 7.665-3.943 0.866-7.656 2.487-13.669 1.301-4.218-0.811-6.033-0.907-8.923-3.422-2.869-2.464-4.656-3.855-5.062-7.91-1.145-10.202 1.83-15.344 6.144-24.299 3.895-8.252 12.065-7.407 16.83-6.706 17.238 2.61 15.155-10.557 19.912-15.313 4.401-4.401 16.965-7.95 21.082-2.555z"/>
+<path fill="#ffcd11" d="m283.1 284.99c5.877 7.719 16.783 16.004 20.678 18.27 2.833 1.629 6.94 3.541 6.869 8.64-0.142 5.807-3.116 7.436-4.745 9.065-3.257 3.257-23.324 11.292-34.478 14.995-12.375 3.823-17.963 5.864-24.319 7.408-3.917 0.901-7.757 2.505-13.752 1.325-4.201-0.802-5.886-0.842-8.765-3.344-2.856-2.454-4.437-3.633-4.838-7.669-1.132-10.173 1.522-15.081 5.764-24.029 3.896-8.426 12.119-7.201 16.863-6.491 17.183 2.649 14.945-10.876 19.69-15.621 4.391-4.39 16.925-7.931 21.033-2.549z"/>
+<path fill="#ffce14" d="m283.04 285.06c5.863 7.701 16.743 15.966 20.629 18.227 2.826 1.625 6.923 3.532 6.852 8.619-0.141 5.793-3.108 7.418-4.733 9.043-3.25 3.25-23.489 11.342-34.518 14.813-12.395 3.597-17.516 5.529-23.905 7.149-3.89 0.938-7.857 2.524-13.834 1.35-4.184-0.793-5.74-0.777-8.609-3.266-2.841-2.445-4.217-3.412-4.613-7.427-1.119-10.146 1.215-14.818 5.384-23.759 3.897-8.602 12.174-6.996 16.896-6.277 17.128 2.688 14.735-11.195 19.468-15.929 4.38-4.38 16.885-7.912 20.983-2.543z"/>
+<path fill="#ffce16" d="m282.99 285.14c5.85 7.682 16.703 15.928 20.579 18.183 2.82 1.621 6.907 3.524 6.837 8.599-0.141 5.779-3.101 7.4-4.722 9.021-3.242 3.242-23.653 11.392-34.558 14.631-12.414 3.372-17.068 5.194-23.491 6.891-3.863 0.974-7.957 2.542-13.917 1.375-4.167-0.784-5.592-0.713-8.451-3.189-2.828-2.436-3.997-3.191-4.389-7.186-1.106-10.118 0.908-14.555 5.004-23.488 3.898-8.777 12.229-6.79 16.928-6.063 17.074 2.727 14.526-11.515 19.248-16.237 4.369-4.369 16.844-7.893 20.932-2.537z"/>
+<path fill="#ffce19" d="m282.94 285.21c5.836 7.664 16.663 15.89 20.53 18.14 2.813 1.617 6.891 3.515 6.82 8.578-0.14 5.765-3.093 7.382-4.71 8.999-3.235 3.234-23.817 11.442-34.598 14.449-12.433 3.146-16.621 4.859-23.077 6.632-3.837 1.01-8.057 2.561-13.999 1.4-4.15-0.775-5.446-0.648-8.295-3.111-2.814-2.426-3.777-2.969-4.164-6.944-1.093-10.09 0.601-14.293 4.624-23.219 3.899-8.952 12.283-6.584 16.961-5.848 17.019 2.766 14.315-11.834 19.026-16.545 4.359-4.359 16.804-7.874 20.882-2.531z"/>
+<path fill="#ffce1c" d="m282.89 285.28c5.822 7.645 16.623 15.852 20.481 18.096 2.806 1.614 6.874 3.507 6.804 8.557-0.141 5.752-3.086 7.365-4.7 8.978-3.226 3.227-23.981 11.492-34.637 14.267-12.453 2.921-16.173 4.524-22.663 6.374-3.81 1.046-8.158 2.579-14.082 1.424-4.133-0.766-5.299-0.583-8.137-3.033-2.8-2.417-3.557-2.748-3.94-6.703-1.08-10.062 0.293-14.029 4.244-22.948 3.9-9.127 12.338-6.379 16.994-5.634 16.964 2.805 14.105-12.153 18.805-16.853 4.348-4.348 16.763-7.855 20.831-2.525z"/>
+<path fill="#ffcf1e" d="m282.84 285.36c5.807 7.627 16.582 15.814 20.431 18.053 2.799 1.609 6.857 3.498 6.787 8.536-0.14 5.738-3.079 7.347-4.688 8.957-3.219 3.218-24.145 11.541-34.677 14.084-12.472 2.695-15.726 4.189-22.25 6.115-3.783 1.083-8.257 2.598-14.163 1.449-4.116-0.757-5.153-0.518-7.981-2.955-2.786-2.408-3.337-2.526-3.716-6.461-1.066-10.035-0.013-13.767 3.864-22.678 3.902-9.303 12.393-6.173 17.028-5.42 16.908 2.844 13.895-12.473 18.583-17.161 4.338-4.338 16.723-7.836 20.782-2.519z"/>
+<path fill="#ffcf21" d="m282.78 285.43c5.793 7.609 16.543 15.776 20.382 18.009 2.792 1.606 6.84 3.49 6.77 8.516-0.139 5.724-3.071 7.329-4.676 8.935-3.211 3.211-24.309 11.591-34.717 13.902-12.491 2.47-15.278 3.854-21.836 5.857-3.756 1.119-8.357 2.616-14.246 1.474-4.099-0.749-5.006-0.454-7.823-2.878-2.773-2.398-3.118-2.305-3.492-6.219-1.053-10.007-0.32-13.505 3.484-22.408 3.903-9.478 12.448-5.968 17.061-5.206 16.853 2.883 13.684-12.792 18.361-17.469 4.328-4.328 16.683-7.818 20.732-2.513z"/>
+<path fill="#ffcf23" d="m282.73 285.5c5.779 7.59 16.503 15.737 20.332 17.966 2.786 1.601 6.825 3.481 6.755 8.495-0.139 5.71-3.064 7.311-4.665 8.913-3.204 3.203-24.474 11.641-34.757 13.72-12.511 2.244-14.831 3.519-21.422 5.598-3.729 1.155-8.457 2.634-14.328 1.499-4.082-0.74-4.86-0.389-7.667-2.8-2.759-2.389-2.897-2.083-3.267-5.978-1.04-9.979-0.627-13.242 3.104-22.138 3.904-9.653 12.503-5.762 17.093-4.991 16.799 2.922 13.475-13.111 18.141-17.777 4.317-4.317 16.642-7.799 20.681-2.507z"/>
+<path fill="#ffcf26" d="m282.68 285.57c5.766 7.572 16.463 15.699 20.283 17.922 2.779 1.598 6.808 3.473 6.738 8.475-0.139 5.696-3.056 7.293-4.654 8.891-3.195 3.195-24.637 11.691-34.797 13.537-12.529 2.02-14.382 3.185-21.007 5.341-3.703 1.191-8.558 2.652-14.411 1.523-4.065-0.731-4.713-0.324-7.509-2.722-2.745-2.38-2.678-1.862-3.043-5.736-1.027-9.952-0.935-12.979 2.724-21.868 3.905-9.828 12.557-5.557 17.126-4.777 16.744 2.961 13.265-13.431 17.919-18.085 4.307-4.307 16.602-7.78 20.631-2.501z"/>
+<path fill="#ffd028" d="m282.63 285.65c5.752 7.553 16.423 15.66 20.234 17.878 2.772 1.593 6.791 3.464 6.722 8.454-0.139 5.682-3.049 7.275-4.643 8.869-3.188 3.188-24.801 11.741-34.837 13.355-12.548 1.794-13.935 2.85-20.593 5.082-3.676 1.228-8.658 2.671-14.493 1.548-4.048-0.722-4.566-0.259-7.353-2.644-2.731-2.37-2.457-1.64-2.818-5.495-1.014-9.923-1.242-12.716 2.344-21.597 3.906-10.004 12.612-5.351 17.159-4.563 16.689 3 13.054-13.75 17.698-18.393 4.296-4.296 16.561-7.761 20.58-2.494z"/>
+<path fill="#ffd02b" d="m282.58 285.72c5.737 7.534 16.382 15.622 20.184 17.834 2.765 1.59 6.774 3.456 6.705 8.433-0.138 5.669-3.041 7.259-4.631 8.848-3.18 3.18-24.966 11.791-34.877 13.173-12.568 1.569-13.487 2.514-20.179 4.824-3.65 1.263-8.758 2.689-14.575 1.573-4.031-0.713-4.42-0.195-7.196-2.567-2.718-2.361-2.238-1.419-2.594-5.253-1.001-9.896-1.549-12.454 1.964-21.328 3.907-10.178 12.666-5.145 17.192-4.348 16.634 3.039 12.844-14.07 17.476-18.701 4.286-4.286 16.521-7.742 20.531-2.488z"/>
+<path fill="#ffd02d" d="m282.53 285.79c5.723 7.516 16.342 15.584 20.135 17.79 2.758 1.587 6.758 3.448 6.688 8.413-0.137 5.655-3.033 7.241-4.619 8.827-3.173 3.172-25.13 11.84-34.917 12.99-12.587 1.343-13.04 2.179-19.765 4.565-3.623 1.3-8.858 2.708-14.658 1.598-4.014-0.704-4.273-0.13-7.039-2.489-2.703-2.352-2.018-1.197-2.369-5.012-0.988-9.868-1.856-12.19 1.584-21.057 3.908-10.354 12.721-4.94 17.225-4.134 16.579 3.078 12.634-14.389 17.254-19.009 4.275-4.275 16.481-7.723 20.481-2.482z"/>
+<path fill="#ffd030" d="m282.47 285.87c5.709 7.498 16.302 15.546 20.085 17.747 2.752 1.582 6.742 3.439 6.673 8.392-0.138 5.641-3.027 7.223-4.608 8.805-3.165 3.164-25.294 11.89-34.957 12.808-12.606 1.117-12.592 1.844-19.352 4.307-3.595 1.336-8.958 2.726-14.739 1.622-3.997-0.695-4.127-0.065-6.882-2.411-2.69-2.342-1.798-0.976-2.146-4.77-0.974-9.84-2.163-11.928 1.204-20.787 3.91-10.529 12.777-4.735 17.258-3.92 16.524 3.117 12.425-14.708 17.034-19.317 4.264-4.265 16.44-7.704 20.43-2.476z"/>
+</g>
+<path fill="#ffd133" d="m465.45 342.16c0.49691 0.65257 1.4189 1.3531 1.7482 1.5447 0.23952 0.13777 0.58679 0.29937 0.58077 0.73049-0.012 0.49098-0.26342 0.62867-0.40111 0.76636-0.27546 0.27537-2.2213 1.0418-3.0536 1.1017-1.1017 0.0778-1.0597 0.13166-1.6524 0.3532-0.31141 0.1198-0.79035 0.23952-1.2933 0.14371-0.34727-0.0599-0.34727 0-0.58678-0.20356-0.23349-0.20357-0.13769-0.0659-0.16762-0.39518-0.0838-0.85614-0.21551-1.0178 0.0719-1.7901 0.34125-0.93405 1.1196-0.39517 1.5087-0.32336 1.43 [...]
+<path fill="#995900" d="m443.44 341.17c-0.56541 0.40835-1.9978 0.37066-2.3621 0.84812-0.35809 0.47745 0.0126 1.1685 0.006 2.4501 0 0.54656-0.0942 0.96119-0.15706 1.2942-0.0879 0.42092-0.14449 0.71618 0.0314 1.0177 0.3204 0.534 0.83555 0.66593 3.782 1.2816 1.5769 0.32668 3.0658 1.1748 4.0646 1.2565 0.99888 0.0754 1.2125-0.25758 1.8219-0.79786 0.6031-0.54027 0.79785-0.37065 0.77901-1.558-0.0188-1.1811-0.77901-1.5329-1.6397-2.8961-0.86066-1.3633-0.99887-1.6146-1.5706-2.5192-0.57169-0.89208- [...]
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#9e5e00" d="m30.194 274.9c-6.3972 4.702-22.475 3.788-27.061 9.512-4.1544 5.414 0.2268 13.276 0.0972 27.954-0.0252 6.231-1.152 10.882-1.9368 14.878-1.0368 4.871-1.6776 8.201 0.3492 11.618 3.7872 6.163 9.6947 7.124 43.456 14.169 18.061 3.737 34.542 13.306 46.343 14.112 11.186 0.792 13.565-2.829 20.463-8.96 6.897-6.196 9.025-4.277 8.859-17.406-0.075-13.522-8.305-17.349-18.169-32.973-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3. [...]
+<path fill="#a36400" d="m30.299 275.19c-6.3144 4.724-22.054 3.327-27.05 9.303-4.2048 5.357 0.3096 13.161 0.1224 27.828-0.0504 6.199-1.224 10.749-2.0736 14.925-1.0656 4.918-1.6992 8.194 0.3384 11.571 3.9024 6.206 9.8135 6.617 43.567 13.651 18.05 3.73 33.948 13.147 46.102 13.824 10.922 0.72 13.234-2.707 20.044-8.777 6.884-6.199 8.907-4.305 8.792-16.956 0.064-13.507-7.683-17.129-17.547-32.753-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.02 [...]
+<path fill="#a86a00" d="m30.403 275.48c-6.2316 4.745-21.632 2.866-27.04 9.094-4.2552 5.299 0.3924 13.046 0.1476 27.702-0.0756 6.167-1.296 10.616-2.2104 14.972-1.0944 4.965-1.7208 8.187 0.3276 11.524 4.0176 6.25 9.9323 6.109 43.679 13.133 18.04 3.722 33.354 12.989 45.86 13.536 10.659 0.648 12.902-2.585 19.627-8.593 6.869-6.203 8.788-4.335 8.723-16.506 0.205-13.493-7.06-16.91-16.924-32.534-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024- [...]
+<path fill="#ad7000" d="m30.508 275.77c-6.1488 4.767-21.211 2.405-27.029 8.885-4.3056 5.242 0.4752 12.931 0.1728 27.576-0.1008 6.135-1.368 10.483-2.3472 15.019-1.1232 5.012-1.7424 8.18 0.3168 11.477 4.1328 6.293 10.051 5.602 43.79 12.615 18.029 3.715 32.76 12.83 45.619 13.248 10.397 0.576 12.571-2.463 19.21-8.41 6.854-6.206 8.668-4.363 8.654-16.056 0.346-13.478-6.437-16.69-16.301-32.314-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-1 [...]
+<path fill="#b27500" d="m30.612 276.05c-6.066 4.788-20.79 1.944-27.018 8.676-4.356 5.184 0.558 12.816 0.198 27.45-0.126 6.102-1.44 10.35-2.484 15.066-1.152 5.058-1.764 8.172 0.306 11.43 4.248 6.336 10.17 5.094 43.902 12.096 18.018 3.708 32.166 12.672 45.378 12.96 10.134 0.504 12.24-2.34 18.792-8.226 6.84-6.21 8.55-4.392 8.586-15.606 0.486-13.464-5.814-16.47-15.678-32.094-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12.888 6.768s-7.9 [...]
+<path fill="#b77b00" d="m30.716 276.34c-5.9832 4.81-20.369 1.484-27.007 8.468-4.4064 5.126 0.6408 12.7 0.2232 27.324-0.1512 6.069-1.512 10.216-2.6208 15.112-1.1808 5.105-1.7856 8.165 0.2952 11.384 4.3632 6.379 10.289 4.586 44.014 11.577 18.007 3.701 31.572 12.514 45.137 12.672 9.8717 0.432 11.909-2.217 18.375-8.042 6.825-6.214 8.431-4.421 8.517-15.156 0.627-13.45-5.191-16.251-15.055-31.875-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.02 [...]
+<path fill="#bc8100" d="m30.821 276.63c-5.9004 4.832-19.948 1.023-26.996 8.259-4.4568 5.069 0.7236 12.585 0.2484 27.198-0.1764 6.037-1.584 10.083-2.7576 15.159-1.2096 5.152-1.8072 8.158 0.2844 11.337 4.4784 6.422 10.408 4.079 44.125 11.059 17.996 3.694 30.978 12.355 44.896 12.384 9.6085 0.36 11.578-2.095 17.956-7.859 6.812-6.217 8.313-4.449 8.45-14.706 0.766-13.435-4.569-16.031-14.433-31.655-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3. [...]
+<path fill="#c18700" d="m30.925 276.92c-5.8176 4.853-19.526 0.562-26.986 8.05-4.5072 5.011 0.8064 12.47 0.2736 27.072-0.2016 6.005-1.656 9.95-2.8944 15.206-1.2384 5.199-1.8288 8.151 0.2736 11.29 4.5936 6.466 10.526 3.571 44.237 10.541 17.986 3.686 30.384 12.197 44.654 12.096 9.3457 0.288 11.246-1.973 17.539-7.675 6.797-6.221 8.194-4.479 8.381-14.256 0.907-13.421-3.946-15.812-13.81-31.436-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024- [...]
+<path fill="#c68c00" d="m31.03 277.21c-5.7348 4.875-19.105 0.101-26.975 7.841-4.5576 4.954 0.8892 12.355 0.2988 26.946-0.2268 5.973-1.728 9.817-3.0312 15.253-1.2672 5.246-1.8504 8.144 0.2628 11.243 4.7088 6.509 10.645 3.064 44.348 10.023 17.975 3.679 29.79 12.038 44.413 11.808 9.0829 0.216 10.915-1.851 17.122-7.492 6.782-6.224 8.074-4.507 8.312-13.806 1.048-13.406-3.323-15.592-13.187-31.216-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.0 [...]
+<path fill="#cc9200" d="m31.134 277.49c-5.652 4.896-18.684-0.36-26.964 7.632-4.608 4.896 0.972 12.24 0.324 26.82-0.252 5.94-1.8 9.684-3.168 15.3-1.296 5.292-1.872 8.136 0.252 11.196 4.824 6.552 10.764 2.556 44.46 9.504 17.964 3.672 29.196 11.88 44.172 11.52 8.8201 0.144 10.584-1.728 16.704-7.308 6.768-6.228 7.956-4.536 8.244-13.356 1.188-13.392-2.7-15.372-12.564-30.996-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12.888 6.768s-7.668 [...]
+<path fill="#d19800" d="m31.238 277.78c-5.5692 4.918-18.263-0.82-26.953 7.424-4.6584 4.838 1.0548 12.124 0.3492 26.694-0.2772 5.907-1.872 9.55-3.3048 15.346-1.3248 5.339-1.8936 8.129 0.2412 11.15 4.9392 6.595 10.883 2.048 44.572 8.985 17.953 3.665 28.602 11.722 43.931 11.232 8.5573 0.072 10.253-1.605 16.287-7.124 6.753-6.232 7.837-4.565 8.175-12.906 1.329-13.378-2.077-15.153-11.941-30.777-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024 [...]
+<path fill="#d69e00" d="m31.343 278.07c-5.4864 4.94-17.842-1.281-26.942 7.215-4.7088 4.781 1.1376 12.009 0.3744 26.568-0.3024 5.875-1.944 9.417-3.4416 15.393-1.3536 5.386-1.9152 8.122 0.2304 11.103 5.0544 6.638 11.002 1.541 44.683 8.467 17.942 3.658 28.008 11.563 43.69 10.944 8.2945 0 9.9217-1.483 15.868-6.941 6.74-6.235 7.719-4.593 8.108-12.456 1.468-13.363-1.455-14.933-11.319-30.557-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12. [...]
+<path fill="#dba300" d="m31.447 278.36c-5.4036 4.961-17.42-1.742-26.932 7.006-4.7592 4.723 1.2204 11.894 0.3996 26.442-0.3276 5.843-2.016 9.284-3.5784 15.44-1.3824 5.433-1.9368 8.115 0.2196 11.056 5.1696 6.682 11.12 1.033 44.795 7.949 17.932 3.65 27.414 11.405 43.448 10.656 8.0317-0.072 9.5905-1.361 15.451-6.757 6.725-6.239 7.6-4.623 8.039-12.006 1.609-13.349-0.832-14.714-10.696-30.338-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12 [...]
+<path fill="#e0a900" d="m31.552 278.65c-5.3208 4.983-16.999-2.203-26.921 6.797-4.8096 4.666 1.3032 11.779 0.4248 26.316-0.3528 5.811-2.088 9.151-3.7152 15.487-1.4112 5.48-1.9584 8.108 0.2088 11.009 5.2848 6.725 11.239 0.526 44.906 7.431 17.921 3.643 26.82 11.246 43.207 10.368 7.7689-0.144 9.2593-1.239 15.034-6.574 6.71-6.242 7.48-4.651 7.97-11.556 1.75-13.334-0.209-14.494-10.073-30.118-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12 [...]
+<path fill="#e5af00" d="m31.656 278.93c-5.238 5.004-16.578-2.664-26.91 6.588-4.86 4.608 1.386 11.664 0.45 26.19-0.378 5.778-2.16 9.018-3.852 15.534-1.44 5.526-1.98 8.1 0.198 10.962 5.4 6.768 11.358 0.018 45.018 6.912 17.91 3.636 26.226 11.088 42.966 10.08 7.5061-0.216 8.9281-1.116 14.616-6.39 6.696-6.246 7.362-4.68 7.902-11.106 1.89-13.32 0.414-14.274-9.45-29.898-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12.888 6.768s-7.398 16.70 [...]
+<path fill="#eab500" d="m31.76 279.22c-5.1552 5.026-16.157-3.124-26.899 6.38-4.9104 4.55 1.4688 11.548 0.4752 26.064-0.4032 5.745-2.232 8.884-3.9888 15.58-1.4688 5.573-2.0016 8.093 0.1872 10.916 5.5152 6.811 11.477-0.49 45.13 6.393 17.899 3.629 25.632 10.93 42.725 9.792 7.2433-0.288 8.5969-0.993 14.199-6.206 6.681-6.25 7.243-4.709 7.833-10.656 2.031-13.306 1.037-14.055-8.827-29.679-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12.888 [...]
+<path fill="#efba00" d="m31.865 279.51c-5.0724 5.048-15.736-3.585-26.888 6.171-4.9608 4.493 1.5516 11.433 0.5004 25.938-0.4284 5.713-2.304 8.751-4.1256 15.627-1.4976 5.62-2.0232 8.086 0.1764 10.869 5.6304 6.854 11.596-0.997 45.241 5.875 17.888 3.622 25.038 10.771 42.484 9.504 6.9804-0.36 8.2657-0.871 13.78-6.023 6.668-6.253 7.125-4.737 7.766-10.206 2.17-13.291 1.659-13.835-8.205-29.459-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12 [...]
+<path fill="#f4c000" d="m31.969 279.8c-4.9896 5.069-15.314-4.046-26.878 5.962-5.0112 4.435 1.6344 11.318 0.5256 25.812-0.4536 5.681-2.376 8.618-4.2624 15.674-1.5264 5.667-2.0448 8.079 0.1656 10.822 5.7456 6.898 11.714-1.505 45.353 5.357 17.878 3.614 24.444 10.613 42.242 9.216 6.7176-0.432 7.9344-0.749 13.363-5.839 6.653-6.257 7.006-4.767 7.697-9.756 2.311-13.277 2.282-13.616-7.582-29.24-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-1 [...]
+<path fill="#f9c600" d="m32.074 280.09c-4.9068 5.091-14.893-4.507-26.867 5.753-5.0616 4.378 1.7172 11.203 0.5508 25.686-0.4788 5.649-2.448 8.485-4.3992 15.721-1.5552 5.714-2.0664 8.072 0.1548 10.775 5.8608 6.941 11.833-2.012 45.464 4.839 17.867 3.607 23.85 10.454 42.001 8.928 6.4548-0.504 7.6032-0.627 12.946-5.656 6.638-6.26 6.886-4.795 7.628-9.306 2.452-13.262 2.905-13.396-6.959-29.02-9.8639-15.624-11.448-18.504-18-28.872-6.552-10.224-19.512-28.8-26.928-29.016-5.904-0.144-9.216 3.024-12 [...]
+</g>
+<path fill="#fc0" d="m443.62 341.67c-0.42092 0.44604-1.2628-0.43348-2.3433 0.48374-0.44604 0.37694 0.15706 0.96747 0.0503 2.2302-0.044 0.49002-0.21988 0.72874-0.39579 1.3758-0.13821 0.50259-0.18218 0.70362 0.0126 0.93606 0.52143 0.60939 1.0429-0.21988 3.9767 0.37694 1.558 0.31412 2.0292 0.89837 3.6437 0.75388 0.54028-0.0503 0.63452-0.044 1.0931-0.47746 0.57797-0.54656 0.59053-0.42091 0.65964-0.77272 0.22616-1.1559 0.30783-1.1497-0.55285-2.5129-0.86066-1.3633-0.99887-1.6146-1.5706-2.5192- [...]
+<path fill="#fc0" d="m443.89 342.16c-0.3733 0.39596-1.595-0.11875-2.1719 0.31673-0.41287 0.30548 0.20927 0.6901 0.12443 1.8213-0.0339 0.42982-0.3337 0.50904-0.20926 1.1029 0.0961 0.44683 0.19796 0.43548 0.36763 0.63913 0.46378 0.54299 0.35634 0.14703 2.9976 0.67867 1.397 0.28288 1.8269 0.80885 3.2805 0.67875 0.48641-0.0452 0.57691-0.0396 0.98414-0.42982 0.52037-0.48644 0.25451-0.38461 0.31104-0.69567 0.19798-1.0351 0.0396-1.2161-0.73524-2.4434-0.77486-1.2274-0.70698-1.2952-1.216-2.104-0. [...]
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#ffcc02" d="m35.591 286.09c-4.4612 4.702-18.605-1.196-25.06 3.706-4.7008 3.513 2.5782 8.049 1.6088 20.679-0.4008 4.897-3.7331 5.877-2.4582 12.634 0.98705 5.093 2.3582 4.938 4.3338 7.201 5.6862 6.131 4.6733 1.826 34.119 7.743 15.918 3.211 20.816 9.215 37.372 7.733 5.5414-0.513 6.4782-0.463 11.155-4.849 5.8652-5.407 2.8596-4.287 3.4122-8.057 2.067-11.788 0.443-13.982-8.1878-27.65-8.8304-13.983-8.1427-14.699-13.942-23.913-5.7992-9.085-13.701-25.805-20.337-25.934-5.2193-0.129-8.2 [...]
+<path fill="#ffcc05" d="m35.885 286.18c-4.6441 4.866-18.93-1.031-25.229 3.781-4.6698 3.527 2.7581 8.191 1.7917 20.487-0.4128 4.867-3.6419 5.918-2.5183 12.626 0.87197 5.066 2.4474 4.886 4.4544 7.078 6.057 6.04 5.2628 1.967 33.883 7.708 15.826 3.18 20.694 9.16 37.148 7.686 5.5082-0.506 6.3446-0.471 11.03-4.77 5.7676-5.24 2.8022-4.167 3.2599-8.141 1.8647-11.715 0.4317-14.027-7.9495-27.298-8.7802-13.899-8.1829-14.553-13.947-23.712-5.7644-9.031-13.53-25.811-20.126-25.939-5.188-0.129-8.1984 2. [...]
+<path fill="#ffcc07" d="m36.18 286.27c-4.827 5.03-19.255-0.866-25.397 3.856-4.6388 3.541 2.9379 8.332 1.9744 20.294-0.4248 4.838-3.5506 5.961-2.5782 12.62 0.7569 5.038 2.5366 4.833 4.5749 6.954 6.4278 5.949 5.8522 2.109 33.647 7.674 15.733 3.148 20.572 9.103 36.924 7.639 5.4749-0.501 6.211-0.48 10.906-4.693 5.669-5.072 2.7448-4.046 3.1073-8.224 1.6627-11.642 0.4202-14.073-7.7108-26.946-8.7302-13.815-8.2232-14.407-13.953-23.511-5.7297-8.976-13.358-25.817-19.916-25.945-5.1568-0.127-8.149 2 [...]
+<path fill="#ffcd0a" d="m36.474 286.36c-5.0099 5.194-19.58-0.701-25.566 3.931-4.6077 3.554 3.1177 8.474 2.1572 20.101-0.4367 4.809-3.4593 6.004-2.6381 12.613 0.6419 5.011 2.6259 4.781 4.6953 6.831 6.7987 5.857 6.4417 2.25 33.411 7.639 15.641 3.118 20.45 9.048 36.7 7.593 5.4417-0.495 6.0774-0.489 10.782-4.615 5.5704-4.905 2.6875-3.926 2.9548-8.308 1.4616-11.569 0.4088-14.119-7.4722-26.594-8.6802-13.731-8.2634-14.261-13.958-23.31-5.6949-8.922-13.187-25.823-19.704-25.95-5.1255-0.127-8.0995  [...]
+<path fill="#ffcd0c" d="m36.768 286.45c-5.1927 5.359-19.905-0.535-25.734 4.008-4.5767 3.567 3.2975 8.614 2.3399 19.908-0.4487 4.779-3.368 6.045-2.698 12.606 0.5268 4.982 2.7151 4.728 4.8158 6.707 7.1696 5.766 7.0311 2.391 33.175 7.604 15.548 3.087 20.328 8.993 36.476 7.546 5.4085-0.488 5.9437-0.497 10.657-4.537 5.4719-4.737 2.6302-3.805 2.8023-8.392 1.26-11.49 0.398-14.16-7.233-26.24-8.63-13.64-8.304-14.11-13.964-23.11-5.66-8.86-13.016-25.83-19.494-25.95-5.0942-0.126-8.05 2.642-11.257 5. [...]
+<path fill="#ffcd0f" d="m37.062 286.54c-5.3757 5.523-20.23-0.37-25.903 4.083-4.5456 3.581 3.4774 8.756 2.5227 19.715-0.4606 4.75-3.2767 6.088-2.7579 12.599 0.4117 4.955 2.8043 4.676 4.9363 6.584 7.5404 5.675 7.6205 2.532 32.939 7.569 15.456 3.056 20.206 8.938 36.252 7.5 5.3753-0.483 5.8101-0.506 10.533-4.459 5.3743-4.57 2.5728-3.685 2.6497-8.476 1.0573-11.421 0.3863-14.209-6.9949-25.888-8.5801-13.564-8.3439-13.971-13.969-22.909-5.6254-8.813-12.845-25.835-19.283-25.961-5.063-0.125-8.0006  [...]
+<path fill="#ffcd11" d="m37.357 286.64c-5.5586 5.687-20.555-0.205-26.071 4.158-4.5145 3.594 3.6573 8.897 2.7055 19.522-0.4725 4.721-3.1853 6.131-2.8179 12.593 0.2967 4.927 2.8936 4.623 5.0569 6.46 7.9112 5.583 8.2099 2.674 32.702 7.534 15.363 3.026 20.084 8.883 36.028 7.454 5.342-0.477 5.6765-0.515 10.409-4.381 5.2757-4.403 2.5155-3.565 2.4971-8.56 0.8554-11.348 0.3751-14.255-6.7563-25.536-8.53-13.48-8.3841-13.825-13.975-22.708-5.5906-8.759-12.674-25.842-19.072-25.966-5.0316-0.125-7.9511 [...]
+<path fill="#ffce14" d="m37.651 286.73c-5.7415 5.851-20.88-0.04-26.24 4.233-4.4836 3.608 3.837 9.039 2.8882 19.33-0.4845 4.691-3.094 6.172-2.8778 12.585 0.1817 4.9 2.9829 4.571 5.1773 6.337 8.2821 5.492 8.7994 2.815 32.466 7.499 15.27 2.995 19.962 8.827 35.804 7.407 5.3088-0.471 5.5429-0.523 10.284-4.303 5.1771-4.235 2.4581-3.444 2.3446-8.643 0.6534-11.274 0.3637-14.3-6.5177-25.184-8.4799-13.395-8.4243-13.679-13.98-22.507-5.5558-8.704-12.502-25.848-18.861-25.972-5.0004-0.123-7.9017 2.593 [...]
+<path fill="#ffce16" d="m37.945 286.82c-5.9244 6.015-21.205 0.125-26.408 4.309-4.4525 3.621 4.0169 9.179 3.071 19.136-0.4964 4.662-3.0027 6.215-2.9377 12.579 0.0666 4.872 3.0721 4.518 5.2978 6.213 8.653 5.401 9.3888 2.956 32.23 7.464 15.178 2.964 19.84 8.772 35.58 7.361 5.2756-0.465 5.4093-0.532 10.16-4.225 5.0785-4.068 2.4007-3.324 2.192-8.728 0.4515-11.2 0.3525-14.345-6.2791-24.831-8.4298-13.311-8.4645-13.534-13.986-22.306-5.5211-8.65-12.331-25.854-18.65-25.977-4.9691-0.123-7.8522 2.57 [...]
+<path fill="#ffce19" d="m38.24 286.91c-6.1072 6.18-21.53 0.291-26.577 4.385-4.4215 3.634 4.1967 9.321 3.2537 18.944-0.5084 4.632-2.9114 6.257-2.9976 12.572-0.0485 4.844 3.1613 4.465 5.4183 6.088 9.0238 5.31 9.9782 3.098 31.994 7.43 15.085 2.933 19.718 8.717 35.356 7.315 5.2423-0.459 5.2756-0.541 10.036-4.148 4.9805-3.9 2.3435-3.203 2.0395-8.811 0.2495-11.127 0.3412-14.391-6.0404-24.478-8.3798-13.228-8.5048-13.389-13.991-22.106-5.4863-8.595-12.16-25.86-18.439-25.983-4.9378-0.122-7.8028 2. [...]
+<path fill="#ffce1c" d="m38.534 287c-6.2901 6.344-21.855 0.456-26.746 4.46-4.3904 3.648 4.3766 9.462 3.4365 18.751-0.5203 4.603-2.8201 6.299-3.0575 12.565-0.1635 4.817 3.2506 4.413 5.5388 5.965 9.3946 5.219 10.568 3.24 31.758 7.395 14.993 2.903 19.596 8.662 35.132 7.268 5.2091-0.453 5.142-0.549 9.9115-4.069 4.8821-3.733 2.2861-3.083 1.887-8.895 0.0475-11.054 0.3299-14.436-5.8019-24.126-8.328-13.14-8.543-13.24-13.995-21.9-5.451-8.54-11.989-25.87-18.228-25.99-4.9065-0.121-7.7533 2.544-10.8 [...]
+<path fill="#ffcf1e" d="m38.828 287.09c-6.473 6.509-22.18 0.621-26.914 4.535-4.3594 3.661 4.5563 9.604 3.6193 18.558-0.5323 4.574-2.7289 6.342-3.1175 12.559-0.2786 4.789 3.3398 4.36 5.6592 5.841 9.7655 5.127 11.157 3.381 31.522 7.36 14.9 2.872 19.474 8.607 34.908 7.222 5.1759-0.447 5.0084-0.558 9.7872-3.992 4.7837-3.565 2.2288-2.962 1.7344-8.978-0.1544-10.98 0.3186-14.482-5.5632-23.774-8.2797-13.06-8.5852-13.098-14.002-21.704-5.4168-8.486-11.818-25.872-18.017-25.993-4.8752-0.121-7.7039 2 [...]
+<path fill="#ffcf21" d="m39.122 287.18c-6.656 6.673-22.505 0.785-27.083 4.611-4.3283 3.674 4.7362 9.745 3.8021 18.365-0.5443 4.544-2.6376 6.384-3.1775 12.551-0.3936 4.761 3.4291 4.308 5.7798 5.718 10.136 5.036 11.747 3.522 31.286 7.325 14.808 2.841 19.352 8.551 34.684 7.176 5.1426-0.441 4.8748-0.567 9.6629-3.914 4.6854-3.398 2.1714-2.842 1.5818-9.063-0.3563-10.906 0.3074-14.527-5.3246-23.421-8.2296-12.976-8.6254-12.952-14.007-21.503-5.382-8.432-11.647-25.878-17.806-25.999-4.8439-0.119-7. [...]
+<path fill="#ffcf23" d="m39.417 287.27c-6.8389 6.837-22.83 0.95-27.251 4.686-4.2973 3.688 4.916 9.886 3.9848 18.172-0.5562 4.515-2.5463 6.426-3.2374 12.545-0.5086 4.733 3.5184 4.255 5.9003 5.594 10.507 4.945 12.336 3.663 31.05 7.29 14.715 2.811 19.23 8.496 34.46 7.129 5.1094-0.435 4.7412-0.575 9.5386-3.836 4.587-3.231 2.114-2.721 1.4293-9.146-0.5583-10.833 0.296-14.572-5.086-23.069-8.1796-12.892-8.6656-12.806-14.013-21.302-5.3473-8.378-11.476-25.885-17.595-26.004-4.8127-0.119-7.605 2.496 [...]
+<path fill="#ffcf26" d="m39.711 287.36c-7.0217 7.001-23.155 1.115-27.42 4.761-4.2663 3.701 5.0959 10.028 4.1676 17.979-0.5682 4.486-2.4549 6.469-3.2973 12.538-0.6237 4.706 3.6076 4.203 6.0208 5.471 10.878 4.853 12.925 3.804 30.813 7.255 14.622 2.78 19.109 8.441 34.236 7.083 5.0762-0.429 4.6075-0.584 9.4142-3.758 4.4887-3.064 2.0568-2.601 1.2768-9.23-0.7603-10.759 0.2848-14.618-4.8473-22.716-8.1295-12.809-8.7059-12.661-14.018-21.102-5.3125-8.323-11.304-25.891-17.384-26.01-4.7814-0.118-7.5 [...]
+<path fill="#ffd028" d="m40.005 287.45c-7.2046 7.166-23.48 1.281-27.588 4.837-4.2353 3.715 5.2756 10.169 4.3503 17.787-0.5801 4.456-2.3636 6.511-3.3572 12.531-0.7388 4.678 3.6968 4.15 6.1412 5.347 11.249 4.762 13.515 3.946 30.577 7.22 14.53 2.749 18.987 8.386 34.012 7.037 5.043-0.424 4.4739-0.594 9.2899-3.68 4.3903-2.897 1.9994-2.481 1.1242-9.314-0.9622-10.686 0.2735-14.664-4.6087-22.364-8.0794-12.725-8.7461-12.516-14.024-20.901-5.2777-8.269-11.133-25.897-17.173-26.015-4.7501-0.117-7.506 [...]
+<path fill="#ffd02b" d="m40.3 287.54c-7.3875 7.33-23.805 1.446-27.757 4.913-4.2042 3.728 5.4555 10.31 4.5331 17.593-0.592 4.427-2.2723 6.553-3.4171 12.524-0.8539 4.651 3.786 4.098 6.2617 5.224 11.62 4.671 14.104 4.087 30.341 7.185 14.437 2.719 18.865 8.33 33.788 6.991 5.0097-0.418 4.3403-0.603 9.1656-3.603 4.292-2.729 1.942-2.36 0.9716-9.398-1.1641-10.612 0.2623-14.708-4.37-22.011-8.0294-12.641-8.7864-12.37-14.029-20.7-5.2429-8.214-10.962-25.903-16.962-26.02-4.7189-0.117-7.4567 2.447-10. [...]
+<path fill="#ffd02d" d="m40.594 287.64c-7.5704 7.494-24.13 1.611-27.925 4.988-4.1731 3.741 5.6354 10.451 4.7159 17.4-0.604 4.398-2.181 6.596-3.477 12.518-0.9689 4.623 3.8753 4.045 6.3822 5.1 11.991 4.579 14.694 4.228 30.105 7.15 14.345 2.688 18.743 8.275 33.564 6.944 4.9765-0.411 4.2067-0.611 9.0413-3.524 4.1936-2.562 1.8847-2.24 0.8191-9.482-1.3661-10.538 0.2509-14.754-4.1315-21.659-7.9793-12.557-8.8265-12.224-14.035-20.499-5.2081-8.16-10.791-25.909-16.751-26.026-4.6875-0.115-7.4072 2.4 [...]
+<path fill="#ffd030" d="m40.888 287.73c-7.7534 7.658-24.455 1.776-28.094 5.063-4.1421 3.755 5.8152 10.593 4.8986 17.208-0.6159 4.368-2.0897 6.637-3.537 12.51-1.0839 4.596 3.9646 3.993 6.5028 4.977 12.361 4.488 15.283 4.369 29.869 7.115 14.252 2.657 18.621 8.22 33.34 6.898 4.9434-0.406 4.0732-0.62 8.9171-3.447 4.0952-2.394 1.8273-2.119 0.6665-9.565-1.568-10.465 0.2397-14.8-3.8928-21.307-7.93-12.48-8.868-12.08-14.041-20.3-5.174-8.1-10.62-25.92-16.54-26.03-4.6563-0.115-7.3578 2.415-10.29 5. [...]
+</g>
+<path fill="#ffd133" d="m444.4 342.32c-0.69247 0.68251-2.1621 0.16936-2.466 0.44831-0.3587 0.32887 0.52309 0.93659 0.44338 1.4846-0.0548 0.37859-0.17437 0.58285-0.31385 1.091-0.10461 0.39858 0.35371 0.3437 0.57791 0.42345 1.1109 0.38366 1.385 0.3936 2.5856 0.61776 1.2355 0.22913 1.6141 0.71243 2.8895 0.59787 0.42843-0.0349 0.34374-0.0549 0.7672-0.29396 0.34875-0.19432 0.15444-0.17443 0.0448-0.84192-0.15444-0.90675 0.0199-1.2953-0.31884-1.8284-0.6875-1.081-0.77718-1.0412-1.2256-1.7536-0.4 [...]
+<path d="m446.6 336.37c-0.0817 0.18219-0.15077 1.7465 0.25758 2.3559 0.40835 0.6031 0.28898 0.94863-0.16334 0.49002-0.47118-0.44604-0.77901-1.1182-0.78529-1.5831 0-0.27014 0.20732-1.3821 0.28899-1.5015 0.0879-0.12565 0.46489 0.10051 0.40206 0.23872z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#030303" d="m66.288 220.03c-0.9036 2.34-1.656 19.699 3.0096 26.668 4.6656 6.902 3.186 10.491-1.8396 5.357-5.2308-4.997-8.6076-12.47-8.7408-17.787-0.0432-3.114 2.2356-15.419 3.132-16.791 0.9612-1.393 5.1264 0.99 4.4388 2.553z"/>
+<path fill="#070707" d="m66.198 220.38c-0.8712 2.592-1.584 19.382 3.0672 26.337 4.6512 6.891 3.06 10.109-1.8072 5.098-5.0616-4.882-8.2872-12.125-8.4816-17.431-0.0864-3.132 2.0952-14.998 2.952-16.373 0.9144-1.346 4.9248 0.828 4.2696 2.369z"/>
+<path fill="#0b0b0b" d="m66.108 220.73c-0.8388 2.844-1.512 19.066 3.1248 26.006 4.6368 6.88 2.934 9.728-1.7748 4.839-4.8924-4.767-7.9668-11.779-8.2224-17.075-0.1296-3.15 1.9548-14.576 2.772-15.955 0.8676-1.3 4.7232 0.666 4.1004 2.185z"/>
+<path fill="#0f0f0f" d="m66.018 221.08c-0.8064 3.096-1.44 18.749 3.1824 25.675 4.6224 6.869 2.808 9.346-1.7424 4.58-4.7232-4.652-7.6464-11.434-7.9632-16.719-0.1728-3.168 1.8144-14.155 2.592-15.537 0.8208-1.253 4.5216 0.504 3.9312 2.001z"/>
+<path fill="#131313" d="m65.928 221.42c-0.774 3.348-1.368 18.432 3.24 25.344 4.608 6.858 2.682 8.964-1.71 4.32-4.554-4.536-7.326-11.088-7.704-16.362-0.216-3.186 1.674-13.734 2.412-15.12 0.774-1.206 4.32 0.342 3.762 1.818z"/>
+<path fill="#161616" d="m65.838 221.77c-0.7416 3.6-1.296 18.115 3.2976 25.012 4.5936 6.848 2.556 8.583-1.6776 4.061-4.3848-4.421-7.0056-10.742-7.4448-16.005-0.2592-3.204 1.5336-13.313 2.232-14.703 0.7272-1.159 4.1184 0.18 3.5928 1.635z"/>
+<path fill="#1a1a1a" d="m65.748 222.12c-0.7092 3.852-1.224 17.798 3.3552 24.681 4.5792 6.837 2.43 8.201-1.6452 3.802-4.2156-4.306-6.6852-10.397-7.1856-15.649-0.3024-3.222 1.3932-12.892 2.052-14.285 0.6804-1.112 3.9168 0.018 3.4236 1.451z"/>
+<path fill="#1e1e1e" d="m65.658 222.47c-0.6768 4.104-1.152 17.482 3.4128 24.35 4.5648 6.826 2.304 7.82-1.6128 3.543-4.0464-4.191-6.3648-10.051-6.9264-15.293-0.3456-3.24 1.2528-12.47 1.872-13.867 0.6336-1.066 3.7152-0.144 3.2544 1.267z"/>
+<path fill="#222" d="m65.568 222.82c-0.6444 4.356-1.08 17.165 3.4704 24.019 4.5504 6.815 2.178 7.438-1.5804 3.284-3.8772-4.076-6.0444-9.706-6.6672-14.937-0.3888-3.258 1.1124-12.049 1.692-13.449 0.5868-1.019 3.5136-0.306 3.0852 1.083z"/>
+<path fill="#262626" d="m65.478 223.17c-0.612 4.608-1.008 16.848 3.528 23.688 4.536 6.804 2.052 7.056-1.548 3.024-3.708-3.96-5.724-9.36-6.408-14.58-0.432-3.276 0.972-11.628 1.512-13.032 0.54-0.972 3.312-0.468 2.916 0.9z"/>
+<path fill="#2a2a2a" d="m65.388 223.52c-0.5796 4.86-0.936 16.531 3.5856 23.356 4.5216 6.794 1.926 6.675-1.5156 2.765-3.5388-3.845-5.4036-9.014-6.1488-14.223-0.4752-3.294 0.8316-11.207 1.332-12.615 0.4932-0.925 3.1104-0.63 2.7468 0.717z"/>
+<path fill="#2d2d2d" d="m65.298 223.87c-0.5472 5.112-0.864 16.214 3.6432 23.025 4.5072 6.783 1.8 6.293-1.4832 2.506-3.3696-3.73-5.0832-8.669-5.8896-13.867-0.5184-3.312 0.6912-10.786 1.152-12.197 0.4464-0.878 2.9088-0.792 2.5776 0.533z"/>
+<path fill="#313131" d="m65.208 224.22c-0.5148 5.364-0.792 15.898 3.7008 22.694 4.4928 6.772 1.674 5.912-1.4508 2.247-3.2004-3.615-4.7628-8.323-5.6304-13.511-0.5616-3.33 0.5508-10.364 0.972-11.779 0.3996-0.832 2.7072-0.954 2.4084 0.349z"/>
+<path fill="#353535" d="m65.118 224.57c-0.4824 5.616-0.72 15.581 3.7584 22.363 4.4784 6.761 1.548 5.53-1.4184 1.988-3.0312-3.5-4.4424-7.978-5.3712-13.155-0.6048-3.348 0.4104-9.943 0.792-11.361 0.3528-0.785 2.5056-1.116 2.2392 0.165z"/>
+<path fill="#393939" d="m65.028 224.92c-0.45 5.868-0.648 15.264 3.816 22.032 4.464 6.75 1.422 5.148-1.386 1.728-2.862-3.384-4.122-7.632-5.112-12.798-0.648-3.366 0.27-9.522 0.612-10.944 0.306-0.738 2.304-1.278 2.07-0.018z"/>
+<path fill="#3d3d3d" d="m64.938 225.27c-0.4176 6.12-0.576 14.947 3.8736 21.7 4.4496 6.74 1.296 4.767-1.3536 1.469-2.6928-3.269-3.8016-7.286-4.8528-12.441-0.6912-3.384 0.1296-9.101 0.432-10.527 0.2592-0.691 2.1024-1.44 1.9008-0.201z"/>
+<path fill="#414141" d="m64.848 225.62c-0.3852 6.372-0.504 14.63 3.9312 21.369 4.4352 6.729 1.17 4.385-1.3212 1.21-2.5236-3.154-3.4812-6.941-4.5936-12.085-0.7344-3.402-0.0108-8.68 0.252-10.109 0.2124-0.644 1.9008-1.602 1.7316-0.385z"/>
+<path fill="#444" d="m64.758 225.96c-0.3528 6.624-0.432 14.314 3.9888 21.038 4.4208 6.718 1.044 4.004-1.2888 0.951-2.3544-3.039-3.1608-6.595-4.3344-11.729-0.7776-3.42-0.1512-8.258 0.072-9.691 0.1656-0.598 1.6992-1.764 1.5624-0.569z"/>
+<path fill="#484848" d="m64.668 226.31c-0.3204 6.876-0.36 13.997 4.0464 20.707 4.4064 6.707 0.918 3.622-1.2564 0.692-2.1852-2.924-2.8404-6.25-4.0752-11.373-0.8208-3.438-0.2916-7.837-0.108-9.273 0.1188-0.551 1.4976-1.926 1.3932-0.753z"/>
+</g>
+<path fill="#4c4c4c" d="m446.45 336.98c-0.0251 0.62195-0.0251 1.1936 0.35809 1.7779 0.38322 0.58426 0.0691 0.2827-0.1068 0.0377-0.17591-0.24501-0.21988-0.51514-0.33296-0.96119-0.0754-0.30155-0.0377-0.64708-0.0251-0.77272 0.006-0.044 0.11308-0.18219 0.1068-0.0817z"/>
+<path d="m446.6 336.37c0.37694-0.82298 0.58426-1.7088 1.1245-2.5695 0.53399-0.85439 0.32039-1.1874-0.0754-0.75388-0.39579 0.43348-0.82927 1.3507-0.82927 1.3507s-0.50886 0.80413-0.62194 1.7339c-0.0189 0.15705 0.33924 0.37065 0.40206 0.23872z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#020202" d="m66.563 219.07c4.2796-9.5 6.6155-19.247 12.586-28.802 5.9018-9.488 3.6095-13.279-0.7633-8.472-4.403 4.847-9.3012 15.236-9.3678 15.381 0 0-5.6373 8.992-6.8776 19.239-0.2082 1.77 3.7208 4.145 4.423 2.654z"/>
+<path fill="#050505" d="m66.748 218.46c4.2392-9.567 6.535-18.909 12.283-28.156 5.6836-9.183 3.547-12.95-0.6626-8.303-4.2701 4.725-9.0985 14.991-9.2317 15.282 0 0-5.4426 8.767-6.6272 18.605-0.2004 1.742 3.5537 4.042 4.2381 2.572z"/>
+<path fill="#070707" d="m66.934 217.85c4.1988-9.634 6.4546-18.572 11.981-27.51 5.4654-8.878 3.4845-12.621-0.5618-8.135-4.1372 4.605-8.8959 14.748-9.0957 15.184 0 0-5.2479 8.542-6.3767 17.972-0.1927 1.712 3.3866 3.938 4.053 2.489z"/>
+<path fill="#0a0a0a" d="m67.119 217.24c4.1584-9.701 6.3741-18.234 11.679-26.864 5.2472-8.573 3.4221-12.292-0.461-7.966-4.0043 4.483-8.6932 14.503-8.9596 15.085 0 0-5.0531 8.317-6.1263 17.338-0.1848 1.683 3.2195 3.835 3.8681 2.407z"/>
+<path fill="#0c0c0c" d="m67.304 216.62c4.1181-9.768 6.2937-17.897 11.377-26.218 5.029-8.268 3.3596-11.962-0.3603-7.797-3.8713 4.361-8.4904 14.259-8.8234 14.985 0 0-4.8585 8.093-5.8759 16.706-0.1771 1.653 3.0523 3.731 3.683 2.324z"/>
+<path fill="#0f0f0f" d="m67.489 216.01c4.0776-9.836 6.2131-17.56 11.074-25.573 4.8108-7.963 3.297-11.633-0.2596-7.629-3.7384 4.241-8.2877 14.015-8.6873 14.887 0 0-4.6638 7.868-5.6255 16.072-0.1693 1.624 2.8852 3.628 3.4981 2.243z"/>
+<path fill="#111" d="m67.674 215.4c4.0372-9.903 6.1326-17.223 10.772-24.927 4.5926-7.658 3.2345-11.304-0.1589-7.46-3.6054 4.119-8.085 13.771-8.5512 14.788 0 0-4.469 7.644-5.375 15.439-0.1616 1.594 2.718 3.524 3.3131 2.16z"/>
+<path fill="#141414" d="m67.859 214.79c3.9969-9.97 6.0522-16.885 10.47-24.281 4.3744-7.353 3.1721-10.975-0.0581-7.291-3.4725 3.998-7.8823 13.526-8.4151 14.689 0 0-4.2743 7.419-5.1246 14.805-0.1537 1.565 2.5509 3.421 3.1281 2.078z"/>
+<path fill="#161616" d="m68.045 214.18c3.9564-10.037 5.9717-16.548 10.167-23.635 4.1562-7.048 3.1096-10.645 0.0426-7.123-3.3395 3.877-7.6795 13.283-8.2789 14.591 0 0-4.0797 7.194-4.8742 14.172-0.146 1.535 2.3837 3.317 2.9431 1.995z"/>
+<path fill="#191919" d="m68.23 213.57c3.9161-10.105 5.8913-16.21 9.8652-22.989 3.938-6.743 3.0471-10.316 0.1433-6.954-3.2066 3.755-7.4768 13.038-8.1428 14.491 0 0-3.8849 6.97-4.6238 13.539-0.1382 1.506 2.2166 3.214 2.7581 1.913z"/>
+<path fill="#1c1c1c" d="m68.415 212.96c3.8757-10.173 5.8108-15.873 9.5629-22.344 3.7198-6.438 2.9846-9.987 0.244-6.785-3.0736 3.634-7.2741 12.793-8.0067 14.392 0 0-3.6902 6.745-4.3733 12.906-0.1304 1.476 2.0494 3.111 2.5731 1.831z"/>
+<path fill="#1e1e1e" d="m68.6 212.35c3.8352-10.24 5.7303-15.536 9.2605-21.698 3.5016-6.133 2.9222-9.658 0.3448-6.617-2.9407 3.513-7.0714 12.55-7.8706 14.294 0 0-3.4954 6.52-4.1229 12.272-0.1226 1.447 1.8823 3.008 2.3882 1.749z"/>
+<path fill="#212121" d="m68.785 211.74c3.7949-10.307 5.6498-15.198 8.9583-21.052 3.2834-5.828 2.8596-9.328 0.4455-6.448-2.8077 3.392-6.8686 12.305-7.7344 14.195 0 0-3.3008 6.295-3.8725 11.639-0.1149 1.417 1.7151 2.904 2.2031 1.666z"/>
+<path fill="#232323" d="m68.97 211.13c3.7544-10.374 5.5693-14.861 8.656-20.406 3.0652-5.523 2.7971-8.999 0.5462-6.279-2.6748 3.27-6.6659 12.061-7.5983 14.096 0 0-3.1061 6.071-3.6221 11.005-0.107 1.388 1.548 2.801 2.0182 1.584z"/>
+<path fill="#262626" d="m69.156 210.52c3.7141-10.441 5.4889-14.523 8.3538-19.76 2.847-5.218 2.7346-8.67 0.6469-6.111-2.5418 3.149-6.4632 11.817-7.4622 13.997 0 0-2.9113 5.847-3.3716 10.373-0.0993 1.358 1.3808 2.697 1.8331 1.501z"/>
+<path fill="#282828" d="m69.341 209.91c3.6737-10.509 5.4084-14.187 8.0514-19.115 2.6288-4.913 2.6722-8.341 0.7477-5.942-2.4089 3.028-6.2605 11.573-7.3261 13.898 0 0-2.7166 5.622-3.1212 9.739-0.0915 1.329 1.2137 2.594 1.6482 1.42z"/>
+<path fill="#2b2b2b" d="m69.526 209.3c3.6332-10.576 5.3279-13.849 7.7491-18.469 2.4106-4.608 2.6097-8.011 0.8484-5.773-2.2759 2.906-6.0577 11.328-7.1899 13.799 0 0-2.522 5.397-2.8708 9.106-0.0838 1.299 1.0465 2.49 1.4632 1.337z"/>
+<path fill="#2d2d2d" d="m69.711 208.68c3.5929-10.643 5.2475-13.512 7.4469-17.823 2.1924-4.303 2.5472-7.682 0.9491-5.605-2.143 2.786-5.855 11.085-7.0538 13.701 0 0-2.3272 5.172-2.6204 8.472-0.0759 1.27 0.8794 2.387 1.2782 1.255z"/>
+<path fill="#303030" d="m69.896 208.07c3.5525-10.71 5.1669-13.174 7.1446-17.177 1.9742-3.998 2.4846-7.353 1.0498-5.436-2.01 2.664-5.6523 10.84-6.9177 13.602 0 0-2.1325 4.947-2.3699 7.839-0.0682 1.24 0.7122 2.283 1.0932 1.172z"/>
+</g>
+<path fill="#333" d="m446.93 335.31c0.30645-0.94043 0.44382-1.1201 0.59702-1.4424 0.15322-0.32232 0.21135-0.61288 0.1004-0.45966-0.16379 0.22189-0.4755 0.92455-0.59173 1.1782 0 0-0.16908 0.41211-0.18493 0.62876-0.005 0.10566 0.0476 0.19021 0.0792 0.0951z"/>
+<path d="m462.68 336.98c0.18219-0.51515 0.16334-1.8282-0.30155-2.6763-0.16334-0.30783-0.3204-0.66592-0.41463-0.68477-0.10052-0.0188-0.28271 0.18219-0.26386 0.2136 0.0251 0.0503 0.87324 1.2439 0.69734 2.8647-0.0126 0.13193 0.23872 0.40207 0.2827 0.28271z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#030303" d="m250.53 225.83c2.026-5.719 1.753-20.38-3.343-29.663-1.816-3.407-3.536-7.374-4.595-7.59-1.122-0.214-3.125 2.022-2.925 2.367 0.258 0.562 9.605 13.778 7.729 31.752-0.13 1.488 2.646 4.457 3.134 3.134z"/>
+<path fill="#070707" d="m250.44 225.06c1.966-5.533 1.636-19.808-3.228-28.654-1.761-3.286-3.401-7.115-4.44-7.332-1.091-0.211-3.009 1.956-2.825 2.287 0.228 0.548 9.202 13.299 7.466 30.672-0.117 1.464 2.556 4.305 3.027 3.027z"/>
+<path fill="#0b0b0b" d="m250.34 224.3c1.904-5.347 1.517-19.235-3.115-27.645-1.706-3.165-3.265-6.856-4.283-7.073-1.061-0.21-2.895 1.889-2.726 2.206 0.197 0.534 8.799 12.82 7.204 29.592-0.104 1.44 2.465 4.153 2.92 2.92z"/>
+<path fill="#0f0f0f" d="m250.25 223.54c1.843-5.162 1.399-18.663-3.001-26.636-1.65-3.044-3.13-6.598-4.127-6.815-1.03-0.207-2.779 1.823-2.626 2.126 0.167 0.52 8.396 12.341 6.941 28.511-0.091 1.417 2.375 4.002 2.813 2.814z"/>
+<path fill="#131313" d="m250.15 222.78c1.781-4.976 1.28-18.09-2.888-25.626-1.595-2.923-2.994-6.34-3.97-6.557-1-0.205-2.664 1.756-2.527 2.045 0.136 0.506 7.993 11.862 6.678 27.431-0.078 1.393 2.285 3.85 2.707 2.707z"/>
+<path fill="#161616" d="m250.06 222.01c1.72-4.79 1.163-17.518-2.774-24.617-1.539-2.802-2.858-6.081-3.813-6.299-0.969-0.203-2.549 1.691-2.427 1.965 0.105 0.492 7.589 11.383 6.414 26.351-0.064 1.369 2.196 3.698 2.6 2.6z"/>
+<path fill="#1a1a1a" d="m249.96 221.25c1.659-4.605 1.044-16.946-2.66-23.609-1.484-2.681-2.723-5.822-3.658-6.04-0.938-0.201-2.434 1.624-2.327 1.884 0.075 0.478 7.186 10.904 6.151 25.271-0.051 1.344 2.106 3.546 2.494 2.494z"/>
+<path fill="#1e1e1e" d="m249.87 220.49c1.598-4.42 0.926-16.374-2.546-22.6-1.429-2.56-2.587-5.564-3.501-5.782-0.908-0.198-2.319 1.558-2.228 1.804 0.044 0.464 6.782 10.425 5.888 24.19-0.037 1.321 2.016 3.395 2.387 2.388z"/>
+<path fill="#222" d="m249.78 219.72c1.536-4.234 0.807-15.801-2.433-21.59-1.373-2.439-2.452-5.306-3.345-5.524-0.877-0.197-2.203 1.491-2.128 1.723 0.014 0.45 6.379 9.946 5.625 23.11-0.024 1.297 1.926 3.243 2.281 2.281z"/>
+<path fill="#262626" d="m249.68 218.96c1.475-4.048 0.69-15.229-2.319-20.581-1.317-2.318-2.316-5.047-3.188-5.266-0.847-0.194-2.088 1.425-2.029 1.642-0.016 0.436 5.976 9.468 5.362 22.031-0.01 1.273 1.836 3.091 2.174 2.174z"/>
+<path fill="#2a2a2a" d="m249.59 218.2c1.413-3.862 0.571-14.656-2.206-19.572-1.262-2.197-2.18-4.788-3.032-5.008-0.816-0.191-1.973 1.36-1.929 1.562-0.047 0.422 5.573 8.989 5.099 20.951 0.003 1.249 1.746 2.94 2.068 2.067z"/>
+<path fill="#2d2d2d" d="m249.49 217.44c1.353-3.677 0.453-14.084-2.091-18.563-1.207-2.076-2.045-4.53-2.876-4.749-0.786-0.19-1.858 1.293-1.83 1.481-0.077 0.408 5.17 8.51 4.836 19.87 0.017 1.226 1.656 2.789 1.961 1.961z"/>
+<path fill="#313131" d="m249.4 216.67c1.291-3.491 0.334-13.511-1.978-17.553-1.151-1.955-1.909-4.272-2.72-4.492-0.755-0.187-1.742 1.227-1.73 1.401-0.107 0.394 4.767 8.031 4.574 18.79 0.029 1.201 1.565 2.637 1.854 1.854z"/>
+<path fill="#353535" d="m249.3 215.91c1.23-3.306 0.217-12.94-1.864-16.545-1.096-1.834-1.774-4.013-2.563-4.233-0.725-0.185-1.627 1.16-1.631 1.32-0.138 0.38 4.364 7.552 4.311 17.71 0.043 1.177 1.475 2.485 1.747 1.748z"/>
+<path fill="#393939" d="m249.21 215.15c1.168-3.12 0.098-12.367-1.751-15.536-1.04-1.713-1.638-3.754-2.407-3.975-0.694-0.183-1.512 1.094-1.531 1.24-0.168 0.366 3.961 7.073 4.048 16.63 0.056 1.153 1.385 2.333 1.641 1.641z"/>
+<path fill="#3d3d3d" d="m249.11 214.38c1.107-2.935-0.02-11.795-1.637-14.527-0.984-1.592-1.502-3.496-2.25-3.716-0.664-0.181-1.397 1.028-1.432 1.159-0.198 0.352 3.558 6.594 3.785 15.549 0.069 1.13 1.295 2.182 1.534 1.535z"/>
+<path fill="#414141" d="m249.02 213.62c1.046-2.749-0.139-11.222-1.523-13.517-0.93-1.471-1.367-3.238-2.094-3.459-0.634-0.179-1.282 0.962-1.333 1.079-0.229 0.338 3.155 6.115 3.522 14.469 0.083 1.106 1.205 2.03 1.428 1.428z"/>
+<path fill="#444" d="m248.92 212.86c0.985-2.563-0.256-10.65-1.409-12.508-0.874-1.35-1.231-2.979-1.938-3.2-0.603-0.177-1.166 0.895-1.233 0.998-0.259 0.324 2.751 5.636 3.259 13.389 0.096 1.082 1.115 1.878 1.321 1.321z"/>
+<path fill="#484848" d="m248.83 212.1c0.923-2.377-0.375-10.077-1.296-11.499-0.818-1.229-1.096-2.72-1.781-2.942-0.573-0.174-1.052 0.829-1.134 0.918-0.289 0.31 2.348 5.157 2.996 12.309 0.11 1.058 1.025 1.726 1.215 1.214z"/>
+</g>
+<path fill="#4c4c4c" d="m462.51 335.65c0.0752-0.19126-0.043-0.82935-0.10314-0.9153-0.0666-0.0967-0.0838-0.21482-0.14178-0.23419-0.0473-0.015-0.0817 0.0666-0.0902 0.073-0.0279 0.0258 0.16971 0.40826 0.23847 0.97978 0.0107 0.0902 0.0816 0.13742 0.0967 0.0967z"/>
+<path d="m461.96 333.62c-0.89209-1.2188-2.048-1.6146-1.9287-1.2313 0 0 0.8858 0.50258 1.6648 1.4449 0.15077 0.18219 0.40207-0.0251 0.26386-0.2136z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#030303" d="m241.97 187.68c-9.924-13.495-22.894-17.912-21.539-13.7 0.017 0.011 9.902 5.614 18.609 16.071 1.678 2.016 4.467-0.285 2.93-2.371z"/>
+<path fill="#070707" d="m241.52 187.3c-9.624-13.022-22.317-17.319-20.975-13.287 0.036 0.023 9.652 5.467 18.139 15.582 1.628 1.943 4.325-0.283 2.836-2.295z"/>
+<path fill="#0b0b0b" d="m241.07 186.91c-9.324-12.549-21.739-16.726-20.41-12.874 0.053 0.034 9.401 5.32 17.668 15.093 1.578 1.87 4.183-0.28 2.742-2.219z"/>
+<path fill="#0f0f0f" d="m240.62 186.52c-9.024-12.077-21.162-16.134-19.846-12.462 0.071 0.045 9.151 5.174 17.198 14.604 1.528 1.798 4.042-0.278 2.648-2.142z"/>
+<path fill="#131313" d="m240.17 186.14c-8.723-11.603-20.583-15.541-19.28-12.049 0.088 0.056 8.901 5.027 16.727 14.114 1.478 1.726 3.9-0.275 2.553-2.065z"/>
+<path fill="#161616" d="m239.72 185.75c-8.423-11.13-20.005-14.948-18.716-11.636 0.106 0.067 8.651 4.88 16.257 13.625 1.428 1.654 3.759-0.272 2.459-1.989z"/>
+<path fill="#1a1a1a" d="m239.27 185.36c-8.123-10.658-19.428-14.356-18.151-11.224 0.124 0.078 8.4 4.734 15.786 13.136 1.378 1.581 3.617-0.27 2.365-1.912z"/>
+<path fill="#1e1e1e" d="m238.82 184.98c-7.824-10.185-18.85-13.763-17.587-10.811 0.142 0.089 8.151 4.587 15.315 12.647 1.329 1.508 3.476-0.267 2.272-1.836z"/>
+<path fill="#222" d="m238.37 184.59c-7.524-9.711-18.273-13.17-17.022-10.398 0.159 0.1 7.9 4.44 14.844 12.158 1.279 1.436 3.335-0.265 2.178-1.76z"/>
+<path fill="#262626" d="m237.92 184.2c-7.224-9.238-17.695-12.578-16.458-9.985 0.177 0.111 7.65 4.293 14.374 11.668 1.229 1.364 3.193-0.262 2.084-1.683z"/>
+<path fill="#2a2a2a" d="m237.47 183.82c-6.924-8.766-17.118-11.986-15.893-9.573 0.194 0.122 7.4 4.147 13.903 11.179 1.179 1.291 3.052-0.259 1.99-1.606z"/>
+<path fill="#2d2d2d" d="m237.02 183.43c-6.623-8.293-16.539-11.393-15.328-9.16 0.213 0.133 7.15 4 13.433 10.69 1.129 1.219 2.91-0.257 1.895-1.53z"/>
+<path fill="#313131" d="m236.57 183.04c-6.323-7.819-15.962-10.8-14.763-8.747 0.23 0.144 6.899 3.853 12.962 10.201 1.079 1.146 2.768-0.254 1.801-1.454z"/>
+<path fill="#353535" d="m236.12 182.66c-6.023-7.347-15.384-10.208-14.199-8.335 0.248 0.155 6.649 3.707 12.492 9.712 1.029 1.073 2.627-0.252 1.707-1.377z"/>
+<path fill="#393939" d="m235.67 182.27c-5.723-6.874-14.807-9.615-13.634-7.922 0.265 0.166 6.399 3.56 12.021 9.222 0.978 1.002 2.485-0.249 1.613-1.3z"/>
+<path fill="#3d3d3d" d="m235.22 181.88c-5.423-6.401-14.229-9.022-13.07-7.509 0.283 0.177 6.149 3.413 11.551 8.733 0.928 0.929 2.344-0.246 1.519-1.224z"/>
+<path fill="#414141" d="m234.77 181.5c-5.123-5.928-13.651-8.43-12.505-7.097 0.301 0.188 5.898 3.267 11.08 8.244 0.878 0.856 2.202-0.244 1.425-1.147z"/>
+<path fill="#444" d="m234.32 181.11c-4.824-5.455-13.074-7.837-11.941-6.684 0.319 0.199 5.649 3.12 10.609 7.755 0.829 0.784 2.061-0.241 1.332-1.071z"/>
+<path fill="#484848" d="m233.86 180.72c-4.523-4.982-12.495-7.244-11.375-6.272 0.336 0.211 5.398 2.974 10.138 7.267 0.779 0.711 1.92-0.239 1.237-0.995z"/>
+</g>
+<path fill="#4c4c4c" d="m461.18 332.94c-0.36848-0.39343-1.0399-0.58042-0.94331-0.51123 0.0309 0.0194 0.44918 0.24667 0.84357 0.59133 0.0636 0.0557 0.15514-0.0206 0.0997-0.0801z"/>
+<path d="m462.68 336.98c0.0126 0.54656-0.50259 1.9412-0.69734 1.891-0.21988-0.0503 0.044-0.45861 0.24501-1.1497 0.0817-0.28899 0.1445-0.99889 0.16963-1.024 0.0817-0.0817 0.2827 0.15078 0.2827 0.28271z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#050505" d="m250.44 227.11c0.103 6.083-5.637 21.594-7.796 21.018-2.422-0.567 0.547-5.146 2.814-12.928 0.899-3.177 1.595-10.947 1.887-11.249 0.913-0.927 3.146 1.527 3.095 3.159z"/>
+<path fill="#0a0a0a" d="m250.26 227.63c0.062 5.902-5.514 20.939-7.601 20.364-2.322-0.558 0.592-5.036 2.821-12.681 0.861-3.041 1.534-10.446 1.831-10.761 0.888-0.918 3.052 1.326 2.949 3.078z"/>
+<path fill="#0f0f0f" d="m250.07 228.16c0.021 5.722-5.391 20.285-7.405 19.711-2.224-0.549 0.635-4.926 2.828-12.433 0.823-2.907 1.473-9.946 1.773-10.274 0.865-0.91 2.958 1.125 2.804 2.996z"/>
+<path fill="#141414" d="m249.89 228.68c-0.02 5.54-5.268 19.63-7.21 19.057-2.125-0.541 0.679-4.816 2.835-12.186 0.786-2.771 1.412-9.445 1.716-9.786 0.841-0.901 2.864 0.924 2.659 2.915z"/>
+<path fill="#191919" d="m249.71 229.2c-0.062 5.36-5.145 18.977-7.014 18.404-2.027-0.532 0.722-4.706 2.841-11.938 0.748-2.637 1.351-8.945 1.659-9.299 0.818-0.893 2.77 0.723 2.514 2.833z"/>
+<path fill="#1e1e1e" d="m249.52 229.72c-0.103 5.179-5.022 18.322-6.818 17.75-1.929-0.523 0.765-4.596 2.847-11.691 0.711-2.501 1.29-8.444 1.602-8.811 0.795-0.884 2.676 0.522 2.369 2.752z"/>
+<path fill="#232323" d="m249.34 230.24c-0.144 4.998-4.899 17.667-6.623 17.096-1.83-0.515 0.81-4.486 2.854-11.443 0.673-2.367 1.229-7.944 1.545-8.325 0.771-0.875 2.583 0.321 2.224 2.672z"/>
+<path fill="#282828" d="m249.15 230.76c-0.185 4.817-4.777 17.013-6.427 16.443-1.732-0.506 0.853-4.376 2.86-11.196 0.636-2.231 1.168-7.443 1.488-7.837 0.748-0.866 2.489 0.12 2.079 2.59z"/>
+<path fill="#2d2d2d" d="m248.97 231.28c-0.226 4.636-4.654 16.359-6.232 15.789-1.632-0.497 0.897-4.266 2.867-10.948 0.599-2.097 1.107-6.943 1.432-7.35 0.723-0.858 2.394-0.081 1.933 2.509z"/>
+<path fill="#333" d="m248.79 231.81c-0.267 4.456-4.531 15.705-6.036 15.136-1.534-0.489 0.94-4.156 2.873-10.701 0.561-1.961 1.046-6.442 1.375-6.862 0.7-0.849 2.3-0.282 1.788 2.427z"/>
+<path fill="#383838" d="m248.6 232.33c-0.308 4.275-4.408 15.05-5.841 14.482-1.435-0.48 0.984-4.046 2.88-10.453 0.524-1.826 0.985-5.942 1.318-6.375 0.676-0.841 2.206-0.483 1.643 2.346z"/>
+<path fill="#3d3d3d" d="m248.42 232.85c-0.35 4.093-4.285 14.395-5.645 13.828-1.337-0.471 1.028-3.936 2.886-10.206 0.486-1.691 0.924-5.441 1.261-5.887 0.653-0.832 2.113-0.684 1.498 2.265z"/>
+<path fill="#424242" d="m248.23 233.37c-0.391 3.913-4.162 13.742-5.45 13.175-1.238-0.462 1.072-3.826 2.894-9.958 0.448-1.556 0.863-4.941 1.203-5.4 0.629-0.823 2.019-0.886 1.353 2.183z"/>
+<path fill="#474747" d="m248.05 233.89c-0.432 3.732-4.039 13.087-5.254 12.521-1.14-0.454 1.115-3.716 2.9-9.711 0.411-1.421 0.802-4.44 1.146-4.913 0.606-0.814 1.925-1.086 1.208 2.103z"/>
+<path fill="#4c4c4c" d="m247.87 234.41c-0.473 3.552-3.916 12.433-5.059 11.868-1.041-0.445 1.159-3.606 2.907-9.463 0.373-1.286 0.741-3.94 1.089-4.426 0.582-0.805 1.831-1.287 1.063 2.021z"/>
+<path fill="#515151" d="m247.68 234.94c-0.514 3.37-3.793 11.778-4.863 11.214-0.942-0.436 1.202-3.496 2.913-9.216 0.336-1.151 0.68-3.439 1.033-3.938 0.558-0.797 1.736-1.488 0.917 1.94z"/>
+<path fill="#565656" d="m247.5 235.46c-0.555 3.189-3.67 11.124-4.667 10.56-0.844-0.428 1.246-3.386 2.919-8.968 0.298-1.016 0.619-2.939 0.976-3.451 0.535-0.788 1.643-1.689 0.772 1.859z"/>
+<path fill="#5b5b5b" d="m247.31 235.98c-0.596 3.009-3.548 10.47-4.472 9.907-0.745-0.419 1.29-3.276 2.926-8.721 0.261-0.881 0.558-2.438 0.919-2.963 0.511-0.78 1.549-1.89 0.627 1.777z"/>
+<path fill="#606060" d="m247.13 236.5c-0.638 2.828-3.425 9.815-4.276 9.253-0.647-0.41 1.333-3.167 2.932-8.473 0.224-0.746 0.497-1.938 0.862-2.476 0.488-0.771 1.455-2.091 0.482 1.696z"/>
+</g>
+<path fill="#666" d="m462.36 337.89c-0.0592 0.23096-0.28811 0.79934-0.35608 0.7503-0.0478-0.035 0.12015-0.26665 0.25644-0.71767 0.0162-0.0533 0.038-0.12538 0.0702-0.17354 0.0405-0.0665 0.11875-0.19999 0.0294 0.14091z"/>
+<path d="m460.76 333.69c-0.13411 0.14152-0.2533 0.87175 0.0819 1.125 0.33532 0.24589 0.92393-0.20862 0.92393-0.46943-0.007-0.58861-0.87176-0.80465-1.0059-0.65562z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#010101" d="m228.8 189c-1.559 1.611-2.876 9.822 0.857 12.666 3.732 2.764 10.349-2.273 10.384-5.279-0.047-6.575-9.681-9.082-11.241-7.387z"/>
+<path fill="#030303" d="m228.94 189.14c-1.582 1.601-2.849 9.654 0.775 12.439 3.62 2.709 10.109-2.155 10.178-5.178-0.007-6.404-9.371-8.943-10.953-7.261z"/>
+<path fill="#050505" d="m229.08 189.28c-1.604 1.589-2.823 9.484 0.692 12.211 3.51 2.654 9.869-2.037 9.974-5.077 0.031-6.233-9.061-8.803-10.666-7.134z"/>
+<path fill="#070707" d="m229.21 189.42c-1.626 1.579-2.795 9.316 0.611 11.984 3.398 2.599 9.629-1.919 9.768-4.976 0.071-6.062-8.751-8.664-10.379-7.008z"/>
+<path fill="#090909" d="m229.35 189.56c-1.649 1.568-2.768 9.147 0.529 11.757 3.287 2.544 9.389-1.801 9.563-4.875 0.109-5.891-8.441-8.524-10.092-6.882z"/>
+<path fill="#0b0b0b" d="m229.49 189.7c-1.671 1.557-2.741 8.978 0.446 11.529 3.176 2.489 9.15-1.683 9.359-4.774 0.148-5.72-8.132-8.385-9.805-6.755z"/>
+<path fill="#0d0d0d" d="m229.62 189.84c-1.694 1.546-2.715 8.809 0.364 11.302 3.065 2.434 8.909-1.566 9.153-4.673 0.188-5.549-7.821-8.245-9.517-6.629z"/>
+<path fill="#0f0f0f" d="m229.76 189.99c-1.716 1.535-2.688 8.64 0.282 11.074 2.953 2.38 8.669-1.448 8.948-4.572 0.226-5.378-7.512-8.106-9.23-6.502z"/>
+<path fill="#111" d="m229.9 190.13c-1.738 1.524-2.66 8.471 0.201 10.847 2.842 2.325 8.429-1.33 8.742-4.471 0.266-5.207-7.201-7.966-8.943-6.376z"/>
+<path fill="#131313" d="m230.03 190.27c-1.76 1.514-2.633 8.303 0.118 10.619 2.731 2.271 8.19-1.211 8.538-4.369 0.305-5.036-6.892-7.827-8.656-6.25z"/>
+<path fill="#151515" d="m230.17 190.41c-1.783 1.503-2.607 8.133 0.036 10.391 2.62 2.216 7.949-1.093 8.332-4.268 0.344-4.865-6.581-7.687-8.368-6.123z"/>
+<path fill="#161616" d="m230.31 190.55c-1.805 1.492-2.58 7.965-0.046 10.164 2.508 2.161 7.709-0.975 8.127-4.167 0.383-4.694-6.272-7.548-8.081-5.997z"/>
+<path fill="#181818" d="m230.44 190.69c-1.828 1.481-2.553 7.796-0.129 9.936 2.398 2.106 7.47-0.858 7.922-4.066 0.423-4.523-5.961-7.408-7.793-5.87z"/>
+<path fill="#1a1a1a" d="m230.58 190.83c-1.849 1.47-2.525 7.627-0.21 9.709 2.286 2.052 7.23-0.74 7.717-3.965 0.461-4.352-5.652-7.269-7.507-5.744z"/>
+<path fill="#1c1c1c" d="m230.72 190.97c-1.872 1.46-2.499 7.459-0.292 9.482 2.175 1.997 6.989-0.622 7.511-3.864 0.501-4.181-5.341-7.129-7.219-5.618z"/>
+<path fill="#1e1e1e" d="m230.86 191.11c-1.895 1.448-2.472 7.289-0.375 9.254 2.064 1.942 6.75-0.504 7.307-3.763 0.54-4.01-5.032-6.99-6.932-5.491z"/>
+<path fill="#202020" d="m230.99 191.25c-1.917 1.438-2.445 7.121-0.457 9.027 1.953 1.887 6.51-0.386 7.102-3.662 0.578-3.839-4.722-6.85-6.645-5.365z"/>
+<path fill="#222" d="m231.13 191.39c-1.94 1.426-2.418 6.951-0.539 8.799 1.841 1.832 6.27-0.268 6.896-3.561 0.618-3.668-4.412-6.711-6.357-5.238z"/>
+<path fill="#242424" d="m231.26 191.53c-1.961 1.416-2.391 6.783-0.62 8.572 1.73 1.777 6.029-0.15 6.691-3.46 0.657-3.497-4.102-6.571-6.071-5.112z"/>
+</g>
+<path fill="#262626" d="m461 333.93c-0.17311 0.12259-0.20627 0.5771-0.0613 0.72805 0.14127 0.15033 0.50521-0.003 0.56593-0.293 0.0607-0.29021-0.33086-0.56122-0.50459-0.43505z"/>
+<path d="m460.73 339.69c0.13193 0.13193 0.24501-0.19475 0.37694-0.30155s0.34553-0.33924 0.77273-0.33924c0.42719 0 0.39578-0.0126 0.37693-0.17591-0.0126-0.15706-0.13821-0.14449-0.51514-0.0879-0.37694 0.0503-0.62824 0.24501-0.77901 0.42091-0.14449 0.16963-0.30783 0.40835-0.23245 0.48374z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#050505" d="m228.64 257.33c1.459 1.45 2.703-2.12 4.205-3.307 1.501-1.186 3.93-3.732 8.639-3.732 4.71-0.001 4.415-0.128 4.209-1.94-0.138-1.743-1.543-1.593-5.749-0.979-4.206 0.543-7.029 2.702-8.712 4.648-1.615 1.878-3.437 4.475-2.592 5.31z"/>
+<path fill="#0a0a0a" d="m228.97 256.96c1.407 1.388 2.599-2.008 4.089-3.157 1.491-1.149 3.901-3.576 8.424-3.577 4.522-0.001 4.293-0.111 4.096-1.863-0.131-1.687-1.501-1.53-5.594-0.951-4.092 0.51-6.857 2.596-8.495 4.472-1.574 1.812-3.347 4.271-2.52 5.076z"/>
+<path fill="#0f0f0f" d="m229.3 256.59c1.354 1.327 2.494-1.895 3.974-3.007s3.871-3.421 8.207-3.422c4.336-0.002 4.171-0.094 3.985-1.786-0.126-1.631-1.46-1.467-5.439-0.923-3.979 0.478-6.686 2.491-8.28 4.297-1.531 1.745-3.256 4.065-2.447 4.841z"/>
+<path fill="#141414" d="m229.64 256.22c1.301 1.265 2.389-1.783 3.858-2.857 1.47-1.075 3.842-3.265 7.991-3.267 4.15-0.002 4.05-0.077 3.873-1.709-0.119-1.575-1.419-1.404-5.284-0.895-3.865 0.445-6.514 2.385-8.063 4.121-1.49 1.679-3.165 3.861-2.375 4.607z"/>
+<path fill="#191919" d="m229.97 255.86c1.249 1.202 2.285-1.671 3.744-2.708 1.458-1.037 3.812-3.109 7.774-3.112 3.963-0.003 3.929-0.06 3.761-1.632-0.113-1.519-1.377-1.341-5.128-0.867-3.751 0.413-6.344 2.279-7.847 3.945-1.449 1.613-3.075 3.656-2.304 4.374z"/>
+<path fill="#1e1e1e" d="m230.3 255.49c1.196 1.141 2.181-1.559 3.629-2.558 1.447-1 3.782-2.954 7.558-2.957s3.806-0.043 3.649-1.555c-0.107-1.462-1.336-1.278-4.974-0.839-3.637 0.38-6.172 2.174-7.63 3.77-1.408 1.546-2.984 3.451-2.232 4.139z"/>
+<path fill="#232323" d="m230.64 255.12c1.143 1.079 2.076-1.446 3.513-2.409 1.437-0.962 3.753-2.797 7.342-2.801 3.589-0.003 3.685-0.026 3.537-1.479-0.1-1.405-1.294-1.214-4.818-0.81-3.524 0.348-6.001 2.068-7.415 3.594-1.366 1.48-2.893 3.246-2.159 3.905z"/>
+<path fill="#282828" d="m230.97 254.75c1.09 1.017 1.971-1.334 3.398-2.259 1.426-0.925 3.723-2.641 7.125-2.645 3.403-0.005 3.564-0.01 3.426-1.403-0.095-1.349-1.253-1.151-4.664-0.782-3.409 0.315-5.829 1.962-7.198 3.419-1.325 1.413-2.803 3.041-2.087 3.67z"/>
+<path fill="#2d2d2d" d="m231.3 254.38c1.038 0.955 1.866-1.222 3.282-2.11 1.416-0.887 3.694-2.486 6.909-2.49 3.217-0.005 3.443 0.007 3.314-1.326-0.088-1.293-1.212-1.088-4.508-0.754-3.296 0.283-5.658 1.857-6.982 3.243-1.284 1.347-2.712 2.836-2.015 3.437z"/>
+<path fill="#333" d="m231.64 254.02c0.985 0.893 1.762-1.11 3.167-1.96s3.664-2.33 6.693-2.335c3.029-0.006 3.32 0.023 3.202-1.249-0.082-1.237-1.171-1.025-4.354-0.726-3.182 0.25-5.486 1.751-6.765 3.067-1.243 1.281-2.622 2.632-1.943 3.203z"/>
+<path fill="#383838" d="m231.97 253.65c0.932 0.831 1.657-0.998 3.051-1.81 1.395-0.813 3.635-2.174 6.477-2.18 2.843-0.006 3.199 0.04 3.09-1.172-0.076-1.18-1.129-0.962-4.198-0.697-3.068 0.217-5.315 1.644-6.55 2.891-1.201 1.214-2.53 2.427-1.87 2.968z"/>
+<path fill="#3d3d3d" d="m232.3 253.28c0.88 0.77 1.553-0.885 2.937-1.66 1.383-0.776 3.605-2.019 6.26-2.025 2.656-0.006 3.078 0.057 2.979-1.095-0.07-1.124-1.088-0.899-4.044-0.669-2.954 0.184-5.144 1.539-6.333 2.715-1.16 1.148-2.44 2.222-1.799 2.734z"/>
+<path fill="#424242" d="m232.63 252.91c0.827 0.707 1.448-0.774 2.821-1.512 1.373-0.737 3.576-1.862 6.044-1.869 2.47-0.007 2.956 0.074 2.867-1.019-0.063-1.067-1.046-0.835-3.888-0.64-2.841 0.152-4.973 1.433-6.117 2.54-1.118 1.081-2.35 2.017-1.727 2.5z"/>
+<path fill="#474747" d="m232.97 252.55c0.774 0.645 1.344-0.661 2.706-1.362 1.362-0.7 3.546-1.706 5.828-1.713 2.283-0.008 2.834 0.09 2.755-0.943-0.058-1.011-1.006-0.772-3.734-0.612-2.727 0.119-4.801 1.327-5.9 2.364-1.077 1.015-2.259 1.812-1.655 2.266z"/>
+<path fill="#4c4c4c" d="m233.3 252.18c0.721 0.584 1.239-0.549 2.59-1.212 1.352-0.663 3.516-1.551 5.612-1.558 2.096-0.009 2.713 0.107 2.643-0.866-0.051-0.955-0.964-0.709-3.578-0.584-2.613 0.087-4.63 1.222-5.685 2.188-1.035 0.949-2.168 1.608-1.582 2.032z"/>
+<path fill="#515151" d="m233.63 251.81c0.669 0.522 1.134-0.436 2.475-1.062s3.486-1.395 5.395-1.403c1.91-0.009 2.591 0.124 2.531-0.789-0.044-0.898-0.922-0.646-3.423-0.556-2.499 0.054-4.458 1.116-5.468 2.013-0.994 0.882-2.077 1.402-1.51 1.797z"/>
+<path fill="#565656" d="m233.96 251.44c0.616 0.459 1.029-0.325 2.36-0.913 1.33-0.588 3.456-1.24 5.178-1.248 1.723-0.009 2.47 0.141 2.42-0.712-0.039-0.842-0.881-0.583-3.268-0.528-2.386 0.022-4.287 1.01-5.252 1.837-0.953 0.816-1.987 1.198-1.438 1.564z"/>
+<path fill="#5b5b5b" d="m234.3 251.08c0.563 0.398 0.925-0.212 2.244-0.763 1.32-0.551 3.427-1.084 4.963-1.093 1.536-0.01 2.348 0.158 2.307-0.635-0.032-0.786-0.839-0.52-3.113-0.5-2.271-0.011-4.115 0.905-5.035 1.662-0.912 0.749-1.897 0.992-1.366 1.329z"/>
+<path fill="#606060" d="m234.63 250.71c0.511 0.336 0.821-0.1 2.13-0.613 1.308-0.514 3.397-0.928 4.746-0.938 1.35-0.01 2.227 0.175 2.196-0.558-0.026-0.73-0.799-0.457-2.958-0.472-2.158-0.043-3.945 0.799-4.82 1.486-0.87 0.683-1.805 0.788-1.294 1.095z"/>
+</g>
+<path fill="#666" d="m461.31 339.05c0.04 0.0239 0.0625 0.001 0.17573-0.0405 0.11325-0.0415 0.29387-0.0674 0.39526-0.0682 0.10147-0.00096 0.18367 0.0167 0.18184-0.0421-0.002-0.0587-0.0661-0.0343-0.24458-0.0387-0.17835-0.007-0.32921 0.0605-0.40163 0.1143-0.0723 0.0538-0.14964 0.0509-0.10662 0.0751z"/>
+<path d="m462.43 338.87c0 0.20103 0.40835 0.27014 0.79785 0.32668 0.38322 0.0565 0.69106 0.13193 0.7099 0.534 0.0188 0.39578-0.0817 0.67849 0.0942 0.64707 0.37694-0.0691 0.51515-0.47745 0.50886-0.66592 0-0.18847-0.27642-0.52771-0.77272-0.71618-0.36437-0.13821-0.62823-0.20104-0.94863-0.2136-0.42719-0.0189-0.3895 0.0879-0.3895 0.0879z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#030303" d="m247.94 248.3c0.012 2.239 4.643 2.97 9.049 3.639 4.352 0.674 7.75 1.51 8.111 6.002 0.344 4.415-0.854 7.514 1.135 7.189 4.145-0.74 5.688-5.201 5.608-7.332-0.015-2.152-3.118-5.911-8.734-8.039-4.129-1.564-7.11-2.298-10.74-2.452-4.754-0.217-4.438 0.952-4.429 0.993z"/>
+<path fill="#070707" d="m248.07 248.34c0.024 2.174 4.606 2.845 8.953 3.534 4.312 0.701 7.581 1.508 8.087 5.885 0.471 4.294-0.771 7.251 1.19 6.962 3.97-0.689 5.473-4.93 5.384-7.033-0.029-2.144-3.069-5.773-8.611-7.87-4.082-1.543-7.022-2.291-10.609-2.456-4.612-0.218-4.411 0.896-4.394 0.978z"/>
+<path fill="#0b0b0b" d="m248.2 248.38c0.035 2.109 4.569 2.72 8.858 3.43 4.271 0.727 7.411 1.505 8.063 5.766 0.598 4.174-0.69 6.989 1.244 6.736 3.796-0.637 5.257-4.66 5.16-6.734-0.044-2.136-3.019-5.635-8.489-7.7-4.035-1.523-6.932-2.285-10.477-2.46-4.47-0.219-4.385 0.839-4.359 0.962z"/>
+<path fill="#0f0f0f" d="m248.32 248.42c0.047 2.043 4.532 2.594 8.762 3.324 4.232 0.754 7.242 1.504 8.039 5.649 0.725 4.052-0.608 6.727 1.299 6.509 3.621-0.586 5.041-4.389 4.936-6.435-0.059-2.128-2.97-5.497-8.367-7.531-3.988-1.502-6.842-2.278-10.345-2.464-4.328-0.22-4.359 0.783-4.324 0.948z"/>
+<path fill="#131313" d="m248.45 248.45c0.059 1.978 4.495 2.469 8.667 3.219 4.191 0.781 7.073 1.502 8.014 5.532 0.853 3.931-0.526 6.464 1.354 6.282 3.446-0.535 4.825-4.118 4.712-6.136-0.074-2.119-2.92-5.359-8.245-7.361-3.941-1.482-6.753-2.272-10.213-2.469-4.186-0.221-4.333 0.727-4.289 0.933z"/>
+<path fill="#161616" d="m248.57 248.49c0.071 1.913 4.459 2.344 8.572 3.115 4.15 0.807 6.903 1.5 7.989 5.413 0.981 3.811-0.444 6.202 1.409 6.056 3.271-0.483 4.609-3.848 4.488-5.836-0.088-2.112-2.87-5.222-8.123-7.193-3.893-1.461-6.663-2.265-10.08-2.472-4.045-0.222-4.308 0.67-4.255 0.917z"/>
+<path fill="#1a1a1a" d="m248.7 248.53c0.082 1.847 4.422 2.218 8.476 3.009 4.111 0.833 6.734 1.498 7.965 5.296 1.108 3.69-0.361 5.94 1.464 5.829 3.096-0.432 4.393-3.577 4.264-5.537-0.103-2.104-2.821-5.084-8-7.023-3.847-1.442-6.575-2.26-9.949-2.477-3.903-0.223-4.282 0.614-4.22 0.903z"/>
+<path fill="#1e1e1e" d="m248.83 248.57c0.094 1.782 4.385 2.093 8.381 2.905 4.07 0.859 6.564 1.495 7.94 5.178 1.236 3.568-0.279 5.677 1.519 5.602 2.921-0.381 4.177-3.306 4.04-5.238-0.118-2.096-2.771-4.946-7.878-6.854-3.8-1.421-6.485-2.253-9.817-2.48-3.762-0.224-4.256 0.557-4.185 0.887z"/>
+<path fill="#222" d="m248.95 248.61c0.106 1.717 4.348 1.968 8.285 2.8 4.03 0.886 6.395 1.494 7.916 5.06 1.363 3.448-0.197 5.415 1.574 5.376 2.746-0.329 3.962-3.036 3.816-4.939-0.133-2.087-2.722-4.808-7.756-6.684-3.753-1.401-6.395-2.247-9.685-2.485-3.62-0.225-4.229 0.501-4.15 0.872z"/>
+<path fill="#262626" d="m249.08 248.64c0.118 1.652 4.311 1.842 8.19 2.695 3.99 0.913 6.225 1.492 7.891 4.943 1.491 3.327-0.115 5.152 1.629 5.149 2.571-0.278 3.746-2.765 3.592-4.64-0.147-2.079-2.672-4.671-7.634-6.515-3.705-1.38-6.306-2.24-9.553-2.489-3.478-0.226-4.203 0.445-4.115 0.857z"/>
+<path fill="#2a2a2a" d="m249.2 248.68c0.129 1.587 4.274 1.716 8.094 2.59 3.95 0.939 6.056 1.489 7.867 4.825 1.618 3.206-0.033 4.89 1.684 4.922 2.396-0.227 3.53-2.494 3.368-4.34-0.162-2.072-2.623-4.534-7.512-6.347-3.658-1.359-6.216-2.233-9.421-2.492-3.336-0.227-4.177 0.389-4.08 0.842z"/>
+<path fill="#2d2d2d" d="m249.33 248.72c0.141 1.522 4.237 1.591 7.999 2.485 3.909 0.966 5.886 1.488 7.842 4.707 1.746 3.085 0.05 4.628 1.739 4.696 2.221-0.175 3.314-2.224 3.144-4.041-0.177-2.064-2.573-4.396-7.389-6.177-3.612-1.339-6.128-2.227-9.29-2.497-3.194-0.228-4.151 0.333-4.045 0.827z"/>
+<path fill="#313131" d="m249.46 248.76c0.153 1.457 4.2 1.466 7.903 2.381 3.87 0.992 5.717 1.485 7.819 4.589 1.872 2.964 0.131 4.365 1.793 4.469 2.047-0.124 3.098-1.953 2.92-3.742-0.192-2.055-2.524-4.258-7.267-6.008-3.565-1.319-6.038-2.22-9.158-2.5-3.052-0.229-4.125 0.276-4.01 0.811z"/>
+<path fill="#353535" d="m249.58 248.8c0.165 1.391 4.163 1.34 7.808 2.275 3.829 1.018 5.547 1.483 7.794 4.472 2 2.843 0.213 4.103 1.848 4.242 1.872-0.073 2.882-1.682 2.696-3.443-0.206-2.047-2.474-4.12-7.145-5.838-3.517-1.299-5.948-2.215-9.026-2.505-2.91-0.23-4.099 0.22-3.975 0.797z"/>
+<path fill="#393939" d="m249.71 248.84c0.176 1.326 4.126 1.215 7.713 2.17 3.788 1.045 5.377 1.482 7.769 4.354 2.127 2.723 0.295 3.841 1.902 4.016 1.698-0.021 2.667-1.412 2.473-3.144-0.221-2.039-2.424-3.982-7.023-5.669-3.47-1.278-5.859-2.208-8.894-2.509-2.768-0.231-4.073 0.164-3.94 0.782z"/>
+<path fill="#3d3d3d" d="m249.83 248.88c0.188 1.261 4.089 1.09 7.617 2.066 3.749 1.071 5.208 1.479 7.745 4.236 2.255 2.601 0.377 3.578 1.957 3.789 1.523 0.03 2.452-1.141 2.249-2.844-0.236-2.032-2.375-3.845-6.901-5.5-3.423-1.258-5.769-2.202-8.762-2.513-2.626-0.232-4.046 0.107-3.905 0.766z"/>
+<path fill="#414141" d="m249.96 248.91c0.2 1.195 4.052 0.964 7.522 1.96 3.708 1.098 5.038 1.477 7.72 4.118 2.383 2.481 0.46 3.317 2.012 3.563 1.348 0.081 2.236-0.87 2.025-2.545-0.251-2.023-2.325-3.707-6.778-5.331-3.376-1.237-5.681-2.195-8.631-2.517-2.484-0.233-4.02 0.051-3.87 0.752z"/>
+<path fill="#444" d="m250.09 248.95c0.212 1.13 4.015 0.839 7.426 1.856 3.669 1.124 4.869 1.475 7.696 4 2.51 2.36 0.542 3.054 2.067 3.336 1.173 0.133 2.02-0.6 1.801-2.246-0.265-2.015-2.276-3.569-6.656-5.161-3.329-1.217-5.591-2.189-8.499-2.521-2.343-0.234-3.994-0.006-3.835 0.736z"/>
+<path fill="#484848" d="m250.21 248.99c0.223 1.065 3.978 0.714 7.331 1.751 3.628 1.151 4.699 1.473 7.671 3.883 2.638 2.239 0.624 2.791 2.122 3.109 0.998 0.184 1.804-0.329 1.577-1.947-0.28-2.007-2.226-3.431-6.534-4.992-3.282-1.196-5.501-2.182-8.367-2.525-2.201-0.235-3.968-0.062-3.8 0.721z"/>
+</g>
+<path fill="#4c4c4c" d="m462.65 338.94c0.0205 0.0872 0.34387 0.0513 0.63128 0.14362 0.31307 0.1027 0.39527 0.12835 0.66724 0.32851 0.24126 0.1848 0.0616 0.22067 0.18995 0.25155 0.0718 0.0205 0.13856-0.005 0.11806-0.14379-0.0257-0.17442-0.18996-0.28742-0.55948-0.42083-0.28227-0.10261-0.47222-0.18986-0.71854-0.22066-0.17965-0.0206-0.34395-0.0103-0.32851 0.0616z"/>
+<path fill="#4c4c4c" d="m463.95 339.36c0.14371 0.0873 0.11805 0.17966 0.21046 0.24126 0.0461 0.0307 0.1232 0.0307 0.077-0.0873-0.0616-0.13856-0.11291-0.21561-0.43113-0.34396-0.20531-0.0821-0.16421 0.005 0.14371 0.18995z"/>
+<g transform="matrix(.087254 0 0 .087254 440.81 317.21)">
+<path fill="#505050" d="m265.2 253.86c1.607 0.975 1.32 2.008 2.353 2.697 0.516 0.343 1.377 0.343 0.86-0.976-0.689-1.549-1.262-2.41-4.82-3.845-2.295-0.918-1.836 0.058 1.607 2.124z"/>
+<path fill="#545454" d="m265.25 253.88c1.566 0.951 1.286 1.958 2.293 2.629 0.503 0.335 1.343 0.335 0.839-0.951-0.671-1.51-1.23-2.35-4.699-3.749-2.237-0.894-1.79 0.057 1.567 2.071z"/>
+<path fill="#575757" d="m265.29 253.89c1.526 0.926 1.254 1.908 2.235 2.562 0.49 0.326 1.308 0.326 0.817-0.927-0.654-1.471-1.199-2.289-4.578-3.652-2.18-0.872-1.743 0.055 1.526 2.017z"/>
+<path fill="#5b5b5b" d="m265.34 253.9c1.485 0.902 1.22 1.857 2.175 2.494 0.478 0.318 1.274 0.318 0.796-0.902-0.637-1.432-1.167-2.229-4.457-3.556-2.122-0.848-1.697 0.054 1.486 1.964z"/>
+<path fill="#5f5f5f" d="m265.38 253.91c1.446 0.878 1.188 1.807 2.117 2.426 0.464 0.309 1.239 0.309 0.774-0.877-0.62-1.394-1.136-2.168-4.336-3.459-2.065-0.826-1.651 0.052 1.445 1.91z"/>
+<path fill="#636363" d="m265.42 253.92c1.405 0.853 1.154 1.757 2.058 2.359 0.451 0.3 1.204 0.3 0.752-0.853-0.602-1.355-1.104-2.108-4.215-3.363-2.007-0.802-1.605 0.051 1.405 1.857z"/>
+<path fill="#676767" d="m265.47 253.94c1.364 0.828 1.121 1.705 1.998 2.29 0.438 0.292 1.17 0.292 0.731-0.828-0.585-1.316-1.072-2.047-4.094-3.266-1.949-0.78-1.559 0.049 1.365 1.804z"/>
+<path fill="#6b6b6b" d="m265.51 253.95c1.325 0.804 1.088 1.655 1.94 2.223 0.425 0.283 1.135 0.283 0.709-0.804-0.568-1.277-1.041-1.987-3.973-3.17-1.892-0.756-1.513 0.048 1.324 1.751z"/>
+<path fill="#6e6e6e" d="m265.55 253.96c1.284 0.779 1.055 1.605 1.88 2.155 0.413 0.275 1.101 0.275 0.688-0.779-0.55-1.238-1.009-1.927-3.852-3.073-1.834-0.734-1.467 0.046 1.284 1.697z"/>
+<path fill="#727272" d="m265.6 253.97c1.243 0.755 1.021 1.554 1.821 2.087 0.399 0.266 1.066 0.266 0.666-0.755-0.533-1.199-0.977-1.865-3.731-2.976-1.776-0.71-1.421 0.045 1.244 1.644z"/>
+<path fill="#767676" d="m265.64 253.98c1.204 0.731 0.989 1.504 1.762 2.02 0.387 0.257 1.032 0.257 0.645-0.731-0.516-1.16-0.946-1.805-3.61-2.879-1.719-0.687-1.375 0.043 1.203 1.59z"/>
+<path fill="#7a7a7a" d="m265.68 254c1.163 0.706 0.955 1.454 1.703 1.952 0.373 0.249 0.997 0.249 0.623-0.706-0.499-1.121-0.914-1.744-3.489-2.783-1.661-0.664-1.329 0.042 1.163 1.537z"/>
+<path fill="#7e7e7e" d="m265.73 254.01c1.122 0.682 0.922 1.404 1.643 1.885 0.361 0.24 0.963 0.24 0.602-0.682-0.482-1.082-0.882-1.684-3.368-2.686-1.603-0.641-1.282 0.04 1.123 1.483z"/>
+<path fill="#828282" d="m265.77 254.02c1.082 0.657 0.889 1.352 1.585 1.816 0.348 0.232 0.928 0.232 0.58-0.657-0.464-1.043-0.851-1.623-3.247-2.59-1.546-0.618-1.236 0.039 1.082 1.431z"/>
+<path fill="#858585" d="m265.82 254.03c1.042 0.632 0.856 1.302 1.525 1.748 0.335 0.223 0.893 0.223 0.558-0.632-0.446-1.005-0.818-1.563-3.125-2.493-1.488-0.595-1.19 0.037 1.042 1.377z"/>
+<path fill="#898989" d="m265.86 254.05c1.001 0.608 0.822 1.252 1.466 1.681 0.322 0.214 0.858 0.214 0.536-0.608-0.429-0.966-0.786-1.502-3.004-2.397-1.43-0.572-1.144 0.036 1.002 1.324z"/>
+<path fill="#8d8d8d" d="m265.9 254.06c0.961 0.584 0.79 1.201 1.408 1.613 0.308 0.206 0.823 0.206 0.514-0.583-0.412-0.927-0.755-1.442-2.883-2.3-1.373-0.549-1.098 0.034 0.961 1.27z"/>
+<path fill="#919191" d="m265.95 254.07c0.921 0.559 0.756 1.151 1.348 1.546 0.296 0.197 0.789 0.197 0.493-0.559-0.394-0.888-0.723-1.381-2.762-2.204-1.315-0.526-1.052 0.033 0.921 1.217z"/>
+<path fill="#959595" d="m265.99 254.08c0.88 0.535 0.723 1.101 1.289 1.478 0.283 0.189 0.754 0.189 0.471-0.534-0.377-0.849-0.691-1.321-2.641-2.107-1.257-0.503-1.006 0.031 0.881 1.163z"/>
+</g>
+<path fill="#999" d="m464.02 339.38c0.0733 0.0445 0.0602 0.0916 0.10733 0.12303 0.0236 0.0157 0.0628 0.0157 0.0393-0.0445-0.0314-0.0707-0.0576-0.10994-0.21988-0.17539-0.10471-0.0419-0.0838 0.003 0.0733 0.0969z"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/positive.svg b/freeplane/viewer-resources/images/icons/positive.svg
new file mode 100644
index 0000000..c383f14
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/positive.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.5" width="32.5" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.499888 32.499889" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="209.68" cx="231.3" gradientTransform="matrix(1.1422 .98944 -.52685 .60822 79.582 -147.53)" r="54.625">
+<stop stop-color="#f7f7f7" offset="0"/>
+<stop stop-color="#7d7373" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-165.27 -205.77)">
+<g transform="translate(-436.83,-84.222)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29291 0 0 .29291 542.94 241.83)" stroke="#038103" stroke-width="8.5352" fill="url(#a)"/>
+<g font-size="57.759px" transform="matrix(1.0002,0,0,1.0002,172.74,-203.13)" font-family="Arial" fill="#008000">
+<text y="586.23639" x="387.50137" transform="scale(1.1218 .89142)" space="preserve">
+<tspan font-size="57.759px" y="586.23639" x="387.50137" font-family="Arial" fill="#008000">-</tspan>
+</text>
+<text y="514.73151" x="-463.58392" transform="matrix(0 -1.1218 .89142 0 0 0)" space="preserve">
+<tspan font-size="57.759px" y="514.73151" x="-463.58392" font-family="Arial" fill="#008000">-</tspan>
+</text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/prepare.svg b/freeplane/viewer-resources/images/icons/prepare.svg
new file mode 100644
index 0000000..78efd5f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/prepare.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.005" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 32.005061" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<filter id="c" style="color-interpolation-filters:sRGB" height="1.1931" width="1.2009" y="-.096529" x="-.10044">
+<feGaussianBlur stdDeviation="0.33615137"/>
+</filter>
+<linearGradient id="a" y2="619.85" gradientUnits="userSpaceOnUse" y1="586.56" gradientTransform="matrix(1.1454,0,0,1.0743,-285.58,-167.7)" x2="424.05" x1="424.05">
+<stop stop-color="#161627" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="623.78" cx="423.23" gradientTransform="matrix(.6578 .0069657 -.006742 .63667 149.04 223.68)" r="2.9041">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#ffff38" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-100.14 -165.09)">
+<g transform="translate(-23.705,-426.87)">
+<g stroke-linecap="round" transform="translate(-60.313,128.24)">
+<rect stroke-linejoin="round" height="28.912" width="15.756" stroke="#000" y="464.26" x="192.27" stroke-width="1.0702" fill="#e6e6e6"/>
+<rect stroke-opacity=".80814" height="1.7332" width="3.5007" stroke="#000" y="493.68" x="198.4" stroke-width="0.633"/>
+<rect stroke-linejoin="round" stroke-opacity=".87097" height="25.895" width="12.251" stroke="#000" y="465.71" x="194.02" stroke-width=".55465" fill="url(#a)"/>
+<path d="m426.21 624.16a2.5541 2.6339 0 0 1 -2.5535 2.6339 2.5541 2.6339 0 0 1 -2.5547 -2.6326 2.5541 2.6339 0 0 1 2.5522 -2.6351 2.5541 2.6339 0 0 1 2.5559 2.6314" stroke-opacity=".87097" transform="matrix(1.1454,0,0,1.0743,-285.13,-183.86)" stroke="#000" stroke-width="0.7" fill="#999"/>
+<path d="m426.21 624.16a2.5541 2.6339 0 0 1 -2.5535 2.6339 2.5541 2.6339 0 0 1 -2.5547 -2.6326 2.5541 2.6339 0 0 1 2.5522 -2.6351 2.5541 2.6339 0 0 1 2.5559 2.6314" stroke-opacity=".87097" transform="matrix(1.1454,0,0,1.0743,-285.13,-200.17)" stroke="#000" stroke-width="0.7" fill="#999"/>
+<path d="m426.21 624.16a2.5541 2.6339 0 0 1 -2.5535 2.6339 2.5541 2.6339 0 0 1 -2.5547 -2.6326 2.5541 2.6339 0 0 1 2.5522 -2.6351 2.5541 2.6339 0 0 1 2.5559 2.6314" stroke-opacity=".53488" transform="matrix(1.5398,0,0,1.4442,-452.13,-422.89)" filter="url(#c)" stroke="#fff541" stroke-width="3.006" fill="url(#b)"/>
+</g>
+<rect rx=".16552" ry=".18513" height="32" width="32" y="591.97" x="123.84" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/redo.png b/freeplane/viewer-resources/images/icons/redo.png
deleted file mode 100644
index 69cff22..0000000
Binary files a/freeplane/viewer-resources/images/icons/redo.png and /dev/null differ
diff --git a/freeplane/viewer-resources/images/icons/revision-green.png b/freeplane/viewer-resources/images/icons/revision-green.png
new file mode 100644
index 0000000..261928c
Binary files /dev/null and b/freeplane/viewer-resources/images/icons/revision-green.png differ
diff --git a/freeplane/viewer-resources/images/icons/revision-green.svg b/freeplane/viewer-resources/images/icons/revision-green.svg
new file mode 100644
index 0000000..fbace50
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/revision-green.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="40"
+   version="1.1"
+   viewBox="0 0 39.999499 32.000053"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="revision-green.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1310"
+     inkscape:window-height="833"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="9.3166478"
+     inkscape:cx="1.0273031"
+     inkscape:cy="12.6655"
+     inkscape:window-x="192"
+     inkscape:window-y="90"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b">
+      <stop
+         stop-color="#36d200"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="377.60001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       y1="388.92001"
+       gradientTransform="matrix(-9.8272e-4,-1.1301,0.86375,-0.0011671,-329.75,812.82)"
+       x2="142.38"
+       x1="160.7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b"
+       id="linearGradient4372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-9.8272e-4,-1.1301,0.86375,-0.0011671,-329.75,812.82)"
+       x1="160.7"
+       y1="388.92001"
+       x2="142.38"
+       y2="377.60001" />
+  </defs>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.2497585,0,0,1.2632236,-624.03719,-430.36271)"
+     id="g14"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <g
+       transform="matrix(1.5832,0,0,1.5832,1445.4,-598.85)"
+       id="g16">
+      <g
+         transform="matrix(0.22857,0,0,0.22857,-446.94,470.16)"
+         id="g18"
+         style="stroke:#008000">
+        <rect
+           style="color:#000000;fill:none;stroke-width:8"
+           rx="14"
+           ry="14"
+           height="62"
+           width="62"
+           y="543.35999"
+           x="-646"
+           id="rect20" />
+        <path
+           d="m -583.97,584.27 -12.356,-15.996 24.301,0 -11.944,15.996 z"
+           id="path22"
+           style="fill:url(#linearGradient4372);fill-rule:evenodd;stroke-width:2.9000001;stroke-linejoin:round"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -645.2,567.18 -12.356,15.996 24.301,0 -11.944,-15.996 z"
+           id="path24"
+           style="fill:url(#a);fill-rule:evenodd;stroke-width:2.9000001;stroke-linejoin:round"
+           inkscape:connector-curvature="0" />
+      </g>
+      <text
+         style="font-weight:bold;font-size:11px;line-height:125%;font-family:Arial;letter-spacing:1px;word-spacing:0px;fill:#008000"
+         space="preserve"
+         font-size="11px"
+         y="605.37836"
+         x="-591.42194"
+         font-weight="bold"
+         line-height="125%"
+         id="text26"
+         sodipodi:linespacing="125%">
+        <tspan
+           y="605.37836"
+           x="-591.42194"
+           id="tspan28">R</tspan>
+      </text>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/revision-pink.png b/freeplane/viewer-resources/images/icons/revision-pink.png
new file mode 100644
index 0000000..62c24be
Binary files /dev/null and b/freeplane/viewer-resources/images/icons/revision-pink.png differ
diff --git a/freeplane/viewer-resources/images/icons/revision-pink.svg b/freeplane/viewer-resources/images/icons/revision-pink.svg
new file mode 100644
index 0000000..ddf9f35
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/revision-pink.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="40"
+   version="1.1"
+   viewBox="0 0 39.999498 32.000053"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="revision-pink.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1151"
+     inkscape:window-height="695"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="9.3166478"
+     inkscape:cx="1.0273031"
+     inkscape:cy="12.6655"
+     inkscape:window-x="542"
+     inkscape:window-y="132"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b">
+      <stop
+         stop-color="#36d200"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="377.60001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       y1="388.92001"
+       gradientTransform="matrix(-9.8272e-4,-1.1301,0.86375,-0.0011671,-76.811,812.82)"
+       x2="142.38"
+       x1="160.7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b"
+       id="linearGradient4372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-9.8272e-4,-1.1301,0.86375,-0.0011671,-76.811,812.82)"
+       x1="160.7"
+       y1="388.92001"
+       x2="142.38"
+       y2="377.60001" />
+  </defs>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.2497441,0,0,1.2640968,-541.15064,-430.67342)"
+     id="g14">
+    <g
+       transform="matrix(1.5832,0,0,1.5832,1475.5,-598.31)"
+       id="g16">
+      <g
+         transform="matrix(0.22857,0,0,0.22857,-507.84,469.82)"
+         id="g18"
+         style="stroke:#8800aa">
+        <rect
+           style="color:#000000;fill:none;stroke-width:8"
+           rx="14"
+           ry="14"
+           height="62"
+           width="62"
+           y="543.35999"
+           x="-646"
+           id="rect20" />
+        <path
+           d="m -583.97,584.27 -12.356,-15.996 24.301,0 -11.944,15.996 z"
+           id="path22"
+           style="fill:url(#linearGradient4372);fill-rule:evenodd;stroke-width:2.9000001;stroke-linejoin:round"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -645.2,567.18 -12.356,15.996 24.301,0 -11.944,-15.996 z"
+           id="path24"
+           style="fill:url(#a);fill-rule:evenodd;stroke-width:2.9000001;stroke-linejoin:round"
+           inkscape:connector-curvature="0" />
+      </g>
+      <text
+         style="font-weight:bold;font-size:11px;line-height:125%;font-family:Arial;letter-spacing:1px;word-spacing:0px;fill:#8800aa"
+         space="preserve"
+         font-size="11px"
+         y="605.04181"
+         x="-652.3277"
+         font-weight="bold"
+         line-height="125%"
+         id="text26"
+         sodipodi:linespacing="125%">
+        <tspan
+           y="605.04181"
+           x="-652.3277"
+           id="tspan28">R</tspan>
+      </text>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/revision-red.png b/freeplane/viewer-resources/images/icons/revision-red.png
new file mode 100644
index 0000000..337ca8f
Binary files /dev/null and b/freeplane/viewer-resources/images/icons/revision-red.png differ
diff --git a/freeplane/viewer-resources/images/icons/revision-red.svg b/freeplane/viewer-resources/images/icons/revision-red.svg
new file mode 100644
index 0000000..227d195
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/revision-red.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="40"
+   version="1.1"
+   viewBox="0 0 39.999498 32.000053"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="revision-red.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="9.3166478"
+     inkscape:cx="1.0273031"
+     inkscape:cy="12.6655"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="b">
+      <stop
+         stop-color="#36d200"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       y2="377.60001"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       y1="388.92001"
+       gradientTransform="matrix(-9.8272e-4,-1.1301,0.86375,-0.0011671,-203.28,812.82)"
+       x2="142.38"
+       x1="160.7" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b"
+       id="linearGradient4372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-9.8272e-4,-1.1301,0.86375,-0.0011671,-203.28,812.82)"
+       x1="160.7"
+       y1="388.92001"
+       x2="142.38"
+       y2="377.60001" />
+  </defs>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.249997,0,0,1.2632245,-585.43236,-430.35448)"
+     id="g14">
+    <g
+       transform="matrix(1.5832,0,0,1.5832,1456.8,-600.06)"
+       id="g16">
+      <g
+         transform="matrix(0.22857,0,0,0.22857,-473.71,470.92)"
+         id="g18"
+         style="stroke:#d40000">
+        <rect
+           style="color:#000000;fill:none;stroke-width:8"
+           rx="14"
+           ry="14"
+           height="62"
+           width="62"
+           y="543.35999"
+           x="-646"
+           id="rect20" />
+        <path
+           d="m -583.97,584.27 -12.356,-15.996 24.301,0 -11.944,15.996 z"
+           id="path22"
+           style="fill:url(#linearGradient4372);fill-rule:evenodd;stroke-width:2.9000001;stroke-linejoin:round"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -645.2,567.18 -12.356,15.996 24.301,0 -11.944,-15.996 z"
+           id="path24"
+           style="fill:url(#a);fill-rule:evenodd;stroke-width:2.9000001;stroke-linejoin:round"
+           inkscape:connector-curvature="0" />
+      </g>
+      <text
+         style="font-weight:bold;font-size:11px;line-height:125%;font-family:Arial;letter-spacing:1px;word-spacing:0px;fill:#d40000"
+         space="preserve"
+         font-size="11px"
+         y="606.14331"
+         x="-618.19421"
+         font-weight="bold"
+         line-height="125%"
+         id="text26"
+         sodipodi:linespacing="125%">
+        <tspan
+           y="606.14331"
+           x="-618.19421"
+           id="tspan28">R</tspan>
+      </text>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/revision.svg b/freeplane/viewer-resources/images/icons/revision.svg
new file mode 100644
index 0000000..a83eb99
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/revision.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="25.331" width="32.001" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000598 25.331041" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="377.6" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="388.92" gradientTransform="matrix(-.00098272 -1.1301 .86375 -.0011671 -456.22 812.82)" x2="142.38" x1="160.7"/>
+<linearGradient id="b">
+<stop stop-color="#36d200" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-539.01 -340.69)">
+<g transform="matrix(1.5832,0,0,1.5832,1444.2,-598.85)">
+<g transform="matrix(.22857 0 0 .22857 -421.12 470.16)" stroke="#0000d4">
+<rect style="color:#000000" rx="14" ry="14" height="62" width="62" y="543.36" x="-646" stroke-width="8" fill="none"/>
+<path stroke-linejoin="round" d="m-583.97 584.27-12.356-15.996h24.301l-11.944 15.996z" fill-rule="evenodd" stroke-width="2.9" fill="url(#a)"/>
+<path stroke-linejoin="round" d="m-645.2 567.18-12.356 15.996h24.301l-11.944-15.996z" fill-rule="evenodd" stroke-width="2.9" fill="url(#a)"/>
+</g>
+<text style="word-spacing:0px;letter-spacing:1px" font-family="Arial" space="preserve" font-size="11px" y="605.37836" x="-565.6059" font-weight="bold" line-height="125%" fill="#0000d4">
+<tspan y="605.37836" x="-565.6059">R</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/smiley-angry.svg b/freeplane/viewer-resources/images/icons/smiley-angry.svg
new file mode 100644
index 0000000..165d8cf
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/smiley-angry.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#ff0" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#fdff00" offset="0"/>
+<stop stop-color="#ffd000" offset="1"/>
+</radialGradient>
+<radialGradient id="a" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="419.45" cx="127.13" gradientTransform="matrix(1,0,0,1.7307,0,-306.48)" r="2.2463"/>
+<linearGradient id="b" y2="214.96" gradientUnits="userSpaceOnUse" y1="271.12" x2="246.2" x1="315.83">
+<stop stop-color="#540" offset="0"/>
+<stop stop-color="#d4aa00" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-157.63 -724.72)">
+<g transform="translate(-163.38,305.52)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".79651" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 261.69 370.86)" stroke="#000" stroke-width="6.8381" fill="url(#c)"/>
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 261.65 370.83)" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.3985 0 0 .94735 155.22 37.117)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path d="m331.35 442.91c0.0587-0.94077-0.0442-0.96971 0.0239-1.639 0.97754 0.0128 10.284-0.0228 11.174-0.0199 0.0777 0.64499-0.10545 0.6359-0.0285 1.5804" stroke="#000" stroke-linecap="square" stroke-width="1.344" fill="none"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.3985 0 0 .94735 163.29 37.117)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path d="m338.04 431.92c1.0614-2.387 2.7157-3.8222 5.2806-4.4347m-12.673-0.0375c2.4314 0.6195 4.6497 2.6276 5.4437 4.5444" stroke="#000" stroke-width="1.5" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/smiley-neutral.svg b/freeplane/viewer-resources/images/icons/smiley-neutral.svg
new file mode 100644
index 0000000..ac91861
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/smiley-neutral.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#ff0" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#fdff00" offset="0"/>
+<stop stop-color="#ffd000" offset="1"/>
+</radialGradient>
+<radialGradient id="a" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="419.45" cx="127.13" gradientTransform="matrix(1,0,0,1.7307,0,-306.48)" r="2.2463"/>
+<linearGradient id="b" y2="214.96" gradientUnits="userSpaceOnUse" y1="271.12" x2="246.2" x1="315.83">
+<stop stop-color="#540" offset="0"/>
+<stop stop-color="#d4aa00" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-71.638 -724.72)">
+<g transform="translate(-212.71,257.99)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".79651" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 225.03 418.39)" stroke="#000" stroke-width="6.8381" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,89.881,20.567)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path stroke-linejoin="round" d="m293.48 488.9c5.6914 0.0566 6.3879 0.13606 13.549-0.0331" stroke="#000" stroke-linecap="round" stroke-width="1.3444" fill="none"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,99.394,20.624)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 225.17 418.28)" fill="url(#b)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/smiley-oh.svg b/freeplane/viewer-resources/images/icons/smiley-oh.svg
new file mode 100644
index 0000000..8fb330f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/smiley-oh.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#ff0" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#fdff00" offset="0"/>
+<stop stop-color="#ffd000" offset="1"/>
+</radialGradient>
+<radialGradient id="a" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="419.45" cx="127.13" gradientTransform="matrix(1,0,0,1.7307,0,-306.48)" r="2.2463"/>
+<linearGradient id="b" y2="214.96" gradientUnits="userSpaceOnUse" y1="271.12" x2="246.2" x1="315.83">
+<stop stop-color="#540" offset="0"/>
+<stop stop-color="#d4aa00" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-114.63 -724.72)">
+<g transform="translate(-132.57,261.81)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".79651" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 187.88 414.57)" stroke="#000" stroke-width="6.8381" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,52.73,16.744)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,62.244,16.801)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 187.88 414.57)" fill="url(#b)"/>
+<path stroke-linejoin="round" d="m243.35 500.84a3.8551 3.8551 0 0 1 -3.8551 3.8551 3.8551 3.8551 0 0 1 -3.8551 -3.8551 3.8551 3.8551 0 0 1 3.8551 -3.8551 3.8551 3.8551 0 0 1 3.8551 3.8551z" stroke-opacity=".83871" transform="matrix(1.0443,0,0,1.2229,13.198,-127.41)" stroke="#1a1a1a" stroke-linecap="round" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/smily_bad.svg b/freeplane/viewer-resources/images/icons/smily_bad.svg
new file mode 100644
index 0000000..090b024
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/smily_bad.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.956" width="31.956" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.955807 31.955808" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="d">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#ff0" stop-opacity="0" offset="1"/>
+</linearGradient>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="230.15" cx="267.6" gradientTransform="matrix(-1.2041 -.8086 .97364 -1.4498 368.7 779.61)" r="54.705">
+<stop stop-color="#fdff00" offset="0"/>
+<stop stop-color="#ffd000" offset="1"/>
+</radialGradient>
+<radialGradient id="a" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="419.45" cx="127.13" gradientTransform="matrix(1,0,0,1.7307,0,-306.48)" r="2.2463"/>
+<linearGradient id="b" y2="214.96" gradientUnits="userSpaceOnUse" y1="271.12" x2="246.2" x1="315.83">
+<stop stop-color="#540" offset="0"/>
+<stop stop-color="#d4aa00" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-200.61 -724.72)">
+<g transform="translate(138.85,397.61)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" stroke-opacity=".79651" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 2.4462 278.77)" stroke="#000" stroke-width="6.8381" fill="url(#c)"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,-132.71,-119.05)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path stroke-linejoin="round" d="m69.862 351.57c4.7441-9.6763 13.523-5.7568 15.52-0.19094" stroke="#000" stroke-linecap="round" stroke-width="1.3444" fill="none"/>
+<path stroke-linejoin="round" d="m128.77 419.45a1.6413 3.2825 0 0 1 -1.6413 3.2825 1.6413 3.2825 0 0 1 -1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 -3.2825 1.6413 3.2825 0 0 1 1.6413 3.2825z" stroke-opacity=".84884" transform="matrix(1.6157,0,0,1.0945,-123.19,-118.99)" stroke="url(#a)" stroke-linecap="round" stroke-width="1.21"/>
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 2.4068 278.74)" fill="url(#b)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/stop-sign.svg b/freeplane/viewer-resources/images/icons/stop-sign.svg
new file mode 100644
index 0000000..f9d7707
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/stop-sign.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.388" width="32.38" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.380297 32.388404" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="407.43" gradientUnits="userSpaceOnUse" y1="384.69" x2="407.99" x1="391.99">
+<stop stop-color="#fff" stop-opacity=".75893" offset="0"/>
+<stop stop-color="#feffff" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-310.49 -33.936)">
+<g transform="translate(-81.302,-350.56)">
+<path d="m413.97 415.9-12.519-0.10826-8.6755-8.8768v-12.233l8.6756-9.0933 12.629-0.10826 9.1148 9.2016v12.016l-9.2246 9.2016z" fill-rule="evenodd" stroke="#fff" stroke-width="1.9609" fill="#f00"/>
+<path d="m414.11 416.26-12.819-0.11085-8.883-9.0891v-12.525l8.883-9.3108 12.931-0.11086 9.3328 9.4216v12.303l-9.4452 9.4216z" fill-rule="evenodd" stroke="#1a1a1a" stroke-width=".85330" fill="url(#a)"/>
+<text font-size="10px" font-family="Arial" space="preserve" y="404.26379" x="394.41705" font-weight="bold" line-height="125%" fill="#ffffff">
+<tspan y="404.26379" x="394.41705">STOP</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/stop.svg b/freeplane/viewer-resources/images/icons/stop.svg
new file mode 100644
index 0000000..9f0242f
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/stop.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 32.000376 31.999812"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="stop.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     id="namedview37"
+     showgrid="false"
+     inkscape:zoom="18.651497"
+     inkscape:cx="8.5437079"
+     inkscape:cy="17.155223"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <filter
+       id="c"
+       style="color-interpolation-filters:sRGB"
+       height="1.1931"
+       width="1.2009"
+       y="-0.096529"
+       x="-0.10044">
+      <feGaussianBlur
+         stdDeviation="0.33615137"
+         id="feGaussianBlur7" />
+    </filter>
+    <linearGradient
+       id="a"
+       y2="578.17999"
+       gradientUnits="userSpaceOnUse"
+       y1="609.46997"
+       gradientTransform="matrix(1.1454,0,0,1.0743,-67.105,-384.12)"
+       x2="424.04999"
+       x1="424.04999">
+      <stop
+         stop-color="#161627"
+         offset="0"
+         id="stop10" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop12" />
+    </linearGradient>
+    <radialGradient
+       id="b"
+       gradientUnits="userSpaceOnUse"
+       cy="623.78003"
+       cx="423.23001"
+       gradientTransform="matrix(0.6578,0.0069657,-0.006742,0.63667,149.04,223.68)"
+       r="2.9040999">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop15" />
+      <stop
+         stop-color="#f00"
+         offset="1"
+         id="stop17" />
+    </radialGradient>
+  </defs>
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.0000046,0,0,0.99985947,-70.888211,-165.07895)"
+     id="g21">
+    <g
+       transform="translate(-331.74,-82.203)"
+       id="g23"
+       style="stroke-linecap:round">
+      <rect
+         height="28.912001"
+         width="15.756"
+         y="247.84"
+         x="410.75"
+         id="rect25"
+         style="fill:#e6e6e6;stroke:#000000;stroke-width:1.07019997;stroke-linejoin:round" />
+      <rect
+         height="1.7332"
+         width="3.5007"
+         y="277.26001"
+         x="416.88"
+         id="rect27"
+         style="stroke:#000000;stroke-width:0.63300002;stroke-opacity:0.80814" />
+      <rect
+         height="25.895"
+         width="12.251"
+         y="249.28999"
+         x="412.48999"
+         id="rect29"
+         style="fill:url(#a);stroke:#000000;stroke-width:0.55465001;stroke-linejoin:round;stroke-opacity:0.87097" />
+      <path
+         d="m 426.21,624.16 a 2.5541,2.6339 0 0 1 -2.5535,2.6339 2.5541,2.6339 0 0 1 -2.5547,-2.6326 2.5541,2.6339 0 0 1 2.5522,-2.6351 2.5541,2.6339 0 0 1 2.5559,2.6314"
+         transform="matrix(1.1454,0,0,1.0743,-66.648,-408.39)"
+         id="path31"
+         inkscape:connector-curvature="0"
+         style="fill:#999999;stroke:#000000;stroke-width:0.69999999;stroke-opacity:0.87097" />
+      <path
+         d="m 426.21,624.16 a 2.5541,2.6339 0 0 1 -2.5535,2.6339 2.5541,2.6339 0 0 1 -2.5547,-2.6326 2.5541,2.6339 0 0 1 2.5522,-2.6351 2.5541,2.6339 0 0 1 2.5559,2.6314"
+         transform="matrix(1.1454,0,0,1.0743,-66.648,-400.59)"
+         id="path33"
+         inkscape:connector-curvature="0"
+         style="fill:#999999;stroke:#000000;stroke-width:0.69999999;stroke-opacity:0.87097" />
+      <path
+         d="m 426.21,624.16 a 2.5541,2.6339 0 0 1 -2.5535,2.6339 2.5541,2.6339 0 0 1 -2.5547,-2.6326 2.5541,2.6339 0 0 1 2.5522,-2.6351 2.5541,2.6339 0 0 1 2.5559,2.6314"
+         transform="matrix(1.5398,0,0,1.4442,-233.65,-647.22)"
+         id="path35"
+         style="fill:url(#b);stroke:#ff0000;stroke-width:3.00600004;stroke-opacity:0.43226001;filter:url(#c)"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/subtraction.svg b/freeplane/viewer-resources/images/icons/subtraction.svg
new file mode 100644
index 0000000..57279d2
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/subtraction.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="713.34" gradientUnits="userSpaceOnUse" y1="713.34" x2="396.37" x1="385.39">
+<stop stop-color="#04a" offset="0"/>
+<stop stop-color="#06f" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-63.08 -900.49)">
+<g transform="matrix(2,0,0,2,-914.42,-195.59)">
+<rect style="color:#000000" height="16" width="16" y="548.04" x="488.75" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="548.04" x="488.75" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="548.04" x="488.75" fill="none"/>
+<rect style="color:#000000" height="16" width="16" y="548.04" x="488.75" fill="none"/>
+<g font-size="40.75px" font-family="Arial" transform="translate(-1.4856,-3.5882)" font-weight="bold">
+<text style="word-spacing:0px;letter-spacing:0px" space="preserve" transform="scale(1.2747 .78452)" stroke="#00112b" y="723.91199" x="383.09729" stroke-width=".25" line-height="125%" fill="#0048b4">
+<tspan y="723.91199" x="383.09729" stroke-width=".25" fill="#0048b4">-</tspan>
+</text>
+<text style="word-spacing:0px;letter-spacing:0px" space="preserve" transform="scale(1.2747 .78452)" y="723.91199" x="383.09729" line-height="125%" fill="url(#a)">
+<tspan y="723.91199" x="383.09729" fill="url(#a)">-</tspan>
+</text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/unchecked.svg b/freeplane/viewer-resources/images/icons/unchecked.svg
new file mode 100644
index 0000000..ead5826
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/unchecked.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.001" width="32.001" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.000998 32.000999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-112.17 -107.12)">
+<g transform="matrix(2,0,0,2,-110.97,-119.52)">
+<rect style="color:#000000" height="15.72" width="15.72" stroke="#1a1a1a" y="113.46" x="111.71" stroke-width=".28050" fill="#fff"/>
+<path stroke-linejoin="round" style="color:#000000" d="m111.79 113.59 1.2262 1.2272 0.0702 14.271h-1.2963z" stroke-opacity=".82447" stroke="#4d4d4d" stroke-linecap="round" stroke-width=".23645" fill="#808080"/>
+<path stroke-linejoin="round" style="color:#000000" d="m111.78 113.54 1.2974 1.2263h14.304v-1.2614z" stroke-opacity=".82447" stroke="#4d4d4d" stroke-linecap="round" stroke-width=".23613" fill="#808080"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/up.svg b/freeplane/viewer-resources/images/icons/up.svg
new file mode 100644
index 0000000..17dd552
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/up.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="9.0933mm" width="9.5446mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 33.819528 32.220455" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="377.6" gradientUnits="userSpaceOnUse" y1="388.92" gradientTransform="matrix(-.0014106 1.3013 1.2399 .001344 -198.23 341.47)" x2="142.38" x1="160.7">
+<stop stop-color="#0d56c0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-263.09 -521.97)">
+<path d="m280.03 522.81-15.397 15.075 9.1261 0.0745-0.29505 15.574 12.824 0.0139 0.19025-15.574 8.8842 0.01-15.332-15.173z" stroke-opacity=".72674" fill-rule="evenodd" stroke="#027" stroke-width="1.2702px" fill="url(#a)"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/user_icon.svg b/freeplane/viewer-resources/images/icons/user_icon.svg
new file mode 100644
index 0000000..57ebb90
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/user_icon.svg
@@ -0,0 +1,512 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg18792"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32"
+   sodipodi:docname="user_icon.svg">
+  <defs
+     id="defs18794">
+    <linearGradient
+       id="linearGradient19965">
+      <stop
+         id="stop19967"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.95686275" />
+      <stop
+         id="stop19969"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12496-4">
+      <stop
+         style="stop-color:#dcdcdc;stop-opacity:1"
+         offset="0"
+         id="stop12498-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop12500-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15516-1-8">
+      <stop
+         style="stop-color:#dc7fcf;stop-opacity:1"
+         offset="0"
+         id="stop15518-1-5" />
+      <stop
+         style="stop-color:#a8bef9;stop-opacity:1"
+         offset="1"
+         id="stop15520-5-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20602-6">
+      <stop
+         style="stop-color:#c2c2f1;stop-opacity:1"
+         offset="0"
+         id="stop20604-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop20606-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20574-8">
+      <stop
+         id="stop20576-6"
+         offset="0"
+         style="stop-color:#cccccc;stop-opacity:1" />
+      <stop
+         id="stop20578-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20584-4">
+      <stop
+         id="stop20586-8"
+         offset="0"
+         style="stop-color:#a6a6c6;stop-opacity:1" />
+      <stop
+         id="stop20588-6"
+         offset="1"
+         style="stop-color:#c2c2f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20409-9">
+      <stop
+         id="stop20411-3"
+         offset="0"
+         style="stop-color:#36d200;stop-opacity:1;" />
+      <stop
+         id="stop20413-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13706-3">
+      <stop
+         id="stop13708-7"
+         offset="0"
+         style="stop-color:#f1d103;stop-opacity:1;" />
+      <stop
+         id="stop13710-8"
+         offset="1"
+         style="stop-color:#f7cd03;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4318-5">
+      <stop
+         id="stop4320-98"
+         offset="0"
+         style="stop-color:#ff9e3b;stop-opacity:1" />
+      <stop
+         id="stop4322-4"
+         offset="1"
+         style="stop-color:#e47800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4738">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.72656250;"
+         offset="0.0000000"
+         id="stop4740" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4742" />
+    </linearGradient>
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-179.17645,-209.24803)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468-5"
+       xlink:href="#linearGradient4738"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7648-4"
+       id="linearGradient8827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.098989,0,0,-0.797757,-1.953865,37.324)"
+       x1="21.9326"
+       y1="24.627399"
+       x2="21.9326"
+       y2="7.1090999" />
+    <linearGradient
+       y2="7.1090999"
+       x2="21.9326"
+       y1="24.627399"
+       x1="21.9326"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7648-4">
+      <stop
+         id="stop7650"
+         style="stop-color:#8595bc;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop7652"
+         style="stop-color:#041a3b;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd3"
+       id="linearGradient8829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.098989,0,0,1.106697,-1.953865,-4.922453)"
+       x1="21.9326"
+       y1="24.627399"
+       x2="21.9326"
+       y2="7.1090999" />
+    <linearGradient
+       id="aigrd3"
+       gradientUnits="userSpaceOnUse"
+       x1="21.9326"
+       y1="24.627399"
+       x2="21.9326"
+       y2="7.1090999">
+      <stop
+         offset="0"
+         style="stop-color:#D0D6E5;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667"
+         id="stop16199" />
+      <stop
+         offset="1"
+         style="stop-color:#093A80;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667"
+         id="stop16201" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19965"
+       id="radialGradient8831"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5260609,0,0,0.88037109,-323.44657,948.8826)"
+       cx="12.700491"
+       cy="10.404876"
+       fx="12.700491"
+       fy="10.404876"
+       r="19.96875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6951"
+       id="linearGradient8833"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-166.44127,731.00873)"
+       x1="28.058632"
+       y1="18.867767"
+       x2="33.436985"
+       y2="23.742767" />
+    <linearGradient
+       id="linearGradient6951">
+      <stop
+         id="stop6953"
+         offset="0"
+         style="stop-color:#6e3d09;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ea8113;stop-opacity:1;"
+         offset="0.24242425"
+         id="stop6959" />
+      <stop
+         id="stop6961-0"
+         offset="0.62121212"
+         style="stop-color:#5c3307;stop-opacity:1;" />
+      <stop
+         id="stop6955"
+         offset="1"
+         style="stop-color:#e07c12;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6939"
+       id="linearGradient8835"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-166.44127,731.00873)"
+       x1="19.394735"
+       y1="30.001331"
+       x2="23.109331"
+       y2="33.438831" />
+    <linearGradient
+       id="linearGradient6939">
+      <stop
+         id="stop6941"
+         offset="0"
+         style="stop-color:#bdbdbd;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e2e2e2;stop-opacity:1;"
+         offset="0.33333334"
+         id="stop6947" />
+      <stop
+         id="stop6949"
+         offset="0.66666669"
+         style="stop-color:#a3a3a3;stop-opacity:1;" />
+      <stop
+         id="stop6943"
+         offset="1"
+         style="stop-color:#dddddd;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6963-9"
+       id="radialGradient8837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.994655,0,0,0.969322,-167.11734,732.97751)"
+       cx="15.415101"
+       cy="35.356506"
+       fx="15.415101"
+       fy="35.356506"
+       r="7.5791559" />
+    <linearGradient
+       id="linearGradient6963-9">
+      <stop
+         id="stop6965"
+         offset="0"
+         style="stop-color:#696969;stop-opacity:1;" />
+      <stop
+         id="stop6967"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19965"
+       id="linearGradient8839"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.852298,0,0,0.852298,-164.20943,736.56557)"
+       x1="13.236155"
+       y1="37.752247"
+       x2="7.7521091"
+       y2="42.282146" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.822941"
+     inkscape:cx="4.3813553"
+     inkscape:cy="7.2020661"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1394"
+     inkscape:window-height="818"
+     inkscape:window-x="164"
+     inkscape:window-y="86"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <g
+       id="g20335"
+       transform="matrix(2,0,0,2,-0.04540758,-16.187564)">
+      <g
+         transform="matrix(0.44367413,0,0,0.44367413,137.75865,-418.54839)"
+         id="g8532">
+        <g
+           id="g7654"
+           transform="matrix(1.054774,0,0,1.049989,-316.25859,948.06455)">
+          <path
+             id="path7644"
+             d="m 5.512695,30 34.130539,0 0,-10.372625 -34.130539,0 0,10.372625 z"
+             style="fill:url(#linearGradient8827);fill-opacity:1;fill-rule:nonzero;stroke:none"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#linearGradient8829);fill-rule:nonzero;stroke:none"
+             d="m 5.512695,5.237844 34.130539,0 0,14.389531 -34.130539,0 0,-14.389531 z"
+             id="path16203"
+             inkscape:connector-curvature="0" />
+          <g
+             id="g16205"
+             style="fill-rule:nonzero;stroke:#000000;stroke-width:1.15611064;stroke-miterlimit:4"
+             transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)">
+            <g
+               id="g16207">
+              <path
+                 style="opacity:0.04999994;fill:#e8f52f;stroke:none"
+                 d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z"
+                 id="path16209"
+                 inkscape:connector-curvature="0" />
+              <path
+                 style="opacity:0.20829994;fill:#ecf751;stroke:none"
+                 d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 l 0,0 z"
+                 id="path16211"
+                 inkscape:connector-curvature="0" />
+              <path
+                 style="opacity:0.36669994;fill:#f0f972;stroke:none"
+                 d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 l 0,0 z"
+                 id="path16213"
+                 inkscape:connector-curvature="0" />
+              <path
+                 style="opacity:0.525;fill:#f4fa95;stroke:none"
+                 d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z"
+                 id="path16215"
+                 inkscape:connector-curvature="0" />
+              <path
+                 style="opacity:0.6833;fill:#f7fcb7;stroke:none"
+                 d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 l 0,0 z"
+                 id="path16217"
+                 inkscape:connector-curvature="0" />
+              <path
+                 style="opacity:0.8417;fill:#fbfddb;stroke:none"
+                 d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z"
+                 id="path16219"
+                 inkscape:connector-curvature="0" />
+              <path
+                 style="fill:#ffffff;stroke:none"
+                 d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 l 0,0 z"
+                 id="path16221"
+                 inkscape:connector-curvature="0" />
+            </g>
+          </g>
+          <path
+             style="opacity:0.3;fill-rule:nonzero;stroke:none"
+             d="m 25.015859,21.649044 8.681289,0 1.664904,0.475688 -2.854121,0 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 l -5.589323,0 0,-0.475686 0,-0.118922 z"
+             id="path16223"
+             inkscape:connector-curvature="0" />
+          <path
+             style="opacity:0.3;fill-rule:nonzero;stroke:none"
+             d="m 30.724106,22.362574 -4.994715,0 9.275897,5.232557 -4.281182,-5.232557 0,0 z"
+             id="path16225"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#515151;fill-rule:nonzero;stroke:none"
+             d="m 25.015859,21.767966 8.681289,0 1.30814,-0.832453 -2.854121,0 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 l -5.470401,0 0.237844,0.832453 0.118921,0 z"
+             id="path16227"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#515151;fill-rule:nonzero;stroke:none"
+             d="m 30.248418,20.459827 -4.994714,0 5.946086,-9.038054 -0.951372,9.038054 z"
+             id="path16229"
+             inkscape:connector-curvature="0" />
+        </g>
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           id="rect8163"
+           width="35.0625"
+           height="25.0625"
+           x="-309.94394"
+           y="954.07953" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8831);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           d="m -310.39358,953.73305 0,17.26737 c 19.91835,0.69528 22.14522,-10.22346 35.63049,-10.22346 l 0,-7.04391 -35.63049,0 z"
+           id="rect8150"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0.28310809,0,0,0.28310809,48.14027,-207.48371)"
+         id="g8779">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient8833);fill-opacity:1;fill-rule:nonzero;stroke:#673907;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -142.88264,755.39832 4.06587,3.8007 c 7.1875,-7.0625 17.78306,-23.97728 17.78306,-23.97728 0.42949,-1.22445 -1.08725,-1.9959 -1.84636,-1.1705 0,0 -13.69007,14.09709 -20.00257,21.34708 z"
+           id="path6937"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="ccssc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient8835);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -150.48403,765.62548 2.24632,1.93382 8.49276,-7.36703 0.27506,-0.70583 1.09441,-0.0178 c -0.4375,-1.5625 -2.94152,-4.38345 -4.81652,-4.38345 l 0.082,1.09008 -0.66999,0.38002 -6.70406,9.07021 z"
+           id="path6935"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient8837);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2;marker:none"
+           d="m -160.77661,773.53551 c 6.60531,0 11.61819,0.7866 12.56722,-4.01908 0.7648,-3.87271 -4.56032,-5.72836 -7.19913,-2.27105 -2.542,3.33048 -5.36809,6.29013 -5.36809,6.29013 z"
+           id="path6933"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cssc"
+           inkscape:connector-curvature="0" />
+        <circle
+           r="1.2499999"
+           cy="37.75"
+           cx="7.624999"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.52777782;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           id="path6971"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           transform="matrix(0.852298,0,0,0.852298,-158.80077,735.38719)" />
+        <circle
+           r="1.2499999"
+           cy="37.75"
+           cx="7.624999"
+           transform="matrix(0.787867,0,0,0.787867,-148.26894,728.08822)"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path6983"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m -143.59288,759.20974 -5.3033,6.14299"
+           id="path6985"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.42777776;fill:url(#linearGradient8839);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           d="m -159.46343,772.88057 c 0,0 3.34111,-1.64183 4.76483,-4.08683 0.5037,-0.86504 1.64437,-0.12684 0.94166,0.7345 -1.51783,1.86045 -5.70649,3.35233 -5.70649,3.35233 z"
+           id="path1571"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cssc"
+           inkscape:connector-curvature="0" />
+        <circle
+           r="1.2499999"
+           cy="37.75"
+           cx="7.624999"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.53333285;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+           id="path2454"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           transform="matrix(0.237867,0,0,0.237867,-124.10043,725.71056)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/very_negative.svg b/freeplane/viewer-resources/images/icons/very_negative.svg
new file mode 100644
index 0000000..c5a4768
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/very_negative.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.501" width="32.501" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.500853 32.500854" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="b" gradientUnits="userSpaceOnUse" cy="209.68" cx="231.3" gradientTransform="matrix(.75923 .68302 -.53818 .59822 170.55 -74.564)" r="54.625">
+<stop stop-color="#f86b6b" offset="0"/>
+<stop stop-color="#b40000" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="571.27" gradientUnits="userSpaceOnUse" y1="571.27" x2="404.93" x1="389.33">
+<stop offset="0"/>
+<stop stop-color="#212121" stop-opacity=".984" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-34.584 -205.79)">
+<g transform="matrix(1.0015,0,0,1.0015,-395.34,-287.97)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29248 0 0 .29248 370.21 444.93)" stroke="#870e0e" stroke-width="8.5352" fill="url(#b)"/>
+<text opacity=".91561" font-size="57.759px" space="preserve" transform="scale(1.1218 .89142)" y="586.23639" x="387.50137" font-family="Arial" fill="url(#a)">
+<tspan font-size="57.759px" y="586.23639" x="387.50137" font-family="Arial" fill="url(#a)">-</tspan>
+</text>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/very_positive.svg b/freeplane/viewer-resources/images/icons/very_positive.svg
new file mode 100644
index 0000000..cba374c
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/very_positive.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.5" width="32.5" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.499888 32.499889" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="209.68" cx="231.3" gradientTransform="matrix(1.1422 .98944 -.52685 .60822 79.582 -147.53)" r="54.625">
+<stop stop-color="#69e117" offset="0"/>
+<stop stop-color="#008000" offset="1"/>
+</radialGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-208.84 -205.77)">
+<g transform="translate(-393.26,-120.99)">
+<path font-size="61.543px" d="m308.65 219.91a51.206 51.206 0 0 1 -51.21 51.21 51.206 51.206 0 0 1 -51.21 -51.21 51.206 51.206 0 0 1 51.21 -51.21 51.206 51.206 0 0 1 51.21 51.21z" fill-rule="evenodd" transform="matrix(.29291 0 0 .29291 542.94 278.6)" stroke="#287204" stroke-width="8.5352" fill="url(#a)"/>
+<g font-size="57.759px" transform="matrix(1.0002,0,0,1.0002,172.74,-166.36)" font-family="Arial" fill="#250">
+<text y="586.23639" x="387.50137" transform="scale(1.1218 .89142)" space="preserve">
+<tspan font-size="57.759px" y="586.23639" x="387.50137" font-family="Arial" fill="#225500">-</tspan>
+</text>
+<text y="514.73151" x="-463.58392" transform="matrix(0 -1.1218 .89142 0 0 0)" space="preserve">
+<tspan font-size="57.759px" y="514.73151" x="-463.58392" font-family="Arial" fill="#225500">-</tspan>
+</text>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/video.svg b/freeplane/viewer-resources/images/icons/video.svg
new file mode 100644
index 0000000..1132a2e
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/video.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="265.88" gradientUnits="userSpaceOnUse" y1="264.4" gradientTransform="translate(.42293 -.21145)" x2="33.197" x1="31.006">
+<stop stop-color="#f7f7f7" offset="0"/>
+<stop stop-color="#f7f7f7" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-111.06 -458.37)">
+<g transform="matrix(2,0,0,2,51.469,-16.493)">
+<g fill-rule="evenodd" transform="translate(1.9457,-20.43)">
+<rect style="color:#000000" ry="0" height="16" width="16" y="257.86" x="27.849" fill="#083e3e"/>
+<g fill="#fff" transform="matrix(.94328 0 0 .94328 1.3986 14.403)">
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="258.89" x="29.101"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="258.89" x="41.838"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="258.89" x="38.654"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="258.89" x="35.469"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="258.89" x="32.285"/>
+</g>
+<g fill="#fff" transform="matrix(.94328 0 0 .94328 1.3986 15.741)">
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="270.9" x="29.101"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="270.9" x="41.838"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="270.9" x="38.654"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="270.9" x="35.469"/>
+<rect style="color:#000000" ry="0" height="1.9813" width="2.1051" y="270.9" x="32.285"/>
+</g>
+<rect opacity=".52273" style="color:#000000" ry="1.0775" height="9.2666" width="13.187" stroke="#1a1a1a" y="261.24" x="29.315" stroke-width=".25" fill="#f7f7f7"/>
+<rect opacity=".52273" style="color:#000000" ry="1.0775" height="9.2666" width="13.187" y="261.24" x="29.315" fill="url(#a)"/>
+<path style="color:#000000" d="m203.69 798.36-2.1202-66.673 58.8 31.5z" transform="matrix(.068683 .003793 -.002858 .091155 23.049 195.3)"/>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/wizard.svg b/freeplane/viewer-resources/images/icons/wizard.svg
new file mode 100644
index 0000000..5f46be0
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/wizard.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="31.995" width="32.007" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.007132 31.994796" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="457.28" gradientUnits="userSpaceOnUse" y1="453.71" gradientTransform="matrix(.58638 .058042 -.059923 .56798 184.18 -7.3309)" x2="307.24" x1="302.76">
+<stop stop-color="#4d4d4d" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="440.88" gradientUnits="userSpaceOnUse" y1="440.09" gradientTransform="matrix(.55936 .055367 -.057162 .5418 191.24 5.2196)" x2="317.68" x1="316.32">
+<stop stop-color="#999" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<linearGradient id="c" y2="542.92" gradientUnits="userSpaceOnUse" y1="523.05" x2="327.26" x1="351.04">
+<stop stop-color="#ff0" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-150.57 -107.12)">
+<g fill-rule="evenodd" transform="translate(-178.97,-135.44)" stroke="#000">
+<path d="m338.82 263.12c0.97332-0.1844 2.642 1.3268 2.296 2.7715" stroke-linecap="round" stroke-width=".61568" fill="#858585"/>
+<path stroke-width=".58011px" fill="url(#a)" d="m329.88 270.91c-0.24645 1.4633 0.45691 3.3844 2.9366 3.3525l8.0946-8.1259c-0.96923-0.43622-1.9298-0.89762-2.4005-2.7886l-8.6307 7.562z"/>
+<path stroke-width=".55338px" fill="url(#b)" d="m339.55 263.73 6.2233-5.4051c0.41526 0.74684 0.36295 0.52567 0.66781 0.79412l-5.8868 5.8054c-0.73806-0.34182-0.94459-0.75785-1.0044-1.1944z"/>
+<path stroke-linejoin="round" d="m375.45 551.77-24.487-6.4998-13.595 21.378-6.6144-24.456-25.311-1.0847 17.872-17.956-11.716-22.463 24.487 6.4998 13.595-21.378 6.6144 24.456 25.311 1.0847-17.872 17.956z" stroke-opacity=".8" transform="matrix(.275 .020074 -.02006 .27518 266.18 102.54)" stroke-linecap="round" stroke-width="4.9779" fill="url(#c)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/xmag.svg b/freeplane/viewer-resources/images/icons/xmag.svg
new file mode 100644
index 0000000..2f570de
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/xmag.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.37" width="32.044" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32.043567 32.37017" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="c" gradientUnits="userSpaceOnUse" cy="879.75" cx="390.85" gradientTransform="matrix(1.1453 1.179 -.80701 .78396 653.16 -270.77)" r="61.352">
+<stop stop-color="#fff" stop-opacity=".92035" offset="0"/>
+<stop stop-color="#ccc" offset="1"/>
+</radialGradient>
+<linearGradient id="a" y2="777.97" gradientUnits="userSpaceOnUse" y1="888.86" gradientTransform="matrix(.17907 0 0 .084624 -53.94 313.55)" x2="376.45" x1="310.88">
+<stop stop-color="#b94606" stop-opacity=".99115" offset="0"/>
+<stop stop-color="#ffff06" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="791.12" gradientUnits="userSpaceOnUse" y1="791.28" gradientTransform="matrix(.13602 -.1335 .083774 .086016 160.37 241.84)" x2="343.89" x1="333.49">
+<stop stop-color="#3c3c3c" stop-opacity=".99608" offset="0"/>
+<stop stop-color="#b3b3b3" stop-opacity="0" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-342.62 -106.74)">
+<g stroke-linejoin="round" transform="translate(91.947,-136.41)">
+<path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(.19274 0 0 .20125 187.57 78.355)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#c)"/>
+<rect ry=".66506" stroke-opacity=".90698" transform="matrix(.7273 -.68632 .70389 .7103 0 0)" height="10.627" width="4.2374" stroke="#a40" stroke-linecap="round" y="381.71" x="4.6915" stroke-width=".68356" fill="url(#a)"/>
+<path d="m270.46 264.54 1.5901 3.1229 2.8487-2.7762-2.9623-1.7638-1.4765 1.4171z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".40676" fill="url(#b)"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/icons/yes.svg b/freeplane/viewer-resources/images/icons/yes.svg
new file mode 100644
index 0000000..1334d19
--- /dev/null
+++ b/freeplane/viewer-resources/images/icons/yes.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31.999999 31.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="a" y2="264.85" gradientUnits="userSpaceOnUse" y1="264.85" x2="533.3" x1="536.23">
+<stop stop-color="#000d68" stop-opacity=".85841" offset="0"/>
+<stop stop-color="#84f1f4" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="237.66" gradientUnits="userSpaceOnUse" y1="237.49" gradientTransform="matrix(1.4584 0 0 .67677 -592.79 376.47)" x2="530.58" x1="534.6">
+<stop stop-color="#000080" offset="0"/>
+<stop stop-color="#8afbf9" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-71.48 -34.283)">
+<g stroke-linejoin="round" transform="matrix(.96865 0 0 .98756 -91.237 -485.34)" stroke="#000" stroke-linecap="round">
+<path d="m538.37 264.85a2.9444 4.1057 0 0 1 -2.9444 4.1057 2.9444 4.1057 0 0 1 -2.9444 -4.1057 2.9444 4.1057 0 0 1 2.9444 -4.1057 2.9444 4.1057 0 0 1 2.9444 4.1057z" stroke-opacity=".99419" transform="matrix(.97368 0 0 .67111 -336.72 377.62)" stroke-width="1.2371" fill="url(#a)"/>
+<path d="m184.63 550.22c-1.3315-0.18121-1.7802-1.5268-2.051-3.0189-0.3799-6.0957-0.88218-9.7293-1.6175-11.848-0.35046-1.5739-1.0241-3.0394-1.0553-5.1012 0.28568-1.7241 1.9528-3.5749 4.9265-3.4695 1.8879 0.009 3.9968 1.1312 4.256 3.3724-0.0344 2.0124-0.70672 3.5596-1.1922 5.2962-0.83998 2.5402-1.0764 6.4674-1.1807 11.83-0.32619 1.8247-0.74757 2.9708-2.086 2.9385z" fill-rule="evenodd" stroke-width="1.1415" fill="url(#b)"/>
+</g>
+<rect rx=".16552" ry=".18513" height="32" width="32" y="34.283" x="71.48" fill="none"/>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/knotes.svg b/freeplane/viewer-resources/images/knotes.svg
new file mode 100644
index 0000000..2c5a00b
--- /dev/null
+++ b/freeplane/viewer-resources/images/knotes.svg
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs17732">
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       id="linearGradient10095-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.54615384;"
+         offset="0"
+         id="stop10097-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop10099-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11344">
+      <stop
+         id="stop11346"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1"
+         offset="0.5"
+         id="stop11348" />
+      <stop
+         id="stop11350"
+         offset="1"
+         style="stop-color:#6796df;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11189">
+      <stop
+         id="stop11191"
+         offset="0"
+         style="stop-color:#ff1010;stop-opacity:1;" />
+      <stop
+         id="stop11193"
+         offset="1"
+         style="stop-color:#ff8e8e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2304-6">
+      <stop
+         id="stop2306-1"
+         offset="0"
+         style="stop-color:#babdb6" />
+      <stop
+         id="stop2308-6"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11469">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop11471" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop11473" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9385">
+      <stop
+         style="stop-color:#009f00;stop-opacity:1"
+         offset="0"
+         id="stop9387" />
+      <stop
+         style="stop-color:#60ff60;stop-opacity:1"
+         offset="1"
+         id="stop9389" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4568">
+      <stop
+         style="stop-color:#00ff00;stop-opacity:1;"
+         offset="0"
+         id="stop4570" />
+      <stop
+         style="stop-color:#226122;stop-opacity:1;"
+         offset="1"
+         id="stop4572" />
+    </linearGradient>
+    <linearGradient
+       y2="390.78342"
+       x2="311.27377"
+       y1="377.9527"
+       x1="302.73621"
+       gradientTransform="matrix(0.5896606,0,0,0.5564059,-156.19706,-190.21126)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2468"
+       xlink:href="#linearGradient10095-5"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-9"
+       id="radialGradient26200"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1998129,0.1787036,-0.1589379,0.1657398,241.58479,572.22416)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <linearGradient
+       id="linearGradient7819-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop7821-9" />
+      <stop
+         style="stop-color:#b9150a;stop-opacity:1"
+         offset="1"
+         id="stop7823-2" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-9"
+       id="radialGradient26202"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1998087,0.178708,-0.1435275,0.1493092,230.50894,584.03331)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-9"
+       id="radialGradient26204"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1997994,0.1787128,-0.1504045,0.1566166,235.45341,578.78014)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7819-9"
+       id="radialGradient26206"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1998087,0.178708,-0.1435275,0.1493092,230.50894,584.03331)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <filter
+       id="filter8252">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.61377733"
+         id="feGaussianBlur8254" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22117"
+       id="linearGradient20194"
+       gradientUnits="userSpaceOnUse"
+       x1="35.687248"
+       y1="22.37974"
+       x2="32.888287"
+       y2="29.407671" />
+    <linearGradient
+       id="linearGradient22117">
+      <stop
+         id="stop22119"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873"
+         offset="0.31645569"
+         style="stop-color:#fffab3;stop-opacity:0.84375" />
+      <stop
+         id="stop22121"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient23119-5"
+       id="linearGradient26212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.75,6.25)"
+       x1="43.548729"
+       y1="52.405346"
+       x2="48.452065"
+       y2="43.595425" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22117"
+       id="linearGradient26214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.75,6.25)"
+       x1="53.164078"
+       y1="39.782925"
+       x2="46.986229"
+       y2="43.970425" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32103-2"
+       id="linearGradient26216"
+       gradientUnits="userSpaceOnUse"
+       x1="14.068726"
+       y1="14.622794"
+       x2="14.142981"
+       y2="8.8007002" />
+    <filter
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22117"
+       id="linearGradient19239"
+       gradientUnits="userSpaceOnUse"
+       x1="35.687248"
+       y1="22.37974"
+       x2="32.888287"
+       y2="29.407671" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.5939152"
+     inkscape:cx="-29.907174"
+     inkscape:cy="8.9518223"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)">
+    <path
+       id="path4537"
+       d="m 30.282496,19.036765 c -4.031996,0 -7.303104,3.271101 -7.303098,7.303097 0,1.93721 0.790567,3.668321 2.022673,4.97613 0.640096,-5.286823 5.102252,-9.397367 10.560849,-9.397367 0.147184,0 0.283852,0.02991 0.429595,0.0358 -1.335695,-1.737259 -3.350867,-2.917659 -5.710019,-2.917659 z"
+       style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2468);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61607176;marker:none"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g26161"
+       transform="matrix(1.9824373,0,0,1.9824373,997.72786,-1380.2126)"
+       inkscape:export-filename="E:\FreePlane_radna_mapa\images-view\knotes.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         transform="matrix(0.4572475,0.04464593,0,0.42579129,-263.86028,413.9275)"
+         id="g25867">
+        <g
+           id="g25864">
+          <rect
+             transform="matrix(0.92113501,-0.38924324,0,1,0,0)"
+             y="485.67972"
+             x="-567.88422"
+             height="29.416214"
+             width="24.605892"
+             id="rect7760-2"
+             style="display:inline;overflow:visible;visibility:visible;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;marker:none;enable-background:accumulate" />
+        </g>
+        <g
+           id="g25853">
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,-0.27256627,0,0.676014,-623.02066,266.92661)"
+             id="path7732-57"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient26200);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <rect
+             transform="matrix(0.92113501,-0.38924324,0,1,0,0)"
+             ry="0.18628855"
+             rx="0.12230919"
+             y="490.2327"
+             x="-560.15643"
+             height="2.0193746"
+             width="13.971254"
+             id="rect7742-6"
+             style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate" />
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient26202);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate"
+             id="path7837-6"
+             transform="matrix(0.6450217,-0.27256627,0,0.676014,-623.02066,278.46796)" />
+          <rect
+             transform="matrix(0.92113501,-0.38924324,0,1,0,0)"
+             style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate"
+             id="rect7839-1"
+             width="13.971254"
+             height="2.0193746"
+             x="-560.15643"
+             y="501.77402"
+             rx="0.12230919"
+             ry="0.18628855" />
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,-0.27256627,0,0.676014,-623.02066,272.69728)"
+             id="path7843-5"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient26204);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <g
+             style="fill:#000000;fill-opacity:1"
+             transform="matrix(1,-0.42256915,0,1,-640.34013,117.65886)"
+             id="g7881-7">
+            <rect
+               style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate"
+               id="rect7845-48"
+               width="12.869411"
+               height="2.0193746"
+               x="124.36045"
+               y="648.9325"
+               rx="0.11266328"
+               ry="0.18628855" />
+          </g>
+          <circle
+             r="2.9620285"
+             cy="721.26471"
+             cx="160.78854"
+             transform="matrix(0.6450217,-0.27256627,0,0.676014,-623.02066,284.23864)"
+             id="path7871-6"
+             style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient26206);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate" />
+          <rect
+             transform="matrix(0.92113501,-0.38924324,0,1,0,0)"
+             ry="0.18628855"
+             rx="0.12230919"
+             y="507.54471"
+             x="-560.15643"
+             height="2.0193746"
+             width="13.971254"
+             id="rect7873-4"
+             style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0.42478977,0.02918674,-0.02918674,0.42478977,-272.814,414.06215)"
+         id="g25774">
+        <g
+           id="g4062"
+           style="display:inline"
+           transform="matrix(-0.446605,0,0,0.446605,-455.24725,672.12665)">
+          <path
+             id="path4280"
+             style="display:inline;fill:#ff3434;fill-opacity:0.80327866;fill-rule:evenodd;stroke:none"
+             d="m 11.076929,24.893417 -3.3764559,3.376456 24.8507149,24.850715 2.160931,2.160931 0.101294,0.03376 2.194696,0.506468 2.498578,-2.498578 -28.429758,-28.429757 z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path8242"
+             style="opacity:0.98000004;fill:#ed0000;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8252)"
+             transform="translate(-7.3614141,7.78125)"
+             d="M 20.03125,16.5625 C 20.01958,16.5716 20.00909,16.58208 20,16.59375 c -0.0104,-9.1e-4 -0.02085,-9.1e-4 -0.03125,0 -0.01167,0.0091 -0.02216,0.01958 -0.03125,0.03125 L 16.0625,20.5 42.4375,46.875 46.3125,43 c 0.01167,-0.0091 0.02216,-0.01958 0.03125,-0.03125 9.09e-4,-0.0104 9.1e-4,-0.02085 0,-0.03125 0.01442,-0.01858 0.02504,-0.03982 0.03125,-0.0625 9.09e-4,-0.0104 9.1e-4,-0.02085 0,-0.03125 -0.0091,-0.01167 -0.01958,-0.02216 -0.03125,-0.03125 9.09e-4,-0.0104 9.1e-4,-0.0208 [...]
+             inkscape:connector-curvature="0" />
+          <path
+             id="path3134"
+             style="display:inline;fill:#860000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             transform="translate(-7.3614141,7.78125)"
+             d="m 26.78125,6.25 c -2.176738,-0.1255409 -5.391794,1.4855447 -8.1875,4.28125 -3.727607,3.727607 -5.301863,8.198137 -3.53125,9.96875 0.416287,0.416287 0.986917,0.626698 1.65625,0.6875 L 16.375,20.84375 c 0.01319,-0.01781 0.01566,-0.04691 0.03125,-0.0625 0.06872,-0.06872 0.170229,-0.102153 0.28125,-0.125 0.3463,-0.07127 0.917452,0.06928 1.625,0.40625 2.016725,-0.445787 4.500131,-1.90638 6.71875,-4.125 C 28.758857,13.209893 30.333114,8.7393632 28.5625,6.96875 28.119847,6.52609 [...]
+             inkscape:connector-curvature="0" />
+          <g
+             id="g20830"
+             style="display:inline;fill:#ed0000;fill-opacity:1"
+             transform="matrix(1.0804658,1.0804658,-1.0804658,1.0804658,36.873051,-11.707362)">
+            <path
+               id="rect2160"
+               style="fill:#ed0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               transform="matrix(0.4627634,-0.4627634,0.4627634,0.4627634,-11.451474,29.488706)"
+               d="m 28.5625,6.96875 -13.5,13.53125 27,27 L 55.59375,34 28.5625,6.96875 Z m -11.875,13.6875 c 1.665318,-0.342705 7.946145,4.352395 14.625,11.03125 7.124111,7.124113 12.005767,13.806733 10.90625,14.90625 -0.01559,0.01559 -0.04469,0.01806 -0.0625,0.03125 L 16.375,20.84375 c 0.01319,-0.01781 0.01566,-0.04691 0.03125,-0.0625 0.06872,-0.06872 0.170229,-0.102153 0.28125,-0.125 z"
+               inkscape:connector-curvature="0" />
+            <path
+               id="rect12985"
+               style="fill:#ed0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               transform="matrix(0.4627634,-0.4627634,0.4627634,0.4627634,-11.451474,29.488706)"
+               d="M 52.875,31.3125 41.03125,43.15625 c 1.127384,1.774587 1.609266,3.015734 1.1875,3.4375 -0.01559,0.01559 -0.04469,0.01806 -0.0625,0.03125 l -2.28125,-2.3125 -0.5,0.5 2.71875,2.6875 8.75,2.03125 6.78125,-6.75 L 55.59375,34 52.875,31.3125 Z"
+               inkscape:connector-curvature="0" />
+          </g>
+          <g
+             id="g7055"
+             style="display:inline;fill:#860000;fill-opacity:1"
+             transform="matrix(1.0804658,1.0804658,-1.0389094,1.0389094,35.543246,-10.377557)">
+            <path
+               id="path7024-7"
+               style="fill:#860000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               transform="matrix(0.6189723,0,0,0.6968594,27.51182,20.443789)"
+               d="m 13.727961,10.978299 0,-7.4451723 5.399396,3.1173426 c 0.43545,0.256508 0.47055,0.9184115 0.04141,1.186579 L 13.72796,10.978299 Z"
+               inkscape:connector-curvature="0" />
+          </g>
+          <path
+             id="rect7119"
+             style="display:inline;fill:#ffffff;fill-opacity:0.52459011;fill-rule:evenodd;stroke:none"
+             d="m 21.206296,14.764051 -3.376456,3.376456 28.159641,28.15964 2.6674,-2.667401 -0.438939,-1.85705 -2.262225,-2.262225 -24.749421,-24.74942 z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path8240"
+             style="display:inline;fill:#000000;fill-opacity:0.41568627;fill-rule:evenodd;stroke:none"
+             d="m 11.0625,24.90625 -3.375,3.375 24.875,24.84375 2.15625,2.15625 0.09375,0.03125 2.1875,0.5 2.5,-2.5 -28.4375,-28.40625 z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path8092"
+             style="display:inline;fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             d="m 48.217942,41.775696 c 0.130303,1.303367 -0.95477,2.86856 -3.477749,3.275163 -1.067655,4.283204 -3.254512,6.281875 -6.719147,6.786675 -0.679279,2.952125 -1.493655,3.5518 -3.275162,3.47775 l 11.311126,2.59987 c 0.121485,-0.720994 1.159382,-1.886519 2.021777,-2.748914 0.862395,-0.862396 2.13536,-1.912231 2.77279,-2.045653 L 48.217942,41.775696 Z"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="layer4"
+           style="display:inline"
+           transform="matrix(-0.446605,0,0,0.446605,-455.24725,672.12665)">
+          <g
+             id="g22111"
+             style="display:inline;fill:url(#linearGradient20194);fill-opacity:1"
+             transform="matrix(1.0804658,1.0804658,-1.0389094,1.0389094,35.543246,-10.377557)">
+            <path
+               id="path22113"
+               style="fill:url(#linearGradient19239);fill-opacity:1;fill-rule:evenodd;stroke:none"
+               transform="matrix(0.6189723,0,0,0.6968594,27.51182,20.443789)"
+               d="m 13.727961,10.978299 0,-7.4451723 5.399396,3.1173426 c 0.43545,0.256508 0.47055,0.9184115 0.04141,1.186579 L 13.72796,10.978299 Z"
+               inkscape:connector-curvature="0" />
+          </g>
+          <path
+             id="path24108"
+             style="display:inline;fill:url(#linearGradient26212);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             d="m 48.217942,41.775696 c 0.130303,1.303367 -0.95477,2.86856 -3.477749,3.275163 -1.067655,4.283204 -3.254512,6.281875 -6.719147,6.786675 -0.679279,2.952125 -1.493655,3.5518 -3.275162,3.47775 l 11.311126,2.59987 c 0.121485,-0.720994 1.159382,-1.886519 2.021777,-2.748914 0.862395,-0.862396 2.13536,-1.912231 2.77279,-2.045653 L 48.217942,41.775696 Z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path29894"
+             style="display:inline;opacity:0.75708504;fill:url(#linearGradient26214);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             d="m 48.217942,41.775696 c 0.130303,1.303367 -0.95477,2.86856 -3.477749,3.275163 -1.067655,4.283204 -3.254512,6.281875 -6.719147,6.786675 -0.679279,2.952125 -1.493655,3.5518 -3.275162,3.47775 l 11.311126,2.59987 c 0.121485,-0.720994 1.159382,-1.886519 2.021777,-2.748914 0.862395,-0.862396 2.13536,-1.912231 2.77279,-2.045653 L 48.217942,41.775696 Z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path31123"
+             style="display:inline;fill:url(#linearGradient26216);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             transform="matrix(0.9586097,0.9586097,-2.2757587,2.2757587,26.767877,-19.000492)"
+             d="m 14.710346,14.574869 c -1.848017,0 -3.34613,-1.328516 -3.34613,-2.967323 0,-1.6388074 1.498113,-2.9673232 3.34613,-2.9673232 l 0,2.9673232 0,2.967323 z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path32113"
+             style="fill:#ffffff;fill-opacity:0.29918033;fill-rule:evenodd;stroke:none;filter:url(#filter5747)"
+             d="m 50.573052,53.210019 c 0.08255,0.0163 0.658062,2.64414 0.658062,2.64414 0.762664,2.886532 0.91389,2.966241 0.172783,2.742697 -0.722998,-0.356627 -1.710039,-1.519172 -2.171114,-2.176804 -0.440445,-0.670863 -1.01934,-1.738935 0.08043,-2.572261 0.384121,-0.35825 0.920329,-0.704826 1.259838,-0.637772 z"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path34624"
+             style="display:inline;fill:#ffffff;fill-opacity:0.18442622;fill-rule:evenodd;stroke:none"
+             d="m 19.4375,14.03125 c -2.885629,0.006 -5.407694,1.807633 -7.5,3.625 1.340817,-0.526934 2.64365,-1.199749 4.117417,-0.924556 1.408928,0.263086 1.032979,0.978275 1.781074,1.377858 C 18.646329,17.299214 20.408412,15.560338 21.21875,14.75 20.753228,14.278433 20.086778,14.064896 19.4375,14.03125 Z"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="layer2-9"
+           style="display:inline"
+           transform="matrix(-0.446605,0,0,0.446605,-451.95961,675.6018)">
+          <path
+             id="path2222"
+             style="fill:#b9b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#f24e4e;stroke-width:0.30036592;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="m 25.205989,10.353086 26.90778,26.90778 0,0"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path3195"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#b80000;stroke-width:0.30073184;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="m 18.441657,17.10706 26.940559,26.940559 0,0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/lock.svg b/freeplane/viewer-resources/images/lock.svg
new file mode 100644
index 0000000..c254e4b
--- /dev/null
+++ b/freeplane/viewer-resources/images/lock.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<radialGradient id="a" gradientUnits="userSpaceOnUse" cy="498.92" cx="453.11" gradientTransform="matrix(.68894 .47114 -.26406 .38613 -344.02 452.26)" r="8.4836">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#d4aa00" offset="1"/>
+</radialGradient>
+<linearGradient id="c" y2="536.1" gradientUnits="userSpaceOnUse" x2="501.47" gradientTransform="matrix(.5 0 0 .5 -416.31 597.42)" y1="543.43" x1="517.95">
+<stop stop-color="#786721" offset="0"/>
+<stop stop-color="#e9ddaf" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="514.45" gradientUnits="userSpaceOnUse" x2="486.74" y1="506.23" x1="475.91">
+<stop stop-color="#786721" offset="0"/>
+<stop stop-color="#e9ddaf" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -99.776)">
+<g transform="translate(264.86 -755.9)">
+<g transform="matrix(1.0654 0 0 1.0654 10.92 -56.976)">
+<path d="m-163.06 862.42-2.4598 0.0324 0.0216-2.7619c0.0577-1.5423 1.7639-2.8003 3.9271-2.7835 2.2472-0.00036 3.9927 1.4267 4.035 2.7619v2.7835h-2.4382v-2.5677c-0.0351-0.54405-0.7471-1.0233-1.5223-1.0035-0.67127-0.001-1.5434 0.15913-1.5848 1.0466l0.0216 2.4922z" fill-rule="evenodd" stroke="#806600" stroke-width=".5px" fill="url(#a)"/>
+<rect height="8.951" width="10.572" stroke="#540" stroke-linecap="round" y="862.47" x="-166.81" stroke-width=".5" fill="url(#c)"/>
+<path d="m-161.54 864.69c-0.5669 0-1.0156 0.44873-1.0156 1.0156 0 0.43756 0.27049 0.82091 0.65625 0.96875l-0.20312 0.6875-0.54688 1.8438h1.1094 1.125l-0.57813-1.8438-0.20312-0.6875c0.40059-0.14009 0.68749-0.52056 0.6875-0.96875 0-0.5669-0.46435-1.0156-1.0312-1.0156z" stroke="#fc0" stroke-linecap="round" stroke-width=".33419"/>
+<circle stroke="url(#b)" cx="481.84" stroke-linecap="round" transform="matrix(.5 0 0 .5 -402.45 611.88)" cy="510.14" r="6.7778" fill="none"/>
+</g>
+<rect ry=".092563" rx=".082762" transform="scale(-1)" height="16" width="16" y="-871.67" x="153.17" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/note_black_and_transp.svg b/freeplane/viewer-resources/images/note_black_and_transp.svg
new file mode 100644
index 0000000..de45898
--- /dev/null
+++ b/freeplane/viewer-resources/images/note_black_and_transp.svg
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg17730"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs17732">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22279"
+       id="radialGradient22593"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06089925,0.05097151,-0.04844131,0.04727386,26.619566,-36.792511)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <linearGradient
+       id="linearGradient22279">
+      <stop
+         id="stop22281"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop22283"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22279"
+       id="radialGradient22595"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06089797,0.05097277,-0.04374451,0.04258737,23.243853,-26.119765)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22279"
+       id="radialGradient22597"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06089925,0.05097151,-0.04844131,0.04727386,26.649834,-34.383824)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22279"
+       id="radialGradient22599"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06089925,0.05097151,-0.04844131,0.04727386,26.649823,-31.918287)"
+       cx="160.43956"
+       cy="718.77441"
+       fx="160.43956"
+       fy="718.77441"
+       r="6.9383259" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22117-5"
+       id="linearGradient22603"
+       gradientUnits="userSpaceOnUse"
+       x1="35.687248"
+       y1="22.37974"
+       x2="32.888287"
+       y2="29.407671" />
+    <linearGradient
+       id="linearGradient22117-5">
+      <stop
+         id="stop22119-5"
+         offset="0"
+         style="stop-color:#fffffd;stop-opacity:0" />
+      <stop
+         id="stop30873-1"
+         offset="0.31645569"
+         style="stop-color:#fffaff;stop-opacity:0.84375;" />
+      <stop
+         id="stop22121-7"
+         offset="1"
+         style="stop-color:#fffbfb;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient23119-5"
+       id="linearGradient22605"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.19237552,-0.01321786,-0.01321786,0.19237552,-174.04194,597.10201)"
+       x1="43.548729"
+       y1="52.405346"
+       x2="48.452065"
+       y2="43.595425" />
+    <linearGradient
+       id="linearGradient23119-5">
+      <stop
+         id="stop24106-4-2"
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:0.671875" />
+      <stop
+         id="stop30885-7"
+         offset="0.28481013"
+         style="stop-color:#000000;stop-opacity:0.5859375" />
+      <stop
+         id="stop23123-6"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22117-5"
+       id="linearGradient22607"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.19237552,-0.01321786,-0.01321786,0.19237552,-174.04194,597.10201)"
+       x1="53.164078"
+       y1="39.782925"
+       x2="46.986229"
+       y2="43.970425" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient32103-2"
+       id="linearGradient22609"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.19708381,0.17174227,0.4077196,0.46788092,-179.00195,591.88071)"
+       x1="14.068726"
+       y1="14.622794"
+       x2="14.142981"
+       y2="8.8007002" />
+    <linearGradient
+       id="linearGradient32103-2">
+      <stop
+         id="stop32105-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.5234375" />
+      <stop
+         id="stop32107-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.78039217" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       x="-0.42079461"
+       width="1.8415892"
+       y="-0.24655832"
+       height="1.4931167"
+       id="filter5747-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.56224844"
+         id="feGaussianBlur5749-1" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient22117-5"
+       id="linearGradient18412"
+       gradientUnits="userSpaceOnUse"
+       x1="35.687248"
+       y1="22.37974"
+       x2="32.888287"
+       y2="29.407671" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.70198013"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17735">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g18445"
+       transform="translate(-1.5692921e-6,-2.1886268e-6)">
+      <rect
+         transform="matrix(0.95891252,-0.28370192,0,1,0,0)"
+         y="3.3712361"
+         x="0.20380616"
+         height="12.41153"
+         width="10.709681"
+         id="rect7760-2-7"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.42853665;marker:none;enable-background:accumulate" />
+      <ellipse
+         ry="0.84485745"
+         rx="0.90277112"
+         transform="matrix(0.95891251,-0.28370194,0,1,0,0)"
+         id="path7732-57-1"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient22593);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate"
+         cx="1.9943744"
+         cy="5.7182279" />
+      <rect
+         transform="matrix(0.95891252,-0.28370192,0,1,0,0)"
+         ry="0.078600384"
+         rx="0.053234905"
+         y="5.2922549"
+         x="3.5673158"
+         height="0.85203105"
+         width="6.0809693"
+         id="rect7742-6-8"
+         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate" />
+      <rect
+         transform="matrix(0.95891252,-0.28370192,0,1,0,0)"
+         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate"
+         id="rect7839-1-2"
+         width="6.0809693"
+         height="0.85203105"
+         x="3.5673158"
+         y="10.16186"
+         rx="0.053234905"
+         ry="0.078600384" />
+      <g
+         style="fill:#000000;fill-opacity:1"
+         transform="matrix(0.45309899,-0.13405295,0,0.42192817,-52.926848,-250.41702)"
+         id="g7881-7-9">
+        <rect
+           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate"
+           id="rect7845-48-5"
+           width="12.869411"
+           height="2.0193746"
+           x="124.36045"
+           y="648.9325"
+           rx="0.11266328"
+           ry="0.18628855" />
+      </g>
+      <ellipse
+         ry="0.84485745"
+         rx="0.90277112"
+         transform="matrix(0.95891251,-0.28370194,0,1,0,0)"
+         id="path7871-6-4"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient22595);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate"
+         cx="1.9943744"
+         cy="13.022658" />
+      <rect
+         transform="matrix(0.95891252,-0.28370192,0,1,0,0)"
+         ry="0.078600384"
+         rx="0.053234905"
+         y="12.596662"
+         x="3.5673158"
+         height="0.85203105"
+         width="6.0809693"
+         id="rect7873-4-3"
+         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.12752812;marker:none;enable-background:accumulate" />
+      <ellipse
+         ry="0.84485745"
+         rx="0.90277112"
+         transform="matrix(0.95891251,-0.28370194,0,1,0,0)"
+         id="path7732-57-1-9"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient22597);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate"
+         cx="2.024642"
+         cy="8.126915" />
+      <ellipse
+         ry="0.84485745"
+         rx="0.90277112"
+         transform="matrix(0.95891251,-0.28370194,0,1,0,0)"
+         id="path7732-57-1-7"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient22599);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25;marker:none;enable-background:accumulate"
+         cx="2.0246315"
+         cy="10.592452" />
+      <g
+         transform="matrix(0.97721377,0,0,0.97721377,184.70283,-589.594)"
+         id="g22526">
+        <path
+           id="path22391"
+           style="display:inline;fill:#140d0d;fill-opacity:0.71957673;fill-rule:evenodd;stroke:none"
+           d="m -173.39977,606.01883 0.60492,0.69418 -5.10914,4.45219 -0.44428,0.38715 -0.0199,0.005 -0.4289,0.0684 -0.44764,-0.51369 5.84497,-5.09341 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path22395"
+           style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           d="m -174.86117,603.81894 c 0.42041,0.005 1.01761,0.35705 1.51849,0.93183 0.66783,0.76637 0.91158,1.6472 0.54756,1.96441 -0.0856,0.0746 -0.19814,0.10752 -0.32771,0.11037 l 0.0707,-0.0616 c -0.002,-0.004 -0.002,-0.009 -0.005,-0.0124 -0.0123,-0.0141 -0.0314,-0.0219 -0.0525,-0.0278 -0.0657,-0.0183 -0.17741,10e-4 -0.31798,0.0567 -0.38207,-0.11242 -0.84051,-0.42623 -1.238,-0.88236 -0.66783,-0.76637 -0.91158,-1.6472 -0.54756,-1.96442 0.091,-0.0793 0.21203,-0.11626 0.35217,-0.11472 z"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m -175.13324,603.85357 2.41822,2.78152 -5.55102,4.83726 -2.42464,-2.77592 5.55744,-4.84286 z m 2.10354,2.7901 c -0.31583,-0.0879 -1.58617,0.73227 -2.9593,1.92884 -1.46467,1.27633 -2.49211,2.49738 -2.29512,2.72344 0.003,0.003 0.008,0.004 0.0116,0.007 l 5.30045,-4.61891 c -0.002,-0.004 -0.002,-0.009 -0.005,-0.0124 -0.0123,-0.0141 -0.0314,-0.0219 -0.0525,-0.0278 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="path22399" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m -180.21224,608.29545 2.1219,2.435 c -0.24034,0.32649 -0.34945,0.55888 -0.27388,0.6456 0.003,0.003 0.008,0.004 0.0116,0.007 l 0.46942,-0.41471 0.0896,0.1028 -0.55855,0.48107 -1.71013,0.2751 -1.21533,-1.38816 0.50684,-1.66245 0.55854,-0.48108 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="path22401" />
+        <g
+           id="g22403"
+           style="display:inline;fill:#000000;fill-opacity:1"
+           transform="matrix(-0.22213662,0.19357372,0.18612858,0.2135929,-177.64028,598.91017)">
+          <path
+             id="path22405"
+             style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             transform="matrix(0.6189723,0,0,0.6968594,27.51182,20.443789)"
+             d="m 13.727961,10.978299 0,-7.4451723 5.399396,3.1173426 c 0.43545,0.256508 0.47055,0.9184115 0.04141,1.186579 L 13.72796,10.978299 Z"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           id="path22407"
+           style="display:inline;fill:#ffffff;fill-opacity:0.52459011;fill-rule:evenodd;stroke:none"
+           d="m -175.21452,603.9363 0.60492,0.69418 -5.78944,5.04501 -0.47788,-0.5484 0.10898,-0.35145 0.4651,-0.40529 5.08832,-4.43405 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path22409"
+           style="display:inline;fill:#000000;fill-opacity:0.41568627;fill-rule:evenodd;stroke:none"
+           d="m -173.23697,605.74116 0.60466,0.69388 -5.11373,4.45053 -0.44331,0.38631 -0.0185,0.005 -0.42743,0.0673 -0.44789,-0.51399 5.84615,-5.08878 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path22411"
+           style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           d="m -180.76794,608.77564 c -0.0423,0.24902 0.14576,0.56446 0.62575,0.67603 0.14877,0.8381 0.54305,1.2515 1.20289,1.39441 0.0917,0.57689 0.2404,0.70302 0.58409,0.71232 l -2.21035,0.35064 c -0.0138,-0.1403 -0.1981,-0.37824 -0.3526,-0.55554 -0.15451,-0.17731 -0.38552,-0.3961 -0.50638,-0.43019 l 0.6566,-2.14767 z"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g22504"
+           transform="translate(3.1638118,5.4866103)">
+          <g
+             transform="matrix(-0.22213662,0.19357372,0.18612858,0.2135929,-180.80409,593.42356)"
+             style="display:inline;fill:url(#linearGradient22603);fill-opacity:1"
+             id="g22415">
+            <path
+               inkscape:connector-curvature="0"
+               d="m 13.727961,10.978299 0,-7.4451723 5.399396,3.1173426 c 0.43545,0.256508 0.47055,0.9184115 0.04141,1.186579 L 13.72796,10.978299 Z"
+               transform="matrix(0.6189723,0,0,0.6968594,27.51182,20.443789)"
+               style="fill:url(#linearGradient18412);fill-opacity:1;fill-rule:evenodd;stroke:none"
+               id="path22417" />
+          </g>
+          <path
+             inkscape:connector-curvature="0"
+             d="m -183.93175,603.28903 c -0.0423,0.24902 0.14576,0.56446 0.62575,0.67603 0.14877,0.8381 0.54305,1.2515 1.20289,1.39441 0.0917,0.57689 0.2404,0.70302 0.58409,0.71232 l -2.21035,0.35064 c -0.0138,-0.1403 -0.1981,-0.37824 -0.3526,-0.55554 -0.15451,-0.17731 -0.38552,-0.3961 -0.50638,-0.43019 l 0.6566,-2.14767 z"
+             style="display:inline;fill:url(#linearGradient22605);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="path22419" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m -183.93175,603.28903 c -0.0423,0.24902 0.14576,0.56446 0.62575,0.67603 0.14877,0.8381 0.54305,1.2515 1.20289,1.39441 0.0917,0.57689 0.2404,0.70302 0.58409,0.71232 l -2.21035,0.35064 c -0.0138,-0.1403 -0.1981,-0.37824 -0.3526,-0.55554 -0.15451,-0.17731 -0.38552,-0.3961 -0.50638,-0.43019 l 0.6566,-2.14767 z"
+             style="display:inline;opacity:0.75708504;fill:url(#linearGradient22607);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="path22421" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m -175.95866,601.2264 c 0.36421,-0.31738 0.1178,-1.19626 -0.55037,-1.96302 -0.66817,-0.76677 -1.50509,-1.13107 -1.8693,-0.81369 l 1.20983,1.38836 1.20984,1.38835 z"
+             style="display:inline;fill:url(#linearGradient22609);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="path22423" />
+          <path
+             transform="matrix(-0.19237552,-0.01321786,-0.01321786,0.19237552,-174.10361,595.88975)"
+             inkscape:connector-curvature="0"
+             d="m 50.573052,53.210019 c 0.08255,0.0163 0.658062,2.64414 0.658062,2.64414 0.762664,2.886532 0.91389,2.966241 0.172783,2.742697 -0.722998,-0.356627 -1.710039,-1.519172 -2.171114,-2.176804 -0.440445,-0.670863 -1.01934,-1.738935 0.08043,-2.572261 0.384121,-0.35825 0.920329,-0.704826 1.259838,-0.637772 z"
+             style="fill:#ffffff;fill-opacity:0.29918033;fill-rule:evenodd;stroke:none;filter:url(#filter5747-2)"
+             id="path22425" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m -178.02837,598.3321 c 0.55504,0.0393 1.01641,0.41922 1.3949,0.79649 -0.25098,-0.11909 -0.49272,-0.26574 -0.77987,-0.23228 -0.27452,0.032 -0.21165,0.17454 -0.36085,0.24152 -0.14518,-0.1666 -0.46117,-0.52441 -0.60635,-0.69101 0.0958,-0.0846 0.22682,-0.11683 0.35217,-0.11472 z"
+             style="display:inline;fill:#ffffff;fill-opacity:0.18442622;fill-rule:evenodd;stroke:none"
+             id="path22427" />
+          <g
+             id="g22429"
+             style="display:inline"
+             transform="matrix(-0.19237552,-0.01321786,-0.01321786,0.19237552,-172.79031,597.48397)">
+            <path
+               id="path22431"
+               style="fill:#b9b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.30036592;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="m 25.205989,10.353086 26.90778,26.90778 0,0"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path22433"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.30073184;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="m 18.441657,17.10706 26.940559,26.940559 0,0"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/number.svg b/freeplane/viewer-resources/images/number.svg
new file mode 100644
index 0000000..b5e8d3b
--- /dev/null
+++ b/freeplane/viewer-resources/images/number.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="16"
+   id="svg17093"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 21 16">
+  <defs
+     id="defs17095" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.70198013"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17098">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g17780">
+      <rect
+         style="fill:none;fill-opacity:1;fill-rule:evenodd"
+         id="rect45894-2"
+         width="20.920828"
+         height="16"
+         x="0.039586067"
+         y="0" />
+      <g
+         transform="matrix(1.3280179,0,0,1.3086921,835.83648,-262.84477)"
+         id="g47184">
+        <g
+           style="fill:#d40000;stroke:#aa0000;stroke-width:1.08678877;stroke-miterlimit:4;stroke-dasharray:none"
+           id="g45985-9"
+           transform="matrix(0.36805682,0,0,0.36805682,-343.73236,167.76602)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path45965-8"
+             d="m -775.38299,117.93644 42.04123,0"
+             style="fill:#d40000;stroke:#aa0000;stroke-width:1.08678877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path45965-5-4"
+             d="m -775.38299,120.71275 42.04123,0"
+             style="fill:#d40000;stroke:#aa0000;stroke-width:1.08678877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+        <g
+           id="g46337">
+          <text
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+             sodipodi:linespacing="125%"
+             id="text14029-0-6"
+             y="209.80252"
+             x="-630.36884"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.27445984px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.35232687;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="fill:#d40000;stroke:#000000;stroke-width:0.35232687;stroke-opacity:1"
+               y="209.80252"
+               x="-630.36884"
+               id="tspan14031-9-4"
+               sodipodi:role="line">1</tspan></text>
+          <text
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+             sodipodi:linespacing="125%"
+             id="text14029-0-4-0"
+             y="209.82242"
+             x="-624.51892"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.00059509px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.3125186;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="fill:#d40000;stroke:#000000;stroke-width:0.3125186;stroke-opacity:1"
+               y="209.82242"
+               x="-624.51892"
+               id="tspan14031-9-7-6"
+               sodipodi:role="line">2</tspan></text>
+          <text
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+             sodipodi:linespacing="125%"
+             id="text14029-0-8-1"
+             y="209.74435"
+             x="-618.01514"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.27438641px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.25857458;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="fill:#d40000;stroke:#000000;stroke-width:0.25857458;stroke-opacity:1"
+               y="209.74435"
+               x="-618.01514"
+               id="tspan14031-9-3-8"
+               sodipodi:role="line">3</tspan></text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/outline_view.svg b/freeplane/viewer-resources/images/outline_view.svg
new file mode 100644
index 0000000..4cdc3aa
--- /dev/null
+++ b/freeplane/viewer-resources/images/outline_view.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg3148"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="outline_view.svg">
+  <defs
+     id="defs3174" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3172"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22424933"
+     inkscape:cx="341.70501"
+     inkscape:cy="-350.42999"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3148" />
+  <metadata
+     id="metadata3150">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-238.33,-726.40002)"
+     id="g3152">
+    <rect
+       style="opacity:0.92510998;color:#000000;fill:none"
+       rx="0.070384003"
+       ry="0.092563003"
+       height="16"
+       width="16"
+       y="726.40002"
+       x="238.33"
+       id="rect3154" />
+    <rect
+       style="color:#000000;fill:none"
+       height="16"
+       width="16"
+       y="726.40002"
+       x="238.33"
+       id="rect3156" />
+    <g
+       transform="translate(-5.23,0.058203)"
+       id="g3158">
+      <rect
+         height="4.7522998"
+         rx="1.101"
+         ry="1.048"
+         width="9.7364998"
+         y="726.69"
+         x="243.98"
+         id="rect3160"
+         style="fill:#aaeeff;fill-rule:evenodd;stroke:#000080;stroke-width:0.32808;stroke-linejoin:round" />
+      <path
+         style="color:#000000;fill:#003380;stroke:#000080;stroke-width:0.93624997px;stroke-linecap:square"
+         d="m 248.85,740.81 v -8.6874"
+         id="path3162"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#003380;stroke:#000080;stroke-width:0.93624997px;stroke-linecap:square"
+         d="m 249.58,735.5 h 6.9688"
+         id="path3164"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#003380;stroke:#000080;stroke-width:0.93624997px;stroke-linecap:square"
+         d="m 249.56,740.46 h 6.9688"
+         id="path3166"
+         inkscape:connector-curvature="0" />
+      <rect
+         height="3.1795001"
+         rx="0.73659003"
+         ry="0.70117003"
+         width="6.5141001"
+         y="733.90997"
+         x="252.69"
+         id="rect3168"
+         style="fill:#ff6600;fill-rule:evenodd;stroke:#803300;stroke-width:0.21950001;stroke-linejoin:round" />
+      <rect
+         height="3.1795001"
+         rx="0.73659003"
+         ry="0.70117003"
+         width="6.5141001"
+         y="738.87"
+         x="252.69"
+         id="rect3170"
+         style="fill:#00ff00;fill-rule:evenodd;stroke:#008000;stroke-width:0.21950001;stroke-linejoin:round" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/print_preview.svg b/freeplane/viewer-resources/images/print_preview.svg
new file mode 100644
index 0000000..11cb457
--- /dev/null
+++ b/freeplane/viewer-resources/images/print_preview.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<defs>
+<linearGradient id="g" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.37028 0 0 .36654 1168.4 1165.7)" y1="-2128.6" x1="-2585.9">
+<stop stop-color="#dcdcdc" offset="0"/>
+<stop stop-color="#fff" offset="1"/>
+</linearGradient>
+<filter id="h" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+<feGaussianBlur stdDeviation="0.82320991"/>
+</filter>
+<linearGradient id="f" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.33386 0 0 .33049 1074.2 1089)" y1="-2130.1" x1="-2584.4">
+<stop stop-color="#fff" offset="0"/>
+<stop stop-color="#dcdcdc" offset="1"/>
+</linearGradient>
+<radialGradient id="a" xlink:href="#d" gradientUnits="userSpaceOnUse" cy="866.01" cx="386.21" gradientTransform="matrix(1.1453 1.179 -.80701 .78396 653.16 -270.77)" r="61.352"/>
+<linearGradient id="d">
+<stop stop-color="#fff" stop-opacity=".92035" offset="0"/>
+<stop stop-color="#ccc" offset="1"/>
+</linearGradient>
+<linearGradient id="b" y2="864.59" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="318.68" gradientTransform="matrix(.071627 0 0 .033849 -450.95 108.48)" y1="863.3" x1="348.72"/>
+<linearGradient id="c">
+<stop stop-color="#d4aa00" offset="0"/>
+<stop stop-color="#fea" offset="1"/>
+</linearGradient>
+<linearGradient id="e" y2="791.12" gradientUnits="userSpaceOnUse" x2="343.89" gradientTransform="matrix(-.052815 -.054974 -.034505 .033407 248.8 386.87)" y1="791.28" x1="333.49">
+<stop stop-color="#3c3c3c" stop-opacity=".99608" offset="0"/>
+<stop stop-color="#fdfdfd" offset="1"/>
+</linearGradient>
+</defs>
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -251.34)">
+<g transform="translate(-104.05 -131.69)">
+<rect style="color:#000000" height="16" width="16" y="383.02" x="199.74" fill="none"/>
+<g transform="translate(-.30841)">
+<path d="m201.15 383.44h7.8035l3.9268 4.0816-0.0887 11.207h-11.642v-15.288z" fill-rule="evenodd" stroke="#666" stroke-width=".53351" fill="url(#g)"/>
+<path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" fill-rule="evenodd" transform="matrix(.33386 0 0 .33049 1153.6 988.22)" filter="url(#h)" stroke="#666" stroke-width="1.6061" fill="#d3d3d3"/>
+<path stroke-linejoin="round" d="m209.18 383.68c0.35669 1.5836 0.12812 2.8224-0.02 3.5988 0.8796-0.21633 1.9163-0.45787 3.4556 0.009-1.6593-1.8338-2.3361-2.3982-3.4356-3.6086z" fill-rule="evenodd" stroke="#666" stroke-width=".53351" fill="url(#f)"/>
+<g transform="translate(.61683 .038552)">
+<g stroke-linejoin="round" transform="matrix(-1 0 0 1 414.13 .044278)">
+<path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(-.064420 -.0044076 -.0046022 .067263 236.45 334.22)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#a)"/>
+<rect ry=".26602" stroke-opacity=".90698" rx=".26602" transform="matrix(-.70683 -.70739 -.72445 .68933 0 0)" height="4.2508" width="1.6949" stroke="#a05a2c" stroke-linecap="round" y="135.74" x="-427.5" stroke-width=".27342" fill="url(#b)"/>
+<path d="m204.52 394.65-0.67242 1.2299-1.1063-1.1434 1.2051-0.67038 0.57367 0.58389z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".16270" fill="url(#e)"/>
+<rect transform="matrix(-.70683 -.70739 -.72445 .68933 0 0)" stroke-opacity=".90698" rx=".26602" ry=".26602" height="4.2508" width="1.6949" stroke="#a05a2c" stroke-linecap="round" y="135.74" x="-427.5" stroke-width=".27342" fill="url(#b)"/>
+<rect ry=".26602" stroke-opacity=".97396" rx=".26602" transform="matrix(-.70683 -.70739 -.72445 .68933 0 0)" height="4.2508" width="1.6949" stroke="#62371b" stroke-linecap="round" y="135.74" x="-427.5" stroke-width=".27342" fill="url(#b)"/>
+<path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(-.064420 -.0044076 -.0046022 .067263 236.45 334.22)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#a)"/>
+<path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(-.064420 -.0044076 -.0046022 .067263 236.45 334.22)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#a)"/>
+</g>
+<text style="word-spacing:0px;letter-spacing:0px" font-size="5.3686px" line-height="125%" y="393.24792" x="203.75331" font-family="Sans" xml:space="preserve" fill="#000000"><tspan y="393.24792" x="203.75331">ab</tspan></text>
+</g>
+</g>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/quit.svg b/freeplane/viewer-resources/images/quit.svg
new file mode 100644
index 0000000..68cb901
--- /dev/null
+++ b/freeplane/viewer-resources/images/quit.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-95.692 -327.64)">
+<g transform="translate(27.308 227.85)">
+<path stroke-linejoin="round" style="color:#000000" d="m78.382 101.02h-8.759v13.523h8.759" stroke="#dc0000" stroke-linecap="square" stroke-width="2.4773" fill="none"/>
+<path stroke-linejoin="round" style="color:#000000" d="m83.937 107.79-3.8154-3.957-0.01635 2.7043-6.4289-0.0557v2.5683l6.4289 0.0347v2.6559l3.8317-3.9506z" fill-rule="evenodd" stroke="#dc0000" stroke-width=".66457" fill="#dc0000"/>
+<rect style="color:#000000" transform="scale(-1,1)" height="16" width="16" y="99.785" x="-84.385" fill="none"/>
+</g>
+</g>
+</svg>
diff --git a/freeplane/viewer-resources/images/reapply_filter.svg b/freeplane/viewer-resources/images/reapply_filter.svg
new file mode 100644
index 0000000..9e9a1bb
--- /dev/null
+++ b/freeplane/viewer-resources/images/reapply_filter.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5079mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.97274 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-17.175 -92.351)">
+  <g transform="matrix(.99830 0 0 .99830 -311.06 -511.54)">
+   <g transform="matrix(0.5 0 0 0.5 297.68 296.61)">
+    <g fill-rule="evenodd" transform="translate(-129.1 80.903)" stroke="#000080">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#b)"/>
+     <ellipse rx="8.6451" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" ry=".79745" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#a)"/>
+    </g>
+    <rect rx=".16552" ry=".18513" height="32" width="32" y="616.69" x="62.226" fill="none"/>
+    <rect rx=".16202" ry=".18121" height="31.322" width="31.322" y="617.03" x="62.565" fill="none"/>
+   </g>
+   <path stroke-linejoin="round" style="color:#000000" d="m339.27 608.48-0.98253 1.4713c-0.0838-0.0559-0.15958-0.0859-0.24354-0.13587l-0.0102 0.0124c-0.88072-0.44195-1.8953-0.64593-2.9532-0.54022-2.9728 0.29705-5.1538 2.9307-4.862 5.8867 0.29175 2.956 2.946 5.1179 5.9188 4.8209 1.0445-0.10437 1.9849-0.50322 2.7569-1.0993l0.0124 0.0101c0.0725-0.0657 0.14091-0.11007 0.21221-0.18142l-1.5997-1.751c-0.0673 0.0716-0.15227 0.11745-0.22365 0.18253l0.0136 0.0215c-0.40519 0.27248-0.87913 0.45399-1 [...]
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/redo_filter.svg b/freeplane/viewer-resources/images/redo_filter.svg
new file mode 100644
index 0000000..385331c
--- /dev/null
+++ b/freeplane/viewer-resources/images/redo_filter.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" style="shape-rendering:crispEdges" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999998 15.999998" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="c" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2=".029297" gradientUnits="userSpaceOnUse" x2="-.13419" y1="8.4145" x1="12.978">
+   <stop stop-color="#003a00" offset="0"/>
+   <stop stop-color="#00d800" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-17.433 -49.289)">
+  <g transform="translate(.98016 34.796)">
+   <g transform="translate(12.306 -432.6)">
+    <g fill-rule="evenodd" transform="matrix(.40751 0 0 .40751 -73.784 230.58)" stroke="#000080">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#c)"/>
+     <ellipse rx="8.6451" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" ry=".79745" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#b)"/>
+    </g>
+    <rect rx=".082762" ry=".092563" height="16" width="16" y="447.1" x="4.1472" fill="none"/>
+    <rect rx=".081010" ry=".090603" height="15.661" width="15.661" y="447.43" x="4.486" fill="none"/>
+    <g transform="matrix(-.88880 0 0 .85629 19.955 447.31)" stroke="#008000">
+     <path d="m6.8344 2.3145c9.1116-0.0305 9.2026 13.622 9.2026 13.622" stroke-linecap="square" stroke-width=".10268" fill="none"/>
+     <path d="m6.8731 7.5577c9.1639-0.0551 9.1639 8.3793 9.1639 8.3793" stroke-width=".097447" fill="none"/>
+     <path d="m15.828 13.918c-0.04417-0.0012-0.08824 0.03624-0.07709 0.08282 0.01649 0.06229 0.02393 0.12816 0.04842 0.18767 0.02758 0.05273 0.11714 0.03995 0.12565-0.02028 0.0012-0.06518-0.01129-0.13063-0.01907-0.19538-0.0077-0.03491-0.04255-0.05906-0.07791-0.05483zm-0.07228-0.41032c-0.08234-0.003-0.12906 0.0819-0.08981 0.15232 0.0371 0.10056 0.03381 0.22471 0.10556 0.30694 0.06998 0.05137 0.14352-0.04469 0.11806-0.11482-0.02667-0.10564 0.000226-0.2319-0.0662-0.32315-0.01876-0.01605-0.0 [...]
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/remove_filtering.svg b/freeplane/viewer-resources/images/remove_filtering.svg
new file mode 100644
index 0000000..3b0545d
--- /dev/null
+++ b/freeplane/viewer-resources/images/remove_filtering.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5233mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999999 16.027296" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="c" y2="335.21" gradientUnits="userSpaceOnUse" x2="34.999" gradientTransform="matrix(.0051170 -.41238 .41196 .0051118 -49.255 837.87)" y1="355.87" x1="55.911">
+   <stop stop-color="#fe0000" offset="0"/>
+   <stop stop-color="#ff5858" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-18.312 -189.64)">
+  <g transform="translate(-70.12 -620.18)">
+   <g transform="matrix(.5 0 0 .5 -7.2306 527.72)">
+    <g fill-rule="evenodd" transform="translate(.0000051953 28.466)" stroke="#000080">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#b)"/>
+     <ellipse rx="8.6451" ry=".79745" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#a)"/>
+    </g>
+    <rect rx=".16552" ry=".18513" height="32" width="32" y="564.25" x="191.33" fill="none"/>
+   </g>
+   <path d="m99.289 813.44c0.85847 0.035 1.9987-0.41362 1.6619 1.8638l-3.9908 3.8282 3.7094 4.0565c0.60117 0.79915-0.41977 2.4972-1.7067 1.5762-0.35681-0.25532-3.7835-3.7831-3.8495-3.795l-3.8713 4.0036c-1.9803-0.47858-1.7791-1.3193-1.99-2.0244l3.7821-3.8134c0.12538-0.0146-3.6298-3.7988-3.6683-3.958-0.40364-1.6687 1.2357-2.174 1.9332-1.8018 0.31933 0.17041 3.793 3.8552 3.8433 3.8558l4.1466-3.7915z" fill-rule="evenodd" stroke="#a00" stroke-width=".41220px" fill="url(#c)"/>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/select_all_found_nodes.svg b/freeplane/viewer-resources/images/select_all_found_nodes.svg
new file mode 100644
index 0000000..677d894
--- /dev/null
+++ b/freeplane/viewer-resources/images/select_all_found_nodes.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999999 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="e" y2="-2104.9" gradientUnits="userSpaceOnUse" x2="-2596.4" gradientTransform="matrix(.35401 0 0 .35044 736.99 1605)" y1="-2128.6" x1="-2585.9">
+   <stop stop-color="#dcdcdc" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+  <filter id="f" style="color-interpolation-filters:sRGB" height="1.3315" width="1.3481" y="-.16576" x="-.17407">
+   <feGaussianBlur stdDeviation="0.82320991"/>
+  </filter>
+  <linearGradient id="d" y2="-2125.2" gradientUnits="userSpaceOnUse" x2="-2589.3" gradientTransform="matrix(.31920 0 0 .31597 646.95 1531.6)" y1="-2130.1" x1="-2584.4">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#dcdcdc" offset="1"/>
+  </linearGradient>
+  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="866.01" cx="386.21" gradientTransform="matrix(1.1453 1.179 -.80701 .78396 653.16 -270.77)" r="61.352">
+   <stop stop-color="#fff" stop-opacity=".92035" offset="0"/>
+   <stop stop-color="#ccc" offset="1"/>
+  </radialGradient>
+  <linearGradient id="c" y2="864.59" gradientUnits="userSpaceOnUse" x2="318.68" gradientTransform="matrix(.074862 0 0 .035378 -776.1 471.94)" y1="863.3" x1="348.72">
+   <stop stop-color="#00f" offset="0"/>
+   <stop stop-color="#fff" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="791.12" gradientUnits="userSpaceOnUse" x2="343.89" gradientTransform="matrix(.056864 -.055812 .035022 .035960 -241.08 860.4)" y1="791.28" x1="333.49">
+   <stop stop-color="#3c3c3c" stop-opacity=".99608" offset="0"/>
+   <stop stop-color="#b3b3b3" stop-opacity="0" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-19.464 -162.59)">
+  <g transform="translate(-193.89 75.914)">
+   <g transform="translate(147.81 15.862)">
+    <g transform="translate(256.69 -788.29)">
+     <rect style="color:#000000" height="16" width="16" y="859.1" x="-191.14" fill="none"/>
+     <g transform="matrix(.99006 0 0 .99006 -4.9251 10.904)">
+      <path d="m-187.78 857.08h7.4607l3.7543 3.9023-0.0848 10.715h-11.13v-14.617z" fill-rule="evenodd" stroke="#666" stroke-width=".51007" fill="url(#e)"/>
+      <path stroke-linejoin="round" d="m-2829.3-1828.3c1.0683 4.7916 0.3837 8.5401-0.06 10.889 2.6346-0.6545 5.7398-1.3853 10.35 0.03-4.9699-5.5487-6.9971-7.2565-10.29-10.919z" fill-rule="evenodd" transform="matrix(.31920 0 0 .31597 722.81 1435.3)" filter="url(#f)" stroke="#666" stroke-width="1.6061" fill="#d3d3d3"/>
+      <g transform="matrix(.82225 0 0 -.82225 -65.407 1595.4)">
+       <path d="m-136.67 894.82v-7.2898c0-0.27565-0.2203-0.48099-0.4916-0.48099h-9.9595c-0.2713 0-0.49161 0.20534-0.49161 0.48099v7.2898h10.943z" stroke="#000" stroke-width=".088094" fill="#fff"/>
+       <rect transform="scale(-1)" height="1.0284" width="10.824" y="-894.73" x="136.73" fill="#ffee4f"/>
+       <path d="m-137.52 892.5h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+       <path d="m-137.52 891.14h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+       <path d="m-137.52 889.79h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+       <path d="m-137.52 888.44h-9.1804" stroke="#000" stroke-width=".073412" fill="none"/>
+      </g>
+      <path stroke-linejoin="round" d="m-180.1 857.31c0.34101 1.514 0.12248 2.6984-0.0191 3.4407 0.84097-0.20683 1.8321-0.43776 3.3038 0.009-1.5864-1.7532-2.2335-2.2928-3.2847-3.4501z" fill-rule="evenodd" stroke="#666" stroke-width=".51007" fill="url(#d)"/>
+      <g stroke-linejoin="round" transform="matrix(1.0111 -.15114 .15114 1.0111 -111.91 -40.236)">
+       <rect transform="matrix(.72730 -.68632 .70389 .71030 0 0)" stroke-opacity=".90698" rx=".27803" ry=".27803" height="4.4428" width="1.7715" stroke="#7900aa" stroke-linecap="round" y="500.43" x="-751.59" stroke-width=".28577" fill="#fff"/>
+       <path d="m-195.06 869.88 0.66476 1.3056 1.1909-1.1606-1.2384-0.73736-0.61726 0.59241z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".17005" fill="#fff"/>
+       <g transform="translate(-.035609 -.059735)">
+        <path d="m451.11 879.75a60.261 57.727 0 0 1 -60.247 57.727 60.261 57.727 0 0 1 -60.275 -57.699 60.261 57.727 0 0 1 60.218 -57.754 60.261 57.727 0 0 1 60.304 57.672" stroke-opacity=".81395" transform="matrix(.069360 0 0 .072422 -224.82 802.68)" stroke="#1a1a1a" stroke-linecap="round" stroke-width="6.3301" fill="url(#a)"/>
+        <rect transform="matrix(.72730 -.68632 .70389 .71030 0 0)" stroke-opacity=".90698" rx=".27803" ry=".27803" height="4.4428" width="1.7715" stroke="#000080" stroke-linecap="round" y="500.43" x="-751.59" stroke-width=".28577" fill="url(#c)"/>
+        <path d="m-195.06 869.88 0.66476 1.3056 1.1909-1.1606-1.2384-0.73736-0.61726 0.59241z" stroke-opacity=".88372" fill-rule="evenodd" stroke="#333" stroke-width=".17005" fill="url(#b)"/>
+       </g>
+      </g>
+     </g>
+    </g>
+    <rect stroke-linejoin="round" height="4.3082" stroke="#000080" stroke-width=".5" fill="#fff" fill-rule="evenodd" rx=".99808" ry=".95008" width="8.8266" y="72.092" x="71.666"/>
+    <rect stroke-linejoin="round" height="4.3082" stroke="#000080" stroke-width=".5" fill="#fff" fill-rule="evenodd" rx=".99808" ry=".95008" width="8.8266" y="77.481" x="66.915"/>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/showAttributes.svg b/freeplane/viewer-resources/images/showAttributes.svg
new file mode 100644
index 0000000..d9e913f
--- /dev/null
+++ b/freeplane/viewer-resources/images/showAttributes.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 16 16.147"
+   version="1.1">
+  <defs
+     id="defs44" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="color:#000000;opacity:0.93720003;fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5000034"
+     height="15.646773"
+     width="14.362469"
+     y="0.25612867"
+     x="0.82313555"
+     id="rect12" />
+  <path
+     style="color:#000000;opacity:0.93720003;fill:#b1b1b1;fill-rule:evenodd;stroke:#000000;stroke-width:0.11799508;stroke-linecap:round;stroke-linejoin:round"
+     d="m 8.0043695,3.581619 -7.14663805,0 0,-3.30911514 7.14663805,0 m 0,3.30911514 7.1466385,0 0,-3.30911514 -7.1466385,0 -0.024507,3.31419874"
+     id="path14" />
+  <path
+     style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+     d="m 8.0043695,7.013022 -7.14663805,0 0,-3.3091151 7.14663805,0 m 0,3.3091151 7.1466385,0 0,-3.3091151 -7.1466385,0 -0.024507,3.3141987"
+     id="path16" />
+  <path
+     style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+     d="m 8.0043695,10.444425 -7.14663805,0 0,-3.3091151 7.14663805,0 m 0,3.3091151 7.1466385,0 0,-3.3091151 -7.1466385,0 -0.024507,3.3141991"
+     id="path18" />
+  <path
+     style="color:#000000;opacity:0.93720003;fill:none;stroke:#000000;stroke-width:0.24999818;stroke-linecap:round;stroke-linejoin:round"
+     d="m 8.0043695,13.875828 -7.14663805,0 0,-3.309115 7.14663805,0 m 0,3.309115 7.1466385,0 0,-3.309115 -7.1466385,0 -0.024507,3.314199"
+     id="path20" />
+  <path
+     style="color:#000000;opacity:0.93720003;fill:#cccccc;stroke:#000000;stroke-width:0.03117987;stroke-linecap:round;stroke-linejoin:round"
+     d="m 1.0511891,14.850177 0,-0.873031 6.9530392,0 6.9530397,0 0,0.873031 0,0.873031 -6.9530397,0 -6.9530392,0 0,-0.873031 z"
+     id="path22" />
+  <rect
+     id="rect40"
+     x="0.0040026247"
+     y="0.080026858"
+     width="16"
+     height="16"
+     style="color:#000000;fill:none" />
+  <text
+     id="text4219"
+     y="6.4314318"
+     x="1.4210041"
+     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#0000ff;"
+     xml:space="preserve"><tspan
+       y="6.4314318"
+       x="1.4210041"
+       id="tspan4221">AAA</tspan></text>
+  <text
+     id="text4223"
+     y="6.4314318"
+     x="8.7576942"
+     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#008000;"
+     xml:space="preserve"><tspan
+       y="6.4314318"
+       x="8.7576942"
+       id="tspan4225">BBB</tspan></text>
+  <text
+     id="text4219-4"
+     y="9.6689501"
+     x="1.4210041"
+     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#ff0000;"
+     xml:space="preserve"><tspan
+       y="9.6689501"
+       x="1.4210041"
+       id="tspan4253">CCC</tspan></text>
+  <text
+     id="text4219-8"
+     y="9.6689501"
+     x="8.7576942"
+     style="font-style:normal;font-weight:normal;font-size:2.5px;line-height:125%;font-family:sans-serif;letter-spacing:1px;fill:#ff6600;"
+     xml:space="preserve"><tspan
+       id="tspan4255">123</tspan></text>
+</svg>
diff --git a/freeplane/viewer-resources/images/show_ancestors.svg b/freeplane/viewer-resources/images/show_ancestors.svg
new file mode 100644
index 0000000..7443493
--- /dev/null
+++ b/freeplane/viewer-resources/images/show_ancestors.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5079mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.972752 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-17.484 -231.83)">
+  <g transform="matrix(.99830 0 0 .99830 -67.486 19.013)">
+   <g transform="matrix(.5 0 0 .5 -10.548 -68.922)">
+    <g fill-rule="evenodd" transform="translate(.0000051953 28.466)" stroke="#000080">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#b)"/>
+     <ellipse rx="8.6451" ry=".79745" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#a)"/>
+    </g>
+    <rect rx=".16552" ry=".18513" height="32" width="32" y="564.25" x="191.33" fill="none"/>
+   </g>
+   <g transform="matrix(.98294 0 0 .98294 -113.55 -373.89)">
+    <path d="m206.43 609.36 10.358 0.14386" stroke="#00f" stroke-width="1.5" fill="none"/>
+    <circle style="color:#000000" cx="205.27" stroke="#000" cy="609.43" r="3.0304" stroke-width=".25" fill="#00f"/>
+    <circle style="color:#000000" stroke-width=".25" stroke="#000" cy="609.43" cx="216.54" r="1.7269" fill="#00f"/>
+    <circle style="color:#000000" cx="211.55" stroke="#000" cy="609.43" r="2.1787" stroke-width=".25" fill="#00f"/>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/show_descendants.svg b/freeplane/viewer-resources/images/show_descendants.svg
new file mode 100644
index 0000000..7862d80
--- /dev/null
+++ b/freeplane/viewer-resources/images/show_descendants.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16.000003 15.999999" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-17.484 -254.36)">
+  <g transform="matrix(.49915 0 0 .49915 -78.016 -27.261)">
+   <g fill-rule="evenodd" transform="translate(.0000051953 28.466)" stroke="#000080">
+    <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#b)"/>
+    <ellipse rx="8.6451" ry=".79745" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#a)"/>
+   </g>
+   <rect rx=".16552" ry=".18513" height="32" width="32" y="564.25" x="191.33" fill="none"/>
+  </g>
+  <g transform="matrix(-.98294 0 0 .98294 232.15 -332.74)">
+   <path d="m206.43 609.36 10.358 0.14386" stroke="#00f" stroke-width="1.5" fill="none"/>
+   <circle style="color:#000000" cx="205.27" stroke="#000" cy="609.43" r="3.0304" stroke-width=".25" fill="#00f"/>
+   <circle style="color:#000000" stroke-width=".25" stroke="#000" cy="609.43" cx="216.54" r="1.7269" fill="#00f"/>
+   <circle style="color:#000000" cx="211.55" stroke="#000" cy="609.43" r="2.1787" stroke-width=".25" fill="#00f"/>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/text.svg b/freeplane/viewer-resources/images/text.svg
new file mode 100644
index 0000000..af4c47b
--- /dev/null
+++ b/freeplane/viewer-resources/images/text.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="21"
+   height="16"
+   id="svg17093"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 21 16">
+  <defs
+     id="defs17095" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="0.70198013"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata17098">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g17704">
+      <rect
+         y="9.0942365e-010"
+         x="0.0092973709"
+         height="16"
+         width="20.981405"
+         id="rect45894"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd" />
+      <g
+         transform="matrix(1.0048851,0,0,0.99612944,633.1465,-181.67069)"
+         id="g47223">
+        <g
+           id="g46295"
+           transform="matrix(0.98850118,0,0,1.1028998,-7.2438954,-20.529316)">
+          <text
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+             sodipodi:linespacing="125%"
+             id="text14029-0"
+             y="193.93622"
+             x="-629.77588"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.27445984px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:#000000;stroke-width:0.35232687;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="fill:#000080;stroke:#000000;stroke-width:0.35232687;stroke-opacity:1"
+               y="193.93622"
+               x="-629.77588"
+               id="tspan14031-9"
+               sodipodi:role="line">A</tspan></text>
+          <text
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+             sodipodi:linespacing="125%"
+             id="text14029-0-4"
+             y="193.95607"
+             x="-621.74493"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.00437069px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:#000000;stroke-width:0.31263658;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="fill:#000080;stroke:#000000;stroke-width:0.31263658;stroke-opacity:1"
+               y="193.95607"
+               x="-621.74493"
+               id="tspan14031-9-7"
+               sodipodi:role="line">B</tspan></text>
+          <text
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="F:\LiberKey\MyDocuments\Freeplane\FreePlane_radna_mapa\Sys_icons\IncreaseNodeFontAction.png"
+             sodipodi:linespacing="125%"
+             id="text14029-0-8"
+             y="193.8707"
+             x="-615.09119"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.6838398px;line-height:125%;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:#000000;stroke-width:0.27136999;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="fill:#000080;stroke:#000000;stroke-width:0.27136999;stroke-opacity:1"
+               y="193.8707"
+               x="-615.09119"
+               id="tspan14031-9-3"
+               sodipodi:role="line">C</tspan></text>
+        </g>
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -629.84691,194.98722 20.4567,0"
+           id="path45965"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -629.84691,196.33814 20.4567,0"
+           id="path45965-5"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/undo_filter.svg b/freeplane/viewer-resources/images/undo_filter.svg
new file mode 100644
index 0000000..1c970a5
--- /dev/null
+++ b/freeplane/viewer-resources/images/undo_filter.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="4.5156mm" width="4.5156mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 15.999998 15.999998" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="c" y2="563.76" gradientUnits="userSpaceOnUse" x2="285.19" gradientTransform="matrix(1.7686 0 0 1.8459 -306.28 -490.99)" y1="563.58" x1="295.32">
+   <stop stop-color="#2a89ea" offset="0"/>
+   <stop stop-color="#d4e2f6" offset=".47542"/>
+   <stop stop-color="#e5eef9" offset=".86308"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="557.24" gradientUnits="userSpaceOnUse" x2="290.7" y1="558.21" x1="290.75">
+   <stop stop-color="#b6c6dd" offset="0"/>
+   <stop stop-color="#f7fafd" offset="1"/>
+  </linearGradient>
+  <linearGradient id="a" y2=".029297" gradientUnits="userSpaceOnUse" x2="-.13419" y1="8.4145" x1="12.978">
+   <stop stop-color="#003a00" offset="0"/>
+   <stop stop-color="#00d800" offset="1"/>
+  </linearGradient>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="translate(-15.942 -68.957)">
+  <g transform="translate(-41.624 -15.293)">
+   <g transform="translate(48.001 -396.91)">
+    <g fill-rule="evenodd" transform="matrix(.40751 0 0 .40751 -65.74 265.38)" stroke="#000080">
+     <path stroke-linejoin="round" d="m192.08 538.38c1.5448 6.8951 11.713 11.923 12.715 15.136l0.0641 13.784 5.4493-5.8882-0.19234-8.2969c0.63957-3.4367 7.9818-5.1312 12.518-14.801" stroke-linecap="round" stroke-width=".90705" fill="url(#c)"/>
+     <ellipse rx="8.6451" transform="matrix(1.7715 0 0 2.4653 -307.3 -837.27)" ry=".79745" cy="557.94" cx="290.51" stroke-width=".43432" fill="url(#b)"/>
+    </g>
+    <rect rx=".082762" ry=".092563" height="16" width="16" y="481.16" x="9.5643" fill="none"/>
+    <rect rx=".081010" ry=".090603" height="15.661" width="15.661" y="481.5" x="9.903" fill="none"/>
+    <g transform="matrix(.88880 0 0 .85629 9.8245 481.86)" stroke="#008000">
+     <path d="m6.8344 2.3145c9.1116-0.0305 9.2026 13.622 9.2026 13.622" stroke-linecap="square" stroke-width=".10268" fill="none"/>
+     <path d="m6.8731 7.5577c9.1639-0.0551 9.1639 8.3793 9.1639 8.3793" stroke-width=".097447" fill="none"/>
+     <path d="m15.828 13.918c-0.04417-0.0012-0.08824 0.03624-0.07709 0.08282 0.01649 0.06229 0.02393 0.12816 0.04842 0.18767 0.02758 0.05273 0.11714 0.03995 0.12565-0.02028 0.0012-0.06518-0.01129-0.13063-0.01907-0.19538-0.0077-0.03491-0.04255-0.05906-0.07791-0.05483zm-0.07228-0.41032c-0.08234-0.003-0.12906 0.0819-0.08981 0.15232 0.0371 0.10056 0.03381 0.22471 0.10556 0.30694 0.06998 0.05137 0.14352-0.04469 0.11806-0.11482-0.02667-0.10564 0.000226-0.2319-0.0662-0.32315-0.01876-0.01605-0.0 [...]
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/unfold.png b/freeplane/viewer-resources/images/unfold.png
deleted file mode 100644
index 0347b30..0000000
Binary files a/freeplane/viewer-resources/images/unfold.png and /dev/null differ
diff --git a/freeplane/viewer-resources/images/unfold_all.svg b/freeplane/viewer-resources/images/unfold_all.svg
new file mode 100644
index 0000000..33e1697
--- /dev/null
+++ b/freeplane/viewer-resources/images/unfold_all.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.014078"
+   width="23.011278"
+   version="1.1"
+   viewBox="0 0 23.011278 16.014078"
+   id="svg3109"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="xx009.svg">
+  <defs
+     id="defs3139" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3137"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="335.54351"
+     inkscape:cy="-374.28112"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3109" />
+  <metadata
+     id="metadata3111">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-451.45374,-726.4059)"
+     id="g3113">
+    <g
+       transform="translate(-20.295,104.88)"
+       id="g3115">
+      <g
+         transform="matrix(1.0355,0,0,1,-18.153,-0.75535)"
+         id="g3117">
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.45978001;stroke-opacity:0.99607999"
+           d="m 482.19,627.43 c 1.8238,-0.0366 2.9365,-0.70147 4.0129,-1.822 1.0764,-1.12053 2.1103,-1.7849 3.6559,-1.6124 -1.292,-0.13399 -2.4788,0.8886 -3.5166,2.1886 -1.0576,1.3272 -2.2792,2.9033 -4.1418,2.9406 L 482.19,627.43 z"
+           id="path3119"
+           inkscape:connector-curvature="0" />
+        <rect
+           height="3.023"
+           rx="0.70033002"
+           ry="0.66665"
+           width="6.1933999"
+           y="622.54999"
+           x="488.87"
+           id="rect3121"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.51086998;stroke-linejoin:round" />
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.45978001;stroke-opacity:0.99607999"
+           d="m 481.71,633.12 c 1.8238,0.0366 2.9365,0.70148 4.0129,1.822 1.0764,1.12052 2.1103,1.7849 3.656,1.6124 -1.2921,0.13399 -2.4788,-0.8886 -3.5166,-2.1886 -1.0576,-1.3272 -2.2792,-2.9033 -4.1418,-2.9406 l -0.0104,1.6948 z"
+           id="path3123"
+           inkscape:connector-curvature="0" />
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#003380;stroke-width:0.45978001"
+           d="m 483.02,630.97 c 1.8238,0.0265 3.0792,-0.91261 4.1557,-0.10145 1.0764,0.81112 1.92,0.38817 3.4656,0.26325 -1.292,0.0971 -2.2884,0.26065 -3.3263,-0.6804 -1.0576,-0.96069 -2.422,-0.6812 -4.2845,-0.70816 l -0.0104,1.2268 h -1e-5 z"
+           id="path3125"
+           inkscape:connector-curvature="0" />
+        <circle
+           transform="matrix(0.11654,0,0,0.11654,449.62,604.75)"
+           cy="219.91"
+           cx="257.44"
+           r="51.206001"
+           id="circle3127"
+           d="m 308.646,219.91 c 0,28.2803 -22.9257,51.206 -51.206,51.206 -28.28029,0 -51.206,-22.9257 -51.206,-51.206 0,-28.28029 22.92571,-51.206 51.206,-51.206 28.2803,0 51.206,22.92571 51.206,51.206 z"
+           sodipodi:cx="257.44"
+           sodipodi:cy="219.91"
+           sodipodi:rx="51.206001"
+           sodipodi:ry="51.206001"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:9.42259979;stroke-opacity:0.99607999" />
+        <path
+           d="m 478.54,626.24 v 3.0669 h -2.8651 v 2.1387 h 2.8651 v 3.0669 h 2.1791 v -3.0669 h 2.8651 v -2.1387 h -2.8651 V 626.24 H 478.54 z"
+           id="path3129"
+           inkscape:connector-curvature="0"
+           style="fill:#f21313;stroke:#f70808;stroke-width:0.19269px" />
+        <rect
+           height="3.0676"
+           rx="0.71065998"
+           ry="0.67648"
+           width="6.2848001"
+           y="629.58002"
+           x="488.76999"
+           id="rect3131"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.51086998;stroke-linejoin:round" />
+        <rect
+           height="3.2014"
+           rx="0.74166"
+           ry="0.70599002"
+           width="6.559"
+           y="634.84003"
+           x="488.45001"
+           id="rect3133"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.51086998;stroke-linejoin:round" />
+      </g>
+      <rect
+         style="color:#000000;fill:none"
+         height="16"
+         width="23"
+         y="621.53998"
+         x="471.76001"
+         id="rect3135" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/unfold_filtered_ancestors.png b/freeplane/viewer-resources/images/unfold_filtered_ancestors.png
deleted file mode 100644
index 5df2a55..0000000
Binary files a/freeplane/viewer-resources/images/unfold_filtered_ancestors.png and /dev/null differ
diff --git a/freeplane/viewer-resources/images/unfold_one_level.svg b/freeplane/viewer-resources/images/unfold_one_level.svg
new file mode 100644
index 0000000..10b1c19
--- /dev/null
+++ b/freeplane/viewer-resources/images/unfold_one_level.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.021091"
+   width="23.001595"
+   version="1.1"
+   viewBox="0 0 23.001595 16.021092"
+   id="svg3141"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="xx011.svg">
+  <defs
+     id="defs3163" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3161"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="335.53523"
+     inkscape:cy="-416.867"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3141" />
+  <metadata
+     id="metadata3143">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-451.94201,-720.413)"
+     id="g3145">
+    <g
+       transform="translate(-57.318,96.283)"
+       id="g3147">
+      <g
+         transform="matrix(1.088,0,0,1.0969,-48.224,-61.854)"
+         id="g3149">
+        <path
+           style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#003380;stroke:#000080;stroke-width:0.65200001;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99607999"
+           d="m 513.5,632.12 c 2.586,0.0519 5.5911,1.0831 7.1174,2.672 1.5263,1.5888 3.9736,3.6813 6.1652,3.4366 -1.832,0.18999 -4.496,-2.4103 -5.9677,-4.2537 -1.4995,-1.8819 -4.6592,-4.2052 -7.3002,-4.258 l -0.0148,2.4032 h 10e-6 z"
+           id="path3151"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 524.57,625.77 v 3.5345 h -3.3019 v 2.4648 h 3.3019 v 3.5345 h 2.5114 v -3.5345 h 3.3019 v -2.4648 h -3.3019 V 625.77 H 524.57 z"
+           id="path3153"
+           inkscape:connector-curvature="0"
+           style="fill:#f21313;stroke:#f70808;stroke-width:0.22206999px" />
+        <g
+           transform="translate(0.097063,-0.29119)"
+           id="g3155">
+          <rect
+             height="3.2014"
+             rx="0.74166"
+             ry="0.70599002"
+             width="6.559"
+             y="636.82001"
+             x="526.62"
+             id="rect3157"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#000080;stroke-width:0.51086998;stroke-linejoin:round" />
+        </g>
+      </g>
+      <rect
+         style="color:#000000;fill:none"
+         height="16"
+         width="23"
+         y="624.13"
+         x="509.26001"
+         id="rect3159" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/images/unlock.svg b/freeplane/viewer-resources/images/unlock.svg
new file mode 100644
index 0000000..e513bed
--- /dev/null
+++ b/freeplane/viewer-resources/images/unlock.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16.003298"
+   width="16"
+   version="1.1"
+   viewBox="0 0 16 16.003298"
+   id="svg3243"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="decrypted.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3278"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.22425739"
+     inkscape:cx="344.06223"
+     inkscape:cy="-418.50109"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3243" />
+  <defs
+     id="defs3245">
+    <radialGradient
+       id="a"
+       gradientUnits="userSpaceOnUse"
+       cy="498.92001"
+       cx="453.10999"
+       gradientTransform="matrix(1.372,0.93823,-0.52585,0.76894,99.161,-331.72)"
+       r="8.4835997">
+      <stop
+         stop-color="#fff"
+         offset="0"
+         id="stop3248" />
+      <stop
+         stop-color="#7c7c7c"
+         offset="1"
+         id="stop3250" />
+    </radialGradient>
+    <linearGradient
+       id="c"
+       y2="536.09998"
+       gradientUnits="userSpaceOnUse"
+       x2="501.47"
+       gradientTransform="translate(-74.951,-42.905)"
+       y1="543.42999"
+       x1="517.95001">
+      <stop
+         stop-color="#8dd35f"
+         offset="0"
+         id="stop3253" />
+      <stop
+         stop-color="#fff"
+         offset="1"
+         id="stop3255" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       y2="514.45001"
+       gradientUnits="userSpaceOnUse"
+       x2="486.73999"
+       y1="506.23001"
+       x1="475.91">
+      <stop
+         stop-color="#5aa02c"
+         offset="0"
+         id="stop3258" />
+      <stop
+         stop-color="#e3f4d7"
+         offset="1"
+         id="stop3260" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata3262">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(0.5,0,0,0.5,-226.42501,-236.7967)"
+     id="g3264">
+    <path
+       d="m 459.53,485.08 -4.8985,0.0645 0.043,-5.5001 c 0.11486,-3.0714 3.5127,-5.5766 7.8204,-5.543 4.4752,-7e-4 7.9512,2.8412 8.0353,5.5001 v 9.6681 h -4.8555 v -9.2384 c -0.07,-1.0834 -1.4878,-2.0378 -3.0316,-1.9984 -1.3368,-0.002 -3.0735,0.31689 -3.156,2.0843 l 0.043,4.963 z"
+       id="path3266"
+       inkscape:connector-curvature="0"
+       style="fill:url(#a);fill-rule:evenodd;stroke:#484848;stroke-width:0.99571002px" />
+    <rect
+       ry="0.18513"
+       rx="0.16552"
+       transform="scale(-1,-1)"
+       height="32"
+       width="32"
+       y="-505.60001"
+       x="-484.85001"
+       id="rect3268"
+       style="fill:none" />
+    <g
+       transform="translate(38,0)"
+       id="g3270"
+       style="stroke-linecap:round">
+      <rect
+         height="17.902"
+         width="21.143999"
+         y="487.20001"
+         x="424.04999"
+         id="rect3272"
+         style="fill:url(#c);stroke:#225500" />
+      <path
+         d="m 434.6,491.64 c -1.1338,0 -2.0312,0.89746 -2.0312,2.0312 0,0.87514 0.54097,1.6418 1.3125,1.9375 l -0.40625,1.375 -1.0938,3.6875 h 2.2188 2.25 l -1.1562,-3.6875 -0.40625,-1.375 c 0.80119,-0.28016 1.375,-1.0411 1.375,-1.9375 0,-1.1338 -0.9287,-2.0313 -2.0625,-2.0312 z"
+         id="path3274"
+         inkscape:connector-curvature="0"
+         style="stroke:#2d5016;stroke-width:0.66838002" />
+      <circle
+         transform="translate(-47.222,-13.985)"
+         cy="510.14001"
+         cx="481.84"
+         r="6.7778001"
+         id="circle3276"
+         d="m 488.6178,510.14001 c 0,3.74328 -3.03453,6.7778 -6.7778,6.7778 -3.74328,0 -6.7778,-3.03452 -6.7778,-6.7778 0,-3.74327 3.03452,-6.7778 6.7778,-6.7778 3.74327,0 6.7778,3.03453 6.7778,6.7778 z"
+         sodipodi:cx="481.84"
+         sodipodi:cy="510.14001"
+         sodipodi:rx="6.7778001"
+         sodipodi:ry="6.7778001"
+         style="fill:none;stroke:url(#b)" />
+    </g>
+  </g>
+</svg>
diff --git a/freeplane/viewer-resources/translations/Resources_en.properties b/freeplane/viewer-resources/translations/Resources_en.properties
index 0166a84..95f1d60 100644
--- a/freeplane/viewer-resources/translations/Resources_en.properties
+++ b/freeplane/viewer-resources/translations/Resources_en.properties
@@ -15,13 +15,13 @@ accessories/plugins/EncryptNode.properties_7=Cancel
 accessories/plugins/EncryptNode.properties_insert_encrypted_node_first=You can only toggle password protection (encryption) state of an encrypted node. Please insert such a node using the tools menu.
 accessories/plugins/EncryptNode.properties_select_me=Select me to continue!
 accessories/plugins/EncryptNode.properties_wrong_password=The password is not correct.
+accessories/plugins/Export_JavaWebStart.text=Java Web Start...
+accessories/plugins/Export_JavaWebStart.tooltip=Exports the map for java web start.
 accessories/plugins/ExportWithTWiki.text=TWiki...
 accessories/plugins/ExportWithTWiki.tooltip=Exports the map as a TWiki document.
 accessories/plugins/ExportWithXSLT.tooltip=This is an uniform export method.
 accessories/plugins/ExportWithXSLT_Applet.text=Java Applet...
 accessories/plugins/ExportWithXSLT_Applet.tooltip=Exports the map as a java browser applet.
-accessories/plugins/ExportWithXSLT_Flash.text=Flash...
-accessories/plugins/ExportWithXSLT_Flash.tooltip=Exports the map as a flash application.
 accessories/plugins/ExportWithXSLT_HTML.text=XHTML (JavaScript version)...
 accessories/plugins/ExportWithXSLT_HTML3.text=XHTML (Clickable map image version)...
 accessories/plugins/ExportWithXSLT_RESOURCESTJI.text=Resources from RESOURCES node to TaskJuggler file...
@@ -73,7 +73,7 @@ addons.installer.too.old=Current Freeplane version {0} is too old. This add-on n
 addons.installer.unknown.deinstallation.rules=Unknown deinstallation rule(s) {0}
 addons.installer.update=Update from version {0}
 addons.installer.warning=<html><body><strong style="color: red; font-size: 9px">You should only install add-ons from sources you trust. Malicious software may cause damage to your data or violate your privacy.</strong></body></html>
-addons.site=http://freeplane.sourceforge.net/addons/
+addons.site=https://www.freeplane.org/addons/
 AddStyleAttributes.text=Attributes from style
 AddStyleAttributes.tooltip=Add attributes from style node
 AllMapsNodeListAction.text=Find and replace in all maps
@@ -184,7 +184,6 @@ cannot_join_nodes_with_children=Cannot join nodes with children
 cannot_move_into_child_node=Can not move into child node
 cannot_move_to_child=Can't move a node to one of its children.
 CenterAction.text=Center
-CenterSelectedNodeAction.text=Center selected node
 ChangeConnectorArrowsAction.backward.text=Draw arrow back
 ChangeConnectorArrowsAction.both.text=Draw arrow forward and back
 ChangeConnectorArrowsAction.forward.text=Draw arrow forward
@@ -198,7 +197,6 @@ ChangeNodeLevelLeftsAction.text=Move node (Parents sibling)
 ChangeNodeLevelLeftsAction.tooltip=On the left of root the node(s) is/are shifted downwards. It/they become children of its above sibling. On the right of root the node(s) are shifted upwards. Directly at root, the node(s) change sides.
 ChangeNodeLevelRightsAction.text=Move node (Siblings child)
 ChangeNodeLevelRightsAction.tooltip=On the right of root the node(s) is/are shifted downwards. It/they become children of its above sibling. On the left of root the node(s) are shifted upwards. Directly at root, the node(s) change sides.
-choose_background_color=Choose Background color:
 choose_cloud_color=Choose Cloud Color:
 choose_edge_color=Choose Edge Color
 choose_map_background_color=Choose map background color
@@ -209,6 +207,8 @@ ClearLinkAnchorAction.tooltip=<html>clear previously set node anchor</html>
 CloneAction.text=Paste Clone
 close_btn=&Close
 CloseAction.text=Close current map
+CloseAllMapsAction.text=Close all maps
+CloseAllOtherMapsAction.text=Close all other maps
 cloud_shapes=Cloud shapes
 CloudAction.text=Add / remove cloud (default)
 CloudColorAction.text=Cloud color...
@@ -216,6 +216,15 @@ CloudShapeAction.ARC.text=Arc
 CloudShapeAction.RECT.text=Rectangle
 CloudShapeAction.ROUND_RECT.text=Round rectangle
 CloudShapeAction.STAR.text=Star
+collection.copy.presentation=Copy presentation
+collection.copy.slide=Copy slide
+collection.delete=Delete
+collection.down=Down
+collection.move=Move
+collection.moveTo=Move to position
+collection.new.presentation=New presentation
+collection.new.slide=New slide
+collection.up=Up
 ColorProperty.ResetColor=Reset color
 combined=Combined
 condition=Condition
@@ -226,14 +235,16 @@ connector_label=Connector label
 connector_lines=Connector lines
 connector_shapes=Connector shapes
 ConnectorColorAction.text=Connector color...
+controls=Controls
 ConvertCloneToIndependentNodeAction.text=Unclone
+copy_name={0} (copy)
 CopyAction.text=Copy
 CopyAction.tooltip=Copy selected branch
 CopyAttributes.text=Copy attributes
 CopyIDAction.text=Copy node ID
 CopyMapStylesAction.text=Copy map style from...
 CopyNodeURIAction.text=Copy node URI
-copyright=Copyright \u00A9 2000-2016 Freeplane team and others
+copyright=Copyright \u00A9 2000-2017 Freeplane team and others
 CopySingleAction.text=Copy node (single)
 CopySingleAction.tooltip=Copy only the selected node
 CopyStyleExtensionsAction.text=Copy extensions from style node
@@ -316,6 +327,7 @@ EditAction.text=Edit node core in-line
 EditAttributesAction.text=Edit attribute in-line
 EditDetailsAction.text=Edit node details in-line
 EditDetailsInDialogAction.text=Edit node details in dialog
+editEdgeColors=Edit edge colors
 EditFilterAction.text=Compose filter
 EditLongAction.text=Edit node core in dialog
 EditNoteInDialogAction.text=Edit note in dialog
@@ -351,14 +363,14 @@ ExecuteScripts.noScriptsAvailable=None available
 ExecuteScripts.text=Scripts
 ExecuteScriptSecurityError.text=An error occured during the script execution: {0}
 export_failed=Export failed
-export_pdf_text=Portable Document Format (PDF)
-export_svg_text=Scalable Vector Graphic (SVG)
 export_using_xslt=Freeplane Export
 ExportAction.text=Export map...
+ExportAllPresentationsAction.text=Export all presentations to PNG images
 ExportBranchAction.text=Move branch to new map...
 ExportBranchToHTMLAction.text=Branch as HTML
 exported_file={0} file
 ExportPdf.text=PDF
+ExportPresentationAction.text=Export current presentation to PNG images
 ExportSvg.text=SVG
 ExportToHTMLAction.text=HTML
 ExportToImage.jpg.text=JPEG
@@ -379,6 +391,7 @@ f_button_unassigned=<no action>
 FaqOpenURLAction.text=FAQ
 file=&File
 file_already_exists=The file {0} already exists. Do you want to overwrite it?
+file_not_accessible=File {0} is not accessible
 file_not_found=File {0} not found
 FileListFlavorHandler=Links to files
 FileProperties_BranchLeafCount=Number of leaf nodes in selected branch(es):
@@ -634,6 +647,9 @@ icon_penguin=Linux
 icon_positive=Positive
 icon_prepare=Yellow Traffic Light
 icon_revision=Revision
+icon_revision-green=Revision green
+icon_revision-pink=Revision pink
+icon_revision-red=Revision red
 icon_smiley-angry=Angry
 icon_smiley-neutral=No Mind
 icon_smiley-oh=Surprising
@@ -708,7 +724,7 @@ latex_editor=Edit LaTeX Formula
 LatexDeleteLatexAction.text=Remove LaTeX formula
 LatexEditLatexAction.text=Edit LaTeX formula...
 LatexInsertLatexAction.msg1=<html>You are trying to insert a <i>legacy</i> LaTeX formula.<br/>The new way to create LaTeX text/formulae is described on this page:</html>
-LatexInsertLatexAction.msg2=<html>In short: <ul><li>use a "\\latex " prefix in node text or</li><li><i>View->Properties panel</i>, then <i>Core text->Format->Latex</i></li></ul></html>
+LatexInsertLatexAction.msg2=<html>In short: <ul><li>use a "\\latex " prefix in node text or</li><li><i>View->Tool panel</i>, then <i>Core text->Format->Latex</i></li></ul></html>
 LatexInsertLatexAction.text=Add LaTeX formula...
 latexPatternFormat=LaTeX
 LengthUnits.cm=cm
@@ -839,6 +855,9 @@ ModesMenuAction.File.text=File explorer
 ModesMenuAction.MindMap.text=Mind map editor
 most_recent_files=Most recent maps
 MoveAction.text=Move
+MoveSelectedNodeAction.CENTER.text=Center selected node
+MoveSelectedNodeAction.EAST.text=Move selected node to the right
+MoveSelectedNodeAction.WEST.text=Move selected node to the left
 MoveToRootAction.text=Goto root
 NameConditionAction.text=Set name
 navigate=&Navigate
@@ -878,7 +897,7 @@ NextNodeAction.BACK.text=Goto previous node
 NextNodeAction.BACK_N_FOLD.text=Goto previous node (fold)
 NextNodeAction.FORWARD.text=Goto next node
 NextNodeAction.FORWARD_N_FOLD.text=Goto next node (fold)
-NextPresentationItemAction.text=Unfold next presentation item
+NextPresentationItemAction.text=Unfold next presentation item (fold)
 no=No
 no_copy_attributes_before_paste_attributes=You can't paste attributes until you've copied some.
 NO_FORMAT=Text
@@ -918,6 +937,7 @@ not_saved_for_image_error=The map must be saved before you can set an image by f
 not_saved_for_link_error=The map must be saved before you can set a link by file chooser
 note_window_location=Note panel position
 notes=Note
+NotFoldingNextPresentationItemAction.text=Unfold next presentation item
 NotificationOptions.CLOSE=Close
 NotificationOptions.REMIND_ME_LATER=Remind me later
 NotificationOptions.REMOVE_REMINDER=Remove reminder
@@ -944,6 +964,7 @@ OptionPanel.accessories/plugins/AutomaticLayout.properties_PatternTabName=Level
 OptionPanel.ADD_CHILD=Add child node
 OptionPanel.ADD_SIBLING=Add sibling node
 OptionPanel.addons=Add-ons
+OptionPanel.af=Afrikaans
 OptionPanel.always_fold_all_after_load=Fold all
 OptionPanel.always_load_last_maps=Load last and new maps
 OptionPanel.always_load_last_maps.tooltip=Open last files set by above options, even starting FP with a selected map file.
@@ -957,6 +978,8 @@ OptionPanel.antialias.tooltip=<html>Determines the quality of the map. More anti
 OptionPanel.antialias_all=Antialias all
 OptionPanel.antialias_edges=Antialias edges
 OptionPanel.antialias_none=No antialias
+OptionPanel.antialias_svg=Antialias SVGs
+OptionPanel.antialias_svg.tooltip=<html>Determines the quality of SVG rendering. More antialias needs more time.</html>
 OptionPanel.Appearance=Appearance
 OptionPanel.approximate_search_threshold=Threshold for approximate matching
 OptionPanel.approximate_search_threshold.tooltip=<html>Threshold for approximate matching<br/><font size="2">see http://freeplane.sf.net/wiki/index.php/Approximate_search</font><br/>(the higher the fewer variations<br/>of the search term will be found)</html>
@@ -973,6 +996,8 @@ OptionPanel.Behaviour=Behaviour
 OptionPanel.bezier=Smoothly curved (bezier)
 OptionPanel.border_color=Color
 OptionPanel.border_color_matches_edge_color=Use edge color
+OptionPanel.border_dash=Border line type
+OptionPanel.border_dash_matches_edge_dash=Use edge line type
 OptionPanel.border_width=Line width
 OptionPanel.border_width_matches_edge_width=Use edge width
 OptionPanel.bubble=Bubble
@@ -989,6 +1014,8 @@ OptionPanel.cloudcolor=Cloud color
 OptionPanel.cloudshape=Cloud shape
 OptionPanel.combined=Combined
 OptionPanel.compare_as_number=Compare as numbers
+OptionPanel.connector_arrows=Connector arrows
+OptionPanel.connector_dash=Line type
 OptionPanel.convert_to_current_version=<html>Automatically convert maps of older Freeplane versions <br>to the current version?</html>
 OptionPanel.convert_to_current_version.tooltip=<html>Only for very big maps that don't need to be converted <br>(this is expert knowledge) you can open the maps without conversion.</html>
 OptionPanel.copyFormatToNewSibling=Copy format to new siblings
@@ -996,6 +1023,7 @@ OptionPanel.copyFormatToNewSiblingIncludesIcons=Copy format with icons
 OptionPanel.cs=Czech / \u010Desky
 OptionPanel.cut_nodes_without_question=Cut nodes without confirmation?
 OptionPanel.cut_nodes_without_question.tooltip=If this check box is set the nodes are cut without confirmation. This can cause loss of information if pressed without intention.
+OptionPanel.cut_out_pictures_when_pasting_html=Remove images from HTML
 OptionPanel.da=Danish / dansk
 OptionPanel.date_format=Standard date format
 OptionPanel.date_format.tooltip=Either SHORT, MEDIUM, LONG or FULL or a pattern like "MM/dd/yyyy"
@@ -1026,6 +1054,7 @@ OptionPanel.display_inline_editor_for_all_new_nodes=Display inline editor for al
 OptionPanel.display_node_id=Display node ID
 OptionPanel.edgecolor=Edge color
 OptionPanel.edgecolor.tooltip=Property of the edge to the parent node (is also applied to all child nodes)
+OptionPanel.edgedash=Edge line type
 OptionPanel.edgestyle=Edge style
 OptionPanel.edgestyle.tooltip=Property of the edge to the parent node (is also applied to all child nodes)
 OptionPanel.edgewidth=Edge width
@@ -1082,6 +1111,7 @@ OptionPanel.groovy_editor_font.tooltip=Use 'Dialog' or 'Monospaced' if you need
 OptionPanel.groovy_editor_font_size=Font size for Groovy Syntax Highlighting Editor
 OptionPanel.gtk=Gtk
 OptionPanel.hide_edge=Hide edge
+OptionPanel.hide_single_end_connectors=Hide single end connectors
 OptionPanel.highlight_formulas=Highlight formulas
 OptionPanel.horizontal=Horizontal
 OptionPanel.hr=Croatian / hrvatski
@@ -1097,6 +1127,7 @@ OptionPanel.ic_file=Use disk
 OptionPanel.ic_ram=In RAM
 OptionPanel.icon=Icon
 OptionPanel.icon.tooltip=If applied, the node will have exactly this icon.
+OptionPanel.icon_size=Icon size
 OptionPanel.icons.list=List of Displayed Standard Icons
 OptionPanel.icons.list.tooltip=Here, you can order or disable the standard icons. The icons have to be separated by ';'.
 OptionPanel.id=Indonesian / Bahasa Indonesia
@@ -1138,6 +1169,8 @@ OptionPanel.lookandfeel.scaleuifonts=Scale UI Fonts
 OptionPanel.lookandfeel.scaleuifonts.tooltip=Useful for high density monitors
 OptionPanel.lookandfeel.tooltip=<html>The Look&Feel to use. 'metal','windows','motif', 'gtk' are supported, 'mac' is available only on MacOS. Default means, that the default look and feel is used. If you want to put your own L&F, please, enter the class name here and assure that the corresponding jar file(s) are loaded. If there are problems with the look and feel, then choose 'nothing' here. It works for applets.</html>
 OptionPanel.lt=Lithuanian / kalba
+OptionPanel.markClones=Paint clone marks
+OptionPanel.markSelectedClones=Paint clone marks for selection
 OptionPanel.max_displayed_node_count=Maximum number of displayed nodes
 OptionPanel.max_image_width=Max initial image width
 OptionPanel.max_image_width.tooltip=New images are scaled down to this width
@@ -1145,8 +1178,10 @@ OptionPanel.max_menu_item_count=Maximum number of menu items
 OptionPanel.max_menu_item_count.tooltip=Limits number if items in one submenu, at least 10
 OptionPanel.max_node_width=Max node width
 OptionPanel.max_shortened_text_length=Maximum shortened text width
+OptionPanel.menuItemFontSize=Menu item font size
 OptionPanel.metal=Metal
 OptionPanel.min_node_width=Min node width
+OptionPanel.monitor_size_inches=Monitor size (inches)
 OptionPanel.motif=Motif
 OptionPanel.narrow_hexagon=Narrow hexagon
 OptionPanel.nb=Norwegian Bokm\u00E5l / Norsk bokm\u00E5l
@@ -1193,6 +1228,8 @@ OptionPanel.parse_latex=Recognize LaTeX
 OptionPanel.parse_latex.tooltip=Recognize LaTeX formulas by format or prefix: See http://www.freeplane.org/wiki/index.php/LaTeX_in_Freeplane.
 OptionPanel.PASTE_HTML=Paste as HTML
 OptionPanel.PASTE_PLAIN_TEXT=Paste as plain-text
+OptionPanel.pasteImagesFromFiles=Paste images from files
+OptionPanel.pasteImagesFromFiles.tooltip=Insert image if image file is dropped into the map
 OptionPanel.path_property_may_not_be_empty=Path property may not be empty! Change has been reverted.
 OptionPanel.patternname=Name
 OptionPanel.patternname.tooltip=Unique pattern name
@@ -1201,8 +1238,18 @@ OptionPanel.placenewbranches=Place new branches
 OptionPanel.placenewbranches.tooltip=<html>Where to place new branches. Valid values are 'first' and 'last' </html>
 OptionPanel.plugin.tooltip=Non-core plugins.
 OptionPanel.plugins=Plugins
-OptionPanel.presentation_dimmer_transparency=Presentation dimmer transparenty
-OptionPanel.presentation_mode=Presentation mode
+OptionPanel.Presentation=Presentation
+OptionPanel.presentation.combineAll=Combine all presentations
+OptionPanel.presentation.exportDirectory=exported presentation directory name
+OptionPanel.presentation.maxDropBoxRowCount=Maximum row count in drop-down box
+OptionPanel.presentation.maxDropBoxRowCount.tooltip=Applies to presentation and slide selectors
+OptionPanel.presentation.processesEscapeKey=ESCAPE key ends presentation
+OptionPanel.presentation.processesNavigationKeys=Navigation keys control presentation
+OptionPanel.presentation.slideDisplaysAllNodes=Unfold all slide nodes automatically
+OptionPanel.presentation.slowMotion=Slow motion
+OptionPanel.presentation.switchToFullScreen=Activate full screen
+OptionPanel.presentation.switchToSpotlight=Activate spotlight
+OptionPanel.presentation.zoom=Use map zoom
 OptionPanel.printonwhitebackground=<html>White background for printing</html>
 OptionPanel.printonwhitebackground.tooltip=<html>Always use white background for printing</html>
 OptionPanel.pt_BR=Portuguese (Brasil) / Portugu\u00EAs (Brasil)
@@ -1250,6 +1297,8 @@ OptionPanel.separator.automatic_save=Automatic save
 OptionPanel.separator.behaviour=Behaviour
 OptionPanel.separator.browser=Browser
 OptionPanel.separator.cache=Cache
+OptionPanel.separator.clones=Clones
+OptionPanel.separator.cloud=Cloud
 OptionPanel.separator.CloudControls=Clouds
 OptionPanel.separator.commands_for_the_program=Commands for the program
 OptionPanel.separator.connectors=Connectors
@@ -1268,7 +1317,9 @@ OptionPanel.separator.html_export=Html Export
 OptionPanel.separator.html_import=Html Import
 OptionPanel.separator.hyperlink_types=Hyperlink types
 OptionPanel.separator.icon_properties=Icons
+OptionPanel.separator.IconControls=Icons
 OptionPanel.separator.icons=Icons in "Select icon..."
+OptionPanel.separator.Icons=Icons
 OptionPanel.separator.initial_map_size=Initial map size
 OptionPanel.separator.inline_editor=In-line node editor
 OptionPanel.separator.JoinNodesAction=Joining nodes
@@ -1293,6 +1344,7 @@ OptionPanel.separator.other_defaults=Other Defaults
 OptionPanel.separator.others=Other key bindings
 OptionPanel.separator.outline_view=Outline view
 OptionPanel.separator.patterns=Patterns
+OptionPanel.separator.presentation=Presentation
 OptionPanel.separator.reminderOptions=Reminder options
 OptionPanel.separator.RichTextEditor=Rich-Text Editor
 OptionPanel.separator.root_node_appearance=Root node appearance
@@ -1308,7 +1360,8 @@ OptionPanel.separator.spelling=Spell checker options
 OptionPanel.separator.SplitToWordsAction=Splitting node to words
 OptionPanel.separator.status=Status line
 OptionPanel.separator.surveys=Surveys
-OptionPanel.separator.tooltip=Tooltip times
+OptionPanel.separator.svg_icons=SVG Icons
+OptionPanel.separator.tooltip=Tooltips
 OptionPanel.separator.undo=Undo
 OptionPanel.separator.updates=Program updates
 OptionPanel.set_property_text=Change
@@ -1320,9 +1373,12 @@ OptionPanel.shape_vertical_margin=Vertical margin
 OptionPanel.sharp_bezier=Sharply curved (bezier)
 OptionPanel.sharp_linear=Sharp linear
 OptionPanel.shouldCenterSmallMaps=Center small maps
+OptionPanel.show_connectors=Show connector lines
 OptionPanel.show_icon_for_attributes=Show icon for attributes
+OptionPanel.show_icons=Show icons
 OptionPanel.show_less_than_N_nodes_by_default_after_load=Load from map or unfold some nodes
 OptionPanel.show_node_tooltips=Display tool tips
+OptionPanel.show_note_icon_in_tooltip=Show note icon in tool tip
 OptionPanel.show_note_icons=Show note icons
 OptionPanel.show_styles_in_tooltip=Display node styles in tool tips
 OptionPanel.signed_script_are_trusted=Trust signed scripts (recommended).
@@ -1338,7 +1394,7 @@ OptionPanel.single_instance_force.tooltip=Avoid a second instance even if there
 OptionPanel.sk=Slovak / sloven\u010Dina
 OptionPanel.skip_template_selection=Skip template selection dialog
 OptionPanel.sl=Slovene / sloven\u0161\u010Dina
-OptionPanel.slow_scroll_selected_node=Slow scrolling to selected node
+OptionPanel.slow_scroll_selected_node=Scroll selected node smoothly
 OptionPanel.spelling_opt_case_sensitive=Case sensitive
 OptionPanel.spelling_opt_ignore_all_caps_words=Ignore all upper case words.
 OptionPanel.spelling_opt_ignore_capitalization=Ignore capital letters at word begin
@@ -1350,14 +1406,17 @@ OptionPanel.SplitToWordsAction.charactersAcceptedInWord=characters in words
 OptionPanel.SplitToWordsAction.leaveOriginalNodeEmpty=leave original node empty
 OptionPanel.SplitToWordsAction.nodeNumbersInLine=node number in row
 OptionPanel.SplitToWordsAction.saveOriginalTextAsDetails=save original text as details
+OptionPanel.spotlight=Spotlight
+OptionPanel.spotlight_background_color=Spotlight background color
 OptionPanel.sr=Serbian / \u0441\u0440\u043F\u0441\u043A\u0438
 OptionPanel.standard_template=Standard template file
-OptionPanel.standardbackgroundcolor=Standard Background color
+OptionPanel.standardbackgroundcolor=Standard background color
 OptionPanel.standardbackgroundcolor.tooltip=<html>The standard background color in html notation </html>
-OptionPanel.standardcloudcolor=Standard Cloud color
+OptionPanel.standardcloudcolor=Standard cloud color
 OptionPanel.standardcloudcolor.tooltip=<html>The standard cloud color in html notation </html>
 OptionPanel.standardcloudestyle=Standard Cloud style
 OptionPanel.standardcloudestyle.tooltip=<html>The standard cloud style. </html>
+OptionPanel.standardcloudshape=Standard cloud shape
 OptionPanel.standarddrawrectangleforselection=Display selected nodes in bubbles
 OptionPanel.standarddrawrectangleforselection.tooltip=<html>Mark selected nodes by bubble around.</html>
 OptionPanel.standardlinkcolor=Standard link color
@@ -1380,6 +1439,7 @@ OptionPanel.time_for_automatic_save=Time for automatic save
 OptionPanel.time_for_automatic_save.tooltip=<html> time between two consecutive automatic saving actions (in msec): To disable automatic saving set this number to 2000000000.</html>
 OptionPanel.time_for_delayed_selection=Time for delayed selection
 OptionPanel.time_for_delayed_selection.tooltip=<html> Selection time delay of nodes when mouse is over (in msec). Change this value to 1 if you want direct selection on mouse over.</html>
+OptionPanel.toolbar_icon_height=Toolbar icon height
 OptionPanel.toolTipManager.dismissDelay=Dismiss delay, ms
 OptionPanel.toolTipManager.initialDelay=Initial delay, ms
 OptionPanel.toolTipManager.max_tooltip_height=Maximal node tool tip height
@@ -1397,9 +1457,10 @@ OptionPanel.unfold_on_paste.tooltip=Unfold node on paste or Drag-And-Drop
 OptionPanel.uniform_shape=Uniform
 OptionPanel.use_common_out_point_for_root_node=Edges start from one point at root node
 OptionPanel.use_common_out_point_for_root_node.tooltip=Edges start from one point at root node
+OptionPanel.use_svg_icons=Use SVG Icons
+OptionPanel.use_svg_icons.tooltip=<html>Determines the quality of icon rendering. SVG icons need more time.</html>
 OptionPanel.use_tabbed_pane=Use Tabs
 OptionPanel.use_tabbed_pane.tooltip=If selected the maps are displayed in tabs (like in FireFox :-) ).
-OptionPanel.user_defined_screen_resolution=User defined screen resolution (dpi)
 OptionPanel.validate_classpath_needs_readaccess=Scripting: When setting the classpath you have to permit read access on files!
 OptionPanel.validate_invalid_date_format=Invalid standard date format
 OptionPanel.validate_invalid_datetime_format=Invalid standard date-time format
@@ -1500,11 +1561,14 @@ plugins/TimeManagement.xml_todayButton=Reset calendar
 plugins/TimeManagement.xml_WindowTitle=Manage time
 plugins/TimeManagement.xml_WindowTitle_All_Nodes=Search & replace
 preferences=Preferences
+presentation=Presentation
+presentation.combineAll=Combine all presentations
 print_preview_title=Print preview
 PrintAction.text=Print map...
 PrintDirectAction.text=Print
 printing_settings=Print scaling
 PrintPreviewAction.text=Print preview...
+program_terminates=Internal error, program terminates.
 progress=Progress icon (%)
 PropertyAction.dialog=Preferences
 PropertyAction.text=Preferences ...
@@ -1563,7 +1627,7 @@ SaveAcceleratorPresetsAction.text=Save hot key set...
 SaveAction.text=&Save map
 SaveAction_readonlyMsg=This map is read-only. Please use 'File->Save map as...' to save this map.
 SaveAction_readonlyTitle=Attempt to save read-only map
-SaveAll.text=Save &all opened maps
+SaveAll.text=Save &all maps
 SaveAll.tooltip=Saves all opened maps
 SaveAs_toReadonlyMsg={0} is read-only. Please save to a different file.
 SaveAs_toReadonlyTitle=Attempt to save to read-only file
@@ -1603,7 +1667,7 @@ SelectNoteAction.tooltip=Switch to resp. from note panel
 set_accelerator_on_next_click_helpmessage=To create a new keyboard shortcut click on the desired command in the menu.
 SetAccelerator.dialogTitle=Hot key assignment
 SetAccelerator.keystrokeDetected=Keystroke ''{0}'' is not assigned to any menu item.
-SetAcceleratorOnNextClickAction.text=Assign hot key...
+SetAcceleratorOnNextClickAction.text=Assign hot key
 SetAlwaysUnfoldedNodeFlagsAction.text=Keep unfolded nodes
 SetAlwaysUnfoldedNodeFlagsAction.tooltip=Prevents folding for currently unfolded nodes
 SetImageByFileChooserAction.text=Image by choice or link...
@@ -1624,12 +1688,17 @@ ShowAncestorsAction.text=Show ancestors
 ShowAttributeDialogAction.text=Attribute manager...
 ShowDescendantsAction.text=Show descendants
 ShowFilterToolbarAction.text=Filter toolbar
-ShowFormatPanel.text=Properties panel
+ShowFirstSlideAction.text=First slide
+ShowFirstSlideAndStartPresentationAction.text=Run presentation from the beginning
+ShowFormatPanel.text=Tool panel
 ShowFormatPanel.tooltip=Presents a dialog in which node and edge attributes can be changed at once.
 ShowHideNoteAction.text=Display note panel
 ShowHideNoteAction.tooltip=Lets the note panel appear resp. disappear.
+ShowLastSlideAction.text=Last slide
 ShowNextChildAction.text=Show next child
+ShowNextSlideAction.text=Next slide
 ShowNotesInMapAction.text=Display notes in map
+ShowPreviousSlideAction.text=Previous slide
 ShowSelectedAttributesAction.text=Show selected attributes
 ShowSelectionAsRectangleAction.text=Rectangular selection
 simplyhtml.aboutFrameTitle=About this application
@@ -1818,6 +1887,42 @@ simplyhtml.valignMiddle=middle
 simplyhtml.valignTop=top
 simplyhtml.wholeWordsOnly=Whole words only
 simplyhtml.wholeWordsOnly.tooltip=Restrict matches to whole words.
+slide.add=Add
+slide.add.tooltip=Add currently selected nodes to the slide
+slide.at_center.tooltip=at center
+slide.content=Slide content
+slide.descendants=Show descendants
+slide.edge=at margin
+slide.filter=Filter
+slide.first=First
+slide.last=Last
+slide.next=Next
+slide.nofilter=No filter
+slide.on_the_left.tooltip=on the left
+slide.on_the_right.tooltip=on the left
+slide.placenode=Place selected node
+slide.placenode.tooltip=when slide is presented
+slide.present=Present
+slide.presentation=Presentation
+slide.presentations=Presentations
+slide.previous=Previous
+slide.remove=Remove
+slide.remove.tooltip=Remove currently selected nodes from the slide
+slide.select=Select
+slide.select.tooltip=Select slide nodes on the map
+slide.set=Set
+slide.set.tooltip=Make currently selected nodes the slide content
+slide.setfilter=Set filter
+slide.setfilter.tooltip=Set or remove filter to be applied when slide is shown
+slide.setfoldingstate=Set folding
+slide.setfoldingstate.tooltip=Restore current folding when slide is shown
+slide.setzoom=Set zoom
+slide.setzoom.tooltip=Set or remove map zoom applied when slide is shown
+slide.showancestors=Show ancestors
+slide.showonlyselected=Show only selected nodes
+slide.showonlyselected.tooltip=Hide other nodes when slide is shown
+slide.slides=Slides
+slide.stop=Stop
 SortNodes.text=Sort children
 SortNodes.tooltip=Sorts all children of a node alphabetically.
 split=&Split
@@ -1826,7 +1931,10 @@ SplitNode.text=Split node
 SplitNode.tooltip=<html>Node is splitted</html>
 SplitToWordsAction.text=Split with {0} words in line
 STANDARD_FORMAT=Standard
+StartPresentationAction.text=Run presentation
+StartPresentationOrShowNextSlideAction.text=Run presentation/Next slide
 stop_processing=Stop
+StopPresentationAction.text=Stop presentation
 StringFlavorHandler=Plain text as node hierarchy
 StructuredHtmlFlavorHandler=HTML as node hierarchy
 style=Style
@@ -1890,7 +1998,6 @@ ToggleMenubarAction.text=Menubar
 ToggleScrollbarsAction.text=Scrollbars
 ToggleStatusAction.text=Display status line
 ToggleToolbarAction.text=Toolbar
-toolbars=Toolbars
 TranslatedElement.BORDER=Border text
 TranslatedElement.TEXT=Text
 TranslatedElement.TOOLTIP=Tool tip
diff --git a/freeplane/viewer-resources/version.properties b/freeplane/viewer-resources/version.properties
index 78a315c..950bf8c 100644
--- a/freeplane/viewer-resources/version.properties
+++ b/freeplane/viewer-resources/version.properties
@@ -1,2 +1,2 @@
-freeplane_version=1.5.18
+freeplane_version=1.6.6
 freeplane_version_status=
diff --git a/freeplane/viewer-resources/xml/appletmenu.xml b/freeplane/viewer-resources/xml/appletmenu.xml
index 33d1d60..20dcbc6 100644
--- a/freeplane/viewer-resources/xml/appletmenu.xml
+++ b/freeplane/viewer-resources/xml/appletmenu.xml
@@ -15,7 +15,7 @@
 			<Entry name="FindPreviousAction" />
 		</Entry>
 		<Entry name="view">
-			<Entry name="toolbars">
+			<Entry name="controls">
 				<Entry name="ToggleMenubarAction" builder="MB_ToggleMenubarAction" />
 				<Entry name="ToggleToolbarAction" />
 				<Entry name="ShowFilterToolbarAction" accelerator="control F" />
@@ -24,7 +24,7 @@
 			<Entry name="zoom">
 				<Entry accelerator="alt UP" name="ZoomInAction" />
 				<Entry accelerator="alt DOWN" name="ZoomOutAction" />
-				<Entry accelerator="control PERIOD" name="CenterSelectedNodeAction" />
+				<Entry accelerator="alt C" name="MoveSelectedNodeAction.CENTER" />
 			</Entry>
 			<Entry name="menu_viewmode">
 				<Entry name="ViewLayoutTypeAction.OUTLINE" />
@@ -55,9 +55,10 @@
 			<Entry name="GotoNodeAction" />
 			<Entry accelerator="control alt LEFT" name="NextNodeAction.BACK" />
 			<Entry accelerator="control alt RIGHT" name="NextNodeAction.FORWARD" />
+			<Entry name="NotFoldingNextPresentationItemAction" accelerator="control alt SPACE" />
 			<Entry accelerator="control alt shift LEFT" name="NextNodeAction.BACK_N_FOLD" />
 			<Entry accelerator="control alt shift RIGHT" name="NextNodeAction.FORWARD_N_FOLD" />
-			<Entry name="NextPresentationItemAction" />
+			<Entry name="NextPresentationItemAction" accelerator="control shift SPACE" />
 			<Entry name="links">
 			<Entry accelerator="control ENTER" name="FollowLinkAction" />
 			</Entry>
@@ -96,7 +97,7 @@
 		<Entry name="ShowFilterToolbarAction" />
 		<Entry name="ToggleScrollbarsAction" />
 		<Entry name="ViewLayoutTypeAction.OUTLINE" />
-		<Entry name="CenterSelectedNodeAction" />
+		<Entry name="MoveSelectedNodeAction.CENTER" />
 		<Entry name="MoveToRootAction" accelerator="ESCAPE" />
 		<Entry name="GotoNodeAction" />
 	</Entry>
diff --git a/freeplane_ant/src/test/resources/unsorted/Test_de.properties b/freeplane_ant/src/test/resources/unsorted/Test_de.properties
index 9c7b754..213d653 100644
--- a/freeplane_ant/src/test/resources/unsorted/Test_de.properties
+++ b/freeplane_ant/src/test/resources/unsorted/Test_de.properties
@@ -106,7 +106,7 @@ ChangeNodeLevelLeftsAction.text=Knoten nach links schieben
 ChangeNodeLevelLeftsAction.tooltip=Links des Wurzelknotes werden die Knoten zu Kindern ihres benachbarten Geschwisterknotens. Rechts vom Wurzelknoten werden Knoten eine Stufe heraufgehoben. Direkt am Wurzelknoten tauschen die Knoten die Seite.
 ChangeNodeLevelRightsAction.text=Knoten nach rechts schieben
 ChangeNodeLevelRightsAction.tooltip=Rechts des Wurzelknotes werden die Knoten zu Kindern ihres benachbarten Geschwisterknotens. Links vom Wurzelknoten werden Knoten eine Stufe heraufgehoben. Direkt am Wurzelknoten tauschen die Knoten die Seite.
-choose_background_color = Bitte w\u00e4hlen Sie die Hintergrundfarbe
+
 choose_cloud_color = Bitte w\u00e4hlen Sie die Wolkenfarbe
 choose_edge_color = Bitte Kantenfarbe W\u00e4hlen
 choose_map_background_color=Map Hintergrundfarbe w\u00e4hlen
@@ -160,8 +160,8 @@ EnterPassword.text= &Umschalten Ver- / Entschl\u00fcsselt
 error = Fehler
 error_applying_template=Es gab einen Fehler im XSL template.
 error_creating_directory = Es gab Probleme, ein Verzeichnis f\u00fcr den Export zu erstellen.
-export_pdf_text = Portables Dokumentenformat (PDF)
-export_svg_text = Skalierbare Vektorgraphik (SVG)
+
+
 export_using_xslt=Freeplane Export mittels XSLT
 ExportBranchAction.text= Zweig als neue MindMap ...
 ExportBranchToHTMLAction.text= HTML des Zweiges
@@ -1103,7 +1103,7 @@ ApplyToVisibleAction.text=Anwendung auf gefilterte Knoten
 # Ask for Help
 AskForHelp.text=Hilfe anfordern
 # Center selected node
-CenterSelectedNodeAction.text=Selektierten Knoten zentrieren
+MoveSelectedNodeAction.CENTER.text=Selektierten Knoten zentrieren
 # Both
 ChangeConnectorArrowsAction.both.text=Beide
 # None
diff --git a/freeplane_ant/src/test/resources/unsorted/Test_en.properties b/freeplane_ant/src/test/resources/unsorted/Test_en.properties
index 26aa2ff..b9785a7 100644
--- a/freeplane_ant/src/test/resources/unsorted/Test_en.properties
+++ b/freeplane_ant/src/test/resources/unsorted/Test_en.properties
@@ -110,7 +110,7 @@ cannot_delete_root = The root node can't be deleted or cut.
 cannot_join_nodes_with_children = Cannot join nodes with children
 cannot_move_to_child = Can't move a node to one of its children.
 CenterAction.text = Center
-CenterSelectedNodeAction.text = Center selected node
+MoveSelectedNodeAction.CENTER.text = Center selected node
 change_link_arrows = change_link_arrows
 ChangeConnectorArrowsAction.backward.text = Back
 ChangeConnectorArrowsAction.both.text = Both
@@ -121,7 +121,7 @@ ChangeNodeLevelLeftsAction.text = Node left
 ChangeNodeLevelLeftsAction.tooltip = On the left of root the node(s) is/are shifted downwards. It/they become children of its above sibling. On the right of root the node(s) are shifted upwards. Directly at root, the node(s) change sides.
 ChangeNodeLevelRightsAction.text = Node right
 ChangeNodeLevelRightsAction.tooltip = On the right of root the node(s) is/are shifted downwards. It/they become children of its above sibling. On the left of root the node(s) are shifted upwards. Directly at root, the node(s) change sides.
-choose_background_color = Choose Background Color:
+
 choose_cloud_color = Choose Cloud Color:
 choose_edge_color = Choose Edge Color
 choose_map_background_color = Choose Map Background Color
@@ -199,8 +199,8 @@ ExecuteScriptOnSelectedNodeRecursively.text = Execute {0} on selected nodes, rec
 ExecuteScriptOnSingleNode.text = Execute {0} on one selected node
 userScripts = Scripts
 export_failed = Export failed
-export_pdf_text = Portable Document Format (PDF)
-export_svg_text = Scalable Vector Graphic (SVG)
+
+
 export_using_xslt = Freeplane Export using XSLT
 ExportBranchAction.text = Branch as new Map ...
 ExportBranchToHTMLAction.text = Branch as HTML
diff --git a/freeplane_ant/src/test/resources/unsorted/Test_ru.properties b/freeplane_ant/src/test/resources/unsorted/Test_ru.properties
index bf5fa57..75817a6 100644
--- a/freeplane_ant/src/test/resources/unsorted/Test_ru.properties
+++ b/freeplane_ant/src/test/resources/unsorted/Test_ru.properties
@@ -108,7 +108,7 @@ cannot_delete_root = \u041a\u043e\u0440\u043d\u0435\u0432\u043e\u0439 \u0443\u04
 cannot_join_nodes_with_children = \u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u044f\u0442\u044c \u0443\u0437\u043b\u044b \u0441 \u0438\u0445 \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u043c\u0438 \u0443\u0437\u043b\u0430\u043c\u0438
 cannot_move_to_child = \u0423\u0437\u0435\u043b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0435\u0440\u0435\u043c\u0435\u0449\u0435\u043d \u0432 \u0441\u0432\u043e\u0439 \u0434\u043e\u0447\u0435\u0440\u043d\u0438\u0439 \u0443\u0437\u0435\u043b
 CenterAction.text= \u0426\u0435\u043d\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c
-CenterSelectedNodeAction.text=\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043c\u0435\u0447\u0435\u043d\u044b\u0439 \u0443\u0437\u0435\u043b
+MoveSelectedNodeAction.CENTER.text=\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043c\u0435\u0447\u0435\u043d\u044b\u0439 \u0443\u0437\u0435\u043b
 change_link_arrows=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0442\u0440\u0435\u043b\u043a\u0438 \u043d\u0430 \u0441\u0432\u044f\u0437\u0438
 ChangeConnectorArrowsAction.text=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0442\u0440\u0435\u043b\u043a\u0438 \u043d\u0430 \u0441\u0432\u044f\u0437\u0438
 
@@ -116,7 +116,7 @@ ChangeNodeLevelLeftsAction.text=\u0423\u0437\u0435\u043b \u0432\u043b\u0435\u043
 ChangeNodeLevelLeftsAction.tooltip=\u0421 \u043b\u0435\u0432\u043e\u0439 \u0441\u0442\u043e\u0440\u043e\u043d\u044b \u043e\u0442 \u043a\u043e\u0440\u043d\u044f \u0443\u0437\u043b\u044b \u0441\u043c\u0435\u0449\u0430\u044e\u0442\u0441\u044f \u0432\u043d\u0438\u0437 \u0438 \u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0442\u0441\u044f \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u043c\u0438 \u0443\u0437\u043b\u0430\u043c\u0438 \u0432\u044b\u0448\u0435\u043b\u0435\u0436\u0430\ [...]
 ChangeNodeLevelRightsAction.text=\u0423\u0437\u0435\u043b \u0432\u043f\u0440\u0430\u0432\u043e
 ChangeNodeLevelRightsAction.tooltip=\u0421 \u043f\u0440\u0430\u0432\u043e\u0439 \u0441\u0442\u043e\u0440\u043e\u043d\u044b \u043e\u0442 \u043a\u043e\u0440\u043d\u044f \u0443\u0437\u043b\u044b \u0441\u043c\u0435\u0449\u0430\u044e\u0442\u0441\u044f \u0432\u043d\u0438\u0437 \u0438 \u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0442\u0441\u044f \u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u043d\u044b\u043c\u0438 \u0443\u0437\u043b\u0430\u043c\u0438 \u0432\u044b\u0448\u0435\u043b\u0435\u0436 [...]
-choose_background_color = \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u043e\u043d\u043e\u0432\u044b\u0439 \u0446\u0432\u0435\u0442
+
 choose_cloud_color = \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0446\u0432\u0435\u0442 \u043e\u0431\u043b\u0430\u043a\u0430
 choose_edge_color = \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0446\u0432\u0435\u0442 \u0440\u0435\u0431\u0440\u0430
 choose_map_background_color=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0446\u0432\u0435\u0442 \u0444\u043e\u043d\u0430 \u0434\u043b\u044f \u043a\u0430\u0440\u0442\u044b
@@ -176,8 +176,8 @@ EnterPassword.text= &\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u044
 error =\u041e\u0448\u0438\u0431\u043a\u0430
 error_applying_template=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0438 XSLT \u0442\u0440\u0430\u043d\u0441\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438.
 error_creating_directory = \u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u043f\u0430\u043f\u043a\u0438
-export_pdf_text = \u0444\u043e\u0440\u043c\u0430\u0442 PDF
-export_svg_text = \u041c\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u0443\u0435\u043c\u0430\u044f \u0412\u0435\u043a\u0442\u043e\u0440\u043d\u0430\u044f \u0413\u0440\u0430\u0444\u0438\u043a\u0430 (SVG)
+
+
 export_using_xslt=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u0441 XSLT
 ExportBranchAction.text= \u0412\u0435\u0442\u0432\u044c \u043a\u0430\u043a \u043d\u043e\u0432\u0443\u044e \u043a\u0430\u0440\u0442\u0443 ...
 ExportBranchToHTMLAction.text= \u042d\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0442\u0432\u044c \u0432 HTML
diff --git a/freeplane_framework/build.gradle b/freeplane_framework/build.gradle
index 5d8a11f..17376f2 100644
--- a/freeplane_framework/build.gradle
+++ b/freeplane_framework/build.gradle
@@ -2,7 +2,7 @@ import org.apache.tools.ant.filters.*
 
 task freeplanelauncherJar(type: Jar) {
      archiveName = 'freeplanelauncher.jar'
-     destinationDir = new File(globalBuild)
+     destinationDir = new File(globalBin)
 
      dependsOn classes
      from (sourceSets.main.output) {
@@ -24,7 +24,7 @@ task copyFreeplaneShellScript(type: Copy) {
          include('freeplane.sh')
          fileMode = 0755
      }
-	 into(globalBuild)
+	 into(globalBin)
 	 filter(FixCrLfFilter.class, eol:FixCrLfFilter.CrLf.newInstance("lf"))
 }	 
 
@@ -54,18 +54,22 @@ task copyLauncherStuff(type: Copy) {
          include('*.exe')
          include('*.ini')
      }
-     into(globalBuild)
+     into(globalBin)
      dependsOn jar
 }
 
-task makeKnopflerfischPermissionDirs << {
-	new File(globalBuild, 'fwdir/perms').mkdirs()
-	new File(globalBuild, 'fwdir/condperm').mkdirs()
+task makeKnopflerfischPermissionDirs {
+    doLast {
+        new File(globalBin, 'fwdir/perms').mkdirs()
+        new File(globalBin, 'fwdir/condperm').mkdirs()
+    }
 }
 
-eclipseJdt << {
-    File f = file('.settings/org.eclipse.core.resources.prefs')
-    f.append('encoding/windows-installer=ISO-8859-1\n')
+eclipseJdt {
+    doLast {
+        File f = file('.settings/org.eclipse.core.resources.prefs')
+        f.append('encoding/windows-installer=ISO-8859-1\n')
+    }
 }
 
 build.dependsOn (copyLauncherStuff, makeKnopflerfischPermissionDirs)
diff --git a/freeplane_framework/eclipse/launchers/freeplane knopflerfish mac.launch b/freeplane_framework/eclipse/launchers/freeplane knopflerfish mac.launch
index a3c88a0..1aaebe2 100644
--- a/freeplane_framework/eclipse/launchers/freeplane knopflerfish mac.launch	
+++ b/freeplane_framework/eclipse/launchers/freeplane knopflerfish mac.launch	
@@ -11,12 +11,14 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="freeplane" path="1" type="4"/>
"/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath">
<memento exportedEntriesOnly="false" project="freeplane"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry">
<memento path="3" variableString="${workspace_loc:freeplane_framework}/../BIN4mac/Freeplane.app/Contents/Java/framework.jar"/>
</runtimeClasspathEntry>
"/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry">
<memento path="3" variableString="${workspace_loc:freeplane_framework}/../BIN4mac/Freeplane.app/Contents/Java/freeplanelauncher.jar"/>
</runtimeClasspathEntry>
"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_131"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.freeplane.launcher.Launcher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="freeplane_framework"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xdock:icon=${workspace_loc:/freeplane_framework/mac-appbundler/freeplane.icns} -Xdock:name=Freeplane -Xmx512m -Dorg.freeplane.basedirectory=${workspace_loc:freeplane}/..""/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:freeplane_framework/build4mac/Freeplane.app/Contents/Resources/Java}"/>
-<stringAttribute key="yk-options" value="
snapshots-dir=
additional-options2=onexit\=snapshot
startup=0
"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xdock:icon=${workspace_loc:/freeplane_framework/mac-appbundler/freeplane.icns} -Xdock:name=Freeplane -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:freeplane_framework}/../BIN4mac/Freeplane.app/Contents/Java"/>
+<stringAttribute key="yk-options" value="
additional-options2=onexit\=snapshot
startup=0
"/>
 </launchConfiguration>
diff --git a/freeplane_framework/eclipse/launchers/freeplane knopflerfish.launch b/freeplane_framework/eclipse/launchers/freeplane knopflerfish.launch
index d3b9f67..44e7b7c 100644
--- a/freeplane_framework/eclipse/launchers/freeplane knopflerfish.launch	
+++ b/freeplane_framework/eclipse/launchers/freeplane knopflerfish.launch	
@@ -10,7 +10,7 @@
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;archive detectRoot=&quot;true&quot; path=&quot;/hom [...]
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.freeplane.launcher.Launcher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="freeplane_framework"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m "-Dorg.freeplane.basedirectory=${workspace_loc:freeplane}/../BUILD" "-Djava.security.policy=${workspace_loc:freeplane_framework/eclipse/launchers/freeplane.policy}" "-Dframework.home=${system_property:user.home}/.gradle/caches/modules-2/files-2.1/org.knopflerfish/framework""/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:freeplane_framework}/../BUILD"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m "-Dorg.freeplane.basedirectory=${workspace_loc:freeplane}/../BIN" "-Djava.security.policy=${workspace_loc:freeplane_framework/eclipse/launchers/freeplane.policy}" "-Dframework.home=${system_property:user.home}/.gradle/caches/modules-2/files-2.1/org.knopflerfish/framework""/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:freeplane_framework}/../BIN"/>
 <stringAttribute key="yk-options" value="
snapshots-dir=
additional-options2=onexit\=snapshot
startup=0
"/>
 </launchConfiguration>
diff --git a/freeplane_framework/eclipse/launchers/freeplane.policy b/freeplane_framework/eclipse/launchers/freeplane.policy
index 066893b..29c6f9f 100644
--- a/freeplane_framework/eclipse/launchers/freeplane.policy
+++ b/freeplane_framework/eclipse/launchers/freeplane.policy
@@ -14,6 +14,11 @@ grant codeBase "file:${user.home}/.p2/-" {
         permission java.security.AllPermission;
 };
 
+grant codeBase "file:${user.home}/.gradle/-" {
+        permission java.security.AllPermission;
+};
+
 grant {
+		permission java.io.FilePermission "${org.freeplane.basedirectory}/-", "read";
         permission java.lang.RuntimePermission "getClassLoader";
 };
\ No newline at end of file
diff --git a/freeplane_framework/launch4j/freeplaneConsole.lj4.xml b/freeplane_framework/launch4j/freeplaneConsole.lj4.xml
index 30718fd..623149d 100644
--- a/freeplane_framework/launch4j/freeplaneConsole.lj4.xml
+++ b/freeplane_framework/launch4j/freeplaneConsole.lj4.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>console</headerType>
@@ -9,15 +10,18 @@
   <priority>normal</priority>
   <downloadUrl>http://java.com/download</downloadUrl>
   <supportUrl></supportUrl>
-  <customProcName>false</customProcName>
   <stayAlive>true</stayAlive>
+  <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon></icon>
   <jre>
     <path>%FREEPLANE_JAVA_HOME%</path>
+    <bundledJre64Bit>false</bundledJre64Bit>
+    <bundledJreAsFallback>false</bundledJreAsFallback>
     <minVersion>1.7.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
+    <runtimeBits>64/32</runtimeBits>
     <opt>-Dorg.freeplane.userfpdir="%APPDATA%\\Freeplane"</opt>
   </jre>
 </launch4jConfig>
diff --git a/freeplane_framework/launch4j/freeplaneGui.lj4.xml b/freeplane_framework/launch4j/freeplaneGui.lj4.xml
index b38bf40..0c53be0 100644
--- a/freeplane_framework/launch4j/freeplaneGui.lj4.xml
+++ b/freeplane_framework/launch4j/freeplaneGui.lj4.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <launch4jConfig>
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
@@ -9,15 +10,18 @@
   <priority>normal</priority>
   <downloadUrl>http://java.com/download</downloadUrl>
   <supportUrl></supportUrl>
-  <customProcName>false</customProcName>
   <stayAlive>true</stayAlive>
+  <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>Freeplane_app.ico</icon>
   <jre>
     <path>%FREEPLANE_JAVA_HOME%</path>
+    <bundledJre64Bit>false</bundledJre64Bit>
+    <bundledJreAsFallback>false</bundledJreAsFallback>
     <minVersion>1.7.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
+    <runtimeBits>64/32</runtimeBits>
     <opt>-Dorg.freeplane.userfpdir="%APPDATA%\\Freeplane"</opt>
   </jre>
 </launch4jConfig>
diff --git a/freeplane_framework/script/freeplane.policy b/freeplane_framework/script/freeplane.policy
index 6c5dabf..ade1d60 100644
--- a/freeplane_framework/script/freeplane.policy
+++ b/freeplane_framework/script/freeplane.policy
@@ -7,5 +7,6 @@ grant codeBase "file:${org.freeplane.os.lib.ext}/*" {
 };
 
 grant {
+		permission java.io.FilePermission "${org.freeplane.basedirectory}/-", "read";
         permission java.lang.RuntimePermission "getClassLoader";
 };
diff --git a/freeplane_framework/script/props.xargs b/freeplane_framework/script/props.xargs
index 9efed3b..5494a94 100644
--- a/freeplane_framework/script/props.xargs
+++ b/freeplane_framework/script/props.xargs
@@ -40,5 +40,8 @@
 
 
 -Dorg.knopflerfish.startlevel.use=true
+# -Dorg.knopflerfish.framework.bundlestorage.file.unpack=false
+-Dorg.osgi.framework.bundle.parent=app
 
+-Dorg.knopflerfish.framework.bundlestorage.file.unpack=false
 
diff --git a/freeplane_framework/windows-installer/Freeplane_without_Java.iss b/freeplane_framework/windows-installer/Freeplane_without_Java.iss
index 96e616b..565cf56 100644
--- a/freeplane_framework/windows-installer/Freeplane_without_Java.iss
+++ b/freeplane_framework/windows-installer/Freeplane_without_Java.iss
@@ -11,7 +11,7 @@
 ; Predrag Cuklin 18/06/2009 - Universial Version
 ;****************************************************************************
 
-#define MyVersion "1.5.18"
+#define MyVersion "1.6.6"
 #define MyStatus ""
 #define MyAppName "Freeplane"
 #define MyAppPublisher "Open source"
@@ -23,7 +23,7 @@
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{D3941722-C4DD-4509-88C4-0E87F675A859}
-AppCopyright=Copyright � 2000-2016 Freeplane team and others
+AppCopyright=Copyright � 2000-2017 Freeplane team and others
 AppName={#MyAppName}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
@@ -70,7 +70,7 @@ Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription
 Name: associate; Description: {cm:AssocFileExtension,Freeplane,.mm}; GroupDescription: {cm:AssocingFileExtension,Freeplane,.mm}
 
 [Files]
-Source: "..\..\BUILD\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\BIN\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini b/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini
index 2f8e852..77e5982 100644
--- a/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini
+++ b/freeplane_framework/windows-portable/App/AppInfo/appinfo.ini
@@ -21,8 +21,8 @@ CommercialUse=true
 EULAVersion=1
 
 [Version]
-PackageVersion=1.5.18.1
-DisplayVersion=1.5.18
+PackageVersion=1.6.5.1
+DisplayVersion=1.6.6
 
 [SpecialPaths]
 Plugins=NONE
diff --git a/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java b/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java
index 08a8d68..9feee31 100644
--- a/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java
+++ b/freeplane_mac/src/main/java/org/freeplane/plugin/macos/MacChanges.java
@@ -107,7 +107,7 @@ public class MacChanges implements  AboutHandler, OpenFilesHandler, PreferencesH
 
 	
 	public void handlePreferences(PreferencesEvent event) {
-		getModeController().getAction("PropertyAction").actionPerformed(null);
+		getModeController().getAction("ShowPreferencesAction").actionPerformed(null);
 		
 	}
 
diff --git a/freeplane_plugin_bugreport/build.gradle b/freeplane_plugin_bugreport/build.gradle
index 528a46c..c2d63e2 100644
--- a/freeplane_plugin_bugreport/build.gradle
+++ b/freeplane_plugin_bugreport/build.gradle
@@ -16,7 +16,7 @@ jar {
 
         instruction 'Bundle-Vendor', 'Freeplane Project'
         instruction 'Bundle-Activator', pluginid + ".Activator"
-        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
 
         def imports = """\
                       org.osgi.framework;version="1.3.0",
diff --git a/freeplane_plugin_bugreport/src/main/java/org/freeplane/plugin/bugreport/ReportGenerator.java b/freeplane_plugin_bugreport/src/main/java/org/freeplane/plugin/bugreport/ReportGenerator.java
index 84b4424..4387ebd 100644
--- a/freeplane_plugin_bugreport/src/main/java/org/freeplane/plugin/bugreport/ReportGenerator.java
+++ b/freeplane_plugin_bugreport/src/main/java/org/freeplane/plugin/bugreport/ReportGenerator.java
@@ -237,12 +237,11 @@ public class ReportGenerator extends StreamHandler {
 						errorCounter++;
 						if(TextUtils.getRawText("internal_error_tooltip", null) != null){
 							if(logButton == null){
-								final ImageIcon errorIcon = new ImageIcon(ResourceController.getResourceController().getResource(
-										"/images/icons/messagebox_warning.png"));
+								final ImageIcon errorIcon = ResourceController.getResourceController().getIcon("messagebox_warning_icon");
 								logButton = new JButton(){
 									@Override public Dimension getPreferredSize(){
 										Dimension preferredSize = super.getPreferredSize();
-										preferredSize.height = getIcon().getIconHeight();
+										preferredSize.height = Math.max(getIcon().getIconHeight(), getFont().getSize());
 										return preferredSize;
 									}
 								};
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/ImmutableGenericNodeUpdated.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/ImmutableGenericNodeUpdated.java
new file mode 100644
index 0000000..3d412a9
--- /dev/null
+++ b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/ImmutableGenericNodeUpdated.java
@@ -0,0 +1,334 @@
+package org.freeplane.plugin.collaboration.client.event;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import javax.annotation.Generated;
+
+/**
+ * Immutable implementation of {@link GenericNodeUpdated}.
+ * <p>
+ * Use the builder to create immutable instances:
+ * {@code ImmutableGenericNodeUpdated.builder()}.
+ */
+ at SuppressWarnings("all")
+ at Generated({"Immutables.generator", "GenericNodeUpdated"})
+public final class ImmutableGenericNodeUpdated
+    implements GenericNodeUpdated {
+  private final String contentType;
+  private final JsonNode content;
+  private final String nodeId;
+
+  private ImmutableGenericNodeUpdated(
+      String contentType,
+      JsonNode content,
+      String nodeId) {
+    this.contentType = contentType;
+    this.content = content;
+    this.nodeId = nodeId;
+  }
+
+  /**
+   * @return The value of the {@code contentType} attribute
+   */
+  @JsonProperty("contentType")
+  @Override
+  public String contentType() {
+    return contentType;
+  }
+
+  /**
+   * @return The value of the {@code content} attribute
+   */
+  @JsonProperty("content")
+  @Override
+  public JsonNode content() {
+    return content;
+  }
+
+  /**
+   * @return The value of the {@code nodeId} attribute
+   */
+  @JsonProperty("nodeId")
+  @Override
+  public Optional<String> nodeId() {
+    return Optional.ofNullable(nodeId);
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link GenericNodeUpdated#contentType() contentType} attribute.
+   * An equals check used to prevent copying of the same value by returning {@code this}.
+   * @param contentType A new value for contentType
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableGenericNodeUpdated withContentType(String contentType) {
+    if (this.contentType.equals(contentType)) return this;
+    String newValue = Objects.requireNonNull(contentType, "contentType");
+    return new ImmutableGenericNodeUpdated(newValue, this.content, this.nodeId);
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link GenericNodeUpdated#content() content} attribute.
+   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param content A new value for content
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableGenericNodeUpdated withContent(JsonNode content) {
+    if (this.content == content) return this;
+    JsonNode newValue = Objects.requireNonNull(content, "content");
+    return new ImmutableGenericNodeUpdated(this.contentType, newValue, this.nodeId);
+  }
+
+  /**
+   * Copy the current immutable object by setting a <i>present</i> value for the optional {@link GenericNodeUpdated#nodeId() nodeId} attribute.
+   * @param value The value for nodeId
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableGenericNodeUpdated withNodeId(String value) {
+    String newValue = Objects.requireNonNull(value, "nodeId");
+    if (Objects.equals(this.nodeId, newValue)) return this;
+    return new ImmutableGenericNodeUpdated(this.contentType, this.content, newValue);
+  }
+
+  /**
+   * Copy the current immutable object by setting an optional value for the {@link GenericNodeUpdated#nodeId() nodeId} attribute.
+   * An equality check is used on inner nullable value to prevent copying of the same value by returning {@code this}.
+   * @param optional A value for nodeId
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableGenericNodeUpdated withNodeId(Optional<String> optional) {
+    String value = optional.orElse(null);
+    if (Objects.equals(this.nodeId, value)) return this;
+    return new ImmutableGenericNodeUpdated(this.contentType, this.content, value);
+  }
+
+  /**
+   * This instance is equal to all instances of {@code ImmutableGenericNodeUpdated} that have equal attribute values.
+   * @return {@code true} if {@code this} is equal to {@code another} instance
+   */
+  @Override
+  public boolean equals(Object another) {
+    if (this == another) return true;
+    return another instanceof ImmutableGenericNodeUpdated
+        && equalTo((ImmutableGenericNodeUpdated) another);
+  }
+
+  private boolean equalTo(ImmutableGenericNodeUpdated another) {
+    return contentType.equals(another.contentType)
+        && content.equals(another.content)
+        && Objects.equals(nodeId, another.nodeId);
+  }
+
+  /**
+   * Computes a hash code from attributes: {@code contentType}, {@code content}, {@code nodeId}.
+   * @return hashCode value
+   */
+  @Override
+  public int hashCode() {
+    int h = 31;
+    h = h * 17 + contentType.hashCode();
+    h = h * 17 + content.hashCode();
+    h = h * 17 + Objects.hashCode(nodeId);
+    return h;
+  }
+
+  /**
+   * Prints the immutable value {@code GenericNodeUpdated} with attribute values.
+   * @return A string representation of the value
+   */
+  @Override
+  public String toString() {
+    StringBuilder builder = new StringBuilder("GenericNodeUpdated{");
+    builder.append("contentType=").append(contentType);
+    builder.append(", ");
+    builder.append("content=").append(content);
+    if (nodeId != null) {
+      builder.append(", ");
+      builder.append("nodeId=").append(nodeId);
+    }
+    return builder.append("}").toString();
+  }
+
+  /**
+   * Utility type used to correctly read immutable object from JSON representation.
+   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonDeserialize
+  @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
+  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
+  static final class Json implements GenericNodeUpdated {
+    String contentType;
+    JsonNode content;
+    Optional<String> nodeId = Optional.empty();
+    @JsonProperty("contentType")
+    public void setContentType(String contentType) {
+      this.contentType = contentType;
+    }
+    @JsonProperty("content")
+    public void setContent(JsonNode content) {
+      this.content = content;
+    }
+    @JsonProperty("nodeId")
+    public void setNodeId(Optional<String> nodeId) {
+      this.nodeId = nodeId;
+    }
+    @Override
+    public String contentType() { throw new UnsupportedOperationException(); }
+    @Override
+    public JsonNode content() { throw new UnsupportedOperationException(); }
+    @Override
+    public Optional<String> nodeId() { throw new UnsupportedOperationException(); }
+  }
+
+  /**
+   * @param json A JSON-bindable data structure
+   * @return An immutable value type
+   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonCreator
+  static ImmutableGenericNodeUpdated fromJson(Json json) {
+    ImmutableGenericNodeUpdated.Builder builder = ImmutableGenericNodeUpdated.builder();
+    if (json.contentType != null) {
+      builder.contentType(json.contentType);
+    }
+    if (json.content != null) {
+      builder.content(json.content);
+    }
+    if (json.nodeId != null) {
+      builder.nodeId(json.nodeId);
+    }
+    return builder.build();
+  }
+
+  /**
+   * Creates an immutable copy of a {@link GenericNodeUpdated} value.
+   * Uses accessors to get values to initialize the new immutable instance.
+   * If an instance is already immutable, it is returned as is.
+   * @param instance The instance to copy
+   * @return A copied immutable GenericNodeUpdated instance
+   */
+  public static ImmutableGenericNodeUpdated copyOf(GenericNodeUpdated instance) {
+    if (instance instanceof ImmutableGenericNodeUpdated) {
+      return (ImmutableGenericNodeUpdated) instance;
+    }
+    return ImmutableGenericNodeUpdated.builder()
+        .from(instance)
+        .build();
+  }
+
+  /**
+   * Creates a builder for {@link ImmutableGenericNodeUpdated ImmutableGenericNodeUpdated}.
+   * @return A new ImmutableGenericNodeUpdated builder
+   */
+  public static ImmutableGenericNodeUpdated.Builder builder() {
+    return new ImmutableGenericNodeUpdated.Builder();
+  }
+
+  /**
+   * Builds instances of type {@link ImmutableGenericNodeUpdated ImmutableGenericNodeUpdated}.
+   * Initialize attributes and then invoke the {@link #build()} method to create an
+   * immutable instance.
+   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
+   * but instead used immediately to create instances.</em>
+   */
+  public static final class Builder {
+    private static final long INIT_BIT_CONTENT_TYPE = 0x1L;
+    private static final long INIT_BIT_CONTENT = 0x2L;
+    private long initBits = 0x3L;
+
+    private String contentType;
+    private JsonNode content;
+    private String nodeId;
+
+    private Builder() {
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code GenericNodeUpdated} instance.
+     * Regular attribute values will be replaced with those from the given instance.
+     * Absent optional values will not replace present values.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(GenericNodeUpdated instance) {
+      Objects.requireNonNull(instance, "instance");
+      contentType(instance.contentType());
+      content(instance.content());
+      Optional<String> nodeIdOptional = instance.nodeId();
+      if (nodeIdOptional.isPresent()) {
+        nodeId(nodeIdOptional);
+      }
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link GenericNodeUpdated#contentType() contentType} attribute.
+     * @param contentType The value for contentType 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder contentType(String contentType) {
+      this.contentType = Objects.requireNonNull(contentType, "contentType");
+      initBits &= ~INIT_BIT_CONTENT_TYPE;
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link GenericNodeUpdated#content() content} attribute.
+     * @param content The value for content 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder content(JsonNode content) {
+      this.content = Objects.requireNonNull(content, "content");
+      initBits &= ~INIT_BIT_CONTENT;
+      return this;
+    }
+
+    /**
+     * Initializes the optional value {@link GenericNodeUpdated#nodeId() nodeId} to nodeId.
+     * @param nodeId The value for nodeId
+     * @return {@code this} builder for chained invocation
+     */
+    public final Builder nodeId(String nodeId) {
+      this.nodeId = Objects.requireNonNull(nodeId, "nodeId");
+      return this;
+    }
+
+    /**
+     * Initializes the optional value {@link GenericNodeUpdated#nodeId() nodeId} to nodeId.
+     * @param nodeId The value for nodeId
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder nodeId(Optional<String> nodeId) {
+      this.nodeId = nodeId.orElse(null);
+      return this;
+    }
+
+    /**
+     * Builds a new {@link ImmutableGenericNodeUpdated ImmutableGenericNodeUpdated}.
+     * @return An immutable instance of GenericNodeUpdated
+     * @throws java.lang.IllegalStateException if any required attributes are missing
+     */
+    public ImmutableGenericNodeUpdated build() {
+      if (initBits != 0) {
+        throw new IllegalStateException(formatRequiredAttributesMessage());
+      }
+      return new ImmutableGenericNodeUpdated(contentType, content, nodeId);
+    }
+
+    private String formatRequiredAttributesMessage() {
+      List<String> attributes = new ArrayList<String>();
+      if ((initBits & INIT_BIT_CONTENT_TYPE) != 0) attributes.add("contentType");
+      if ((initBits & INIT_BIT_CONTENT) != 0) attributes.add("content");
+      return "Cannot build GenericNodeUpdated, some of required attributes are not set " + attributes;
+    }
+  }
+}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableServerUpdatesFinished.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableServerUpdatesFinished.java
new file mode 100644
index 0000000..d158b49
--- /dev/null
+++ b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableServerUpdatesFinished.java
@@ -0,0 +1,386 @@
+package org.freeplane.plugin.collaboration.client.event.batch;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.Generated;
+import org.freeplane.plugin.collaboration.client.event.GenericNodeUpdated;
+
+/**
+ * Immutable implementation of {@link ServerUpdatesFinished}.
+ * <p>
+ * Use the builder to create immutable instances:
+ * {@code ImmutableServerUpdatesFinished.builder()}.
+ */
+ at SuppressWarnings("all")
+ at Generated({"Immutables.generator", "ServerUpdatesFinished"})
+public final class ImmutableServerUpdatesFinished
+    implements ServerUpdatesFinished {
+  private final String mapId;
+  private final long mapRevision;
+  private final List<GenericNodeUpdated> updateEvents;
+
+  private ImmutableServerUpdatesFinished(
+      String mapId,
+      long mapRevision,
+      List<GenericNodeUpdated> updateEvents) {
+    this.mapId = mapId;
+    this.mapRevision = mapRevision;
+    this.updateEvents = updateEvents;
+  }
+
+  /**
+   * @return The value of the {@code mapId} attribute
+   */
+  @JsonProperty("mapId")
+  @Override
+  public String mapId() {
+    return mapId;
+  }
+
+  /**
+   * @return The value of the {@code mapRevision} attribute
+   */
+  @JsonProperty("mapRevision")
+  @Override
+  public long mapRevision() {
+    return mapRevision;
+  }
+
+  /**
+   * @return The value of the {@code updateEvents} attribute
+   */
+  @JsonProperty("updateEvents")
+  @Override
+  public List<GenericNodeUpdated> updateEvents() {
+    return updateEvents;
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link ServerUpdatesFinished#mapId() mapId} attribute.
+   * An equals check used to prevent copying of the same value by returning {@code this}.
+   * @param mapId A new value for mapId
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableServerUpdatesFinished withMapId(String mapId) {
+    if (this.mapId.equals(mapId)) return this;
+    String newValue = Objects.requireNonNull(mapId, "mapId");
+    return new ImmutableServerUpdatesFinished(newValue, this.mapRevision, this.updateEvents);
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link ServerUpdatesFinished#mapRevision() mapRevision} attribute.
+   * A value equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param mapRevision A new value for mapRevision
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableServerUpdatesFinished withMapRevision(long mapRevision) {
+    if (this.mapRevision == mapRevision) return this;
+    return new ImmutableServerUpdatesFinished(this.mapId, mapRevision, this.updateEvents);
+  }
+
+  /**
+   * Copy the current immutable object with elements that replace the content of {@link ServerUpdatesFinished#updateEvents() updateEvents}.
+   * @param elements The elements to set
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableServerUpdatesFinished withUpdateEvents(GenericNodeUpdated... elements) {
+    List<GenericNodeUpdated> newValue = createUnmodifiableList(false, createSafeList(Arrays.asList(elements), true, false));
+    return new ImmutableServerUpdatesFinished(this.mapId, this.mapRevision, newValue);
+  }
+
+  /**
+   * Copy the current immutable object with elements that replace the content of {@link ServerUpdatesFinished#updateEvents() updateEvents}.
+   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param elements An iterable of updateEvents elements to set
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableServerUpdatesFinished withUpdateEvents(Iterable<? extends GenericNodeUpdated> elements) {
+    if (this.updateEvents == elements) return this;
+    List<GenericNodeUpdated> newValue = createUnmodifiableList(false, createSafeList(elements, true, false));
+    return new ImmutableServerUpdatesFinished(this.mapId, this.mapRevision, newValue);
+  }
+
+  /**
+   * This instance is equal to all instances of {@code ImmutableServerUpdatesFinished} that have equal attribute values.
+   * @return {@code true} if {@code this} is equal to {@code another} instance
+   */
+  @Override
+  public boolean equals(Object another) {
+    if (this == another) return true;
+    return another instanceof ImmutableServerUpdatesFinished
+        && equalTo((ImmutableServerUpdatesFinished) another);
+  }
+
+  private boolean equalTo(ImmutableServerUpdatesFinished another) {
+    return mapId.equals(another.mapId)
+        && mapRevision == another.mapRevision
+        && updateEvents.equals(another.updateEvents);
+  }
+
+  /**
+   * Computes a hash code from attributes: {@code mapId}, {@code mapRevision}, {@code updateEvents}.
+   * @return hashCode value
+   */
+  @Override
+  public int hashCode() {
+    int h = 31;
+    h = h * 17 + mapId.hashCode();
+    h = h * 17 + (int) (mapRevision ^ (mapRevision >>> 32));
+    h = h * 17 + updateEvents.hashCode();
+    return h;
+  }
+
+  /**
+   * Prints the immutable value {@code ServerUpdatesFinished} with attribute values.
+   * @return A string representation of the value
+   */
+  @Override
+  public String toString() {
+    return "ServerUpdatesFinished{"
+        + "mapId=" + mapId
+        + ", mapRevision=" + mapRevision
+        + ", updateEvents=" + updateEvents
+        + "}";
+  }
+
+  /**
+   * Utility type used to correctly read immutable object from JSON representation.
+   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonDeserialize
+  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
+  static final class Json
+      implements ServerUpdatesFinished {
+    String mapId;
+    long mapRevision;
+    boolean mapRevisionIsSet;
+    List<GenericNodeUpdated> updateEvents = Collections.emptyList();
+    @JsonProperty("mapId")
+    public void setMapId(String mapId) {
+      this.mapId = mapId;
+    }
+    @JsonProperty("mapRevision")
+    public void setMapRevision(long mapRevision) {
+      this.mapRevision = mapRevision;
+      this.mapRevisionIsSet = true;
+    }
+    @JsonProperty("updateEvents")
+    public void setUpdateEvents(List<GenericNodeUpdated> updateEvents) {
+      this.updateEvents = updateEvents;
+    }
+    @Override
+    public String mapId() { throw new UnsupportedOperationException(); }
+    @Override
+    public long mapRevision() { throw new UnsupportedOperationException(); }
+    @Override
+    public List<GenericNodeUpdated> updateEvents() { throw new UnsupportedOperationException(); }
+  }
+
+  /**
+   * @param json A JSON-bindable data structure
+   * @return An immutable value type
+   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonCreator
+  static ImmutableServerUpdatesFinished fromJson(Json json) {
+    ImmutableServerUpdatesFinished.Builder builder = ImmutableServerUpdatesFinished.builder();
+    if (json.mapId != null) {
+      builder.mapId(json.mapId);
+    }
+    if (json.mapRevisionIsSet) {
+      builder.mapRevision(json.mapRevision);
+    }
+    if (json.updateEvents != null) {
+      builder.addAllUpdateEvents(json.updateEvents);
+    }
+    return builder.build();
+  }
+
+  /**
+   * Creates an immutable copy of a {@link ServerUpdatesFinished} value.
+   * Uses accessors to get values to initialize the new immutable instance.
+   * If an instance is already immutable, it is returned as is.
+   * @param instance The instance to copy
+   * @return A copied immutable ServerUpdatesFinished instance
+   */
+  public static ImmutableServerUpdatesFinished copyOf(ServerUpdatesFinished instance) {
+    if (instance instanceof ImmutableServerUpdatesFinished) {
+      return (ImmutableServerUpdatesFinished) instance;
+    }
+    return ImmutableServerUpdatesFinished.builder()
+        .from(instance)
+        .build();
+  }
+
+  /**
+   * Creates a builder for {@link ImmutableServerUpdatesFinished ImmutableServerUpdatesFinished}.
+   * @return A new ImmutableServerUpdatesFinished builder
+   */
+  public static ImmutableServerUpdatesFinished.Builder builder() {
+    return new ImmutableServerUpdatesFinished.Builder();
+  }
+
+  /**
+   * Builds instances of type {@link ImmutableServerUpdatesFinished ImmutableServerUpdatesFinished}.
+   * Initialize attributes and then invoke the {@link #build()} method to create an
+   * immutable instance.
+   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
+   * but instead used immediately to create instances.</em>
+   */
+  public static final class Builder {
+    private static final long INIT_BIT_MAP_ID = 0x1L;
+    private static final long INIT_BIT_MAP_REVISION = 0x2L;
+    private long initBits = 0x3L;
+
+    private String mapId;
+    private long mapRevision;
+    private List<GenericNodeUpdated> updateEvents = new ArrayList<GenericNodeUpdated>();
+
+    private Builder() {
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code ServerUpdatesFinished} instance.
+     * Regular attribute values will be replaced with those from the given instance.
+     * Absent optional values will not replace present values.
+     * Collection elements and entries will be added, not replaced.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(ServerUpdatesFinished instance) {
+      Objects.requireNonNull(instance, "instance");
+      mapId(instance.mapId());
+      mapRevision(instance.mapRevision());
+      addAllUpdateEvents(instance.updateEvents());
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link ServerUpdatesFinished#mapId() mapId} attribute.
+     * @param mapId The value for mapId 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder mapId(String mapId) {
+      this.mapId = Objects.requireNonNull(mapId, "mapId");
+      initBits &= ~INIT_BIT_MAP_ID;
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link ServerUpdatesFinished#mapRevision() mapRevision} attribute.
+     * @param mapRevision The value for mapRevision 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder mapRevision(long mapRevision) {
+      this.mapRevision = mapRevision;
+      initBits &= ~INIT_BIT_MAP_REVISION;
+      return this;
+    }
+
+    /**
+     * Adds one element to {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
+     * @param element A updateEvents element
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addUpdateEvents(GenericNodeUpdated element) {
+      this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
+      return this;
+    }
+
+    /**
+     * Adds elements to {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
+     * @param elements An array of updateEvents elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addUpdateEvents(GenericNodeUpdated... elements) {
+      for (GenericNodeUpdated element : elements) {
+        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
+      }
+      return this;
+    }
+
+    /**
+     * Sets or replaces all elements for {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
+     * @param elements An iterable of updateEvents elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder updateEvents(Iterable<? extends GenericNodeUpdated> elements) {
+      this.updateEvents.clear();
+      return addAllUpdateEvents(elements);
+    }
+
+    /**
+     * Adds elements to {@link ServerUpdatesFinished#updateEvents() updateEvents} list.
+     * @param elements An iterable of updateEvents elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addAllUpdateEvents(Iterable<? extends GenericNodeUpdated> elements) {
+      for (GenericNodeUpdated element : elements) {
+        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
+      }
+      return this;
+    }
+
+    /**
+     * Builds a new {@link ImmutableServerUpdatesFinished ImmutableServerUpdatesFinished}.
+     * @return An immutable instance of ServerUpdatesFinished
+     * @throws java.lang.IllegalStateException if any required attributes are missing
+     */
+    public ImmutableServerUpdatesFinished build() {
+      if (initBits != 0) {
+        throw new IllegalStateException(formatRequiredAttributesMessage());
+      }
+      return new ImmutableServerUpdatesFinished(mapId, mapRevision, createUnmodifiableList(true, updateEvents));
+    }
+
+    private String formatRequiredAttributesMessage() {
+      List<String> attributes = new ArrayList<String>();
+      if ((initBits & INIT_BIT_MAP_ID) != 0) attributes.add("mapId");
+      if ((initBits & INIT_BIT_MAP_REVISION) != 0) attributes.add("mapRevision");
+      return "Cannot build ServerUpdatesFinished, some of required attributes are not set " + attributes;
+    }
+  }
+
+  private static <T> List<T> createSafeList(Iterable<? extends T> iterable, boolean checkNulls, boolean skipNulls) {
+    ArrayList<T> list;
+    if (iterable instanceof Collection<?>) {
+      int size = ((Collection<?>) iterable).size();
+      if (size == 0) return Collections.emptyList();
+      list = new ArrayList<T>();
+    } else {
+      list = new ArrayList<T>();
+    }
+    for (T element : iterable) {
+      if (skipNulls && element == null) continue;
+      if (checkNulls) Objects.requireNonNull(element, "element");
+      list.add(element);
+    }
+    return list;
+  }
+
+  private static <T> List<T> createUnmodifiableList(boolean clone, List<T> list) {
+    switch(list.size()) {
+    case 0: return Collections.emptyList();
+    case 1: return Collections.singletonList(list.get(0));
+    default:
+      if (clone) {
+        return Collections.unmodifiableList(new ArrayList<T>(list));
+      } else {
+        if (list instanceof ArrayList<?>) {
+          ((ArrayList<?>) list).trimToSize();
+        }
+        return Collections.unmodifiableList(list);
+      }
+    }
+  }
+}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableUpdatesFinished.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableUpdatesFinished.java
new file mode 100644
index 0000000..4ed3644
--- /dev/null
+++ b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ImmutableUpdatesFinished.java
@@ -0,0 +1,385 @@
+package org.freeplane.plugin.collaboration.client.event.batch;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.Generated;
+import org.freeplane.plugin.collaboration.client.event.MapUpdated;
+
+/**
+ * Immutable implementation of {@link UpdatesFinished}.
+ * <p>
+ * Use the builder to create immutable instances:
+ * {@code ImmutableUpdatesFinished.builder()}.
+ */
+ at SuppressWarnings("all")
+ at Generated({"Immutables.generator", "UpdatesFinished"})
+public final class ImmutableUpdatesFinished
+    implements UpdatesFinished {
+  private final String mapId;
+  private final long mapRevision;
+  private final List<MapUpdated> updateEvents;
+
+  private ImmutableUpdatesFinished(
+      String mapId,
+      long mapRevision,
+      List<MapUpdated> updateEvents) {
+    this.mapId = mapId;
+    this.mapRevision = mapRevision;
+    this.updateEvents = updateEvents;
+  }
+
+  /**
+   * @return The value of the {@code mapId} attribute
+   */
+  @JsonProperty("mapId")
+  @Override
+  public String mapId() {
+    return mapId;
+  }
+
+  /**
+   * @return The value of the {@code mapRevision} attribute
+   */
+  @JsonProperty("mapRevision")
+  @Override
+  public long mapRevision() {
+    return mapRevision;
+  }
+
+  /**
+   * @return The value of the {@code updateEvents} attribute
+   */
+  @JsonProperty("updateEvents")
+  @Override
+  public List<MapUpdated> updateEvents() {
+    return updateEvents;
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link UpdatesFinished#mapId() mapId} attribute.
+   * An equals check used to prevent copying of the same value by returning {@code this}.
+   * @param mapId A new value for mapId
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableUpdatesFinished withMapId(String mapId) {
+    if (this.mapId.equals(mapId)) return this;
+    String newValue = Objects.requireNonNull(mapId, "mapId");
+    return new ImmutableUpdatesFinished(newValue, this.mapRevision, this.updateEvents);
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link UpdatesFinished#mapRevision() mapRevision} attribute.
+   * A value equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param mapRevision A new value for mapRevision
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableUpdatesFinished withMapRevision(long mapRevision) {
+    if (this.mapRevision == mapRevision) return this;
+    return new ImmutableUpdatesFinished(this.mapId, mapRevision, this.updateEvents);
+  }
+
+  /**
+   * Copy the current immutable object with elements that replace the content of {@link UpdatesFinished#updateEvents() updateEvents}.
+   * @param elements The elements to set
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableUpdatesFinished withUpdateEvents(MapUpdated... elements) {
+    List<MapUpdated> newValue = createUnmodifiableList(false, createSafeList(Arrays.asList(elements), true, false));
+    return new ImmutableUpdatesFinished(this.mapId, this.mapRevision, newValue);
+  }
+
+  /**
+   * Copy the current immutable object with elements that replace the content of {@link UpdatesFinished#updateEvents() updateEvents}.
+   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param elements An iterable of updateEvents elements to set
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableUpdatesFinished withUpdateEvents(Iterable<? extends MapUpdated> elements) {
+    if (this.updateEvents == elements) return this;
+    List<MapUpdated> newValue = createUnmodifiableList(false, createSafeList(elements, true, false));
+    return new ImmutableUpdatesFinished(this.mapId, this.mapRevision, newValue);
+  }
+
+  /**
+   * This instance is equal to all instances of {@code ImmutableUpdatesFinished} that have equal attribute values.
+   * @return {@code true} if {@code this} is equal to {@code another} instance
+   */
+  @Override
+  public boolean equals(Object another) {
+    if (this == another) return true;
+    return another instanceof ImmutableUpdatesFinished
+        && equalTo((ImmutableUpdatesFinished) another);
+  }
+
+  private boolean equalTo(ImmutableUpdatesFinished another) {
+    return mapId.equals(another.mapId)
+        && mapRevision == another.mapRevision
+        && updateEvents.equals(another.updateEvents);
+  }
+
+  /**
+   * Computes a hash code from attributes: {@code mapId}, {@code mapRevision}, {@code updateEvents}.
+   * @return hashCode value
+   */
+  @Override
+  public int hashCode() {
+    int h = 31;
+    h = h * 17 + mapId.hashCode();
+    h = h * 17 + (int) (mapRevision ^ (mapRevision >>> 32));
+    h = h * 17 + updateEvents.hashCode();
+    return h;
+  }
+
+  /**
+   * Prints the immutable value {@code UpdatesFinished} with attribute values.
+   * @return A string representation of the value
+   */
+  @Override
+  public String toString() {
+    return "UpdatesFinished{"
+        + "mapId=" + mapId
+        + ", mapRevision=" + mapRevision
+        + ", updateEvents=" + updateEvents
+        + "}";
+  }
+
+  /**
+   * Utility type used to correctly read immutable object from JSON representation.
+   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonDeserialize
+  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
+  static final class Json implements UpdatesFinished {
+    String mapId;
+    long mapRevision;
+    boolean mapRevisionIsSet;
+    List<MapUpdated> updateEvents = Collections.emptyList();
+    @JsonProperty("mapId")
+    public void setMapId(String mapId) {
+      this.mapId = mapId;
+    }
+    @JsonProperty("mapRevision")
+    public void setMapRevision(long mapRevision) {
+      this.mapRevision = mapRevision;
+      this.mapRevisionIsSet = true;
+    }
+    @JsonProperty("updateEvents")
+    public void setUpdateEvents(List<MapUpdated> updateEvents) {
+      this.updateEvents = updateEvents;
+    }
+    @Override
+    public String mapId() { throw new UnsupportedOperationException(); }
+    @Override
+    public long mapRevision() { throw new UnsupportedOperationException(); }
+    @Override
+    public List<MapUpdated> updateEvents() { throw new UnsupportedOperationException(); }
+  }
+
+  /**
+   * @param json A JSON-bindable data structure
+   * @return An immutable value type
+   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonCreator
+  static ImmutableUpdatesFinished fromJson(Json json) {
+    ImmutableUpdatesFinished.Builder builder = ImmutableUpdatesFinished.builder();
+    if (json.mapId != null) {
+      builder.mapId(json.mapId);
+    }
+    if (json.mapRevisionIsSet) {
+      builder.mapRevision(json.mapRevision);
+    }
+    if (json.updateEvents != null) {
+      builder.addAllUpdateEvents(json.updateEvents);
+    }
+    return builder.build();
+  }
+
+  /**
+   * Creates an immutable copy of a {@link UpdatesFinished} value.
+   * Uses accessors to get values to initialize the new immutable instance.
+   * If an instance is already immutable, it is returned as is.
+   * @param instance The instance to copy
+   * @return A copied immutable UpdatesFinished instance
+   */
+  public static ImmutableUpdatesFinished copyOf(UpdatesFinished instance) {
+    if (instance instanceof ImmutableUpdatesFinished) {
+      return (ImmutableUpdatesFinished) instance;
+    }
+    return ImmutableUpdatesFinished.builder()
+        .from(instance)
+        .build();
+  }
+
+  /**
+   * Creates a builder for {@link ImmutableUpdatesFinished ImmutableUpdatesFinished}.
+   * @return A new ImmutableUpdatesFinished builder
+   */
+  public static ImmutableUpdatesFinished.Builder builder() {
+    return new ImmutableUpdatesFinished.Builder();
+  }
+
+  /**
+   * Builds instances of type {@link ImmutableUpdatesFinished ImmutableUpdatesFinished}.
+   * Initialize attributes and then invoke the {@link #build()} method to create an
+   * immutable instance.
+   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
+   * but instead used immediately to create instances.</em>
+   */
+  public static final class Builder {
+    private static final long INIT_BIT_MAP_ID = 0x1L;
+    private static final long INIT_BIT_MAP_REVISION = 0x2L;
+    private long initBits = 0x3L;
+
+    private String mapId;
+    private long mapRevision;
+    private List<MapUpdated> updateEvents = new ArrayList<MapUpdated>();
+
+    private Builder() {
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code UpdatesFinished} instance.
+     * Regular attribute values will be replaced with those from the given instance.
+     * Absent optional values will not replace present values.
+     * Collection elements and entries will be added, not replaced.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(UpdatesFinished instance) {
+      Objects.requireNonNull(instance, "instance");
+      mapId(instance.mapId());
+      mapRevision(instance.mapRevision());
+      addAllUpdateEvents(instance.updateEvents());
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link UpdatesFinished#mapId() mapId} attribute.
+     * @param mapId The value for mapId 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder mapId(String mapId) {
+      this.mapId = Objects.requireNonNull(mapId, "mapId");
+      initBits &= ~INIT_BIT_MAP_ID;
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link UpdatesFinished#mapRevision() mapRevision} attribute.
+     * @param mapRevision The value for mapRevision 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder mapRevision(long mapRevision) {
+      this.mapRevision = mapRevision;
+      initBits &= ~INIT_BIT_MAP_REVISION;
+      return this;
+    }
+
+    /**
+     * Adds one element to {@link UpdatesFinished#updateEvents() updateEvents} list.
+     * @param element A updateEvents element
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addUpdateEvents(MapUpdated element) {
+      this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
+      return this;
+    }
+
+    /**
+     * Adds elements to {@link UpdatesFinished#updateEvents() updateEvents} list.
+     * @param elements An array of updateEvents elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addUpdateEvents(MapUpdated... elements) {
+      for (MapUpdated element : elements) {
+        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
+      }
+      return this;
+    }
+
+    /**
+     * Sets or replaces all elements for {@link UpdatesFinished#updateEvents() updateEvents} list.
+     * @param elements An iterable of updateEvents elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder updateEvents(Iterable<? extends MapUpdated> elements) {
+      this.updateEvents.clear();
+      return addAllUpdateEvents(elements);
+    }
+
+    /**
+     * Adds elements to {@link UpdatesFinished#updateEvents() updateEvents} list.
+     * @param elements An iterable of updateEvents elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addAllUpdateEvents(Iterable<? extends MapUpdated> elements) {
+      for (MapUpdated element : elements) {
+        this.updateEvents.add(Objects.requireNonNull(element, "updateEvents element"));
+      }
+      return this;
+    }
+
+    /**
+     * Builds a new {@link ImmutableUpdatesFinished ImmutableUpdatesFinished}.
+     * @return An immutable instance of UpdatesFinished
+     * @throws java.lang.IllegalStateException if any required attributes are missing
+     */
+    public ImmutableUpdatesFinished build() {
+      if (initBits != 0) {
+        throw new IllegalStateException(formatRequiredAttributesMessage());
+      }
+      return new ImmutableUpdatesFinished(mapId, mapRevision, createUnmodifiableList(true, updateEvents));
+    }
+
+    private String formatRequiredAttributesMessage() {
+      List<String> attributes = new ArrayList<String>();
+      if ((initBits & INIT_BIT_MAP_ID) != 0) attributes.add("mapId");
+      if ((initBits & INIT_BIT_MAP_REVISION) != 0) attributes.add("mapRevision");
+      return "Cannot build UpdatesFinished, some of required attributes are not set " + attributes;
+    }
+  }
+
+  private static <T> List<T> createSafeList(Iterable<? extends T> iterable, boolean checkNulls, boolean skipNulls) {
+    ArrayList<T> list;
+    if (iterable instanceof Collection<?>) {
+      int size = ((Collection<?>) iterable).size();
+      if (size == 0) return Collections.emptyList();
+      list = new ArrayList<T>();
+    } else {
+      list = new ArrayList<T>();
+    }
+    for (T element : iterable) {
+      if (skipNulls && element == null) continue;
+      if (checkNulls) Objects.requireNonNull(element, "element");
+      list.add(element);
+    }
+    return list;
+  }
+
+  private static <T> List<T> createUnmodifiableList(boolean clone, List<T> list) {
+    switch(list.size()) {
+    case 0: return Collections.emptyList();
+    case 1: return Collections.singletonList(list.get(0));
+    default:
+      if (clone) {
+        return Collections.unmodifiableList(new ArrayList<T>(list));
+      } else {
+        if (list instanceof ArrayList<?>) {
+          ((ArrayList<?>) list).trimToSize();
+        }
+        return Collections.unmodifiableList(list);
+      }
+    }
+  }
+}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ModifiableUpdateHeaderExtension.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ModifiableUpdateHeaderExtension.java
new file mode 100644
index 0000000..4f0ff1f
--- /dev/null
+++ b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/batch/ModifiableUpdateHeaderExtension.java
@@ -0,0 +1,185 @@
+package org.freeplane.plugin.collaboration.client.event.batch;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.Generated;
+
+/**
+ * A modifiable implementation of the {@link UpdateHeaderExtension UpdateHeaderExtension} type.
+ * <p>Use the {@link #create()} static factory methods to create new instances.
+ * <p><em>ModifiableUpdateHeaderExtension is not thread-safe</em>
+ */
+ at SuppressWarnings("all")
+ at Generated({"Modifiables.generator", "UpdateHeaderExtension"})
+public final class ModifiableUpdateHeaderExtension
+    implements UpdateHeaderExtension {
+  private static final long INIT_BIT_MAP_ID = 0x1L;
+  private static final long INIT_BIT_MAP_REVISION = 0x2L;
+  private long initBits = 0x3L;
+
+  private String mapId;
+  private long mapRevision;
+
+  private ModifiableUpdateHeaderExtension() {}
+
+  /**
+   * Construct a modifiable instance of {@code UpdateHeaderExtension}.
+   * @return A new modifiable instance
+   */
+  public static ModifiableUpdateHeaderExtension create() {
+    return new ModifiableUpdateHeaderExtension();
+  }
+
+  /**
+   * @return value of {@code mapId} attribute
+   */
+  @Override
+  public final String mapId() {
+    if (!mapIdIsSet()) {
+      checkRequiredAttributes();
+    }
+    return mapId;
+  }
+
+  /**
+   * @return value of {@code mapRevision} attribute
+   */
+  @Override
+  public final long mapRevision() {
+    if (!mapRevisionIsSet()) {
+      checkRequiredAttributes();
+    }
+    return mapRevision;
+  }
+
+  /**
+   * Clears the object by setting all attributes to their initial values.
+   * @return {@code this} for use in a chained invocation
+   */
+  public ModifiableUpdateHeaderExtension clear() {
+    initBits = 0x3L;
+    mapId = null;
+    mapRevision = 0;
+    return this;
+  }
+
+  /**
+   * Fill this modifiable instance with attribute values from the provided {@link UpdateHeaderExtension} instance.
+   * Regular attribute values will be overridden, i.e. replaced with ones of an instance.
+   * Any of the instance's absent optional values will not be copied (will not override current values).
+   * @param instance The instance from which to copy values
+   * @return {@code this} for use in a chained invocation
+   */
+  public ModifiableUpdateHeaderExtension from(UpdateHeaderExtension instance) {
+    Objects.requireNonNull(instance, "instance");
+    setMapId(instance.mapId());
+    setMapRevision(instance.mapRevision());
+    return this;
+  }
+
+  /**
+   * Assigns a value to the {@code mapId} attribute.
+   * @param mapId The value for mapId
+   * @return {@code this} for use in a chained invocation
+   */
+  public ModifiableUpdateHeaderExtension setMapId(String mapId) {
+    this.mapId = Objects.requireNonNull(mapId, "mapId");
+    initBits &= ~INIT_BIT_MAP_ID;
+    return this;
+  }
+
+  /**
+   * Assigns a value to the {@code mapRevision} attribute.
+   * @param mapRevision The value for mapRevision
+   * @return {@code this} for use in a chained invocation
+   */
+  public ModifiableUpdateHeaderExtension setMapRevision(long mapRevision) {
+    this.mapRevision = mapRevision;
+    initBits &= ~INIT_BIT_MAP_REVISION;
+    return this;
+  }
+
+  /**
+   * Returns {@code true} if the required attribute {@code mapId} is set.
+   * @return {@code true} if set
+   */
+  public final boolean mapIdIsSet() {
+    return (initBits & INIT_BIT_MAP_ID) == 0;
+  }
+
+  /**
+   * Returns {@code true} if the required attribute {@code mapRevision} is set.
+   * @return {@code true} if set
+   */
+  public final boolean mapRevisionIsSet() {
+    return (initBits & INIT_BIT_MAP_REVISION) == 0;
+  }
+
+  /**
+   * Returns {@code true} if all required attributes are set, indicating that the object is initialized.
+   * @return {@code true} if set
+   */
+  public final boolean isInitialized() {
+    return initBits == 0;
+  }
+
+  private void checkRequiredAttributes() {
+    if (!isInitialized()) {
+      throw new IllegalStateException(formatRequiredAttributesMessage());
+    }
+  }
+
+  private String formatRequiredAttributesMessage() {
+    List<String> attributes = new ArrayList<String>();
+    if (!mapIdIsSet()) attributes.add("mapId");
+    if (!mapRevisionIsSet()) attributes.add("mapRevision");
+    return "UpdateHeaderExtension in not initialized, some of the required attributes are not set " + attributes;
+  }
+
+  /**
+   * This instance is equal to all instances of {@code ModifiableUpdateHeaderExtension} that have equal attribute values.
+   * An uninitialized instance is equal only to itself.
+   * @return {@code true} if {@code this} is equal to {@code another} instance
+   */
+  @Override
+  public boolean equals(Object another) {
+    if (this == another) return true;
+    if (!(another instanceof ModifiableUpdateHeaderExtension)) return false;
+    ModifiableUpdateHeaderExtension other = (ModifiableUpdateHeaderExtension) another;
+    if (!isInitialized() || !other.isInitialized()) {
+      return false;
+    }
+    return equalTo(other);
+  }
+
+  private boolean equalTo(ModifiableUpdateHeaderExtension another) {
+    return mapId.equals(another.mapId)
+        && mapRevision == another.mapRevision;
+  }
+
+  /**
+   * Computes a hash code from attributes: {@code mapId}, {@code mapRevision}.
+   * @return hashCode value
+   */
+  @Override
+  public int hashCode() {
+    int h = 31;
+    h = h * 17 + mapId.hashCode();
+    h = h * 17 + (int) (mapRevision ^ (mapRevision >>> 32));
+    return h;
+  }
+
+  /**
+   * Generates a string representation of this {@code UpdateHeaderExtension}.
+   * If uninitialized, some attribute values may appear as question marks.
+   * @return A string representation
+   */
+  @Override
+  public String toString() {
+    return "ModifiableUpdateHeaderExtension{"
+        + "mapId="  + (mapIdIsSet() ? mapId() : "?")
+        + ", mapRevision="  + (mapRevisionIsSet() ? mapRevision() : "?")
+        + "}";
+  }
+}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableChildrenUpdated.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableChildrenUpdated.java
new file mode 100644
index 0000000..2ec1100
--- /dev/null
+++ b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableChildrenUpdated.java
@@ -0,0 +1,350 @@
+package org.freeplane.plugin.collaboration.client.event.children;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.Generated;
+import org.freeplane.plugin.collaboration.client.event.NodeUpdated;
+
+/**
+ * Immutable implementation of {@link ChildrenUpdated}.
+ * <p>
+ * Use the builder to create immutable instances:
+ * {@code ImmutableChildrenUpdated.builder()}.
+ */
+ at SuppressWarnings("all")
+ at Generated({"Immutables.generator", "ChildrenUpdated"})
+public final class ImmutableChildrenUpdated
+    implements ChildrenUpdated {
+  private final List<String> content;
+  private final String nodeId;
+
+  private ImmutableChildrenUpdated(List<String> content, String nodeId) {
+    this.content = content;
+    this.nodeId = nodeId;
+  }
+
+  /**
+   * @return The value of the {@code content} attribute
+   */
+  @JsonProperty("content")
+  @Override
+  public List<String> content() {
+    return content;
+  }
+
+  /**
+   * @return The value of the {@code nodeId} attribute
+   */
+  @JsonProperty("nodeId")
+  @Override
+  public String nodeId() {
+    return nodeId;
+  }
+
+  /**
+   * Copy the current immutable object with elements that replace the content of {@link ChildrenUpdated#content() content}.
+   * @param elements The elements to set
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableChildrenUpdated withContent(String... elements) {
+    List<String> newValue = createUnmodifiableList(false, createSafeList(Arrays.asList(elements), true, false));
+    return new ImmutableChildrenUpdated(newValue, this.nodeId);
+  }
+
+  /**
+   * Copy the current immutable object with elements that replace the content of {@link ChildrenUpdated#content() content}.
+   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param elements An iterable of content elements to set
+   * @return A modified copy of {@code this} object
+   */
+  public final ImmutableChildrenUpdated withContent(Iterable<String> elements) {
+    if (this.content == elements) return this;
+    List<String> newValue = createUnmodifiableList(false, createSafeList(elements, true, false));
+    return new ImmutableChildrenUpdated(newValue, this.nodeId);
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link ChildrenUpdated#nodeId() nodeId} attribute.
+   * An equals check used to prevent copying of the same value by returning {@code this}.
+   * @param nodeId A new value for nodeId
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableChildrenUpdated withNodeId(String nodeId) {
+    if (this.nodeId.equals(nodeId)) return this;
+    String newValue = Objects.requireNonNull(nodeId, "nodeId");
+    return new ImmutableChildrenUpdated(this.content, newValue);
+  }
+
+  /**
+   * This instance is equal to all instances of {@code ImmutableChildrenUpdated} that have equal attribute values.
+   * @return {@code true} if {@code this} is equal to {@code another} instance
+   */
+  @Override
+  public boolean equals(Object another) {
+    if (this == another) return true;
+    return another instanceof ImmutableChildrenUpdated
+        && equalTo((ImmutableChildrenUpdated) another);
+  }
+
+  private boolean equalTo(ImmutableChildrenUpdated another) {
+    return content.equals(another.content)
+        && nodeId.equals(another.nodeId);
+  }
+
+  /**
+   * Computes a hash code from attributes: {@code content}, {@code nodeId}.
+   * @return hashCode value
+   */
+  @Override
+  public int hashCode() {
+    int h = 31;
+    h = h * 17 + content.hashCode();
+    h = h * 17 + nodeId.hashCode();
+    return h;
+  }
+
+  /**
+   * Prints the immutable value {@code ChildrenUpdated} with attribute values.
+   * @return A string representation of the value
+   */
+  @Override
+  public String toString() {
+    return "ChildrenUpdated{"
+        + "content=" + content
+        + ", nodeId=" + nodeId
+        + "}";
+  }
+
+  /**
+   * Utility type used to correctly read immutable object from JSON representation.
+   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonDeserialize
+  @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
+  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
+  static final class Json implements ChildrenUpdated {
+    List<String> content = Collections.emptyList();
+    String nodeId;
+    @JsonProperty("content")
+    public void setContent(List<String> content) {
+      this.content = content;
+    }
+    @JsonProperty("nodeId")
+    public void setNodeId(String nodeId) {
+      this.nodeId = nodeId;
+    }
+    @Override
+    public List<String> content() { throw new UnsupportedOperationException(); }
+    @Override
+    public String nodeId() { throw new UnsupportedOperationException(); }
+  }
+
+  /**
+   * @param json A JSON-bindable data structure
+   * @return An immutable value type
+   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonCreator
+  static ImmutableChildrenUpdated fromJson(Json json) {
+    ImmutableChildrenUpdated.Builder builder = ImmutableChildrenUpdated.builder();
+    if (json.content != null) {
+      builder.addAllContent(json.content);
+    }
+    if (json.nodeId != null) {
+      builder.nodeId(json.nodeId);
+    }
+    return builder.build();
+  }
+
+  /**
+   * Creates an immutable copy of a {@link ChildrenUpdated} value.
+   * Uses accessors to get values to initialize the new immutable instance.
+   * If an instance is already immutable, it is returned as is.
+   * @param instance The instance to copy
+   * @return A copied immutable ChildrenUpdated instance
+   */
+  public static ImmutableChildrenUpdated copyOf(ChildrenUpdated instance) {
+    if (instance instanceof ImmutableChildrenUpdated) {
+      return (ImmutableChildrenUpdated) instance;
+    }
+    return ImmutableChildrenUpdated.builder()
+        .from(instance)
+        .build();
+  }
+
+  /**
+   * Creates a builder for {@link ImmutableChildrenUpdated ImmutableChildrenUpdated}.
+   * @return A new ImmutableChildrenUpdated builder
+   */
+  public static ImmutableChildrenUpdated.Builder builder() {
+    return new ImmutableChildrenUpdated.Builder();
+  }
+
+  /**
+   * Builds instances of type {@link ImmutableChildrenUpdated ImmutableChildrenUpdated}.
+   * Initialize attributes and then invoke the {@link #build()} method to create an
+   * immutable instance.
+   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
+   * but instead used immediately to create instances.</em>
+   */
+  public static final class Builder {
+    private static final long INIT_BIT_NODE_ID = 0x1L;
+    private long initBits = 0x1L;
+
+    private List<String> content = new ArrayList<String>();
+    private String nodeId;
+
+    private Builder() {
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.children.ChildrenUpdated} instance.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(ChildrenUpdated instance) {
+      Objects.requireNonNull(instance, "instance");
+      from((Object) instance);
+      return this;
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.NodeUpdated} instance.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(NodeUpdated instance) {
+      Objects.requireNonNull(instance, "instance");
+      from((Object) instance);
+      return this;
+    }
+
+    private void from(Object object) {
+      if (object instanceof ChildrenUpdated) {
+        ChildrenUpdated instance = (ChildrenUpdated) object;
+        addAllContent(instance.content());
+      }
+      if (object instanceof NodeUpdated) {
+        NodeUpdated instance = (NodeUpdated) object;
+        nodeId(instance.nodeId());
+      }
+    }
+
+    /**
+     * Adds one element to {@link ChildrenUpdated#content() content} list.
+     * @param element A content element
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addContent(String element) {
+      this.content.add(Objects.requireNonNull(element, "content element"));
+      return this;
+    }
+
+    /**
+     * Adds elements to {@link ChildrenUpdated#content() content} list.
+     * @param elements An array of content elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addContent(String... elements) {
+      for (String element : elements) {
+        this.content.add(Objects.requireNonNull(element, "content element"));
+      }
+      return this;
+    }
+
+    /**
+     * Sets or replaces all elements for {@link ChildrenUpdated#content() content} list.
+     * @param elements An iterable of content elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder content(Iterable<String> elements) {
+      this.content.clear();
+      return addAllContent(elements);
+    }
+
+    /**
+     * Adds elements to {@link ChildrenUpdated#content() content} list.
+     * @param elements An iterable of content elements
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder addAllContent(Iterable<String> elements) {
+      for (String element : elements) {
+        this.content.add(Objects.requireNonNull(element, "content element"));
+      }
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link ChildrenUpdated#nodeId() nodeId} attribute.
+     * @param nodeId The value for nodeId 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder nodeId(String nodeId) {
+      this.nodeId = Objects.requireNonNull(nodeId, "nodeId");
+      initBits &= ~INIT_BIT_NODE_ID;
+      return this;
+    }
+
+    /**
+     * Builds a new {@link ImmutableChildrenUpdated ImmutableChildrenUpdated}.
+     * @return An immutable instance of ChildrenUpdated
+     * @throws java.lang.IllegalStateException if any required attributes are missing
+     */
+    public ImmutableChildrenUpdated build() {
+      if (initBits != 0) {
+        throw new IllegalStateException(formatRequiredAttributesMessage());
+      }
+      return new ImmutableChildrenUpdated(createUnmodifiableList(true, content), nodeId);
+    }
+
+    private String formatRequiredAttributesMessage() {
+      List<String> attributes = new ArrayList<String>();
+      if ((initBits & INIT_BIT_NODE_ID) != 0) attributes.add("nodeId");
+      return "Cannot build ChildrenUpdated, some of required attributes are not set " + attributes;
+    }
+  }
+
+  private static <T> List<T> createSafeList(Iterable<? extends T> iterable, boolean checkNulls, boolean skipNulls) {
+    ArrayList<T> list;
+    if (iterable instanceof Collection<?>) {
+      int size = ((Collection<?>) iterable).size();
+      if (size == 0) return Collections.emptyList();
+      list = new ArrayList<T>();
+    } else {
+      list = new ArrayList<T>();
+    }
+    for (T element : iterable) {
+      if (skipNulls && element == null) continue;
+      if (checkNulls) Objects.requireNonNull(element, "element");
+      list.add(element);
+    }
+    return list;
+  }
+
+  private static <T> List<T> createUnmodifiableList(boolean clone, List<T> list) {
+    switch(list.size()) {
+    case 0: return Collections.emptyList();
+    case 1: return Collections.singletonList(list.get(0));
+    default:
+      if (clone) {
+        return Collections.unmodifiableList(new ArrayList<T>(list));
+      } else {
+        if (list instanceof ArrayList<?>) {
+          ((ArrayList<?>) list).trimToSize();
+        }
+        return Collections.unmodifiableList(list);
+      }
+    }
+  }
+}
diff --git a/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableSpecialNodeTypeSet.java b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableSpecialNodeTypeSet.java
new file mode 100644
index 0000000..cc92d7d
--- /dev/null
+++ b/freeplane_plugin_collaboration_client/apt_generated/org/freeplane/plugin/collaboration/client/event/children/ImmutableSpecialNodeTypeSet.java
@@ -0,0 +1,276 @@
+package org.freeplane.plugin.collaboration.client.event.children;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.Generated;
+import org.freeplane.plugin.collaboration.client.event.NodeUpdated;
+
+/**
+ * Immutable implementation of {@link SpecialNodeTypeSet}.
+ * <p>
+ * Use the builder to create immutable instances:
+ * {@code ImmutableSpecialNodeTypeSet.builder()}.
+ */
+ at SuppressWarnings("all")
+ at Generated({"Immutables.generator", "SpecialNodeTypeSet"})
+public final class ImmutableSpecialNodeTypeSet
+    implements SpecialNodeTypeSet {
+  private final SpecialNodeTypeSet.SpecialNodeType content;
+  private final String nodeId;
+
+  private ImmutableSpecialNodeTypeSet(
+      SpecialNodeTypeSet.SpecialNodeType content,
+      String nodeId) {
+    this.content = content;
+    this.nodeId = nodeId;
+  }
+
+  /**
+   * @return The value of the {@code content} attribute
+   */
+  @JsonProperty("content")
+  @Override
+  public SpecialNodeTypeSet.SpecialNodeType content() {
+    return content;
+  }
+
+  /**
+   * @return The value of the {@code nodeId} attribute
+   */
+  @JsonProperty("nodeId")
+  @Override
+  public String nodeId() {
+    return nodeId;
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link SpecialNodeTypeSet#content() content} attribute.
+   * A shallow reference equality check is used to prevent copying of the same value by returning {@code this}.
+   * @param content A new value for content
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableSpecialNodeTypeSet withContent(SpecialNodeTypeSet.SpecialNodeType content) {
+    if (this.content == content) return this;
+    SpecialNodeTypeSet.SpecialNodeType newValue = Objects.requireNonNull(content, "content");
+    return new ImmutableSpecialNodeTypeSet(newValue, this.nodeId);
+  }
+
+  /**
+   * Copy the current immutable object by setting a value for the {@link SpecialNodeTypeSet#nodeId() nodeId} attribute.
+   * An equals check used to prevent copying of the same value by returning {@code this}.
+   * @param nodeId A new value for nodeId
+   * @return A modified copy of the {@code this} object
+   */
+  public final ImmutableSpecialNodeTypeSet withNodeId(String nodeId) {
+    if (this.nodeId.equals(nodeId)) return this;
+    String newValue = Objects.requireNonNull(nodeId, "nodeId");
+    return new ImmutableSpecialNodeTypeSet(this.content, newValue);
+  }
+
+  /**
+   * This instance is equal to all instances of {@code ImmutableSpecialNodeTypeSet} that have equal attribute values.
+   * @return {@code true} if {@code this} is equal to {@code another} instance
+   */
+  @Override
+  public boolean equals(Object another) {
+    if (this == another) return true;
+    return another instanceof ImmutableSpecialNodeTypeSet
+        && equalTo((ImmutableSpecialNodeTypeSet) another);
+  }
+
+  private boolean equalTo(ImmutableSpecialNodeTypeSet another) {
+    return content.equals(another.content)
+        && nodeId.equals(another.nodeId);
+  }
+
+  /**
+   * Computes a hash code from attributes: {@code content}, {@code nodeId}.
+   * @return hashCode value
+   */
+  @Override
+  public int hashCode() {
+    int h = 31;
+    h = h * 17 + content.hashCode();
+    h = h * 17 + nodeId.hashCode();
+    return h;
+  }
+
+  /**
+   * Prints the immutable value {@code SpecialNodeTypeSet} with attribute values.
+   * @return A string representation of the value
+   */
+  @Override
+  public String toString() {
+    return "SpecialNodeTypeSet{"
+        + "content=" + content
+        + ", nodeId=" + nodeId
+        + "}";
+  }
+
+  /**
+   * Utility type used to correctly read immutable object from JSON representation.
+   * @deprecated Do not use this type directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonDeserialize
+  @JsonTypeInfo(use=JsonTypeInfo.Id.NONE)
+  @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
+  static final class Json
+      implements SpecialNodeTypeSet {
+    SpecialNodeTypeSet.SpecialNodeType content;
+    String nodeId;
+    @JsonProperty("content")
+    public void setContent(SpecialNodeTypeSet.SpecialNodeType content) {
+      this.content = content;
+    }
+    @JsonProperty("nodeId")
+    public void setNodeId(String nodeId) {
+      this.nodeId = nodeId;
+    }
+    @Override
+    public SpecialNodeTypeSet.SpecialNodeType content() { throw new UnsupportedOperationException(); }
+    @Override
+    public String nodeId() { throw new UnsupportedOperationException(); }
+  }
+
+  /**
+   * @param json A JSON-bindable data structure
+   * @return An immutable value type
+   * @deprecated Do not use this method directly, it exists only for the <em>Jackson</em>-binding infrastructure
+   */
+  @Deprecated
+  @JsonCreator
+  static ImmutableSpecialNodeTypeSet fromJson(Json json) {
+    ImmutableSpecialNodeTypeSet.Builder builder = ImmutableSpecialNodeTypeSet.builder();
+    if (json.content != null) {
+      builder.content(json.content);
+    }
+    if (json.nodeId != null) {
+      builder.nodeId(json.nodeId);
+    }
+    return builder.build();
+  }
+
+  /**
+   * Creates an immutable copy of a {@link SpecialNodeTypeSet} value.
+   * Uses accessors to get values to initialize the new immutable instance.
+   * If an instance is already immutable, it is returned as is.
+   * @param instance The instance to copy
+   * @return A copied immutable SpecialNodeTypeSet instance
+   */
+  public static ImmutableSpecialNodeTypeSet copyOf(SpecialNodeTypeSet instance) {
+    if (instance instanceof ImmutableSpecialNodeTypeSet) {
+      return (ImmutableSpecialNodeTypeSet) instance;
+    }
+    return ImmutableSpecialNodeTypeSet.builder()
+        .from(instance)
+        .build();
+  }
+
+  /**
+   * Creates a builder for {@link ImmutableSpecialNodeTypeSet ImmutableSpecialNodeTypeSet}.
+   * @return A new ImmutableSpecialNodeTypeSet builder
+   */
+  public static ImmutableSpecialNodeTypeSet.Builder builder() {
+    return new ImmutableSpecialNodeTypeSet.Builder();
+  }
+
+  /**
+   * Builds instances of type {@link ImmutableSpecialNodeTypeSet ImmutableSpecialNodeTypeSet}.
+   * Initialize attributes and then invoke the {@link #build()} method to create an
+   * immutable instance.
+   * <p><em>{@code Builder} is not thread-safe and generally should not be stored in a field or collection,
+   * but instead used immediately to create instances.</em>
+   */
+  public static final class Builder {
+    private static final long INIT_BIT_CONTENT = 0x1L;
+    private static final long INIT_BIT_NODE_ID = 0x2L;
+    private long initBits = 0x3L;
+
+    private SpecialNodeTypeSet.SpecialNodeType content;
+    private String nodeId;
+
+    private Builder() {
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.NodeUpdated} instance.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(NodeUpdated instance) {
+      Objects.requireNonNull(instance, "instance");
+      from((Object) instance);
+      return this;
+    }
+
+    /**
+     * Fill a builder with attribute values from the provided {@code org.freeplane.plugin.collaboration.client.event.children.SpecialNodeTypeSet} instance.
+     * @param instance The instance from which to copy values
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder from(SpecialNodeTypeSet instance) {
+      Objects.requireNonNull(instance, "instance");
+      from((Object) instance);
+      return this;
+    }
+
+    private void from(Object object) {
+      if (object instanceof NodeUpdated) {
+        NodeUpdated instance = (NodeUpdated) object;
+        nodeId(instance.nodeId());
+      }
+      if (object instanceof SpecialNodeTypeSet) {
+        SpecialNodeTypeSet instance = (SpecialNodeTypeSet) object;
+        content(instance.content());
+      }
+    }
+
+    /**
+     * Initializes the value for the {@link SpecialNodeTypeSet#content() content} attribute.
+     * @param content The value for content 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder content(SpecialNodeTypeSet.SpecialNodeType content) {
+      this.content = Objects.requireNonNull(content, "content");
+      initBits &= ~INIT_BIT_CONTENT;
+      return this;
+    }
+
+    /**
+     * Initializes the value for the {@link SpecialNodeTypeSet#nodeId() nodeId} attribute.
+     * @param nodeId The value for nodeId 
+     * @return {@code this} builder for use in a chained invocation
+     */
+    public final Builder nodeId(String nodeId) {
+      this.nodeId = Objects.requireNonNull(nodeId, "nodeId");
+      initBits &= ~INIT_BIT_NODE_ID;
+      return this;
+    }
+
+    /**
+     * Builds a new {@link ImmutableSpecialNodeTypeSet ImmutableSpecialNodeTypeSet}.
+     * @return An immutable instance of SpecialNodeTypeSet
+     * @throws java.lang.IllegalStateException if any required attributes are missing
+     */
+    public ImmutableSpecialNodeTypeSet build() {
+      if (initBits != 0) {
+        throw new IllegalStateException(formatRequiredAttributesMessage());
+      }
+      return new ImmutableSpecialNodeTypeSet(content, nodeId);
+    }
+
+    private String formatRequiredAttributesMessage() {
+      List<String> attributes = new ArrayList<String>();
+      if ((initBits & INIT_BIT_CONTENT) != 0) attributes.add("content");
+      if ((initBits & INIT_BIT_NODE_ID) != 0) attributes.add("nodeId");
+      return "Cannot build SpecialNodeTypeSet, some of required attributes are not set " + attributes;
+    }
+  }
+}
diff --git a/freeplane_plugin_formula/build.gradle b/freeplane_plugin_formula/build.gradle
index f2c7198..ba8f08d 100644
--- a/freeplane_plugin_formula/build.gradle
+++ b/freeplane_plugin_formula/build.gradle
@@ -17,7 +17,7 @@ jar {
 
         instruction 'Bundle-Vendor', 'Freeplane Project'
         instruction 'Bundle-Activator', pluginid + ".Activator"
-        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
 
         def imports = """\
                       org.osgi.framework;version="1.3.0",
diff --git a/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaTextTransformer.java b/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaTextTransformer.java
index 912b4dd..9c71e07 100644
--- a/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaTextTransformer.java
+++ b/freeplane_plugin_formula/src/main/java/org/freeplane/plugin/formula/FormulaTextTransformer.java
@@ -38,7 +38,7 @@ class FormulaTextTransformer extends AbstractContentTransformer implements IEdit
         if (!(obj instanceof String)) {
             return obj;
         }
-        if (textController.isTextFormattingDisabled(node))
+        if (transformedExtension == node.getUserObject() && textController.isTextFormattingDisabled(node))
             return obj;
         final String text = obj.toString();
         if (!FormulaUtils.containsFormulaCheckHTML(text)) {
@@ -54,6 +54,24 @@ class FormulaTextTransformer extends AbstractContentTransformer implements IEdit
         return result;
     }
 
+    public boolean isFormula(TextController textController, final Object obj, final NodeModel node,
+    		Object transformedExtension) {
+    	if (obj instanceof FormattedFormula) {
+    		final FormattedFormula formattedFormula = (FormattedFormula) obj;
+    		return isFormula(textController, formattedFormula.getObject(), node,transformedExtension);
+    	}
+    	if (!(obj instanceof String)) {
+    		return false;
+    	}
+    	if (node != null && transformedExtension == node.getUserObject() && textController.isTextFormattingDisabled(node))
+    		return false;
+    	final String text = obj.toString();
+    	if (!FormulaUtils.containsFormulaCheckHTML(text)) {
+    		return false;
+    	}
+    	return true;
+    }
+    
 	public EditNodeBase createEditor(final NodeModel node, final EditNodeBase.IEditControl editControl,
 	                                 String text, final boolean editLong) {
 		MTextController textController = MTextController.getController();
diff --git a/freeplane_plugin_jsyntaxpane/build.gradle b/freeplane_plugin_jsyntaxpane/build.gradle
index 4562f96..5b191e1 100644
--- a/freeplane_plugin_jsyntaxpane/build.gradle
+++ b/freeplane_plugin_jsyntaxpane/build.gradle
@@ -19,7 +19,7 @@ jar {
 
         instruction 'Bundle-Vendor', 'Freeplane Project'
         instruction 'Bundle-Activator', pluginid + ".Activator"
-        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
 
         def imports = """\
                       org.osgi.framework;version="1.3.0",
diff --git a/freeplane_plugin_jsyntaxpane/src/main/java/org/freeplane/plugin/jsyntaxpane/NodeIdHighLighter.java b/freeplane_plugin_jsyntaxpane/src/main/java/org/freeplane/plugin/jsyntaxpane/NodeIdHighLighter.java
index a0375cd..429234d 100644
--- a/freeplane_plugin_jsyntaxpane/src/main/java/org/freeplane/plugin/jsyntaxpane/NodeIdHighLighter.java
+++ b/freeplane_plugin_jsyntaxpane/src/main/java/org/freeplane/plugin/jsyntaxpane/NodeIdHighLighter.java
@@ -110,7 +110,7 @@ public class NodeIdHighLighter implements SyntaxComponent, CaretListener {
 		final int countNodesOriginallyUnfolded = nodesOriginallyFolded.size();
 		if (countNodesOriginallyUnfolded > 0) {
 			for (int i = countNodesOriginallyUnfolded - 1; i >= 0; i--)
-				mapController.setFolded(nodesOriginallyFolded.get(i), true);
+				mapController.fold(nodesOriginallyFolded.get(i));
 			nodesOriginallyFolded.clear();
 		}
 	}
diff --git a/freeplane_plugin_latex/build.gradle b/freeplane_plugin_latex/build.gradle
index 5533629..3825831 100644
--- a/freeplane_plugin_latex/build.gradle
+++ b/freeplane_plugin_latex/build.gradle
@@ -19,7 +19,7 @@ jar {
 
         instruction 'Bundle-Vendor', 'Freeplane Project'
         instruction 'Bundle-Activator', pluginid + ".Activator"
-        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
 
         def imports = """\
                       org.osgi.framework;version="1.3.0",
diff --git a/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/Activator.java b/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/Activator.java
index c2d5805..86ad3dd 100644
--- a/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/Activator.java
+++ b/freeplane_plugin_latex/src/main/java/org/freeplane/plugin/latex/Activator.java
@@ -6,7 +6,6 @@ import java.util.Hashtable;
 import org.freeplane.features.format.FormatController;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.features.mode.ModeController;
-import org.freeplane.features.mode.browsemode.BModeController;
 import org.freeplane.features.mode.mindmapmode.MModeController;
 import org.freeplane.features.text.TextController;
 import org.freeplane.features.text.mindmapmode.ConditionalContentTransformer;
diff --git a/freeplane_plugin_openmaps/src/main/java/org/freeplane/plugin/openmaps/OpenMapsNodeHook.java b/freeplane_plugin_openmaps/src/main/java/org/freeplane/plugin/openmaps/OpenMapsNodeHook.java
index c3d0b84..4447c49 100644
--- a/freeplane_plugin_openmaps/src/main/java/org/freeplane/plugin/openmaps/OpenMapsNodeHook.java
+++ b/freeplane_plugin_openmaps/src/main/java/org/freeplane/plugin/openmaps/OpenMapsNodeHook.java
@@ -183,9 +183,14 @@ public class OpenMapsNodeHook extends PersistentNodeHook implements LocationChoo
 		(new IStateIconProvider () {
 			public UIIcon getStateIcon(NodeModel node) {
 				if (node.getExtension(OpenMapsExtension.class) != null)
-					return IconStoreFactory.create().getUIIcon(ICON_NAME);
+					return IconStoreFactory.ICON_STORE.getUIIcon(ICON_NAME);
 				else 
 					return null;
+			}
+
+			@Override
+			public boolean mustIncludeInIconRegistry() {
+				return true;
 			}	
 		});
 	}
diff --git a/freeplane_plugin_script/build.gradle b/freeplane_plugin_script/build.gradle
index 821c09b..2d9248b 100644
--- a/freeplane_plugin_script/build.gradle
+++ b/freeplane_plugin_script/build.gradle
@@ -1,7 +1,15 @@
 dependencies {
     compile project(':freeplane')
     compile project(':freeplane_plugin_jsyntaxpane')
-    compile group: 'org.codehaus.groovy', name: 'groovy-all', version:'2.3.1'
+    compile 'org.codehaus.groovy:groovy-all:2.3.1'
+	compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
+		transitive = false
+	}
+    compile 'net.bytebuddy:byte-buddy:1.6.9'
+}
+
+tasks.withType(JavaCompile) {
+	options.compilerArgs << '-parameters'
 }
 
 jar {
@@ -18,7 +26,7 @@ jar {
 
         instruction 'Bundle-Vendor', 'Freeplane Project'
         instruction 'Bundle-Activator', pluginid + ".Activator"
-        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
 
         def imports = """\
                       org.osgi.framework;version="1.3.0",
@@ -47,7 +55,7 @@ task copyScripts(type: Copy) {
     from('scripts/') {
         include('**')
     }
-    into(globalBuild + '/scripts')
+    into(globalBin + '/scripts')
 }
 
 javadoc {
@@ -70,17 +78,17 @@ javadoc {
       .include('**/MenuUtils.java')
 
     source = ext.javadocInputFromThisProject + ext.javadocInputFromFreeplaneProject
-    destinationDir = new File(globalBuild + '/doc/api/')
+    destinationDir = new File(globalBin + '/doc/api/')
 }
 
 // TODO: this doesn't work yet!
 /*
 task zipJavadoc(type: Zip) {
   baseName = 'scripting-api'
-  from (globalBuild + '/doc/api/') {
+  from (globalBin + '/doc/api/') {
       include('**')
   }
-  destinationDir = new File(globalBuild)
+  destinationDir = new File(globalBin)
   dependsOn javadoc
 }
 */
diff --git a/freeplane_plugin_script/scripts/apiGenerator.groovy b/freeplane_plugin_script/scripts/apiGenerator.groovy
index 24a9ac8..9a9376f 100644
--- a/freeplane_plugin_script/scripts/apiGenerator.groovy
+++ b/freeplane_plugin_script/scripts/apiGenerator.groovy
@@ -7,6 +7,7 @@
 // (at your option) any later version.
 
 import java.lang.reflect.Method
+import java.lang.reflect.TypeVariable
 
 import org.freeplane.core.ui.components.UITools
 import org.freeplane.core.util.FreeplaneVersion
@@ -63,8 +64,6 @@ def makeApi(Proxy.Node node, Class clazz) {
     classNode.style.font.bold = true
     clazz.getMethods().findAll {
         it.declaringClass == clazz || it.declaringClass.simpleName.endsWith('RO')
-    }.sort {
-        a,b -> b.name <=> a.name
     }.each {
         if (!addProperty(memberMap, it))
             addMethod(memberMap, it);
@@ -155,7 +154,7 @@ def addProperty(Map<String, Map<String, Object>> memberMap, Method method) {
 }
 
 def addMethod(Map<String, Map<String, Object>> memberMap, Method method) {
-    def propertyMap = getOrCreatePropertiesMap(memberMap, method.name)
+    def propertyMap = getOrCreatePropertiesMap(memberMap, formatMethodKey(method))
     propertyMap['types'] = method.parameterTypes
     propertyMap['method'] = formatMethod(method)
     propertyMap['return_type'] = method.returnType
@@ -167,20 +166,33 @@ def formatProperty(String property, String type, String mode) {
     //	return "${property}: ${type} (${mode})"
 }
 
-def formatParameter(Class clazz) {
+def formatMethodKey(Method method) {
+		return method.name + '/' + method.parameterCount
+			'(' + method.parameterTypes.collect{ typeToString(it) }.join(', ') + ')'
+
+}
+
+def formatParameterType(Class clazz) {
     def uri = getApiLink(clazz)
     if (uri)
         "<a href='${uri.toURL()}'>${typeToString(clazz)}</a>"
 }
 
+
+def formatParameter(parameter) {
+	def parameterType = formatParameterType(parameter.type)
+	if(parameterType)
+		parameterType + ' ' + parameter.name;
+	else
+		parameter.name;
+}
+
+
 def formatMethod(Method method) {
+	def parameters =  method.metaClass.respondsTo(method, "getParameters") ? method.getParameters().collect{ formatParameter(it) } : method.parameterTypes.collect{ formatParameterType(it) }
     return '<html><body>' + typeToString(method.returnType) +
     ' <b>' + method.name + '</b>' +
-    '(' + method.parameterTypes.collect{ formatParameter(it) }.join(', ') + ')'
-    // Plain text:
-    //	return typeToString(method.returnType) +
-    //		' ' + method.name +
-    //		'(' + method.parameterTypes.collect{ typeToString(it) }.join(', ') + ')'
+    '(' + parameters.join(', ') + ')'
 }
 
 def isGetter(Method method) {
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GenericScript.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GenericScript.java
index 1d47601..f351e1e 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GenericScript.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GenericScript.java
@@ -191,7 +191,8 @@ public class GenericScript implements IScript {
             final PrintStream oldOut = System.out;
 			ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
             try {
-				scriptClassLoader.setSecurityManager(createScriptingSecurityManager());
+				final ScriptingSecurityManager scriptingSecurityManager = createScriptingSecurityManager();
+				scriptClassLoader.setSecurityManager(scriptingSecurityManager);
 				Thread.currentThread().setContextClassLoader(scriptClassLoader);
                 final SimpleScriptContext context = createScriptContext(node);
                 if (compilationEnabled && engine instanceof Compilable) {
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
index 0aec76d..ee6e139 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyScript.java
@@ -34,8 +34,10 @@ import org.codehaus.groovy.runtime.InvokerHelper;
 import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.plugin.script.proxy.ProxyFactory;
+import org.freeplane.securegroovy.GroovyPatcher;
 
 import groovy.lang.Binding;
+import groovy.lang.GroovyObject;
 import groovy.lang.GroovyRuntimeException;
 import groovy.lang.Script;
 
@@ -132,6 +134,7 @@ public class GroovyScript implements IScript {
             ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
             try {
                 trustedCompileAndCache();
+                Thread.currentThread().setContextClassLoader(scriptClassLoader);
                 final Binding binding = createBinding(node);
                 compiledScript.setBinding(binding);
                 System.setOut(outStream);
@@ -161,12 +164,13 @@ public class GroovyScript implements IScript {
     }
 
     private void trustedCompileAndCache() throws Throwable {
+    	final ScriptingSecurityManager scriptingSecurityManager = createScriptingSecurityManager();
     	AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
 
 			@Override
 			public Void run() throws PrivilegedActionException {
 				try {
-					compileAndCache();
+					compileAndCache(scriptingSecurityManager);
 				} catch (Exception e) {
 					throw new PrivilegedActionException(e);
 				} catch (Error e) {
@@ -179,9 +183,13 @@ public class GroovyScript implements IScript {
 		});
 	}
 
-    private Script compileAndCache() throws Throwable {
-		final ScriptingSecurityManager scriptingSecurityManager = createScriptingSecurityManager();
-        if (compileTimeStrategy.canUseOldCompiledScript()) {
+    private static boolean groovyPatched = false; 
+    private Script compileAndCache(final ScriptingSecurityManager scriptingSecurityManager) throws Throwable {
+    	if(! groovyPatched){
+    		GroovyPatcher.apply(GroovyObject.class);
+    		groovyPatched = true;
+    	}
+    	if (compileTimeStrategy.canUseOldCompiledScript()) {
 			scriptClassLoader.setSecurityManager(scriptingSecurityManager);
             return compiledScript;
         }
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyShell.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyShell.java
index 7318581..2b4b819 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyShell.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/GroovyShell.java
@@ -19,29 +19,23 @@ package org.freeplane.plugin.script;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.CodeSource;
 import java.security.PermissionCollection;
 import java.security.Permissions;
 import java.security.PrivilegedAction;
-import java.util.Map;
 
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.SourceUnit;
-import org.codehaus.groovy.plugin.GroovyRunner;
 import org.codehaus.groovy.runtime.InvokerHelper;
-import org.codehaus.groovy.runtime.InvokerInvocationException;
 
 import groovy.lang.Binding;
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.GroovyCodeSource;
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.GroovyRuntimeException;
-import groovy.lang.GroovySystem;
 import groovy.lang.Script;
 
 /**
@@ -98,116 +92,6 @@ class GroovyShell extends GroovyObjectSupport {
 		}
 	}
 
-	/**
-	 * if (theClass is a Script) {
-	 * run it like a script
-	 * } else if (theClass has a main method) {
-	 * run the main method
-	 * } else if (theClass instanceof GroovyTestCase) {
-	 * use the test runner to run it
-	 * } else if (theClass implements Runnable) {
-	 * if (theClass has a constructor with String[] params)
-	 * instantiate theClass with this constructor and run
-	 * else if (theClass has a no-args constructor)
-	 * instantiate theClass with the no-args constructor and run
-	 * }
-	 */
-	private Object runScriptOrMainOrTestOrRunnable(Class scriptClass, String[] args) {
-		if (scriptClass == null) {
-			return null;
-		}
-		if (Script.class.isAssignableFrom(scriptClass)) {
-			// treat it just like a script if it is one
-			Script script = null;
-			try {
-				script = (Script) scriptClass.newInstance();
-			}
-			catch (InstantiationException e) {
-				// ignore instantiation errors,, try to do main
-			}
-			catch (IllegalAccessException e) {
-				// ignore instantiation errors, try to do main
-			}
-			if (script != null) {
-				script.setBinding(context);
-				script.setProperty("args", args);
-				return script.run();
-			}
-		}
-		try {
-			// let's find a main method
-			scriptClass.getMethod("main", new Class[] { String[].class });
-			// if that main method exist, invoke it
-			return InvokerHelper.invokeMethod(scriptClass, "main", new Object[] { args });
-		}
-		catch (NoSuchMethodException e) {
-			// if it implements Runnable, try to instantiate it
-			if (Runnable.class.isAssignableFrom(scriptClass)) {
-				return runRunnable(scriptClass, args);
-			}
-			for (Map.Entry<String, GroovyRunner> entry : GroovySystem.RUNNER_REGISTRY.entrySet()) {
-				GroovyRunner runner = entry.getValue();
-				if (runner != null && runner.canRun(scriptClass, this.loader)) {
-					return runner.run(scriptClass, this.loader);
-				}
-			}
-			String message = "This script or class could not be run.\n" + "It should either:\n"
-			        + "- have a main method,\n" + "- be a JUnit test or extend GroovyTestCase,\n"
-			        + "- implement the Runnable interface,\n"
-			        + "- or be compatible with a registered script runner. Known runners:\n";
-			if (GroovySystem.RUNNER_REGISTRY.isEmpty()) {
-				message += "  * <none>";
-			}
-			for (Map.Entry<String, GroovyRunner> entry : GroovySystem.RUNNER_REGISTRY.entrySet()) {
-				message += "  * " + entry.getKey() + "\n";
-			}
-			throw new GroovyRuntimeException(message);
-		}
-	}
-
-	private Object runRunnable(Class scriptClass, String[] args) {
-		Constructor constructor = null;
-		Runnable runnable = null;
-		Throwable reason = null;
-		try {
-			// first, fetch the constructor taking String[] as parameter
-			constructor = scriptClass.getConstructor(new Class[] { (new String[] {}).getClass() });
-			try {
-				// instantiate a runnable and run it
-				runnable = (Runnable) constructor.newInstance(new Object[] { args });
-			}
-			catch (Throwable t) {
-				reason = t;
-			}
-		}
-		catch (NoSuchMethodException e1) {
-			try {
-				// otherwise, find the default constructor
-				constructor = scriptClass.getConstructor(new Class[] {});
-				try {
-					// instantiate a runnable and run it
-					runnable = (Runnable) constructor.newInstance();
-				}
-				catch (InvocationTargetException ite) {
-					throw new InvokerInvocationException(ite.getTargetException());
-				}
-				catch (Throwable t) {
-					reason = t;
-				}
-			}
-			catch (NoSuchMethodException nsme) {
-				reason = nsme;
-			}
-		}
-		if (constructor != null && runnable != null) {
-			runnable.run();
-		}
-		else {
-			throw new GroovyRuntimeException("This script or class was runnable but could not be run. ", reason);
-		}
-		return null;
-	}
-
 	private Object getVariable(String name) {
 		return context.getVariables().get(name);
 	}
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java
index 652e948..e9d9efc 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/InternationalizedSecurityManager.java
@@ -20,6 +20,7 @@ package org.freeplane.plugin.script;
 import java.io.FileDescriptor;
 import java.net.InetAddress;
 import java.security.AccessControlException;
+import java.security.Permission;
 
 import org.freeplane.core.util.TextUtils;
 
@@ -208,4 +209,21 @@ class InternationalizedSecurityManager extends SecurityManager {
 	private SecurityException getException(AccessControlException e, final int pPermissionGroup, final int pPermission) {
 		return getException(e, pPermissionGroup, pPermission, "");
 	}
+
+	@Override
+	public void checkPermission(Permission perm) {
+		disallowSupressingAccessChecks(perm);
+		super.checkPermission(perm);
+	}
+
+	private void disallowSupressingAccessChecks(Permission perm) {
+	}
+
+	@Override
+	public void checkPermission(Permission perm, Object context) {
+		disallowSupressingAccessChecks(perm);
+		super.checkPermission(perm, context);	
+	}
+	
+	
 }
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/RestrictingClassLoader.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/RestrictingClassLoader.java
deleted file mode 100644
index 70f1310..0000000
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/RestrictingClassLoader.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2016 dimitry
- *
- *  This file author is dimitry
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.plugin.script;
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java
index 70ec35d..a60cf9b 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptClassLoader.java
@@ -102,6 +102,5 @@ public final class ScriptClassLoader extends URLClassLoader {
 
 	public boolean implies(Permission permission) {
 		return securityManager != null && securityManager.implies(permission);
-	}
-
+	}	
 }
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
index d8697d3..bbbde5a 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingPolicy.java
@@ -22,11 +22,8 @@ package org.freeplane.plugin.script;
 import java.awt.AWTPermission;
 import java.io.File;
 import java.io.FilePermission;
-import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.AllPermission;
-import java.security.BasicPermission;
 import java.security.CodeSource;
 import java.security.Permission;
 import java.security.Permissions;
@@ -84,6 +81,8 @@ class ScriptingPolicy extends Policy {
 		permissions.add(new AWTPermission("accessClipboard"));
 		permissions.add(new AWTPermission("accessEventQueue"));
 		permissions.add(new AWTPermission("setWindowAlwaysOnTop"));
+		permissions.add(new FilePermission(Compat.getApplicationUserDirectory() + "/resources/-", "read"));
+		permissions.add(new FilePermission(Compat.getApplicationUserDirectory() + "/icons/-", "read"));
 	}
 
 
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java
index 57685b0..bed1109 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingRegistration.java
@@ -34,6 +34,7 @@ import java.util.Properties;
 import javax.swing.ComboBoxEditor;
 
 import org.apache.commons.lang.StringUtils;
+import org.freeplane.core.io.xml.XMLLocalParserFactory;
 import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.resources.components.IValidator;
 import org.freeplane.core.ui.menubuilders.generic.EntryVisitor;
@@ -55,7 +56,6 @@ import org.freeplane.n3.nanoxml.IXMLParser;
 import org.freeplane.n3.nanoxml.IXMLReader;
 import org.freeplane.n3.nanoxml.StdXMLReader;
 import org.freeplane.n3.nanoxml.XMLElement;
-import org.freeplane.n3.nanoxml.XMLParserFactory;
 import org.freeplane.plugin.script.ScriptEditorPanel.IScriptModel;
 import org.freeplane.plugin.script.ScriptEditorPanel.ScriptHolder;
 import org.freeplane.plugin.script.addons.ManageAddOnsAction;
@@ -243,7 +243,7 @@ class ScriptingRegistration {
 				return name.endsWith(".script.xml");
 			}
 		});
-		final IXMLParser parser = XMLParserFactory.createDefaultXMLParser();
+		final IXMLParser parser = XMLLocalParserFactory.createLocalXMLParser();
 		for (File file : addonXmlFiles) {
 			BufferedInputStream inputStream = null;
 			try {
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingSecurityManager.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingSecurityManager.java
index d6dd5dd..2ed9f6d 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingSecurityManager.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/ScriptingSecurityManager.java
@@ -25,6 +25,7 @@ import java.net.SocketPermission;
 import java.security.AllPermission;
 import java.security.Permission;
 import java.security.Permissions;
+import java.util.Enumeration;
 
 class ScriptingSecurityManager {
 
@@ -60,6 +61,7 @@ class ScriptingSecurityManager {
 			}
         }
         permissions.setReadOnly();
+        checkRequiredPermissions();
     }
 
     private static final Permission URL_PERMISSION = new SocketPermission("*", "connect");
@@ -77,4 +79,14 @@ class ScriptingSecurityManager {
 		final boolean isAllowed = permissions.implies(permission);
 		return isAllowed;
 	}
+	
+	private void checkRequiredPermissions(){
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            final Enumeration<Permission> permissionElements = permissions.elements();
+            while(permissionElements.hasMoreElements())
+            	sm.checkPermission(permissionElements.nextElement());
+        }
+
+	}
 }
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
index 1adf584..4a40ede 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
@@ -28,7 +28,6 @@ import org.freeplane.core.resources.ResourceController;
 import org.freeplane.core.ui.LabelAndMnemonicSetter;
 import org.freeplane.core.ui.components.UITools;
 import org.freeplane.core.util.FileUtils;
-import org.freeplane.core.util.FreeplaneIconUtils;
 import org.freeplane.core.util.LogUtils;
 import org.freeplane.core.util.TextUtils;
 import org.freeplane.features.map.MapModel;
@@ -211,7 +210,7 @@ public class AddOnInstallerPanel extends JPanel {
 
 	private JButton createFileChooser(final JTextField urlField) {
 		final JButton selectFile = new JButton(getText("search.file"),
-		    FreeplaneIconUtils.createImageIconByResourceKey("OpenAction.icon"));
+		    ResourceController.getResourceController().getIcon("OpenAction.icon"));
 		final JFileChooser fileChooser = new JFileChooser();
 		selectFile.setToolTipText(getText("select.tooltip"));
 		selectFile.setMaximumSize(UITools.MAX_BUTTON_DIMENSION);
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/filter/ScriptCondition.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/filter/ScriptCondition.java
index bc3f571..8d1dc0e 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/filter/ScriptCondition.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/filter/ScriptCondition.java
@@ -16,8 +16,10 @@ import org.freeplane.features.map.NodeModel;
 import org.freeplane.features.mode.Controller;
 import org.freeplane.n3.nanoxml.XMLElement;
 import org.freeplane.plugin.script.ExecuteScriptException;
+import org.freeplane.plugin.script.FormulaUtils;
 import org.freeplane.plugin.script.GroovyScript;
 import org.freeplane.plugin.script.IScript;
+import org.freeplane.plugin.script.ScriptContext;
 import org.freeplane.plugin.script.ScriptingPermissions;
 
 public class ScriptCondition extends ASelectableCondition {
@@ -27,7 +29,7 @@ public class ScriptCondition extends ASelectableCondition {
 	static final String NAME = "script_condition";
 	static final String TAG_NAME = "script";
 	static final String ATTRIB_NAME = "SCRIPT"; // for backward compatibility
-	final private IScript script;
+	final private GroovyScript script;
 	private boolean errorReported = false;
 
 	static ASelectableCondition load(final XMLElement element) {
@@ -85,6 +87,21 @@ public class ScriptCondition extends ASelectableCondition {
         return false;
 	}
 
+	public boolean checkNodeInFormulaContext(NodeModel node){
+		final ScriptContext scriptContext = new ScriptContext();
+		scriptContext.push(node, (String)script.getScript());
+		script.setScriptContext(scriptContext);
+		try {
+			final boolean checkNode = checkNode(node);
+			return checkNode;
+		}
+		finally {
+			scriptContext.pop();
+			script.setScriptContext(null);
+		}
+	}
+
+
 	private void setErrorStatus(final String info) {
 		if(! errorReported){
 			errorReported = true;
@@ -92,7 +109,10 @@ public class ScriptCondition extends ASelectableCondition {
 				TextUtils.getText("error"), JOptionPane.ERROR_MESSAGE);
 		}
 		LogUtils.warn(info);
-		Controller.getCurrentController().getViewController().out(info.trim().replaceAll("\\s", " ").substring(0, 80));
+		String message = info.trim().replaceAll("\\s", " ");
+		if(message.length() > 80)
+			message = message.substring(0, 80);
+		Controller.getCurrentController().getViewController().out(message);
     }
 
 	@Override
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/AttributesProxy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/AttributesProxy.java
index aba2081..4a8b16b 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/AttributesProxy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/AttributesProxy.java
@@ -160,6 +160,16 @@ class AttributesProxy extends AbstractProxy<NodeModel> implements Proxy.Attribut
 		getAttributeController().setAttribute(getDelegate(), index, new Attribute(name, ProxyUtils.transformObject(value, oldPattern)));
 	}
 
+	public void set(final int index, final String name, final Object value, String pattern) {
+		getAttributeController().setAttribute(getDelegate(), index, new Attribute(name, ProxyUtils.transformObject(value, pattern)));
+	}
+
+	public void setFormat(final int index, String pattern) {
+		final NodeAttributeTableModel attributeTableModel = getAndCheckNodeAttributeTableModelForIndex(index, "set1:");
+		final Object value = attributeTableModel.getAttribute(index).getValue();
+		getAttributeController().performSetValueAt(attributeTableModel, ProxyUtils.transformObject(value, pattern), index, 1);
+	}
+
 	public int findFirst(final String name) {
 		final List<String> attributeNames = getAttributeNames();
 		for (int i = 0; i < attributeNames.size(); i++) {
@@ -240,6 +250,11 @@ class AttributesProxy extends AbstractProxy<NodeModel> implements Proxy.Attribut
 		getAttributeController().addAttribute(getDelegate(), attribute);
 	}
 
+    public void add(final String name, final Object value, String pattern) {
+		final Attribute attribute = new Attribute(name, ProxyUtils.transformObject(value, pattern));
+		getAttributeController().addAttribute(getDelegate(), attribute);
+	}
+
 	public int size() {
 		final NodeAttributeTableModel attributeTableModel = getNodeAttributeTableModel();
 		if (attributeTableModel == null) {
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/ControllerProxy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/ControllerProxy.java
index a861b49..a17fb13 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/ControllerProxy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/ControllerProxy.java
@@ -102,14 +102,16 @@ class ControllerProxy implements Proxy.Controller {
     }
 
 	public void select(final Collection<Node> toSelect) {
-		final IMapSelection selection = Controller.getCurrentController().getSelection();
 		final Iterator<Node> it = toSelect.iterator();
 		if (!it.hasNext()) {
 			return;
 		}
-		selection.selectAsTheOnlyOneSelected(((NodeProxy) it.next()).getDelegate());
+		final Node firstNode = it.next();
+		select(firstNode);
 		while (it.hasNext()) {
-			final NodeModel nodeModel = ((NodeProxy) it.next()).getDelegate();
+			final Node nextNode = it.next();
+			final NodeModel nodeModel = ((NodeProxy) nextNode).getDelegate();
+			Controller.getCurrentModeController().getMapController().displayNode(nodeModel);
 			Controller.getCurrentController().getSelection().toggleSelected(nodeModel);
 		}
 	}
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/IconsProxy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/IconsProxy.java
index 2252916..cffce76 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/IconsProxy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/IconsProxy.java
@@ -24,7 +24,7 @@ class IconsProxy extends AbstractProxy<NodeModel> implements Proxy.Icons {
 	}
 
 	public void add(final String name) {
-		getIconController().addIcon(getDelegate(), IconStoreFactory.create().getMindIcon(name));
+		getIconController().addIcon(getDelegate(), IconStoreFactory.ICON_STORE.getMindIcon(name));
 	}
 
 	@Override
diff --git a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java
index a7783aa..63ac7b9 100644
--- a/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java
+++ b/freeplane_plugin_script/src/main/java/org/freeplane/plugin/script/proxy/Proxy.java
@@ -185,6 +185,14 @@ public interface Proxy {
 		/** sets name and value of the attribute at the given index. This method will not create new attributes.
 		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
 		void set(final int index, final String name, final Object value);
+		
+		/** sets name, value and format pattern of the attribute at the given index. This method will not create new attributes.
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
+		public void set(final int index, final String name, final Object value, String format);
+		
+		/** sets format pattern to  the attribute at the given index.
+		 * @throws IndexOutOfBoundsException if index is out of range, i. e. {@code index < 0 || index >= size()}.*/
+		public void setFormat(final int index, String format);
 
 		/** removes the <em>first</em> attribute with this name.
 		 * @return true on removal of an existing attribute and false otherwise.
@@ -206,6 +214,9 @@ public interface Proxy {
 
 		/** adds an attribute no matter if an attribute with the given name already exists. */
 		void add(final String name, final Object value);
+		
+		/** adds an attribute with formatting pattern no matter if an attribute with the given name already exists. */
+		public void add(final String name, final Object value, String format);
 
 		/** removes all attributes.
 		 * @since 1.2 */
@@ -1083,8 +1094,8 @@ public interface Proxy {
 		 * @deprecated since 1.2 - use getPlainText() or getTo().getPlain() instead. */
 		String getPlainTextContent();
 
-		/** Plain text after removal of possible HTML markup.
-		 * Possible transformations (formula evaluation, formatting, ...) are not applied.
+		/** The node text as HTML markup. Returns the same as {@link NodeProxy#getText()} if the node text
+		 * already is HTML or converts the plain text to HTML otherwise.
 		 * @since 1.2 */
 		String getHtmlText();
 
diff --git a/freeplane_plugin_svg/build.gradle b/freeplane_plugin_svg/build.gradle
index 48be7ca..70b36d3 100644
--- a/freeplane_plugin_svg/build.gradle
+++ b/freeplane_plugin_svg/build.gradle
@@ -54,7 +54,7 @@ jar {
 
         instruction 'Bundle-Vendor', 'Freeplane Project'
         instruction 'Bundle-Activator', pluginid + ".Activator"
-        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.6'
+        instruction 'Bundle-RequiredExecutionEnvironment', 'JavaSE-1.7'
 
         def imports = """\
                       org.osgi.framework;version="1.3.0",
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java
index 7cb7638..aaedb80 100644
--- a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java
+++ b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/Activator.java
@@ -2,11 +2,7 @@ package org.freeplane.plugin.svg;
 
 import java.util.Hashtable;
 
-import org.freeplane.core.ui.ExampleFileFilter;
-import org.freeplane.core.util.TextUtils;
-import org.freeplane.features.export.mindmapmode.ExportController;
 import org.freeplane.features.mode.ModeController;
-import org.freeplane.features.mode.browsemode.BModeController;
 import org.freeplane.features.mode.mindmapmode.MModeController;
 import org.freeplane.main.osgi.IModeControllerExtensionProvider;
 import org.freeplane.view.swing.features.filepreview.ViewerController;
@@ -20,7 +16,6 @@ public class Activator implements BundleActivator {
 	 */
 	public void start(final BundleContext context) throws Exception {
 		registerMindMapModeExtension(context);
-		registerBrowseModeExtension(context);
 	}
 
 	private void registerMindMapModeExtension(final BundleContext context) {
@@ -29,22 +24,6 @@ public class Activator implements BundleActivator {
 		context.registerService(IModeControllerExtensionProvider.class.getName(),
 		    new IModeControllerExtensionProvider() {
 			    public void installExtension(ModeController modeController) {
-			    	final ExportController exportController = ExportController.getController(modeController);
-			    	exportController.addExportEngine(new ExampleFileFilter("pdf", TextUtils.getText("export_pdf_text")), new ExportPdf());
-			    	exportController.addExportEngine(new ExampleFileFilter("svg", TextUtils.getText("export_svg_text")), new ExportSvg());
-				    final ViewerController extension = (ViewerController) modeController
-				        .getExtension(ViewerController.class);
-				    extension.addFactory(new SvgViewerFactory());
-			    }
-		    }, props);
-	}
-
-	private void registerBrowseModeExtension(final BundleContext context) {
-		final Hashtable<String, String[]> props = new Hashtable<String, String[]>();
-		props.put("mode", new String[] { BModeController.MODENAME });
-		context.registerService(IModeControllerExtensionProvider.class.getName(),
-		    new IModeControllerExtensionProvider() {
-			    public void installExtension(ModeController modeController) {
 				    final ViewerController extension = (ViewerController) modeController
 				        .getExtension(ViewerController.class);
 				    extension.addFactory(new SvgViewerFactory());
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportPdf.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportPdf.java
deleted file mode 100644
index 443dadd..0000000
--- a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportPdf.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file author is Christian Foltin
- *  It is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.plugin.svg;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.batik.transcoder.SVGAbstractTranscoder;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.fop.svg.PDFTranscoder;
-import org.freeplane.core.ui.components.UITools;
-import org.freeplane.features.export.mindmapmode.ExportController;
-import org.freeplane.features.map.MapModel;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.view.swing.map.MapView;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * @author foltin
- */
-class ExportPdf extends ExportVectorGraphic {
-
-	public ExportPdf() {
-	}
-
-	public void export(MapModel map, File chosenFile) {
-		if (!ExportController.getContoller().checkCurrentMap(map)){
-			return;
-		}
-		try {
-			final MapView view = (MapView) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
-			if (view == null) {
-				return;
-			}
-			Controller.getCurrentController().getViewController().setWaitingCursor(true);
-			final SVGGraphics2D g2d = fillSVGGraphics2D(view);
-			final PDFTranscoder pdfTranscoder = new PDFTranscoder();
-			/*
-			 * according to https: &aid=1921334&group_id=7118 Submitted By:
-			 * Frank Spangenberg (f_spangenberg) Summary: Large mind maps
-			 * produce invalid PDF
-			 */
-			pdfTranscoder.addTranscodingHint(SVGAbstractTranscoder.KEY_MAX_HEIGHT, new Float(19200));
-			pdfTranscoder.addTranscodingHint(SVGAbstractTranscoder.KEY_MAX_WIDTH, new Float(19200));
-			pdfTranscoder.addTranscodingHint(ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, 25.4f/72f/UITools.FONT_SCALE_FACTOR);
-			/* end patch */
-			final Document doc = g2d.getDOMFactory();
-			final Element rootE = doc.getDocumentElement();
-			g2d.getRoot(rootE);
-			final TranscoderInput input = new TranscoderInput(doc);
-			final FileOutputStream ostream = new FileOutputStream(chosenFile);
-			final BufferedOutputStream bufStream = new BufferedOutputStream(ostream);
-			final TranscoderOutput output = new TranscoderOutput(bufStream);
-			pdfTranscoder.transcode(input, output);
-			ostream.flush();
-			ostream.close();
-		}
-		catch (final Exception ex) {
-			org.freeplane.core.util.LogUtils.warn(ex);
-			UITools.errorMessage(ex.getLocalizedMessage());
-		}
-		finally{
-			Controller.getCurrentController().getViewController().setWaitingCursor(false);
-		}
-	}
-
-}
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportSvg.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportSvg.java
deleted file mode 100644
index dc0d048..0000000
--- a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportSvg.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file author is Christian Foltin
- *  It is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.plugin.svg;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.freeplane.core.ui.components.UITools;
-import org.freeplane.features.export.mindmapmode.ExportController;
-import org.freeplane.features.map.MapModel;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.view.swing.map.MapView;
-
-class ExportSvg extends ExportVectorGraphic {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public void export(MapModel map, File chosenFile) {
-		if (!ExportController.getContoller().checkCurrentMap(map)){
-			return;
-		}
-		try {
-			final MapView view = (MapView) Controller.getCurrentController().getMapViewManager().getMapViewComponent();
-			if (view == null) {
-				return;
-			}
-			Controller.getCurrentController().getViewController().setWaitingCursor(true);
-			final SVGGraphics2D g2d = fillSVGGraphics2D(view);
-			final FileOutputStream bos = new FileOutputStream(chosenFile);
-			final BufferedOutputStream bufStream = new BufferedOutputStream(bos);
-			final OutputStreamWriter osw = new OutputStreamWriter(bufStream, "UTF-8");
-			g2d.stream(osw);
-			osw.flush();
-			bos.flush();
-			bos.close();
-		}
-		catch (final Exception ex) {
-			org.freeplane.core.util.LogUtils.warn(ex);
-			UITools.errorMessage(ex.getLocalizedMessage());
-		}
-		finally{
-			Controller.getCurrentController().getViewController().setWaitingCursor(false);
-		}
-	}
-
-}
diff --git a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportVectorGraphic.java b/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportVectorGraphic.java
deleted file mode 100644
index b6207a9..0000000
--- a/freeplane_plugin_svg/src/main/java/org/freeplane/plugin/svg/ExportVectorGraphic.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Freeplane - mind map editor
- *  Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev
- *
- *  This file author is Christian Foltin
- *  It is modified by Dimitry Polivaev in 2008.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.freeplane.plugin.svg;
-
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-
-import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.svggen.SVGGeneratorContext;
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.batik.svggen.SVGGeneratorContext.GraphicContextDefaults;
-import org.apache.batik.util.SVGConstants;
-import org.freeplane.features.export.mindmapmode.IExportEngine;
-import org.freeplane.features.mode.Controller;
-import org.freeplane.view.swing.map.MapView;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-
-/**
- * @author foltin
- */
-abstract class ExportVectorGraphic implements IExportEngine {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 */
-	protected SVGGraphics2D fillSVGGraphics2D(final MapView view) {
-
-		// work around svg/pdf-Export problems when exporting with Gtk or Nimbus L&Fs
-		final String previousLnF = UIManager.getLookAndFeel().getClass().getName();
-		setLnF(view, UIManager.getCrossPlatformLookAndFeelClassName());
-
-		try
-		{
-			final DOMImplementation impl = GenericDOMImplementation.getDOMImplementation();
-			final String namespaceURI = SVGConstants.SVG_NAMESPACE_URI;
-			final Document domFactory = impl.createDocument(namespaceURI, "svg", null);
-			final SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(domFactory);
-			ctx.setEmbeddedFontsOn(true);
-			final GraphicContextDefaults defaults = new GraphicContextDefaults();
-			defaults.setFont(new Font("Arial", Font.PLAIN, 12));
-			ctx.setGraphicContextDefaults(defaults);
-			ctx.setPrecision(12);
-			final SVGGraphics2D g2d = new SVGGraphics2D(ctx, false);
-			g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
-			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_DEFAULT);
-			view.preparePrinting();
-			final Rectangle innerBounds = view.getInnerBounds();
-			g2d.setSVGCanvasSize(new Dimension(innerBounds.width, innerBounds.height));
-			g2d.translate(-innerBounds.x, -innerBounds.y);
-			view.print(g2d);
-			view.endPrinting();
-			return g2d;
-		}
-		finally
-		{
-			setLnF(view, previousLnF);
-		}
-	}
-
-	private void setLnF(final MapView view, final String LnF)
-	{
-		try {
-			// Set cross-platform Java L&F (also called "Metal")
-			UIManager.setLookAndFeel(LnF);
-
-			Frame frame = JOptionPane.getFrameForComponent(view.getRoot().getRootPane());
-			SwingUtilities.updateComponentTreeUI(frame);
-			// this is recommended but causes the root node to be shifted to the bottom right corner :-(
-			// frame.pack();
-		}
-		catch(Exception ex)
-		{
-			throw new RuntimeException("Error when changing L&F for SVG Export!", ex);
-		}
-	}
-
-}
diff --git a/gitinfo.properties b/gitinfo.properties
index 9fd004d..89c3795 100644
--- a/gitinfo.properties
+++ b/gitinfo.properties
@@ -1 +1 @@
-git-revision=7fce59ed725da3f50ae4643d1846198a58bddd7c Dimitry Polivaev 2016-12-04 19:31:29 +0100
\ No newline at end of file
+git-revision=836c57a1e47fc69e31fe60700394ad43562bf1cc Dimitry Polivaev 2017-09-03T10:31:15Z
\ No newline at end of file
diff --git a/gitinfo.txt b/gitinfo.txt
index 9fd004d..89c3795 100644
--- a/gitinfo.txt
+++ b/gitinfo.txt
@@ -1 +1 @@
-git-revision=7fce59ed725da3f50ae4643d1846198a58bddd7c Dimitry Polivaev 2016-12-04 19:31:29 +0100
\ No newline at end of file
+git-revision=836c57a1e47fc69e31fe60700394ad43562bf1cc Dimitry Polivaev 2017-09-03T10:31:15Z
\ No newline at end of file
diff --git a/linux-packages.gradle b/linux-packages.gradle
new file mode 100644
index 0000000..c6e9536
--- /dev/null
+++ b/linux-packages.gradle
@@ -0,0 +1,54 @@
+task freeplaneDeb(type: Deb) {
+    destinationDir = new File(globalDist)
+
+    packageName = 'freeplane'
+    version = distVersion + "~upstream"
+    release = 1
+    
+    requires('default-jre | java7-runtime')
+
+    from(rootDir.path + "/freeplane_framework/script/") {
+      include("freeplane.svg")
+      into("/usr/share/icons/hicolor/scalable/apps")
+    }
+
+    from(rootDir.path + "/freeplane_framework/script/") {
+      include("freeplane.png")
+      into("/usr/share/icons/hicolor/32x32/apps")
+    }
+
+    from(rootDir.path + "/debian-meta-data") {
+      include('freeplane.desktop')
+      into('/usr/share/applications')
+    }
+
+    from(rootDir.path + "/debian-meta-data/") {
+      include("freeplane.sharedmimeinfo")
+      into('/usr/share/mime/packages')
+      rename('freeplane.sharedmimeinfo', 'freeplane.xml')
+    }
+
+    from(rootDir.path + "/debian-meta-data/") {
+      include("freeplane.mime")
+      into('/usr/lib/mime/packages')
+      rename("freeplane.mime", "freeplane")
+    }
+
+    from(globalBin) {
+        include('**')
+        exclude('freeplane.sh')
+        into('/usr/share/freeplane')
+    }
+
+    from(globalBin) {
+        include('freeplane.sh')
+        fileMode = 0755
+     	into('/usr/share/freeplane')
+    }
+
+    link('/usr/bin/freeplane', '/usr/share/freeplane/freeplane.sh')
+
+    for (p in subprojects) {
+        dependsOn p.tasks.getByPath("build")
+    }
+}
diff --git a/mac.dist.gradle b/mac.dist.gradle
index 03981aa..b5448a1 100644
--- a/mac.dist.gradle
+++ b/mac.dist.gradle
@@ -9,16 +9,28 @@ ant.taskdef(
     onerror: "report"
 )
 
-def build4mac = globalDist + '/build4mac'
-def macappfullpath = new File(build4mac, 'Freeplane.app')
+def macAppPropertiesFile = file('macapp.properties')
 
-task macosxapp {
+Properties macAppProperties = new Properties()
+if (macAppPropertiesFile.exists())
+{
+    macAppProperties.load(new FileInputStream(macAppPropertiesFile))
+}
+
+task macDist {}
+
+def defineMacBuildTasks = {boolean includeJavaRuntime -> 
+    def taskName = {base -> includeJavaRuntime ? base + '_jre' : base}
+    def bin4mac = taskName(rootDir.path + '/BIN4mac')
+    def macappfullpath = new File(bin4mac, 'Freeplane.app').absoluteFile
+    
+    def macosxapp = tasks.create (taskName('macosxapp')) {
     doFirst {
-        delete build4mac + '/Freeplane.app'
-        mkdir build4mac
+        delete bin4mac + '/Freeplane.app'
+        mkdir bin4mac
 
         ant.appbundler(
-            outputdirectory: build4mac,
+            outputdirectory: bin4mac,
             name: 'Freeplane',
             displayname: 'Freeplane',
             mainclassname: 'org.freeplane.launcher.Launcher',
@@ -28,7 +40,17 @@ task macosxapp {
             icon: 'freeplane_framework/mac-appbundler/freeplane.icns',
             signature: '????'
         ) {
-            classpath(dir: globalBuild, includes: '*.jar')
+            if (includeJavaRuntime) {
+                if(macAppProperties['macapp.jdk.home'] != null) {
+                    runtime(dir: macAppProperties['macapp.jdk.home'])
+                }
+                else {
+                    def javaHomeJre = System.properties['java.home']
+                    def javaHome = javaHomeJre - ~/\/jre$/
+                    runtime(dir: javaHome)
+                }
+            }
+            classpath(dir: globalBin, includes: '*.jar')
             option(value: "-Xmx512m")
             option(value: "-Dapple.laf.useScreenMenuBar=true")
             option(value: "-Xdock:name=Freeplane")
@@ -45,7 +67,7 @@ task macosxapp {
 
         def macjavafullpath = macappfullpath.path + '/Contents/Java'
         copy {
-            from(globalBuild) {
+            from(globalBin) {
                  exclude('**/*.bat')
                  exclude('**/*.exe')
                  exclude('*.jar')
@@ -60,43 +82,65 @@ task macosxapp {
              }
              into(macresourcesfullpath)
         }
+        }
+        for (p in subprojects) {
+            dependsOn p.tasks.getByPath("build")
+        }
     }
-    for (p in subprojects) {
-        dependsOn p.tasks.getByPath("build")
+
+    def signMacApp= tasks.create (taskName('signMacApp'), Exec) {
+        onlyIf { Os.isFamily(Os.FAMILY_MAC) && macAppProperties['macapp.codesign.identity'] != null}
+ 
+        commandLine 'codesign', '--deep', '-s', macAppProperties['macapp.codesign.identity'], '-v', macappfullpath.path
+
+        dependsOn macosxapp
     }
-}
 
-task dmg4mac(type: Exec) {
-    onlyIf { Os.isFamily(Os.FAMILY_MAC) }
+   def dmg4mac= tasks.create (taskName('dmg4mac'), Exec) {
+        onlyIf { Os.isFamily(Os.FAMILY_MAC) }
+        def dmgPath = globalDist + taskName('/freeplane_app') + '-' + distVersion + '.dmg';
+        doFirst { 
+            mkdir globalDist 
+            file(dmgPath).delete()
+        } 
 
-    commandLine 'hdiutil', 'create', '-srcfolder', macappfullpath.path,
-        globalDist + '/freeplane_app-' + distVersion + '.dmg' 
+        commandLine 'hdiutil', 'create', '-srcfolder', macappfullpath.path,
+            dmgPath
 
-    dependsOn macosxapp
-}
+        dependsOn macosxapp, signMacApp
+    }
+
+    def zip4mac = tasks.create (taskName('zip4mac'), Zip) {
+        destinationDir = new File(globalDist)
+        archiveName = taskName('freeplane_macos_bin') + '-' + distVersion + '.zip'
 
-task zip4mac(type: Zip) {
-    destinationDir = new File(globalDist)
-    archiveName = 'freeplane_macos_bin-' + distVersion + '.zip'
+        from(bin4mac) {
+            exclude('**/JavaAppLauncher')
+        }
+        from(bin4mac) {
+            include('**/JavaAppLauncher')
+            fileMode = 0775
+        }
 
-    from(build4mac) {
-        exclude('**/JavaAppLauncher')
+        into('freeplane-' + distVersion)
+        dependsOn macosxapp
     }
-    from(build4mac) {
-        include('**/JavaAppLauncher')
-        fileMode = 0775
+    
+    def cleanMac = tasks.create (taskName('cleanMac'), Delete) {
+        delete bin4mac
     }
 
-    into('freeplane-' + distVersion)
-    dependsOn macosxapp
+    if (Os.isFamily(Os.FAMILY_MAC)) {
+        macDist.dependsOn dmg4mac
+    }
+    else {
+        macDist.dependsOn zip4mac
+    }
+    
+    clean.dependsOn cleanMac
 }
 
-// this grouping task is necessary so that we can clean up build4mac!
-task macDist {
-    dependsOn dmg4mac
-    dependsOn zip4mac
-
-    doLast {
-        delete(build4mac)
-    }
+if (Os.isFamily(Os.FAMILY_MAC)) {
+    defineMacBuildTasks(true)
 }
+defineMacBuildTasks(false)
diff --git a/src.dist.gradle b/src.dist.gradle
index 23c6f5d..66db9b9 100644
--- a/src.dist.gradle
+++ b/src.dist.gradle
@@ -66,10 +66,10 @@ task srcTarGz(type: Tar) {
 
     // these two files must be included because they are generated from git info
     // and git info is not available int src/srcpure distribs!
-    from(globalBuild) {
+    from(globalBin) {
         include('gitinfo.txt')
     }
-    from(globalBuild + '/resources') {
+    from(globalBin + '/resources') {
         include('gitinfo.properties')
     }
 
@@ -135,10 +135,10 @@ task srcpureTarGz(type: Tar) {
 
     // these two files must be included because they are generated from git info
     // and git info is not available int src/srcpure distribs!
-    from(globalBuild) {
+    from(globalBin) {
         include('gitinfo.txt')
     }
-    from(globalBuild + '/resources') {
+    from(globalBin + '/resources') {
         include('gitinfo.properties')
     }
 
diff --git a/win.dist.gradle b/win.dist.gradle
index 6f63d15..b343c56 100644
--- a/win.dist.gradle
+++ b/win.dist.gradle
@@ -65,7 +65,7 @@ task copyWindowsPortableInstallerFiles(type: Copy) {
     }
 
     // copy all other files
-    from (globalBuild) {
+    from (globalBin) {
         exclude('*.bat', '*.ini', '*.sh')
         exclude('doc/api/**')
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git



More information about the pkg-java-commits mailing list