From 425f27af0c1b27bf4471d78e9a505a341c74385d Mon Sep 17 00:00:00 2001
From: Frank Shaka <frank@xmind.net>
Date: Thu, 19 Oct 2017 15:26:05 +0800
Subject: [PATCH] Release 3.7.2.201705011955

---
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.cathy.fonts/pom.xml         |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.cathy.win32/pom.xml         |   4 +-
 bundles/org.xmind.cathy/META-INF/MANIFEST.MF  |  20 +-
 bundles/org.xmind.cathy/plugin.xml            |   2 +-
 bundles/org.xmind.cathy/pom.xml               |   4 +-
 .../org/xmind/cathy/internal/CathyPlugin.java |   2 +
 .../cathy/internal/OpenFilesProcess.java      |   2 +-
 .../xmind/cathy/internal/StartUpProcess.java  |  10 +-
 .../StartupPreferencePageSection.java         |  16 +-
 .../xmind/cathy/internal/WelcomeDialog.java   |  33 ++-
 .../dashboard/DashboardAutomationAddon.java   |   2 +-
 .../NewFromStructuresDashboardPage.java       |   5 +-
 .../META-INF/MANIFEST.MF                      |   4 +-
 bundles/org.xmind.core.command.remote/pom.xml |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.core.command/pom.xml        |   4 +-
 .../org.xmind.core.io/META-INF/MANIFEST.MF    |   2 +-
 bundles/org.xmind.core.io/pom.xml             |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.core.licensing/pom.xml      |   4 +-
 .../org.xmind.core.net/META-INF/MANIFEST.MF   |   2 +-
 bundles/org.xmind.core.net/pom.xml            |   4 +-
 .../org/xmind/core/net/http/HttpRequest.java  |  33 ++-
 .../http/InvalidResponseValueException.java   |  46 ++++
 .../META-INF/MANIFEST.MF                      |   4 +-
 bundles/org.xmind.core.runtime/pom.xml        |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.core.usagedata/pom.xml      |   4 +-
 .../core/internal/UserDataConstants.java      |  14 +-
 bundles/org.xmind.core/META-INF/MANIFEST.MF   |   2 +-
 bundles/org.xmind.core/pom.xml                |   4 +-
 .../src/org/xmind/core/util/CloneHandler.java |  29 +++
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../pom.xml                                   |   4 +-
 bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF |   6 +-
 bundles/org.xmind.gef.ui/pom.xml              |   4 +-
 .../xmind/gef/ui/editor/GraphicalEditor.java  |  11 +-
 .../org/xmind/ui/datepicker/DatePicker.java   |   6 +
 .../ui/texteditor/FloatingTextEditTool.java   |  15 +-
 bundles/org.xmind.gef/META-INF/MANIFEST.MF    |   2 +-
 bundles/org.xmind.gef/pom.xml                 |   4 +-
 .../org.xmind.neuquant/META-INF/MANIFEST.MF   |   2 +-
 bundles/org.xmind.neuquant/pom.xml            |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../pom.xml                                   |   4 +-
 .../org.xmind.ui.browser/META-INF/MANIFEST.MF |   6 +-
 bundles/org.xmind.ui.browser/pom.xml          |   4 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.ui.dashboard/pom.xml        |   4 +-
 .../META-INF/MANIFEST.MF                      |  12 +-
 .../org.xmind.ui.exports.vector.svg/pom.xml   |   4 +-
 .../META-INF/MANIFEST.MF                      |   4 +-
 bundles/org.xmind.ui.exports.vector/pom.xml   |   4 +-
 .../graphics/GraphicsToGraphics2DAdaptor.java |  17 +-
 .../META-INF/MANIFEST.MF                      |   6 +-
 bundles/org.xmind.ui.fishbone/pom.xml         |   4 +-
 .../org.xmind.ui.imports/META-INF/MANIFEST.MF |  10 +-
 bundles/org.xmind.ui.imports/pom.xml          |   4 +-
 .../imports/freemind/FreeMindImporter.java    |   2 +-
 .../imports/lighten/LightenImportWizard.java  |  14 +
 .../imports/lighten/LightenImporter.java      |   1 +
 .../imports/mm/MindManagerImporter.java       |   1 +
 .../imports/novamind/NovaMindImporter.java    |   1 +
 .../internal/imports/opml/OpmlConstants.java  |  23 +-
 .../imports/opml/OpmlImportWizard.java        |  12 +
 .../internal/imports/opml/OpmlImporter.java   | 239 ++++++++++++------
 .../org.xmind.ui.menus/META-INF/MANIFEST.MF   |  10 +-
 bundles/org.xmind.ui.menus/plugin.xml         |  16 +-
 bundles/org.xmind.ui.menus/pom.xml            |   4 +-
 .../org.xmind.ui.mindmap/META-INF/MANIFEST.MF |  16 +-
 bundles/org.xmind.ui.mindmap/pom.xml          |   4 +-
 .../commands/ModifyTopicStructureCommand.java |  10 +-
 .../org/xmind/ui/internal/ClonedTemplate.java |   2 +-
 .../ui/internal/MindMapResourceManager.java   |  74 +++---
 .../ui/internal/dnd/MindMapDNDClientBase.java |   2 +-
 .../ui/internal/editor/ClonedWorkbookRef.java |  15 +-
 .../DefaultMindMapPreviewGenerator.java       |  50 +++-
 .../internal/editor/LocalFileSaveWizard.java  |   5 +-
 .../ui/internal/editor/MindMapEditor.java     |   4 +-
 .../internal/editor/MiniZoomContribution.java |  40 ++-
 .../CreateSheetFromTemplateHandler.java       |   3 +
 .../ui/internal/mindmap/MindMapPartBase.java  |  10 +-
 .../NumberingPropertySectionPart.java         |   5 +-
 .../internal/properties/PropertiesPart.java   |  41 +--
 .../protocols/AttachmentProtocol.java         |  54 +++-
 .../TemplateResourceManagerViewer.java        |   4 +-
 .../org/xmind/ui/wizards/MindMapImporter.java |   7 +
 .../META-INF/MANIFEST.MF                      |   2 +-
 bundles/org.xmind.ui.resources/pom.xml        |   4 +-
 .../templates/templates.properties            |  29 +++
 .../templates/templates.xml                   |  52 ++--
 .../META-INF/MANIFEST.MF                      |   8 +-
 bundles/org.xmind.ui.spelling/pom.xml         |   4 +-
 .../META-INF/MANIFEST.MF                      |   6 +-
 bundles/org.xmind.ui.spreadsheet/pom.xml      |   4 +-
 .../org.xmind.ui.toolkit/META-INF/MANIFEST.MF |   2 +-
 bundles/org.xmind.ui.toolkit/pom.xml          |   4 +-
 .../MultiSectionPreferencePage.java           |   3 -
 bundles/org.xmind.ui/META-INF/MANIFEST.MF     |   6 +-
 bundles/org.xmind.ui/pom.xml                  |   4 +-
 features/org.xmind.cathy.feature/feature.xml  |   2 +-
 features/org.xmind.cathy.feature/pom.xml      |   4 +-
 .../feature.xml                               |   2 +-
 .../org.xmind.cathy.platform.feature/pom.xml  |   4 +-
 .../org.xmind.graphicsio.feature/feature.xml  |   2 +-
 features/org.xmind.graphicsio.feature/pom.xml |   4 +-
 features/org.xmind.hebe.feature/feature.xml   |   2 +-
 features/org.xmind.hebe.feature/pom.xml       |   4 +-
 pom.xml                                       |  11 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 releng/org.xmind.cathy.product/cathy.product  |  14 +-
 releng/org.xmind.cathy.product/pom.xml        |   4 +-
 .../org.xmind.cathy.repository/category.xml   |   8 +-
 releng/org.xmind.cathy.repository/pom.xml     |   2 +-
 releng/org.xmind.cathy.target/pom.xml         |   2 +-
 .../META-INF/MANIFEST.MF                      |   4 +-
 tests/org.xmind.core.runtime.tests/pom.xml    |   4 +-
 .../org.xmind.core.tests/META-INF/MANIFEST.MF |   4 +-
 tests/org.xmind.core.tests/pom.xml            |   4 +-
 121 files changed, 888 insertions(+), 421 deletions(-)
 create mode 100644 bundles/org.xmind.core.net/src/org/xmind/core/net/http/InvalidResponseValueException.java

diff --git a/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF
index 6eff57e48..e638c03e8 100644
--- a/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.cathy.fonts
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.xmind.cathy.fonts/pom.xml b/bundles/org.xmind.cathy.fonts/pom.xml
index 1de51ffa0..5401edff7 100644
--- a/bundles/org.xmind.cathy.fonts/pom.xml
+++ b/bundles/org.xmind.cathy.fonts/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy.fonts</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF
index c48ae1554..2ddfbd9f9 100644
--- a/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.cathy.win32;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.xmind.cathy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.xmind.cathy.win32/pom.xml b/bundles/org.xmind.cathy.win32/pom.xml
index 4b4d00313..d92320c48 100644
--- a/bundles/org.xmind.cathy.win32/pom.xml
+++ b/bundles/org.xmind.cathy.win32/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy.win32</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/bundles/org.xmind.cathy/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy/META-INF/MANIFEST.MF
index 62a1336b7..7b7da612e 100644
--- a/bundles/org.xmind.cathy/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.cathy/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-SymbolicName: org.xmind.cathy;singleton:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.imports;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.command;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.command.remote;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.imports;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.command;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.command.remote;bundle-version="[3.7.2,3.8.0)",
  org.eclipse.e4.ui.workbench,
  org.eclipse.ui.themes,
  org.eclipse.e4.ui.model.workbench,
@@ -27,12 +27,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.e4.core.commands,
  org.xmind.ui.dashboard,
- org.xmind.core.usagedata;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.2,3.8.0)",
  org.json,
- org.xmind.ui.browser;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.licensing;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.ui.browser;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.licensing;bundle-version="[3.7.2,3.8.0)",
  org.eclipse.e4.ui.workbench.addons.swt,
- org.xmind.ui.mindmap;bundle-version="3.7.0",
+ org.xmind.ui.mindmap;bundle-version="3.7.2",
  org.eclipse.ui.net;bundle-version="1.3.0",
  org.eclipse.emf.ecore.xmi
 Bundle-ManifestVersion: 2
@@ -49,5 +49,5 @@ Export-Package: org.xmind.cathy.internal;x-internal:=true,org.xmind.ca
  l.renderer;x-internal:=true,org.xmind.ui.internal.e4handlers;x-intern
  al:=true
 Bundle-Name: %pluginName
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.cathy.internal.CathyPlugin
diff --git a/bundles/org.xmind.cathy/plugin.xml b/bundles/org.xmind.cathy/plugin.xml
index ed09ede1b..18f2af0a5 100644
--- a/bundles/org.xmind.cathy/plugin.xml
+++ b/bundles/org.xmind.cathy/plugin.xml
@@ -111,7 +111,7 @@
       </page>
       <page
             class="org.eclipse.ui.ExtensionFactory:newKeysPreferencePage"
-            id="org.xmind.ui.prefPage.Keys"
+            id="org.eclipse.ui.preferencePages.Keys"
             name="%prefPage.keys.name">
       </page>
       <!--<page
diff --git a/bundles/org.xmind.cathy/pom.xml b/bundles/org.xmind.cathy/pom.xml
index 2b04bf2b6..47cd3ce39 100644
--- a/bundles/org.xmind.cathy/pom.xml
+++ b/bundles/org.xmind.cathy/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java
index 32794f856..698279bc5 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java
@@ -174,6 +174,8 @@ public class CathyPlugin extends AbstractUIPlugin {
     public static final int AUTO_SAVE_EDITOR_STATE_INTERVALS = 60000;
     public static final String OPTION_AUTO_SAVE_EDITOR_STATE_INTERVALS = "/debug/autoSaveEditorStateIntervals"; //$NON-NLS-1$
 
+    public static final String KEY_NOT_SHOW_UPLOAD_DATA_CHECK = "org.xmind.cathy.notShowUploadDataCheck"; //$NON-NLS-1$
+
     // The shared instance.
     private static CathyPlugin plugin;
 
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/OpenFilesProcess.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/OpenFilesProcess.java
index 2b7d9c8a4..9d2823b8a 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/OpenFilesProcess.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/OpenFilesProcess.java
@@ -140,7 +140,7 @@ protected IEditorInput createEditorInput(String fileName) throws Exception {
     protected IEditorInput newFromTemplate(String path, String fileName)
             throws Exception {
         IWorkbookRef ref = ClonedWorkbookRef
-                .createFromSourceWorkbookURI(new File(path).toURI());
+                .createFromSourceWorkbookURI(new File(path).toURI(), fileName);
         return MindMapUI.getEditorInputFactory().createEditorInput(ref);
     }
 
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartUpProcess.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartUpProcess.java
index 032d37cd7..d73111f0f 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartUpProcess.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartUpProcess.java
@@ -45,6 +45,7 @@ public StartUpProcess(IWorkbench workbench) {
     }
 
     public void startUp() {
+        hideRightStack();
         checkAndRecoverFiles();
 
         if (DEBUG_CHECK_OPEN_FILE) {
@@ -68,6 +69,14 @@ public void run() {
         }
     }
 
+    private void hideRightStack() {
+        MApplication application = workbench.getService(MApplication.class);
+        for (MWindow window : application.getChildren()) {
+            DashboardAutomationAddon.hideVisiblePart(window,
+                    "org.xmind.ui.stack.right"); //$NON-NLS-1$
+        }
+    }
+
     private void checkAndOpenFiles() {
         new CheckOpenFilesProcess(workbench).doCheckAndOpenFiles();
     }
@@ -94,7 +103,6 @@ private void openStartupMap() {
                 doOpenLastSession();
             }
             if (!hasOpenedEditors()) {
-//                doOpenDashboard();
                 closeOpenedDashboard();
             }
         }
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java
index ceb0585fd..ff8601caf 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java
@@ -62,7 +62,9 @@ public void createControl(Composite parent) {
     @Override
     protected void createFieldEditors() {
         addStartupGroup(container);
-        addSendUsageDataGroup(container);
+        if (isShowUploadDataCheck()) {
+            addSendUsageDataGroup(container);
+        }
         this.initialize();
     }
 
@@ -74,8 +76,16 @@ private void addStartupGroup(Composite parent) {
 
         startupActionButton = new Button(container, SWT.CHECK);
         startupActionButton.setText(WorkbenchMessages.RestoreLastSession_label);
-        addField(new BooleanFieldEditor(CathyPlugin.CHECK_UPDATES_ON_STARTUP,
-                WorkbenchMessages.CheckUpdates_label, container));
+
+        if (isShowUploadDataCheck()) {
+            addField(
+                    new BooleanFieldEditor(CathyPlugin.CHECK_UPDATES_ON_STARTUP,
+                            WorkbenchMessages.CheckUpdates_label, container));
+        }
+    }
+
+    private boolean isShowUploadDataCheck() {
+        return !Boolean.getBoolean(CathyPlugin.KEY_NOT_SHOW_UPLOAD_DATA_CHECK);
     }
 
     private void addSendUsageDataGroup(Composite parent) {
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java
index 464f97ce4..5ba7cc3b3 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java
@@ -458,7 +458,7 @@ private void createButtonSection(Composite parent) {
         GridData layoutData = new GridData(SWT.FILL, SWT.BOTTOM, true, false);
         composite.setLayoutData(layoutData);
 
-        GridLayout layout = new GridLayout(2, false);
+        GridLayout layout = new GridLayout(0, false);
         layout.marginWidth = 27;
         layout.marginHeight = 10;
         composite.setLayout(layout);
@@ -468,6 +468,11 @@ private void createButtonSection(Composite parent) {
     }
 
     private void createUploadDataCheck(Composite parent) {
+        if (!isShowUploadDataCheck()) {
+            return;
+        }
+        ((GridLayout) parent.getLayout()).numColumns++;
+
         Composite composite = new Composite(parent, SWT.NONE);
         composite.setBackground(parent.getBackground());
         GridData layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
@@ -514,10 +519,22 @@ public void linkActivated(HyperlinkEvent e) {
         });
     }
 
+    private boolean isShowUploadDataCheck() {
+        return !Boolean.getBoolean(CathyPlugin.KEY_NOT_SHOW_UPLOAD_DATA_CHECK);
+    }
+
     private void createOkButton(Composite parent) {
+        ((GridLayout) parent.getLayout()).numColumns++;
+
         final Button okButton = new Button(parent, SWT.PUSH);
         okButton.setBackground(parent.getBackground());
-        GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, true);
+
+        GridData gridData = null;
+        if (((GridLayout) parent.getLayout()).numColumns > 1) {
+            gridData = new GridData(SWT.CENTER, SWT.CENTER, false, true);
+        } else {
+            gridData = new GridData(SWT.RIGHT, SWT.CENTER, true, true);
+        }
         gridData.widthHint = 92;
         okButton.setLayoutData(gridData);
         okButton.setText(WorkbenchMessages.WelcomeDialog_okButton_text);
@@ -540,12 +557,14 @@ public void mouseDoubleClick(MouseEvent e) {
     }
 
     private void close(boolean restoreDefaults) {
-        boolean isUploadData = true;
-        if (!restoreDefaults) {
-            isUploadData = uploadDataCheck.getSelection();
+        if (uploadDataCheck != null && !uploadDataCheck.isDisposed()) {
+            boolean isUploadData = true;
+            if (!restoreDefaults) {
+                isUploadData = uploadDataCheck.getSelection();
+            }
+            CathyPlugin.getDefault().getPreferenceStore().setValue(
+                    CathyPlugin.USAGE_DATA_UPLOADING_ENABLED, isUploadData);
         }
-        CathyPlugin.getDefault().getPreferenceStore().setValue(
-                CathyPlugin.USAGE_DATA_UPLOADING_ENABLED, isUploadData);
 
         super.close();
     }
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java
index 1876c328d..b53590b82 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java
@@ -272,7 +272,7 @@ private void updateDashboardToolItems(MWindow window) {
         }
     }
 
-    private static final String hideVisiblePart(MWindow window,
+    public static final String hideVisiblePart(MWindow window,
             String partStackId) {
         if (window == null || partStackId == null) {
             return null;
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
index 166f766c2..56b01acba 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
@@ -136,8 +136,11 @@ public void run() {
                 .increase(UserDataConstants.CREATE_WORKBOOK_COUNT);
         MindMapUIPlugin.getDefault().getUsageDataCollector()
                 .increase(UserDataConstants.CREATE_SHEET_COUNT);
+
+        String vs = structure.getValue();
+        String ID = vs.replaceAll("\\.", "_");  //$NON-NLS-1$//$NON-NLS-2$
         MindMapUIPlugin.getDefault().getUsageDataCollector().increase(
-                UserDataConstants.STRUCTURE_TYPE_COUNT + structure.getValue());
+                String.format(UserDataConstants.STRUCTURE_TYPE_COUNT, ID));
         WorkbookInitializer initializer = WorkbookInitializer.getDefault()
                 .withStructureClass(structure.getValue()).withTheme(theme);
         IEditorInput editorInput = MindMapUI.getEditorInputFactory()
diff --git a/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF
index 23777734f..6b23955c0 100644
--- a/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.command.remote;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.internal.command.remote.RemoteCommandPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
- org.xmind.core.command;bundle-version="[3.7.0,3.8.0)";visibility:=reexport
+ org.xmind.core.command;bundle-version="[3.7.2,3.8.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.core.command.remote,
diff --git a/bundles/org.xmind.core.command.remote/pom.xml b/bundles/org.xmind.core.command.remote/pom.xml
index 8d04b567f..9d5c2a095 100644
--- a/bundles/org.xmind.core.command.remote/pom.xml
+++ b/bundles/org.xmind.core.command.remote/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.command.remote</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.command/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command/META-INF/MANIFEST.MF
index 1d8691464..61944f75c 100644
--- a/bundles/org.xmind.core.command/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.command/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.command;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.internal.command.XMindCommandPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime
diff --git a/bundles/org.xmind.core.command/pom.xml b/bundles/org.xmind.core.command/pom.xml
index 3fae40a32..bc4f88412 100644
--- a/bundles/org.xmind.core.command/pom.xml
+++ b/bundles/org.xmind.core.command/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.command</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.io/META-INF/MANIFEST.MF b/bundles/org.xmind.core.io/META-INF/MANIFEST.MF
index 734d69f8b..0785b4c8b 100644
--- a/bundles/org.xmind.core.io/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.io/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.io;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.xmind.core.io/pom.xml b/bundles/org.xmind.core.io/pom.xml
index 8a1d826ba..e468a9e64 100644
--- a/bundles/org.xmind.core.io/pom.xml
+++ b/bundles/org.xmind.core.io/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.io</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF b/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF
index 022ca8243..1e43a446a 100644
--- a/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Licensing API
 Bundle-SymbolicName: org.xmind.core.licensing
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: XMind Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.xmind.core.licensing
diff --git a/bundles/org.xmind.core.licensing/pom.xml b/bundles/org.xmind.core.licensing/pom.xml
index d42660a16..cd9ffaad7 100644
--- a/bundles/org.xmind.core.licensing/pom.xml
+++ b/bundles/org.xmind.core.licensing/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.licensing</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.net/META-INF/MANIFEST.MF b/bundles/org.xmind.core.net/META-INF/MANIFEST.MF
index 28b3e78be..bf194f1bf 100644
--- a/bundles/org.xmind.core.net/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.net;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.net.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.json;bundle-version="1.0.0"
diff --git a/bundles/org.xmind.core.net/pom.xml b/bundles/org.xmind.core.net/pom.xml
index bd4a3cb52..d92cdbf83 100644
--- a/bundles/org.xmind.core.net/pom.xml
+++ b/bundles/org.xmind.core.net/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.net</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java
index a7dcb1e94..8623383b5 100644
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java
@@ -23,6 +23,7 @@
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -51,6 +52,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.osgi.util.NLS;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -408,6 +410,32 @@ public JSONObject getResponseAsJSON() {
         }
     }
 
+    public JSONObject getResponseAsJSONChecked()
+            throws InvalidResponseValueException {
+        if (responseBuffer == null)
+            throw new InvalidResponseValueException("No response buffer.");
+        ByteArrayInputStream input = new ByteArrayInputStream(responseBuffer);
+        try {
+            return new JSONObject(new JSONTokener(input));
+        } catch (JSONException e) {
+            // not a valid JSON object
+            try {
+                throw new InvalidResponseValueException(
+                        NLS.bind("Illegal reponse JSON:\n{0}",
+                                new String(responseBuffer, "utf-8"))); //$NON-NLS-1$
+            } catch (UnsupportedEncodingException e1) {
+                throw new InvalidResponseValueException(
+                        "Illegal reponse JSON.");
+            }
+
+        } finally {
+            try {
+                input.close();
+            } catch (IOException e) {
+            }
+        }
+    }
+
     /**
      * @return the responseHeaders
      */
@@ -681,7 +709,7 @@ private void readResponse(IProgressMonitor monitor,
 
         log("Receiving {0} bytes...", totalBytes); //$NON-NLS-1$
 
-        if (totalBytes > 0) {
+        if (totalBytes >= 0) {
             if (readStream == null)
                 throw new IOException(
                         "No input stream available to read response from"); //$NON-NLS-1$
@@ -736,9 +764,6 @@ private long getResponseLength(InputStream readStream) throws IOException {
             } catch (NumberFormatException e) {
             }
         }
-        if (totalBytes < 0 && readStream != null) {
-            totalBytes = readStream.available();
-        }
         return totalBytes;
     }
 
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/InvalidResponseValueException.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/InvalidResponseValueException.java
new file mode 100644
index 000000000..a1d273035
--- /dev/null
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/InvalidResponseValueException.java
@@ -0,0 +1,46 @@
+/* ******************************************************************************
+ * Copyright (c) 2006-2016 XMind Ltd. and others.
+ * 
+ * This file is a part of XMind 3. XMind releases 3 and
+ * above are dual-licensed under the Eclipse Public License (EPL),
+ * which is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the GNU Lesser General Public License (LGPL), 
+ * which is available at http://www.gnu.org/licenses/lgpl.html
+ * See http://www.xmind.net/license.html for details.
+ * 
+ * Contributors:
+ *     XMind Ltd. - initial API and implementation
+ *******************************************************************************/
+/**
+ * 
+ */
+package org.xmind.core.net.http;
+
+import java.io.IOException;
+
+/**
+ * @author Shawn
+ */
+public class InvalidResponseValueException extends IOException {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -2680012534566070493L;
+
+    /**
+     * @param message
+     */
+    public InvalidResponseValueException(String message) {
+        this(message, null);
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public InvalidResponseValueException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF b/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF
index 1be6d8c08..890afd9be 100644
--- a/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.runtime;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.internal.XmindCore
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.bouncycastle,
- org.xmind.core;bundle-version="[3.7.0,3.8.0)";visibility:=reexport
+ org.xmind.core;bundle-version="[3.7.2,3.8.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.xmind.core.internal;x-internal:=true,
  org.xmind.core.internal.factory;x-internal:=true,
diff --git a/bundles/org.xmind.core.runtime/pom.xml b/bundles/org.xmind.core.runtime/pom.xml
index e004014fe..a60294c2e 100644
--- a/bundles/org.xmind.core.runtime/pom.xml
+++ b/bundles/org.xmind.core.runtime/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.runtime</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF b/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF
index 27838d0ef..ee3b2891c 100644
--- a/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Usage Data API
 Bundle-SymbolicName: org.xmind.core.usagedata
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.xmind.core.usagedata/pom.xml b/bundles/org.xmind.core.usagedata/pom.xml
index 2db051b1c..2734e1f7f 100644
--- a/bundles/org.xmind.core.usagedata/pom.xml
+++ b/bundles/org.xmind.core.usagedata/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.usagedata</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.usagedata/src/org/xmind/core/internal/UserDataConstants.java b/bundles/org.xmind.core.usagedata/src/org/xmind/core/internal/UserDataConstants.java
index 7f34dbc89..88b9c7649 100644
--- a/bundles/org.xmind.core.usagedata/src/org/xmind/core/internal/UserDataConstants.java
+++ b/bundles/org.xmind.core.usagedata/src/org/xmind/core/internal/UserDataConstants.java
@@ -50,7 +50,7 @@ public class UserDataConstants {
     public static final String TOGGLE_MULTI_COLOR_COUNT = "ToggleMultiColorCount"; //$NON-NLS-1$
     public static final String CHANGE_LEGEND_BACKGROUD_COUNT = "ChangeLegendBackgroudCount"; //$NON-NLS-1$
     public static final String SHOW_LEGEND_COUNT = "ShowLegendCount"; //$NON-NLS-1$
-    public static final String NUMBERING_TYPE_COUNT = "NumberingTypeCount:"; //$NON-NLS-1$
+    public static final String NUMBERING_TYPE_COUNT = "Numbering/%s/TypeCount"; //$NON-NLS-1$
     public static final String NUMBER_DEPTH_COUNT = "NumberDepthCount"; //$NON-NLS-1$
     public static final String FILTER_OPERATION_COUNT = "FilterOperationCount"; //$NON-NLS-1$
 
@@ -71,7 +71,7 @@ public class UserDataConstants {
     public static final String SPREAD_SHEET_COUNT = "SpreadSheetCount"; //$NON-NLS-1$
 
     /** Structure */
-    public static final String STRUCTURE_TYPE_COUNT = "StructureTypeCount:";//$NON-NLS-1$
+    public static final String STRUCTURE_TYPE_COUNT = "Structure/%s/TypeCount";//$NON-NLS-1$
     public static final String MODIFY_STRUCTURE_COUNT = "ModifyStructureCount"; //$NON-NLS-1$
 
     /** MarkerPart */
@@ -101,7 +101,7 @@ public class UserDataConstants {
     /** Template */
     public static final String SHOW_TEMPLATES_COUNT = "ShowTemplatesCount"; //$NON-NLS-1$
     public static final String USE_TEMPLATES_COUNT = "UseTemplatesCount"; //$NON-NLS-1$
-    public static final String USE_S_TEMPLATE_COUNT = "Use_%s_TemplateCount";//$NON-NLS-1$
+    public static final String USE_S_TEMPLATE_COUNT = "Template/%s/UseCount";//$NON-NLS-1$
 
     /** Theme */
     public static final String SHOW_THEME_COUNT = "ShowThemeCount"; //$NON-NLS-1$
@@ -109,7 +109,7 @@ public class UserDataConstants {
     public static final String EDIT_THEME_COUNT = "EditThemeCount"; //$NON-NLS-1$
     public static final String EXTRACT_THEME_COUNT = "ExtractThemeCount"; //$NON-NLS-1$
     public static final String CREATE_THEME_COUNT = "CreateThemeCount"; //$NON-NLS-1$
-    public static final String USE_S_THEME_COUNT = "Use_%s_ThemeCount";//$NON-NLS-1$
+    public static final String USE_S_THEME_COUNT = "Theme/%s/UseCount";//$NON-NLS-1$
 
     /** Style */
     public static final String CREATE_STYLE_COUNT = "CreateStyleCount"; //$NON-NLS-1$
@@ -125,7 +125,7 @@ public class UserDataConstants {
 
     public static final String ADD_ATTACHMENT_COUNT = "AddAttachmentCount"; //$NON-NLS-1$
     public static final String ATTACHMENT_FORMAT_COUNT_BLANK_FORMAT = "AttachmentFormatCount:BlankFormat"; //$NON-NLS-1$
-    public static final String ATTACHMENT_FORMAT_COUNT_S = "AttachmentFormatCount:%s"; //$NON-NLS-1$
+    public static final String ATTACHMENT_FORMAT_COUNT_S = "Attachment/%s/FormatCount"; //$NON-NLS-1$
 
     /** Import */
     public static final String IMPORT_FROM_WORD_COUNT = "ImportFromWordCount"; //$NON-NLS-1$
@@ -191,8 +191,8 @@ public class UserDataConstants {
 
     /** TaskInfoPart */
     public static final String SHOW_TASK_INFO_PART_COUNT = "ShowTaskInfoPartCount"; //$NON-NLS-1$
-    public static final String TASK_END_TIME = "TaskEndTime_"; //$NON-NLS-1$
-    public static final String TASK_START_TIME = "TaskStartTime_"; //$NON-NLS-1$
+    public static final String TASK_END_TIME = "Task/%s/startTime"; //$NON-NLS-1$
+    public static final String TASK_START_TIME = "Task/%s/endTime"; //$NON-NLS-1$
     public static final String TASK_INFO_CLICK_CHECK_POINT_COUNT = "TaskInfoClickCheckPointCount"; //$NON-NLS-1$
     public static final String CHANGE_PREDECESSOR_COUNT = "ChangePredecessorCount"; //$NON-NLS-1$
     public static final String REMOVE_PREDECESSOR_COUNT = "RemovePredecessorCount"; //$NON-NLS-1$
diff --git a/bundles/org.xmind.core/META-INF/MANIFEST.MF b/bundles/org.xmind.core/META-INF/MANIFEST.MF
index c1450e37a..e43d03666 100644
--- a/bundles/org.xmind.core/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Export-Package: org.xmind.core,
  org.xmind.core.event,
  org.xmind.core.internal;x-internal:=true,
diff --git a/bundles/org.xmind.core/pom.xml b/bundles/org.xmind.core/pom.xml
index c71bee8e0..e88d98564 100644
--- a/bundles/org.xmind.core/pom.xml
+++ b/bundles/org.xmind.core/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core/src/org/xmind/core/util/CloneHandler.java b/bundles/org.xmind.core/src/org/xmind/core/util/CloneHandler.java
index 87ac1103b..beec75f3a 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/util/CloneHandler.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/util/CloneHandler.java
@@ -498,9 +498,38 @@ private ISheet cloneSheet(ISheet sourceSheet) throws IOException {
         getAllChildrenTopic(targetAllTopics, targetSheet.getRootTopic());
 
         fixInternalHyperlinkFor(targetAllTopics);
+        replaceProcessorOldIds(targetAllTopics);
         return targetSheet;
     }
 
+    private void replaceProcessorOldIds(ArrayList<ITopic> targetAllTopics) {
+        for (ITopic topic : targetAllTopics) {
+            replaceProcessorOldIds(topic);
+        }
+    }
+
+    private void replaceProcessorOldIds(ITopic topic) {
+        ITopicExtension ext = topic.getExtension("org.xmind.ui.taskInfo"); //$NON-NLS-1$
+        if (ext != null) {
+            ITopicExtensionElement content = ext.getContent();
+            List<ITopicExtensionElement> parentElements = content
+                    .getChildren("predecessors"); //$NON-NLS-1$
+
+            for (ITopicExtensionElement parentElement : parentElements) {
+                List<ITopicExtensionElement> elements = parentElement
+                        .getChildren("predecessor"); //$NON-NLS-1$
+                for (ITopicExtensionElement element : elements) {
+                    String taskId = element.getAttribute("task-id"); //$NON-NLS-1$
+                    String newTaskId = mapper
+                            .getString(ICloneData.WORKBOOK_COMPONENTS, taskId);
+                    if (newTaskId != null) {
+                        element.setAttribute("task-id", newTaskId); //$NON-NLS-1$
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * @param sourceSheet
      * @param targetSheet
diff --git a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF
index a64c1dd8c..6fb0ba0c2 100644
--- a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.de.erichseifert.vectorgraphics2d;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
 Export-Package: org.xmind.de.erichseifert.vectorgraphics2d,
diff --git a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml
index 88bd7cd80..f0bb69471 100644
--- a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml
+++ b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.xmind.orbit</groupId>
 	<artifactId>org.xmind.de.erichseifert.vectorgraphics2d</artifactId>
-	<version>3.7.0-SNAPSHOT</version>
+	<version>3.7.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
 	</parent>
 </project>
diff --git a/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF b/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF
index 2ea9bc3f5..d2f40e1af 100644
--- a/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.gef.ui;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.gef.ui.internal.GEFPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,
- org.xmind.gef;bundle-version="[3.7.0,3.8.0)";visibility:=reexport,
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.gef;bundle-version="[3.7.2,3.8.0)";visibility:=reexport,
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)"
 Eclipse-LazyStart: true
 Export-Package: org.xmind.gef.ui.actions,
  org.xmind.gef.ui.editor,
diff --git a/bundles/org.xmind.gef.ui/pom.xml b/bundles/org.xmind.gef.ui/pom.xml
index d63def1b1..5c473934c 100644
--- a/bundles/org.xmind.gef.ui/pom.xml
+++ b/bundles/org.xmind.gef.ui/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.gef.ui</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.gef.ui/src/org/xmind/gef/ui/editor/GraphicalEditor.java b/bundles/org.xmind.gef.ui/src/org/xmind/gef/ui/editor/GraphicalEditor.java
index 9c12e0b46..18a2ba884 100644
--- a/bundles/org.xmind.gef.ui/src/org/xmind/gef/ui/editor/GraphicalEditor.java
+++ b/bundles/org.xmind.gef.ui/src/org/xmind/gef/ui/editor/GraphicalEditor.java
@@ -525,17 +525,18 @@ protected void unhookCommandStack(ICommandStack cs) {
 
     @SuppressWarnings("unchecked")
     public <T> T getAdapter(Class<T> adapter) {
+        T result = getEditorAdapter(adapter);
+        if (result != null) {
+            return result;
+        }
+
         Object activePage = getSelectedPage();
         if (activePage != null) {
-            T result = GEFPlugin.getAdapter(activePage, adapter);
+            result = GEFPlugin.getAdapter(activePage, adapter);
             if (result != null)
                 return result;
         }
 
-        T result = getEditorAdapter(adapter);
-        if (result != null)
-            return result;
-
         return super.getAdapter(adapter);
     }
 
diff --git a/bundles/org.xmind.gef.ui/src/org/xmind/ui/datepicker/DatePicker.java b/bundles/org.xmind.gef.ui/src/org/xmind/ui/datepicker/DatePicker.java
index 62fe19a8d..8e68e5b9f 100644
--- a/bundles/org.xmind.gef.ui/src/org/xmind/ui/datepicker/DatePicker.java
+++ b/bundles/org.xmind.gef.ui/src/org/xmind/ui/datepicker/DatePicker.java
@@ -669,6 +669,9 @@ public DatePicker(Composite parent, int style) {
     }
 
     public DatePicker(Composite parent, int style, Calendar today) {
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+
         this.today = today;
         this.currentMonth = today.get(MONTH);
         this.currentYear = today.get(YEAR);
@@ -1243,6 +1246,9 @@ protected void changeCalendar(int newYear, int newMonth, int hours,
 
     private void updateCalendar() {
         today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+
         updateDayFigures(datePanel.getChildren(), currentYear, currentMonth);
         monthFigure.setMonth(currentMonth);
         yearFigure.setYear(currentYear);
diff --git a/bundles/org.xmind.gef.ui/src/org/xmind/ui/texteditor/FloatingTextEditTool.java b/bundles/org.xmind.gef.ui/src/org/xmind/ui/texteditor/FloatingTextEditTool.java
index 9028188f4..a82e224de 100644
--- a/bundles/org.xmind.gef.ui/src/org/xmind/ui/texteditor/FloatingTextEditTool.java
+++ b/bundles/org.xmind.gef.ui/src/org/xmind/ui/texteditor/FloatingTextEditTool.java
@@ -21,7 +21,6 @@
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
@@ -146,9 +145,7 @@ public void run() {
 
                                     Shell newShell = display.getActiveShell();
                                     if (newShell != null
-                                            && !newShell.isDisposed()
-                                            && !isDescendantShell(newShell,
-                                                    oldShell)) {
+                                            && !newShell.isDisposed()) {
                                         finishEditing();
                                     }
                                 }
@@ -158,16 +155,6 @@ public void run() {
                 });
             }
         }
-
-        private boolean isDescendantShell(Shell newShell, Shell oldShell) {
-            Composite parent = newShell.getParent();
-            if (parent == null || !(parent instanceof Shell))
-                return false;
-            if (parent == oldShell)
-                return true;
-            return isDescendantShell((Shell) parent, oldShell);
-        }
-
     }
 
     private class EditorSelectionChangedListener
diff --git a/bundles/org.xmind.gef/META-INF/MANIFEST.MF b/bundles/org.xmind.gef/META-INF/MANIFEST.MF
index 1daa8bbea..726f9642a 100644
--- a/bundles/org.xmind.gef/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.gef/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.gef;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/bundles/org.xmind.gef/pom.xml b/bundles/org.xmind.gef/pom.xml
index efd2b6bb2..504aa7c97 100644
--- a/bundles/org.xmind.gef/pom.xml
+++ b/bundles/org.xmind.gef/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.gef</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF b/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF
index fb359ef8e..bd827f547 100644
--- a/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.neuquant
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.swt
diff --git a/bundles/org.xmind.neuquant/pom.xml b/bundles/org.xmind.neuquant/pom.xml
index 0b7c68c5e..54182c7fa 100644
--- a/bundles/org.xmind.neuquant/pom.xml
+++ b/bundles/org.xmind.neuquant/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.neuquant</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF b/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF
index 6fb463093..c99d506d2 100644
--- a/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.xmind.org.freehep.vectorgraphics;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.xmind.org.freehep.graphics2d,
  org.xmind.org.freehep.graphics2d.font,
diff --git a/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml b/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml
index c23e340ef..0a8ec09b3 100644
--- a/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml
+++ b/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.xmind.orbit</groupId>
 	<artifactId>org.xmind.org.freehep.vectorgraphics</artifactId>
-	<version>3.7.0-SNAPSHOT</version>
+	<version>3.7.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
 	</parent>
 </project>
diff --git a/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF
index a42b374a8..dfab914c8 100644
--- a/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.browser;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.browser.BrowserPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.net,
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.command;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.command;bundle-version="[3.7.2,3.8.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.ui.browser;
diff --git a/bundles/org.xmind.ui.browser/pom.xml b/bundles/org.xmind.ui.browser/pom.xml
index dcdedf0a4..f0f9d54fc 100644
--- a/bundles/org.xmind.ui.browser/pom.xml
+++ b/bundles/org.xmind.ui.browser/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.browser</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF
index d1751839c..b2c201c5f 100644
--- a/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dashboard
 Bundle-SymbolicName: org.xmind.ui.dashboard;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.dashboard.DashboardPlugin
 Bundle-Vendor: XMind Ltd
 Require-Bundle: org.eclipse.ui,
diff --git a/bundles/org.xmind.ui.dashboard/pom.xml b/bundles/org.xmind.ui.dashboard/pom.xml
index 820c11679..736fae5d7 100644
--- a/bundles/org.xmind.ui.dashboard/pom.xml
+++ b/bundles/org.xmind.ui.dashboard/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.dashboard</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF
index 9a2ff3a85..dd2bcdaed 100644
--- a/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.exports.vector.svg;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.exports.vector.svg.SvgPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)",
- org.xmind.de.erichseifert.vectorgraphics2d;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.exports.vector;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.usagedata;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.de.erichseifert.vectorgraphics2d;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.exports.vector;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.2,3.8.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/bundles/org.xmind.ui.exports.vector.svg/pom.xml b/bundles/org.xmind.ui.exports.vector.svg/pom.xml
index ef5d7926f..7cbbcf392 100644
--- a/bundles/org.xmind.ui.exports.vector.svg/pom.xml
+++ b/bundles/org.xmind.ui.exports.vector.svg/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.exports.vector.svg</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF
index ae11c8ca1..199220ae0 100644
--- a/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.exports.vector;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.exports.vector.VectorPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/bundles/org.xmind.ui.exports.vector/pom.xml b/bundles/org.xmind.ui.exports.vector/pom.xml
index b6304ca01..3a9664607 100644
--- a/bundles/org.xmind.ui.exports.vector/pom.xml
+++ b/bundles/org.xmind.ui.exports.vector/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.exports.vector</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.exports.vector/src/org/xmind/ui/exports/vector/graphics/GraphicsToGraphics2DAdaptor.java b/bundles/org.xmind.ui.exports.vector/src/org/xmind/ui/exports/vector/graphics/GraphicsToGraphics2DAdaptor.java
index be2626a46..7828e938c 100644
--- a/bundles/org.xmind.ui.exports.vector/src/org/xmind/ui/exports/vector/graphics/GraphicsToGraphics2DAdaptor.java
+++ b/bundles/org.xmind.ui.exports.vector/src/org/xmind/ui/exports/vector/graphics/GraphicsToGraphics2DAdaptor.java
@@ -177,6 +177,8 @@ public void copyFrom(State state) {
     private final State currentState = new State();
     private final State appliedState = new State();
 
+    private double[] flatMatrixState;
+
     /**
      * Some strings, Asian string in particular, are painted differently between
      * SWT and AWT. SWT falls back to some default locale font if Asian string
@@ -957,11 +959,13 @@ public void popState() {
     @Override
     public void pushState() {
         swtGraphics.pushState();
-        if (angle != 0) {
-            getGraphics2D().rotate(Math.toRadians(360 - angle), rotateX,
-                    rotateY);
-            angle = 0;
-        }
+//        if (angle != 0) {
+//            getGraphics2D().rotate(Math.toRadians(360 - angle), rotateX,
+//                    rotateY);
+//            angle = 0;
+//        }
+        flatMatrixState = new double[6];
+        getGraphics2D().getTransform().getMatrix(flatMatrixState);
 
         // Make a copy of the current state and push it onto the stack
         State toPush = new State();
@@ -1004,6 +1008,9 @@ private void restoreState(State state) {
         currentState.font = state.font;
         currentState.alpha = state.alpha;
 
+        if (flatMatrixState != null) {
+            getGraphics2D().setTransform(new AffineTransform(flatMatrixState));
+        }
     }
 
     /*
diff --git a/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF
index e31fca26f..36a19f9c0 100644
--- a/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.fishbone;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.fishbone.FishboneUIPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.xmind.ui.fishbone/pom.xml b/bundles/org.xmind.ui.fishbone/pom.xml
index 65039c82b..cc296dc61 100644
--- a/bundles/org.xmind.ui.fishbone/pom.xml
+++ b/bundles/org.xmind.ui.fishbone/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.fishbone</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF
index ed900a37c..f30b84a0c 100644
--- a/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.imports;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.imports.ImportPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.xmind.core.io;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.mindmap;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.usagedata;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.core.io;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.mindmap;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.2,3.8.0)",
  org.json;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.xmind.ui.imports/pom.xml b/bundles/org.xmind.ui.imports/pom.xml
index b3ee4e692..15f7c4275 100644
--- a/bundles/org.xmind.ui.imports/pom.xml
+++ b/bundles/org.xmind.ui.imports/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.imports</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/freemind/FreeMindImporter.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/freemind/FreeMindImporter.java
index c8923c912..30cc131ca 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/freemind/FreeMindImporter.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/freemind/FreeMindImporter.java
@@ -304,7 +304,7 @@ private void arrangeStyles() throws InterruptedException {
     private void loadSheet(Element rootEle) throws InterruptedException {
         checkInterrupted();
         ISheet sheet = getTargetWorkbook().createSheet();
-        sheet.setTitleText("sheet1"); //$NON-NLS-1$
+        sheet.setTitleText(getSuggestedSheetTitle());
         Element nodeEle = child(rootEle, "node"); //$NON-NLS-1$
         if (nodeEle != null)
             loadTopic(sheet.getRootTopic(), nodeEle);
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImportWizard.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImportWizard.java
index b7bd246ff..0e494860e 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImportWizard.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImportWizard.java
@@ -1,5 +1,6 @@
 package org.xmind.ui.internal.imports.lighten;
 
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -9,16 +10,29 @@
 import org.eclipse.swt.widgets.FileDialog;
 import org.xmind.core.IWorkbook;
 import org.xmind.ui.internal.imports.ImportMessages;
+import org.xmind.ui.internal.imports.ImportPlugin;
 import org.xmind.ui.wizards.AbstractMindMapImportPage;
 import org.xmind.ui.wizards.AbstractMindMapImportWizard;
 import org.xmind.ui.wizards.MindMapImporter;
 
 public class LightenImportWizard extends AbstractMindMapImportWizard {
 
+    private static final String SETTINGS_ID = "org.xmind.ui.imports.Lighten"; //$NON-NLS-1$
+
     private final static String PAGE_ID = "importLighten"; //$NON-NLS-1$
 
     private final static String FILE_FORMAT = "*.lighten"; //$NON-NLS-1$
 
+    public LightenImportWizard() {
+        IDialogSettings settings = ImportPlugin.getDefault().getDialogSettings()
+                .getSection(SETTINGS_ID);
+        if (settings == null) {
+            settings = ImportPlugin.getDefault().getDialogSettings()
+                    .addNewSection(SETTINGS_ID);
+        }
+        setDialogSettings(settings);
+    }
+
     @Override
     protected MindMapImporter createImporter(String sourcePath,
             IWorkbook targetWorkbook) {
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImporter.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImporter.java
index 9559f3cad..4077e67d4 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImporter.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/lighten/LightenImporter.java
@@ -103,6 +103,7 @@ private ISheet parseJsonIntoWorkbook(JSONObject json) {
         WorkbookImpl workbook = (WorkbookImpl) getTargetWorkbook();
         targetSheet = workbook.createSheet();
         SheetImpl sheet = (SheetImpl) targetSheet;
+        sheet.setTitleText(getSuggestedSheetTitle());
 
         if (targetStyleSheet == null) {
             targetStyleSheet = workbook.getStyleSheet();
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/mm/MindManagerImporter.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/mm/MindManagerImporter.java
index f6e1655db..81bc11a3d 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/mm/MindManagerImporter.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/mm/MindManagerImporter.java
@@ -478,6 +478,7 @@ private void loadSheet(Element docEle) throws InterruptedException {
         checkInterrupted();
 
         targetSheet = getTargetWorkbook().createSheet();
+        targetSheet.setTitleText(getSuggestedSheetTitle());
 
         Element oneTopicEle = child(docEle, "OneTopic"); //$NON-NLS-1$
         if (oneTopicEle != null) {
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/novamind/NovaMindImporter.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/novamind/NovaMindImporter.java
index e5f2bd52f..ae8034f27 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/novamind/NovaMindImporter.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/novamind/NovaMindImporter.java
@@ -409,6 +409,7 @@ private void loadSheet(Element sheetEle) throws InterruptedException {
         checkInterrupted();
 
         targetSheet = getTargetWorkbook().createSheet();
+        targetSheet.setTitleText(getSuggestedSheetTitle());
 
         Element topicEle = child(sheetEle, "topic-node"); //$NON-NLS-1$
         if (topicEle != null)
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlConstants.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlConstants.java
index 7b674cc9d..34676cde8 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlConstants.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlConstants.java
@@ -1,11 +1,18 @@
 package org.xmind.ui.internal.imports.opml;
 
-public class OpmlConstants {
-
-    public static final String ATT_URL = "url"; //$NON-NLS-1$
-    public static final String TYPE_NOTE = "note"; //$NON-NLS-1$
-    public static final String ATT_TEXT = "text"; //$NON-NLS-1$
-    public static final String TYPE_HYPERLINK = "link"; //$NON-NLS-1$
-    public static final String TAG_BODY = "body"; //$NON-NLS-1$
-    public static final String ATT_TYPE = "type"; //$NON-NLS-1$
+public interface OpmlConstants {
+
+    String TAG_HEAD = "head"; //$NON-NLS-1$
+    String TAG_BODY = "body"; //$NON-NLS-1$
+
+    String TAG_OUTLINE = "outline"; //$NON-NLS-1$
+    String TAG_TITLE = "title"; //$NON-NLS-1$
+
+    String ATTR_TEXT = "text"; //$NON-NLS-1$
+    String ATTR_TYPE = "type"; //$NON-NLS-1$
+    String ATTR_URL = "url"; //$NON-NLS-1$
+
+    String TYPE_LINK = "link"; //$NON-NLS-1$
+    String TYPE_NOTE = "note"; //$NON-NLS-1$
+
 }
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImportWizard.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImportWizard.java
index cdeaeeae3..89964ee5b 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImportWizard.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImportWizard.java
@@ -1,5 +1,6 @@
 package org.xmind.ui.internal.imports.opml;
 
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -9,12 +10,14 @@
 import org.eclipse.swt.widgets.FileDialog;
 import org.xmind.core.IWorkbook;
 import org.xmind.ui.internal.imports.ImportMessages;
+import org.xmind.ui.internal.imports.ImportPlugin;
 import org.xmind.ui.wizards.AbstractMindMapImportPage;
 import org.xmind.ui.wizards.AbstractMindMapImportWizard;
 import org.xmind.ui.wizards.MindMapImporter;
 
 public class OpmlImportWizard extends AbstractMindMapImportWizard {
 
+    private static final String SETTINGS_ID = "org.xmind.ui.imports.Opml"; //$NON-NLS-1$
     private static final String PAGE_ID = "importOPML"; //$NON-NLS-1$
     private static final String DOCUMENT_FILTER = "*.opml"; //$NON-NLS-1$
     private static final String DOCUMENT_EXT = "*.opml"; //$NON-NLS-1$
@@ -56,7 +59,16 @@ protected FileDialog createBrowseDialog() {
                     ImportMessages.OpmlImportPage_FilterName, DOCUMENT_EXT) });
             return dialog;
         }
+    }
 
+    public OpmlImportWizard() {
+        IDialogSettings settings = ImportPlugin.getDefault().getDialogSettings()
+                .getSection(SETTINGS_ID);
+        if (settings == null) {
+            settings = ImportPlugin.getDefault().getDialogSettings()
+                    .addNewSection(SETTINGS_ID);
+        }
+        setDialogSettings(settings);
     }
 
     public void addPages() {
diff --git a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImporter.java b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImporter.java
index 68b88748a..080b99e94 100644
--- a/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImporter.java
+++ b/bundles/org.xmind.ui.imports/src/org/xmind/ui/internal/imports/opml/OpmlImporter.java
@@ -1,39 +1,35 @@
 package org.xmind.ui.internal.imports.opml;
 
-import static org.xmind.ui.internal.imports.opml.OpmlConstants.ATT_TEXT;
-import static org.xmind.ui.internal.imports.opml.OpmlConstants.ATT_TYPE;
-import static org.xmind.ui.internal.imports.opml.OpmlConstants.ATT_URL;
-import static org.xmind.ui.internal.imports.opml.OpmlConstants.TAG_BODY;
-import static org.xmind.ui.internal.imports.opml.OpmlConstants.TYPE_HYPERLINK;
-import static org.xmind.ui.internal.imports.opml.OpmlConstants.TYPE_NOTE;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.xmind.core.INotes;
 import org.xmind.core.IPlainNotesContent;
 import org.xmind.core.ISheet;
 import org.xmind.core.ITopic;
 import org.xmind.core.IWorkbook;
 import org.xmind.core.internal.UserDataConstants;
+import org.xmind.core.util.DOMUtils;
 import org.xmind.ui.internal.MindMapUIPlugin;
 import org.xmind.ui.wizards.MindMapImporter;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-public class OpmlImporter extends MindMapImporter implements ErrorHandler {
+public class OpmlImporter extends MindMapImporter
+        implements ErrorHandler, OpmlConstants {
 
-    private ISheet sheet;
+    private ISheet targetSheet;
 
     public OpmlImporter(String sourcePath, IWorkbook targetWorkbook) {
         super(sourcePath, targetWorkbook);
@@ -43,14 +39,17 @@ public OpmlImporter(String sourcePath, IWorkbook targetWorkbook) {
     public void build() throws InvocationTargetException, InterruptedException {
         MindMapUIPlugin.getDefault().getUsageDataCollector()
                 .increase(UserDataConstants.IMPORT_FROM_OPML_COUNT);
+
         InputStream in = null;
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory
                     .newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
             builder.setErrorHandler(this);
+
             in = new FileInputStream(getSourcePath());
             Document doc = builder.parse(in);
+
             checkInterrupted();
             Element rootElement = doc.getDocumentElement();
 
@@ -65,103 +64,124 @@ public void build() throws InvocationTargetException, InterruptedException {
                 e.printStackTrace();
             }
         }
+
         postBuilded();
     }
 
     private void loadSheet(Element rootElement) throws InterruptedException {
         checkInterrupted();
+
         IWorkbook targetWorkbook = getTargetWorkbook();
-        sheet = targetWorkbook.createSheet();
-        sheet.setTitleText("sheet1"); //$NON-NLS-1$
-        NodeList nodelist = rootElement.getChildNodes();
-        Element bodyEle = (Element) nodelist.item(1);
-        if (TAG_BODY.equals(bodyEle.getTagName())) {
-            loadAll(bodyEle);
+        targetSheet = targetWorkbook.createSheet();
+
+        Element bodyEle = child(rootElement, TAG_BODY);
+        if (bodyEle != null) {
+            loadContents(bodyEle);
+        }
+
+        Element headEle = child(rootElement, TAG_HEAD);
+        if (headEle != null) {
+            loadSheetProperties(headEle);
         }
-        addTargetSheet(sheet);
+
+        addTargetSheet(targetSheet);
     }
 
-    private void loadAll(Element bodyEle) {
-        NodeList nodelist = bodyEle.getChildNodes();
-        if (nodelist.getLength() > 1)
-            return;
+    private void loadContents(Element bodyEle) throws InterruptedException {
+        checkInterrupted();
 
-        Node child = nodelist.item(0);
-        if (child instanceof Element) {
-            Element rootEle = (Element) child;
-            ITopic rootTopic = sheet.getRootTopic();
-            dealRootTopic(rootEle, rootTopic);
-            loadTopic(rootEle, rootTopic);
+        Element rootTopicEle = child(bodyEle, TAG_OUTLINE);
+        if (rootTopicEle != null) {
+            ITopic rootTopic = targetSheet.getRootTopic();
+            loadTopicContent(rootTopicEle, rootTopic);
         }
-    }
 
-    private void dealRootTopic(Element ele, ITopic rootTopic) {
-        rootTopic.setTitleText(att(ele, ATT_TEXT));
-    }
-
-    private void loadTopic(Element ele, ITopic parent) {
-        pushInMap(ele, parent);
-        if (TYPE_HYPERLINK.equals(att(ele, ATT_TYPE)))
-            loadHyperLink(ele, parent);
-        NodeList children = ele.getChildNodes();
-        int lenght = children.getLength();
-        for (int index = 0; index < lenght; index++) {
-            Node childNode = children.item(index);
-            if (childNode instanceof Element) {
-                Element child = (Element) childNode;
-                String type = att(child, ATT_TYPE);
-                if (TYPE_NOTE.equals(type))
-                    loadNotes(child, parent);
-                else {
-                    ITopic topic = dealTopic(child, parent);
-                    loadTopic(child, topic);
-                }
+        Iterator<Element> children = children(bodyEle, TAG_OUTLINE);
+        while (children.hasNext()) {
+            Element next = children.next();
+            if (next != rootTopicEle) {
+                loadFloatingTopic(next, targetSheet.getRootTopic());
             }
         }
     }
 
-    private ITopic dealTopic(Element ele, ITopic parent) {
-        ITopic topic = getTargetWorkbook().createTopic();
-        topic.setTitleText(att(ele, ATT_TEXT));
-        parent.add(topic, ITopic.ATTACHED);
-        return topic;
-    }
+    private void loadTopicContent(Element topicEle, ITopic topic)
+            throws InterruptedException {
+        checkInterrupted();
 
-    private void pushInMap(Element ele, ITopic parent) {
-        parent.setTitleText(att(ele, ATT_TEXT));
-    }
+        topic.setTitleText(attr(topicEle, ATTR_TEXT));
 
-    private String att(Element ele, String attTag) {
-        if (ele.hasAttribute(attTag))
-            return ele.getAttribute(attTag);
-        return null;
+        if (TYPE_LINK.equals(attr(topicEle, ATTR_TYPE)))
+            loadHyperlink(topicEle, topic);
+
+        Iterator<Element> children = children(topicEle, TAG_OUTLINE);
+        while (children.hasNext()) {
+            Element next = children.next();
+            String type = attr(next, ATTR_TYPE);
+            if (TYPE_NOTE.equals(type)) {
+                loadNotes(next, topic);
+            } else {
+                loadSubTopic(next, topic);
+            }
+        }
     }
 
-    private void loadHyperLink(Element ele, ITopic topic) {
-        String link = att(ele, ATT_URL);
+    private void loadHyperlink(Element topicEle, ITopic topic)
+            throws InterruptedException {
+        checkInterrupted();
+
+        String link = attr(topicEle, ATTR_URL);
         if (link != null && isLinkToWeb(link)) {
+            String hyperlink = link;
+            if (!(hyperlink.startsWith("http://") //$NON-NLS-1$
+                    || hyperlink.startsWith("https://"))) { //$NON-NLS-1$
+                hyperlink = "http://" + hyperlink; //$NON-NLS-1$
+            }
             topic.setHyperlink(link);
         }
     }
 
-    private void loadNotes(Element ele, ITopic parent) {
-        String text = att(ele, ATT_TEXT);
+    private void loadNotes(Element topicEle, ITopic topic)
+            throws InterruptedException {
+        checkInterrupted();
+
+        String text = attr(topicEle, ATTR_TEXT);
         if (text != null && !text.trim().equals("")) { //$NON-NLS-1$
             IPlainNotesContent notesContent = (IPlainNotesContent) getTargetWorkbook()
                     .createNotesContent(INotes.PLAIN);
             notesContent.setTextContent(text);
-            parent.getNotes().setContent(INotes.PLAIN, notesContent);
+            topic.getNotes().setContent(INotes.PLAIN, notesContent);
         }
     }
 
-    private boolean isLinkToWeb(String hyperlink) {
-        if (hyperlink.contains("www.") || hyperlink.contains(".com") //$NON-NLS-1$//$NON-NLS-2$
-                || hyperlink.contains(".cn") || hyperlink.contains(".org") //$NON-NLS-1$//$NON-NLS-2$
-                || hyperlink.contains(".cc") || hyperlink.contains(".net") //$NON-NLS-1$//$NON-NLS-2$
-                || hyperlink.contains(".ren")) { //$NON-NLS-1$
-            return true;
+    private void loadSubTopic(Element topicEle, ITopic parent)
+            throws InterruptedException {
+        checkInterrupted();
+
+        ITopic subTopic = getTargetWorkbook().createTopic();
+        parent.add(subTopic, ITopic.ATTACHED);
+        loadTopicContent(topicEle, subTopic);
+    }
+
+    private void loadFloatingTopic(Element floatingTopicEle, ITopic parent)
+            throws InterruptedException {
+        checkInterrupted();
+
+        ITopic subTopic = getTargetWorkbook().createTopic();
+        parent.add(subTopic, ITopic.DETACHED);
+        loadTopicContent(floatingTopicEle, subTopic);
+    }
+
+    private void loadSheetProperties(Element headEle)
+            throws InterruptedException {
+        checkInterrupted();
+
+        Element titleEle = child(headEle, TAG_TITLE);
+        if (titleEle != null) {
+            targetSheet.setTitleText(titleEle.getTextContent());
+        } else {
+            targetSheet.setTitleText(getSuggestedSheetTitle());
         }
-        return false;
     }
 
     private void checkInterrupted() throws InterruptedException {
@@ -169,6 +189,76 @@ private void checkInterrupted() throws InterruptedException {
             throw new InterruptedException();
     }
 
+    private static Element child(Element parentEle, String childTag) {
+        return children(parentEle, childTag).next();
+    }
+
+    private static Iterator<Element> children(final Element parentEle,
+            final String childTag) {
+        return new Iterator<Element>() {
+
+            String tag = DOMUtils.getLocalName(childTag);
+
+            Iterator<Element> it = DOMUtils.childElementIter(parentEle);
+
+            Element next = findNext();
+
+            public void remove() {
+            }
+
+            private Element findNext() {
+                while (it.hasNext()) {
+                    Element ele = it.next();
+                    if (DOMUtils.getLocalName(ele.getTagName())
+                            .equalsIgnoreCase(tag)) {
+                        return ele;
+                    }
+                }
+                return null;
+            }
+
+            public Element next() {
+                Element result = next;
+                next = findNext();
+                return result;
+            }
+
+            public boolean hasNext() {
+                return next != null;
+            }
+        };
+    }
+
+    private static String attr(Element ele, String attName) {
+        if (ele == null || attName == null)
+            return null;
+
+        if (ele.hasAttribute(attName))
+            return ele.getAttribute(attName);
+
+        attName = DOMUtils.getLocalName(attName);
+        NamedNodeMap atts = ele.getAttributes();
+        for (int i = 0; i < atts.getLength(); i++) {
+            Node att = atts.item(i);
+            if (attName.equalsIgnoreCase(
+                    DOMUtils.getLocalName(att.getNodeName()))) {
+                return att.getNodeValue();
+            }
+        }
+        return null;
+    }
+
+    private static boolean isLinkToWeb(String urlOrBookmark) {
+        if (urlOrBookmark.contains("www.") || urlOrBookmark.contains(".com") //$NON-NLS-1$ //$NON-NLS-2$
+                || urlOrBookmark.contains(".cn") //$NON-NLS-1$
+                || urlOrBookmark.contains(".org") //$NON-NLS-1$
+                || urlOrBookmark.contains(".cc") //$NON-NLS-1$
+                || urlOrBookmark.contains(".net")) { //$NON-NLS-1$
+            return true;
+        }
+        return false;
+    }
+
     public void warning(SAXParseException exception) throws SAXException {
         log(exception, null);
     }
@@ -180,4 +270,5 @@ public void error(SAXParseException exception) throws SAXException {
     public void fatalError(SAXParseException exception) throws SAXException {
         log(exception, null);
     }
+
 }
diff --git a/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF
index 7b2ede3c4..223a2e5bc 100644
--- a/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
- org.xmind.core;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.spelling;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.core;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.spelling;bundle-version="[3.7.2,3.8.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.xmind.ui.menus.MenusPlugin
 Bundle-ManifestVersion: 2
diff --git a/bundles/org.xmind.ui.menus/plugin.xml b/bundles/org.xmind.ui.menus/plugin.xml
index ee9b79b6d..86f0efe17 100644
--- a/bundles/org.xmind.ui.menus/plugin.xml
+++ b/bundles/org.xmind.ui.menus/plugin.xml
@@ -199,10 +199,18 @@
                      visible="true">
                </separator>
                <command
-                     commandId="org.xmind.ui.command.showPopover"
+                     commandId="org.xmind.ui.command.showModelPart"
                      id="more"
                      label="%menu.insert.marker.more.label"
                      style="push">
+                  <parameter
+                        name="org.xmind.ui.commandParameter.modelPart.partId"
+                        value="org.xmind.ui.modelPart.markers">
+                  </parameter>
+                  <parameter
+                        name="org.xmind.ui.commandParameter.modelPart.partStackId"
+                        value="org.xmind.ui.stack.right">
+                  </parameter>
                </command>
             </menu>
             <command
@@ -799,12 +807,6 @@
                    visible="true">
              </separator>
           </menu>
-          <command
-                commandId="org.xmind.ui.command.openCloudPage"
-                id="org.xmind.ui.openCloudPage"
-                label="%menu.cloud.label"
-                style="push">
-          </command>
        </menuContribution>
        <menuContribution
            allPopups="false"
diff --git a/bundles/org.xmind.ui.menus/pom.xml b/bundles/org.xmind.ui.menus/pom.xml
index 7440d7bac..5bdb30534 100644
--- a/bundles/org.xmind.ui.menus/pom.xml
+++ b/bundles/org.xmind.ui.menus/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.menus</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF
index ee1a233ad..ad8b06a41 100644
--- a/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.mindmap;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.xmind.ui.internal.MindMapUIPlugin
 Bundle-Vendor: %providerName
@@ -63,14 +63,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  org.apache.commons.codec,
- org.xmind.core.runtime;bundle-version="[3.7.0,3.8.0)";visibility:=reexport,
- org.xmind.gef.ui;bundle-version="[3.7.0,3.8.0)";visibility:=reexport,
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.browser;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.spelling;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.command;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.core.runtime;bundle-version="[3.7.2,3.8.0)";visibility:=reexport,
+ org.xmind.gef.ui;bundle-version="[3.7.2,3.8.0)";visibility:=reexport,
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.browser;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.spelling;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.command;bundle-version="[3.7.2,3.8.0)",
  org.eclipse.swt,
- org.xmind.core.usagedata;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.2,3.8.0)",
  org.xmind.core,
  org.eclipse.e4.core.commands,
  org.eclipse.e4.core.di,
diff --git a/bundles/org.xmind.ui.mindmap/pom.xml b/bundles/org.xmind.ui.mindmap/pom.xml
index 9a11cf042..1b0006d3a 100644
--- a/bundles/org.xmind.ui.mindmap/pom.xml
+++ b/bundles/org.xmind.ui.mindmap/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.mindmap</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/commands/ModifyTopicStructureCommand.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/commands/ModifyTopicStructureCommand.java
index f92aa7900..692e7c86d 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/commands/ModifyTopicStructureCommand.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/commands/ModifyTopicStructureCommand.java
@@ -98,8 +98,14 @@ protected void setValue(Object source, Object value) {
                                 .setTextContent(rightNum);
                     }
                 }
-                MindMapUIPlugin.getDefault().getUsageDataCollector().increase(
-                        UserDataConstants.STRUCTURE_TYPE_COUNT + value);
+                if (value != null) {
+                    String vs = value.toString();
+                    String ID = vs.replaceAll("\\.", "_");  //$NON-NLS-1$//$NON-NLS-2$
+                    MindMapUIPlugin.getDefault().getUsageDataCollector()
+                            .increase(String.format(
+                                    UserDataConstants.STRUCTURE_TYPE_COUNT,
+                                    ID));
+                }
                 topic.setStructureClass((String) value);
             }
         }
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/ClonedTemplate.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/ClonedTemplate.java
index 565691818..88df23710 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/ClonedTemplate.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/ClonedTemplate.java
@@ -38,7 +38,7 @@ public String getName() {
     @Override
     public IWorkbookRef createWorkbookRef() {
         return ClonedWorkbookRef
-                .createFromSourceWorkbookURI(this.sourceWorkbookURI);
+                .createFromSourceWorkbookURI(this.sourceWorkbookURI, name);
     }
 
     public URI getSourceWorkbookURI() {
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/MindMapResourceManager.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/MindMapResourceManager.java
index d8ee7319f..efc123bbd 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/MindMapResourceManager.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/MindMapResourceManager.java
@@ -132,6 +132,10 @@ public class MindMapResourceManager implements IResourceManager {
 
     private static final String USER_TEMPLATES_DIR = "templates/"; //$NON-NLS-1$
 
+    private static final String PATH_TEMPLATES = "templates/"; //$NON-NLS-1$
+
+    private static final String TEMPLATES = "templates"; //$NON-NLS-1$
+
     private static class SystemMarkerResourceProvider
             implements IMarkerResourceProvider {
 
@@ -1079,7 +1083,7 @@ private void loadSystemTemplateGroups(
             Iterator<Element> templateIt = DOMUtils
                     .childElementIterByTag(categoryEle, "template"); //$NON-NLS-1$
             ArrayList<ITemplate> templates = new ArrayList<ITemplate>();
-            loadTemplates(templates, templateIt);
+            loadTemplates(templates, templateIt, bundle);
             templateGroup.setTemplates(templates);
             sysTemplateGroups.add(templateGroup);
         }
@@ -1108,11 +1112,16 @@ private void loadSystemTemplates(List<ITemplate> templates) {
 
         Iterator<Element> it = DOMUtils.childElementIterByTag(element,
                 "template"); //$NON-NLS-1$
-        loadTemplates(templates, it);
+        loadTemplates(templates, it, bundle);
     }
 
-    private void loadTemplates(List<ITemplate> templates,
-            Iterator<Element> it) {
+    private void loadTemplates(List<ITemplate> templates, Iterator<Element> it,
+            Bundle bundle) {
+        if (bundle == null) {
+            return;
+        }
+        Properties properties = getTemplateListProperties(bundle);
+
         while (it.hasNext()) {
             Element templateEle = it.next();
             String resource = templateEle.getAttribute("resource"); //$NON-NLS-1$
@@ -1149,6 +1158,13 @@ private void loadTemplates(List<ITemplate> templates,
             }
 
             String name = templateEle.getAttribute("name"); //$NON-NLS-1$
+            if (name.startsWith("%")) { //$NON-NLS-1$
+                if (properties != null) {
+                    name = properties.getProperty(name.substring(1));
+                } else {
+                    name = null;
+                }
+            }
 
             if (name == null || "".equals(name)) { //$NON-NLS-1$
                 name = FileUtils.getNoExtensionFileName(resource);
@@ -1158,34 +1174,34 @@ private void loadTemplates(List<ITemplate> templates,
     }
 
     private Properties getTemplateListProperties(Bundle bundle) {
-        URL propURL = ResourceFinder.findResource(bundle, SYS_TEMPLATES_DIR,
-                "templates", EXT_PROPERTIES); //$NON-NLS-1$
-        if (propURL == null) {
-            MindMapUIPlugin.getDefault().getLog().log(new Status(
-                    IStatus.WARNING, MindMapUIPlugin.PLUGIN_ID,
-                    "Failed to find template NLS properties file: " //$NON-NLS-1$
-                            + bundle.getSymbolicName() + "/" + SYS_TEMPLATES_DIR //$NON-NLS-1$
-                            + "templates_XX.properties")); //$NON-NLS-1$
-            return null;
-        }
+        final IPropertiesProvider provider = new IPropertiesProvider() {
 
-        try {
-            InputStream is = propURL.openStream();
-            try {
-                Properties properties = new Properties();
-                properties.load(is);
+            Properties properties;
+
+            @Override
+            public void setProperties(Properties properties) {
+                this.properties = properties;
+            }
+
+            @Override
+            public Properties getProperties() {
                 return properties;
-            } finally {
-                is.close();
             }
-        } catch (IOException e) {
-            MindMapUIPlugin.getDefault().getLog()
-                    .log(new Status(IStatus.WARNING, MindMapUIPlugin.PLUGIN_ID,
-                            "Failed to load template NLS properties from " //$NON-NLS-1$
-                                    + propURL.toExternalForm(),
-                            e));
-        }
-        return null;
+        };
+
+        IAdaptable adaptable = new IAdaptable() {
+
+            @Override
+            public <T> T getAdapter(Class<T> adapter) {
+                if (adapter == IPropertiesProvider.class) {
+                    return adapter.cast(provider);
+                }
+                return null;
+            }
+        };
+        loadPropertiesFor(adaptable, PATH_TEMPLATES, TEMPLATES);
+
+        return provider.getProperties();
     }
 
     private Element getTemplateListElement(URL xmlURL) {
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/dnd/MindMapDNDClientBase.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/dnd/MindMapDNDClientBase.java
index 11c2916ac..4ebe6629c 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/dnd/MindMapDNDClientBase.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/dnd/MindMapDNDClientBase.java
@@ -65,10 +65,10 @@ public Command makeDNDCommand(Object transferredData, Request request) {
         IWorkbook workbook = sheet.getOwnedWorkbook();
         IPart parent = (IPart) request.getParameter(GEF.PARAM_PARENT);
         if (parent != null || request.getTargets().size() == 1) {
+            boolean dropInParent = request.getTargets().contains(parent);
             if (parent == null) {
                 parent = request.getPrimaryTarget();
             }
-            boolean dropInParent = request.getTargets().contains(parent);
             ITopic targetParent = findTargetParentTopic(viewer, parent);
             return makeDNDCommand(transferredData, request, workbook,
                     targetParent, dropInParent,
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/ClonedWorkbookRef.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/ClonedWorkbookRef.java
index 552adf553..536a755d3 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/ClonedWorkbookRef.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/ClonedWorkbookRef.java
@@ -27,8 +27,15 @@ public class ClonedWorkbookRef extends AbstractWorkbookRef {
     protected static final String URI_PATH = "/clone"; //$NON-NLS-1$
     private static final String PARAM_SOURCE_URI = "sourceURI"; //$NON-NLS-1$
 
+    private String name;
+
     private ClonedWorkbookRef(URI uri, IMemento state) {
+        this(uri, state, null);
+    }
+
+    private ClonedWorkbookRef(URI uri, IMemento state, String name) {
         super(uri, state);
+        this.name = name;
     }
 
     public URI getSourceWorkbookURI() {
@@ -43,6 +50,10 @@ private static URI getSourceWorkbookURI(URI uri) {
 
     @Override
     public String getName() {
+        if (name != null) {
+            return name;
+        }
+
         String path = getSourceWorkbookURI().getPath();
         int suffixIndex = path.lastIndexOf("."); //$NON-NLS-1$
         if (suffixIndex > 0) {
@@ -116,12 +127,12 @@ public static IWorkbookRef create(URI uri, IMemento state) {
     }
 
     public static IWorkbookRef createFromSourceWorkbookURI(
-            URI sourceWorkbookURI) {
+            URI sourceWorkbookURI, String name) {
         Assert.isNotNull(sourceWorkbookURI);
         URI uri = URI.create(URI_SCHEME + ":" + URI_PATH); //$NON-NLS-1$
         uri = URIParser.appendQueryParameter(uri, PARAM_SOURCE_URI,
                 sourceWorkbookURI.toString());
-        return new ClonedWorkbookRef(uri, null);
+        return new ClonedWorkbookRef(uri, null, name);
     }
 
 }
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/DefaultMindMapPreviewGenerator.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/DefaultMindMapPreviewGenerator.java
index 7702b119c..56b8787bc 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/DefaultMindMapPreviewGenerator.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/DefaultMindMapPreviewGenerator.java
@@ -23,19 +23,22 @@
 import java.util.Properties;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.internal.util.BundleUtility;
 import org.xmind.core.ISheet;
 import org.xmind.core.util.FileUtils;
+import org.xmind.gef.IGraphicalViewer;
 import org.xmind.gef.image.ResizeConstants;
 import org.xmind.ui.internal.MindMapUIPlugin;
+import org.xmind.ui.mindmap.GhostShellProvider;
 import org.xmind.ui.mindmap.IMindMapImages;
 import org.xmind.ui.mindmap.IWorkbookRef;
 import org.xmind.ui.mindmap.MindMap;
+import org.xmind.ui.mindmap.MindMapExportViewer;
 import org.xmind.ui.mindmap.MindMapImageExporter;
 import org.xmind.ui.mindmap.MindMapUI;
+import org.xmind.ui.mindmap.MindMapViewerExportSourceProvider;
 import org.xmind.ui.prefs.PrefConstants;
 
 /**
@@ -45,6 +48,11 @@
 public class DefaultMindMapPreviewGenerator
         implements IMindMapPreviewGenerator {
 
+    private static final int DEFAULT_EXPORT_MARGIN = 5;
+
+    private static final int MINIMUM_PREVIEW_WIDTH = 420;
+    private static final int MAXIMUM_PREVIEW_WIDTH = MINIMUM_PREVIEW_WIDTH * 4;
+
     private final Display display;
 
     /**
@@ -76,17 +84,11 @@ public Properties generateMindMapPreview(final IWorkbookRef workbookRef,
             return properties;
         }
 
-        final MindMapImageExporter exporter = new MindMapImageExporter(display);
-        exporter.setSource(new MindMap(sheet), null,
-                new Insets(MindMapUI.DEFAULT_EXPORT_MARGIN));
-        exporter.setResize(ResizeConstants.RESIZE_MAXPIXELS, 1280, 1024);
-        exporter.setTargetStream(output);
-
         final Exception[] error = new Exception[1];
         display.syncExec(new Runnable() {
             public void run() {
                 try {
-                    exporter.export();
+                    generate(sheet, output);
                 } catch (SWTException e) {
                     error[0] = e;
                 }
@@ -98,4 +100,36 @@ public void run() {
         return properties;
     }
 
+    private void generate(ISheet sheet, OutputStream output) {
+        GhostShellProvider ghostShellProvider = new GhostShellProvider(display);
+        IGraphicalViewer viewer = new MindMapExportViewer(ghostShellProvider,
+                new MindMap(sheet), null);
+        MindMapViewerExportSourceProvider sourceProvider = new MindMapViewerExportSourceProvider(
+                viewer, DEFAULT_EXPORT_MARGIN);
+
+        org.eclipse.draw2d.geometry.Rectangle sourceArea = sourceProvider
+                .getSourceArea();
+
+        int resizeWidth = Math.max(
+                (sourceArea.width % 21 == 0) ? sourceArea.width
+                        : (sourceArea.width + 21 - sourceArea.width % 21),
+                (sourceArea.height % 13 == 0) ? sourceArea.height * 21 / 13
+                        : (sourceArea.height + 13 - sourceArea.height % 13) * 21
+                                / 13);
+        if (resizeWidth < MINIMUM_PREVIEW_WIDTH) {
+            resizeWidth = MINIMUM_PREVIEW_WIDTH;
+        } else if (resizeWidth > MAXIMUM_PREVIEW_WIDTH) {
+            resizeWidth = MAXIMUM_PREVIEW_WIDTH;
+        }
+        int resizeHeight = resizeWidth * 13 / 21;
+
+        MindMapImageExporter exporter = new MindMapImageExporter(display);
+        exporter.setSourceProvider(sourceProvider);
+        exporter.setResize(ResizeConstants.RESIZE_STRETCH, resizeWidth,
+                resizeHeight);
+        exporter.setTargetStream(output);
+
+        exporter.export();
+    }
+
 }
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/LocalFileSaveWizard.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/LocalFileSaveWizard.java
index bba65cc64..314178ae5 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/LocalFileSaveWizard.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/LocalFileSaveWizard.java
@@ -20,7 +20,6 @@
 import org.xmind.ui.wizards.SaveOptions;
 
 /**
- * 
  * @author Frank Shaka
  * @since 3.6.50
  */
@@ -66,7 +65,9 @@ public URI askForTargetURI(ISaveContext context, SaveOptions options) {
             dirPath = new File(oldURI).getParent();
         }
 
-        String result = DialogUtils.save(display.getActiveShell(), proposalName,
+        Shell parentShell = display.getActiveShell() != null
+                ? display.getActiveShell() : new Shell();
+        String result = DialogUtils.save(parentShell, proposalName,
                 new String[] { extensionFullName },
                 new String[] { filterFullName }, 0, dirPath);
         if (result == null)
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MindMapEditor.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MindMapEditor.java
index 88c735c74..a349bf7ff 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MindMapEditor.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MindMapEditor.java
@@ -600,7 +600,9 @@ public void run() {
     }
 
     private static void collectUserData(URI uri) {
-        Assert.isNotNull(uri);
+        if (uri == null || "".equals(uri)) { //$NON-NLS-1$
+            return;
+        }
         String scheme = uri.getScheme();
         if (scheme == null || "".equalsIgnoreCase(scheme)) //$NON-NLS-1$
             return;
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MiniZoomContribution.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MiniZoomContribution.java
index 86ffbd67a..a6823dfbc 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MiniZoomContribution.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/editor/MiniZoomContribution.java
@@ -30,6 +30,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
@@ -259,6 +261,20 @@ public void handleEvent(Event event) {
             };
             valueInput.addListener(SWT.DefaultSelection, inputConfirmListener);
             valueInput.addListener(SWT.Traverse, inputConfirmListener);
+
+            valueInput.addFocusListener(new FocusListener() {
+
+                @Override
+                public void focusLost(FocusEvent e) {
+                    if (e.display.getActiveShell() != getShell()) {
+                        close();
+                    }
+                }
+
+                @Override
+                public void focusGained(FocusEvent e) {
+                }
+            });
         }
 
         private void fillDirectSelector(Composite parent) {
@@ -318,6 +334,20 @@ public void selectionChanged(
                             }
                         }
                     });
+
+            slider.getControl().addFocusListener(new FocusListener() {
+
+                @Override
+                public void focusLost(FocusEvent e) {
+                    if (e.display.getActiveShell() != getShell()) {
+                        close();
+                    }
+                }
+
+                @Override
+                public void focusGained(FocusEvent e) {
+                }
+            });
         }
 
         protected Control getFocusControl() {
@@ -395,6 +425,8 @@ protected List getBackgroundColorExclusions() {
 
     private ZoomPopup zoomPopup = null;
 
+    private ToolBar toolBar;
+
     public MiniZoomContribution(IGraphicalEditor editor) {
         this(ActionConstants.MINI_ZOOM, editor);
     }
@@ -435,6 +467,7 @@ public void dispose() {
     }
 
     public void fill(ToolBar parent, int index) {
+        toolBar = parent;
         if (index < 0) {
             zoomOutItem = new ToolItem(parent, SWT.PUSH);
             zoomValueItem = new ToolItem(parent, SWT.PUSH);
@@ -521,7 +554,12 @@ public void update(String id) {
             } else {
                 double scale = zoomManager.getScale();
                 int s = (int) Math.round(scale * 100);
-                zoomValueItem.setText(String.format("%d%%", s)); //$NON-NLS-1$
+                zoomValueItem.setText(
+                        String.format("%4s", String.format("%d%%", s))); //$NON-NLS-1$ //$NON-NLS-2$
+            }
+
+            if (toolBar != null && !toolBar.isDisposed()) {
+                toolBar.pack();
             }
         }
     }
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/handlers/CreateSheetFromTemplateHandler.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/handlers/CreateSheetFromTemplateHandler.java
index 8fffe326d..26ef1b60b 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/handlers/CreateSheetFromTemplateHandler.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/handlers/CreateSheetFromTemplateHandler.java
@@ -64,6 +64,9 @@ private void createSheetFromTemplate(IEditorPart targetEditor)
                 .increase(UserDataConstants.USE_TEMPLATES_COUNT);
 
         final ITemplate template = dialog.getTemplate();
+        MindMapUIPlugin.getDefault().getUsageDataCollector()
+                .increase(String.format(UserDataConstants.USE_S_TEMPLATE_COUNT,
+                        template.getName().replaceAll(" ", "_")));  //$NON-NLS-1$//$NON-NLS-2$
         Assert.isTrue(template != null);
         final IWorkbookRef tempWorkbookRef = template.createWorkbookRef();
         if (tempWorkbookRef == null)
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/mindmap/MindMapPartBase.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/mindmap/MindMapPartBase.java
index 6ac9bcbc0..ed98bb64e 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/mindmap/MindMapPartBase.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/mindmap/MindMapPartBase.java
@@ -14,8 +14,8 @@
 package org.xmind.ui.internal.mindmap;
 
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.xmind.core.event.CoreEvent;
 import org.xmind.core.event.CoreEventRegister;
 import org.xmind.core.event.ICoreEventListener;
@@ -109,10 +109,12 @@ protected void runInUI(Runnable job) {
     }
 
     protected void runInUI(Runnable job, boolean async) {
-        Shell shell = getSite().getShell();
-        if (shell == null || shell.isDisposed())
+        Control control = getSite().getViewerControl();
+        if (control == null || control.isDisposed()) {
             return;
-        Display display = shell.getDisplay();
+        }
+
+        Display display = control.getDisplay();
         if (display == null || display.isDisposed())
             return;
         if (async) {
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/NumberingPropertySectionPart.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/NumberingPropertySectionPart.java
index abc52ba02..c20e0b0d0 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/NumberingPropertySectionPart.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/NumberingPropertySectionPart.java
@@ -111,8 +111,9 @@ public void selectionChanged(SelectionChangedEvent event) {
                     .getFirstElement();
             if (o instanceof INumberFormatDescriptor) {
                 MindMapUIPlugin.getDefault().getUsageDataCollector()
-                        .increase(UserDataConstants.NUMBERING_TYPE_COUNT
-                                + ((INumberFormatDescriptor) o).getId());
+                        .increase(String.format(
+                                UserDataConstants.NUMBERING_TYPE_COUNT,
+                                ((INumberFormatDescriptor) o).getId()));
                 changeNumberFormat(((INumberFormatDescriptor) o).getId());
             }
         }
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertiesPart.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertiesPart.java
index 54d5e7b0a..61d9c1258 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertiesPart.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertiesPart.java
@@ -151,19 +151,23 @@ private void initContent() {
         }
 
         if (sourceEditor != null) {
-            sourceEditor.getSite().getSelectionProvider()
-                    .addSelectionChangedListener(this);
-
-            final ISelection selection = sourceEditor.getSite()
-                    .getSelectionProvider().getSelection();
-            if (selection != null && !selection.isEmpty()) {
-                Display.getCurrent().asyncExec(new Runnable() {
-                    public void run() {
-                        selectionChanged(new SelectionChangedEvent(
-                                sourceEditor.getSite().getSelectionProvider(),
-                                selection));
+            if (this.sourceEditor != null) {
+                final ISelectionProvider selectionProvider = sourceEditor
+                        .getSite().getSelectionProvider();
+                if (selectionProvider != null) {
+                    selectionProvider.addSelectionChangedListener(this);
+
+                    final ISelection selection = selectionProvider
+                            .getSelection();
+                    if (selection != null && !selection.isEmpty()) {
+                        Display.getCurrent().asyncExec(new Runnable() {
+                            public void run() {
+                                selectionChanged(new SelectionChangedEvent(
+                                        selectionProvider, selection));
+                            }
+                        });
                     }
-                });
+                }
             }
         }
     }
@@ -318,9 +322,13 @@ private void setEditor(IGraphicalEditor editor) {
         if (this.sourceEditor == editor)
             return;
 
-        if (this.sourceEditor != null)
-            this.sourceEditor.getSite().getSelectionProvider()
-                    .removeSelectionChangedListener(this);
+        if (this.sourceEditor != null) {
+            ISelectionProvider selectionProvider = sourceEditor.getSite()
+                    .getSelectionProvider();
+            if (selectionProvider != null) {
+                selectionProvider.removeSelectionChangedListener(this);
+            }
+        }
 
         this.sourceEditor = editor;
 
@@ -730,8 +738,9 @@ public void dispose() {
         if (sourceEditor != null) {
             ISelectionProvider selectionProvider = sourceEditor.getSite()
                     .getSelectionProvider();
-            if (selectionProvider != null)
+            if (selectionProvider != null) {
                 selectionProvider.removeSelectionChangedListener(this);
+            }
         }
 
         for (SectionRecord rec : sections) {
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/protocols/AttachmentProtocol.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/protocols/AttachmentProtocol.java
index ae6281ad0..be29fcc5f 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/protocols/AttachmentProtocol.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/protocols/AttachmentProtocol.java
@@ -25,6 +25,8 @@
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.IPageChangedListener;
+import org.eclipse.jface.dialogs.PageChangedEvent;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IPartListener;
@@ -42,6 +44,8 @@
 import org.xmind.core.event.ICoreEventSource2;
 import org.xmind.core.util.FileUtils;
 import org.xmind.core.util.HyperlinkUtils;
+import org.xmind.gef.ui.editor.IGraphicalEditor;
+import org.xmind.gef.ui.editor.IGraphicalEditorPage;
 import org.xmind.ui.internal.MindMapMessages;
 import org.xmind.ui.internal.editor.MME;
 import org.xmind.ui.mindmap.IMindMapImages;
@@ -86,6 +90,8 @@ public void run() {
             String entryMediaType = path.substring(path.lastIndexOf(".")); //$NON-NLS-1$
             String absolutelyFileName = fileName.endsWith(entryMediaType)
                     ? fileName : fileName + entryMediaType;
+            absolutelyFileName = MindMapUtils
+                    .trimFileName((absolutelyFileName));
             File hiberFile = new File(hiberDir, absolutelyFileName);
 
             IManifest manifest = workbook.getManifest();
@@ -110,7 +116,30 @@ public void run() {
                         Core.WorkbookPreSaveOnce, ICoreEventListener.NULL);
             }
 
-            //write temp file back to entry.
+            addSaveBackSupport(hiberFile, fileEntry);
+        }
+
+        //add write temp file back to entry support.
+        private void addSaveBackSupport(final File hiberFile,
+                final IFileEntry fileEntry) {
+
+            IEditorPart activeEditor = window.getActivePage().getActiveEditor();
+            if (activeEditor instanceof IGraphicalEditor) {
+                final IGraphicalEditorPage currentPage = ((IGraphicalEditor) activeEditor)
+                        .getActivePageInstance();
+
+                ((IGraphicalEditor) activeEditor)
+                        .addPageChangedListener(new IPageChangedListener() {
+
+                            @Override
+                            public void pageChanged(PageChangedEvent event) {
+                                if (event.getSelectedPage() == currentPage) {
+                                    saveEntryBack(fileEntry, hiberFile);
+                                }
+                            }
+                        });
+            }
+
             if (window != null) {
                 window.getWorkbench().addWindowListener(
                         getWindowListener(fileEntry, hiberFile));
@@ -128,6 +157,7 @@ public void partDeactivated(IWorkbenchPart part) {
 
                 @Override
                 public void partClosed(IWorkbenchPart part) {
+                    saveEntryBack(fileEntry, hiberFile);
                     window.getWorkbench().removeWindowListener(
                             getWindowListener(null, null));
                 }
@@ -161,21 +191,25 @@ public void windowClosed(IWorkbenchWindow window) {
 
                     @Override
                     public void windowActivated(IWorkbenchWindow window) {
-                        try {
-                            InputStream is = new FileInputStream(hiberFile);
-                            OutputStream os = fileEntry.openOutputStream();
-                            FileUtils.transfer(is, os);
-                        } catch (IOException e) {
-                            Logger.log(e,
-                                    "Failed to transfer temp-attachments to attachment dir."); //$NON-NLS-1$
-                            return;
-                        }
+                        saveEntryBack(fileEntry, hiberFile);
                     }
                 };
             }
             return windowListener;
         }
 
+        private void saveEntryBack(final IFileEntry fileEntry,
+                final File hiberFile) {
+            try {
+                InputStream is = new FileInputStream(hiberFile);
+                OutputStream os = fileEntry.openOutputStream();
+                FileUtils.transfer(is, os);
+            } catch (IOException e) {
+                Logger.log(e,
+                        "Failed to transfer temp-attachments to attachment dir."); //$NON-NLS-1$
+                return;
+            }
+        }
     }
 
     private Map<IWorkbook, Map<String, IAction>> actions = null;
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/resourcemanager/TemplateResourceManagerViewer.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/resourcemanager/TemplateResourceManagerViewer.java
index d40e4a9bb..e2f921a73 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/resourcemanager/TemplateResourceManagerViewer.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/resourcemanager/TemplateResourceManagerViewer.java
@@ -268,8 +268,8 @@ protected void initNestedGalleryViewer(GalleryViewer galleryViewerer) {
     public void startEditing(ITemplate template) {
         Object input = getInput();
         if (input instanceof TemplateGalleryCore) {
-            List<ITemplateGroup> groups = ((TemplateGalleryCore) input)
-                    .getElements();
+            @SuppressWarnings("unchecked")
+            List<ITemplateGroup> groups = (List) getCategories();
             for (ITemplateGroup group : groups) {
                 if (group.getTemplates().contains(template)) {
                     GalleryViewer galleryViewer = getNestedViewer(group);
diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/wizards/MindMapImporter.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/wizards/MindMapImporter.java
index b95750410..9fea4cdf4 100644
--- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/wizards/MindMapImporter.java
+++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/wizards/MindMapImporter.java
@@ -20,12 +20,14 @@
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.osgi.util.NLS;
 import org.xmind.core.Core;
 import org.xmind.core.ISheet;
 import org.xmind.core.ITopic;
 import org.xmind.core.IWorkbook;
 import org.xmind.core.style.IStyle;
 import org.xmind.core.style.IStyleSheet;
+import org.xmind.ui.internal.MindMapMessages;
 import org.xmind.ui.internal.editor.MME;
 import org.xmind.ui.mindmap.MindMapUI;
 import org.xmind.ui.util.MindMapUtils;
@@ -120,6 +122,11 @@ protected void addTargetSheet(ISheet sheet) {
         targetSheets.add(sheet);
     }
 
+    protected String getSuggestedSheetTitle() {
+        return NLS.bind(MindMapMessages.TitleText_Sheet,
+                newWorkbook ? 1 : getTargetWorkbook().getSheets().size() + 1);
+    }
+
     public List<Map.Entry<Throwable, String>> getErrors() {
         return errors;
     }
diff --git a/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF
index f3b39bf13..ad241ac4a 100644
--- a/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.resources;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.xmind.ui
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.xmind.ui.resources/pom.xml b/bundles/org.xmind.ui.resources/pom.xml
index eb2f986bf..99372a712 100644
--- a/bundles/org.xmind.ui.resources/pom.xml
+++ b/bundles/org.xmind.ui.resources/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.resources</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.resources/templates/templates.properties b/bundles/org.xmind.ui.resources/templates/templates.properties
index 1999d2fe8..8e8dda5f2 100644
--- a/bundles/org.xmind.ui.resources/templates/templates.properties
+++ b/bundles/org.xmind.ui.resources/templates/templates.properties
@@ -1,3 +1,32 @@
 category.business.name=Business
 category.education.name=Education
 category.personal.name=Personal
+
+template.Annual_Report.name=Annual Report
+template.Balance_Sheet.name=Balance Sheet
+template.Business_Plan.name=Business Plan
+template.Business_Timeline.name=Business Timeline
+template.Cause_and_Effect.name=Cause and Effect
+template.Company_Hierarchy.name=Company Hierarchy
+template.Manufactory_Flow.name=Manufactory Flow
+template.Meeting_Management.name=Meeting Management
+template.Problem_Solving.name=Problem Solving
+template.Projects_Dashboard.name=Projects Dashboard
+template.Sales_Management.name=Sales Management
+template.SWOT_Analysis.name=SWOT Analysis
+template.XMind_10_Years.name=XMind 10 Years
+	
+template.Book_Report.name=Book Report
+template.Class_Schedule.name=Class Schedule
+template.Compare_and_Contrast.name=Compare and Contrast
+template.Exam_Review_Plan.name=Exam Review Plan
+template.Example_of_Workflow.name=Example of Workflow
+template.Paper_Outline.name=Paper Outline
+template.Syllabus.name=Syllabus
+
+template.Diet.name=Diet Plan
+template.Party_Preparation.name=Party Preparation
+template.Resume_(CV).name=Resume (CV)
+template.Shopping_List.name=Shopping List
+template.Travel_Plan.name=Travel Plan
+template.Weekly_Plan.name=Weekly Plan
diff --git a/bundles/org.xmind.ui.resources/templates/templates.xml b/bundles/org.xmind.ui.resources/templates/templates.xml
index ae69053c9..eb2a40259 100644
--- a/bundles/org.xmind.ui.resources/templates/templates.xml
+++ b/bundles/org.xmind.ui.resources/templates/templates.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <templates>
 	<category name="%category.business.name">
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Annual Report.xmt" name="Annual Report" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Balance Sheet.xmt" name="Balance Sheet" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Business Plan.xmt" name="Business Plan" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Business Timeline.xmt" name="Business Timeline" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Cause and Effect.xmt" name="Cause and Effect" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Company Hierarchy.xmt" name="Company Hierarchy" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Manufactory Flow.xmt" name="Manufactory Flow" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Meeting Management.xmt" name="Meeting Management" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Problem Solving.xmt" name="Problem Solving" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Projects Dashboard.xmt" name="Projects Dashboard" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Sales Management.xmt" name="Sales Management" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/SWOT Analysis.xmt" name="SWOT Analysis" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/XMind 10 Years.xmt" name="XMind 10 Years" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Annual Report.xmt" name="%template.Annual_Report.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Balance Sheet.xmt" name="%template.Balance_Sheet.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Business Plan.xmt" name="%template.Business_Plan.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Business Timeline.xmt" name="%template.Business_Timeline.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Cause and Effect.xmt" name="%template.Cause_and_Effect.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Company Hierarchy.xmt" name="%template.Company_Hierarchy.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Manufactory Flow.xmt" name="%template.Manufactory_Flow.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Meeting Management.xmt" name="%template.Meeting_Management.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Problem Solving.xmt" name="%template.Problem_Solving.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Projects Dashboard.xmt" name="%template.Projects_Dashboard.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/Sales Management.xmt" name="%template.Sales_Management.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/SWOT Analysis.xmt" name="%template.SWOT_Analysis.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/business/XMind 10 Years.xmt" name="%template.XMind_10_Years.name" />
 	</category>
 	
 	<category name="%category.education.name">
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Book Report.xmt" name="Book Report" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Class Schedule.xmt" name="Class Schedule" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Compare and Contrast.xmt" name="Compare and Contrast" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Exam Review Plan.xmt" name="Exam Review Plan" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Example of Workflow.xmt" name="Example of Workflow" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Paper Outline.xmt" name="Paper Outline" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Syllabus.xmt" name="Syllabus" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Book Report.xmt" name="%template.Book_Report.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Class Schedule.xmt" name="%template.Class_Schedule.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Compare and Contrast.xmt" name="%template.Compare_and_Contrast.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Exam Review Plan.xmt" name="%template.Exam_Review_Plan.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Example of Workflow.xmt" name="%template.Example_of_Workflow.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Paper Outline.xmt" name="%template.Paper_Outline.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/education/Syllabus.xmt" name="%template.Syllabus.name" />
 	</category>
 	
 	<category name="%category.personal.name">
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Diet Plan.xmt" name="Diet Plan" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Party Preparation.xmt" name="Party Preparation" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Resume (CV).xmt" name="Resume (CV)" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Shopping List.xmt" name="Shopping List" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Travel Plan.xmt" name="Travel Plan" />
-		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Weekly Plan.xmt" name="Weekly Plan" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Diet Plan.xmt" name="%template.Diet.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Party Preparation.xmt" name="%template.Party_Preparation.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Resume (CV).xmt" name="%template.Resume_(CV).name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Shopping List.xmt" name="%template.Shopping_List.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Travel Plan.xmt" name="%template.Travel_Plan.name" />
+		<template resource="platform:/plugin/org.xmind.ui/$nl$/templates/personal/Weekly Plan.xmt" name="%template.Weekly_Plan.name" />
 	</category>
 </templates>
\ No newline at end of file
diff --git a/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF
index 6e1ac14f7..e93fdbf6a 100644
--- a/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.spelling;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.spelling.SpellingPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  net.sourceforge.jazzy,
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.browser;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.usagedata;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.browser;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.2,3.8.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.ui,
diff --git a/bundles/org.xmind.ui.spelling/pom.xml b/bundles/org.xmind.ui.spelling/pom.xml
index 200bb9e19..bd326dda9 100644
--- a/bundles/org.xmind.ui.spelling/pom.xml
+++ b/bundles/org.xmind.ui.spelling/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.spelling</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF
index daa7844ed..b87106e00 100644
--- a/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.spreadsheet;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.spreadsheet.SpreadsheetUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
  org.xmind.core.runtime,
  org.xmind.core.usagedata
 Eclipse-LazyStart: true
diff --git a/bundles/org.xmind.ui.spreadsheet/pom.xml b/bundles/org.xmind.ui.spreadsheet/pom.xml
index d4e26fa95..8e6246b14 100644
--- a/bundles/org.xmind.ui.spreadsheet/pom.xml
+++ b/bundles/org.xmind.ui.spreadsheet/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.spreadsheet</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF
index 0e9b77ba7..6b93c9dc9 100644
--- a/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui.toolkit;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.ToolkitPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui;visibility:=reexport,
diff --git a/bundles/org.xmind.ui.toolkit/pom.xml b/bundles/org.xmind.ui.toolkit/pom.xml
index c0c86a7bb..a305fc5ad 100644
--- a/bundles/org.xmind.ui.toolkit/pom.xml
+++ b/bundles/org.xmind.ui.toolkit/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui.toolkit</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.ui.toolkit/src/org/xmind/ui/preference/MultiSectionPreferencePage.java b/bundles/org.xmind.ui.toolkit/src/org/xmind/ui/preference/MultiSectionPreferencePage.java
index eacc037dd..06d6cb95a 100644
--- a/bundles/org.xmind.ui.toolkit/src/org/xmind/ui/preference/MultiSectionPreferencePage.java
+++ b/bundles/org.xmind.ui.toolkit/src/org/xmind/ui/preference/MultiSectionPreferencePage.java
@@ -159,9 +159,6 @@ public boolean performCancel() {
     @Override
     protected void performApply() {
         this.performOk();
-        if (null != pageSections && pageSections.size() > 0)
-            for (IPreferenceSection pageSection : pageSections)
-                pageSection.apply();
     }
 
     @Override
diff --git a/bundles/org.xmind.ui/META-INF/MANIFEST.MF b/bundles/org.xmind.ui/META-INF/MANIFEST.MF
index fe3a56e57..1f652082f 100644
--- a/bundles/org.xmind.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.xmind.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.ui;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.ui.internal.XmindUIPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.xmind.ui.mindmap;bundle-version="[3.7.0,3.8.0)";visibility:=reexport,
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.ui.mindmap;bundle-version="[3.7.2,3.8.0)";visibility:=reexport,
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)"
 Eclipse-LazyStart: true
 Export-Package: org.xmind.ui.internal;x-friends:="org.xmind.ui"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.xmind.ui/pom.xml b/bundles/org.xmind.ui/pom.xml
index 5f9e8b51f..81c20c3ee 100644
--- a/bundles/org.xmind.ui/pom.xml
+++ b/bundles/org.xmind.ui/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.ui</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/features/org.xmind.cathy.feature/feature.xml b/features/org.xmind.cathy.feature/feature.xml
index 5933c3faf..6504fb600 100644
--- a/features/org.xmind.cathy.feature/feature.xml
+++ b/features/org.xmind.cathy.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.xmind.cathy.feature"
       label="XMind RCP Application"
-      version="3.7.0.qualifier"
+      version="3.7.2.qualifier"
       provider-name="XMind Ltd.">
 
    <description>
diff --git a/features/org.xmind.cathy.feature/pom.xml b/features/org.xmind.cathy.feature/pom.xml
index cc0150f8e..3bee66494 100644
--- a/features/org.xmind.cathy.feature/pom.xml
+++ b/features/org.xmind.cathy.feature/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.features</groupId>
     <artifactId>org.xmind.cathy.feature</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/features/org.xmind.cathy.platform.feature/feature.xml b/features/org.xmind.cathy.platform.feature/feature.xml
index 6126d164c..b4171bcb0 100644
--- a/features/org.xmind.cathy.platform.feature/feature.xml
+++ b/features/org.xmind.cathy.platform.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.xmind.cathy.platform.feature"
       label="XMind Product Runtime Platform"
-      version="3.7.0.qualifier"
+      version="3.7.2.qualifier"
       provider-name="XMind Ltd.">
 
    <description>
diff --git a/features/org.xmind.cathy.platform.feature/pom.xml b/features/org.xmind.cathy.platform.feature/pom.xml
index a5ffb8cbe..b0c7a1c93 100644
--- a/features/org.xmind.cathy.platform.feature/pom.xml
+++ b/features/org.xmind.cathy.platform.feature/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.features</groupId>
     <artifactId>org.xmind.cathy.platform.feature</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/features/org.xmind.graphicsio.feature/feature.xml b/features/org.xmind.graphicsio.feature/feature.xml
index d0b4f65ff..8ced3729e 100644
--- a/features/org.xmind.graphicsio.feature/feature.xml
+++ b/features/org.xmind.graphicsio.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.xmind.graphicsio.feature"
       label="Graphics IO Libraries"
-      version="3.7.0.qualifier"
+      version="3.7.2.qualifier"
       provider-name="XMind Ltd.">
 
    <description>
diff --git a/features/org.xmind.graphicsio.feature/pom.xml b/features/org.xmind.graphicsio.feature/pom.xml
index eda9dea9d..8ea350dec 100644
--- a/features/org.xmind.graphicsio.feature/pom.xml
+++ b/features/org.xmind.graphicsio.feature/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.features</groupId>
     <artifactId>org.xmind.graphicsio.feature</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/features/org.xmind.hebe.feature/feature.xml b/features/org.xmind.hebe.feature/feature.xml
index afb1ee649..3087793c7 100644
--- a/features/org.xmind.hebe.feature/feature.xml
+++ b/features/org.xmind.hebe.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.xmind.hebe.feature"
       label="XMind Map Editor"
-      version="3.7.0.qualifier"
+      version="3.7.2.qualifier"
       provider-name="XMind Ltd.">
 
    <description>
diff --git a/features/org.xmind.hebe.feature/pom.xml b/features/org.xmind.hebe.feature/pom.xml
index 4cae83d66..eb2050337 100644
--- a/features/org.xmind.hebe.feature/pom.xml
+++ b/features/org.xmind.hebe.feature/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.features</groupId>
     <artifactId>org.xmind.hebe.feature</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 6a68ed795..fa8fc8869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,31 +5,34 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.releng</groupId>
     <artifactId>org.xmind.cathy.releng</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
         <tycho.version>0.23.0</tycho.version>
         <tychoExtras.version>0.23.0</tychoExtras.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <eclipse-repo.id>eclipse-4.6</eclipse-repo.id>
         <eclipse-repo.url>http://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100</eclipse-repo.url>
+        <gef-repo.id>gef-3.10.1</gef-repo.id>
         <gef-repo.url>http://download.eclipse.org/tools/gef/updates/legacy/releases/3.10.1_gef-maintenance_1205</gef-repo.url>
+        <xmind-orbit-repo.id>xmind-orbit-1.1.0</xmind-orbit-repo.id>
         <xmind-orbit-repo.url>http://p2.xmind.net/updates/orbit/1.1.0</xmind-orbit-repo.url>
     </properties>
 
     <repositories>
         <repository>
-            <id>eclipse-4.6</id>
+            <id>${eclipse-repo.id}</id>
             <url>${eclipse-repo.url}</url>
             <layout>p2</layout>
         </repository>
         <repository>
-            <id>gef-3.10.1</id>
+            <id>${gef-repo.id}</id>
             <url>${gef-repo.url}</url>
             <layout>p2</layout>
         </repository>
         <repository>
-            <id>xmind-orbit-1.1.0</id>
+            <id>${xmind-orbit-repo.id}</id>
             <url>${xmind-orbit-repo.url}</url>
             <layout>p2</layout>
         </repository>
diff --git a/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF b/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF
index b201ad8c9..6113602a6 100644
--- a/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF
+++ b/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XMind Products
 Bundle-SymbolicName: org.xmind.products
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: XMind Ltd.
diff --git a/releng/org.xmind.cathy.product/cathy.product b/releng/org.xmind.cathy.product/cathy.product
index 73d5d83b5..dc5fde8b1 100644
--- a/releng/org.xmind.cathy.product/cathy.product
+++ b/releng/org.xmind.cathy.product/cathy.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="XMind" uid="org.xmind.cathy.product" id="org.xmind.cathy.product" application="org.xmind.cathy.application" version="3.7.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="XMind" uid="org.xmind.cathy.product" id="org.xmind.cathy.product" application="org.xmind.cathy.application" version="3.7.2.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.xmind.cathy/icons/about.png"/>
@@ -17,17 +17,17 @@
       <programArgs>--launcher.defaultAction
 openFile
       </programArgs>
+      <programArgsLin>--launcher.GTK_version
+2
+-eclipse.keyring
+@user.home/.xmind/secure_storage_linux
+      </programArgsLin>
       <programArgsMac>-eclipse.keyring
 @user.home/.xmind/secure_storage_macosx
       </programArgsMac>
       <programArgsWin>-eclipse.keyring
 @user.home/.xmind/secure_storage_win32
       </programArgsWin>
-      <programArgsLinux>--launcher.GTK_version
-2
--eclipse.keyring
-@user.home/.xmind/secure_storage_linux
-      </programArgsLinux>
       <vmArgs>-Dfile.encoding=UTF-8
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread
@@ -51,9 +51,11 @@ openFile
       </win>
    </launcher>
 
+
    <vm>
    </vm>
 
+
    <plugins>
    </plugins>
 
diff --git a/releng/org.xmind.cathy.product/pom.xml b/releng/org.xmind.cathy.product/pom.xml
index 79f29c939..2e241e359 100644
--- a/releng/org.xmind.cathy.product/pom.xml
+++ b/releng/org.xmind.cathy.product/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.releng</groupId>
     <artifactId>org.xmind.cathy.product</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-repository</packaging>
 
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/releng/org.xmind.cathy.repository/category.xml b/releng/org.xmind.cathy.repository/category.xml
index 6ce91d963..6bde93184 100644
--- a/releng/org.xmind.cathy.repository/category.xml
+++ b/releng/org.xmind.cathy.repository/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.xmind.cathy.platform.feature" version="3.7.0.qualifier">
+   <feature id="org.xmind.cathy.platform.feature" version="3.7.2.qualifier">
       <category name="org.xmind.cathy.repository"/>
    </feature>
-   <feature id="org.xmind.hebe.feature" version="3.7.0.qualifier">
+   <feature id="org.xmind.hebe.feature" version="3.7.2.qualifier">
       <category name="org.xmind.cathy.repository"/>
    </feature>
-   <feature id="org.xmind.cathy.feature" version="3.7.0.qualifier">
+   <feature id="org.xmind.cathy.feature" version="3.7.2.qualifier">
       <category name="org.xmind.cathy.repository"/>
    </feature>
-   <feature id="org.xmind.graphicsio.feature" version="3.7.0.qualifier">
+   <feature id="org.xmind.graphicsio.feature" version="3.7.2.qualifier">
       <category name="org.xmind.cathy.repository"/>
    </feature>
    <category-def name="org.xmind.cathy.repository" label="XMind"/>
diff --git a/releng/org.xmind.cathy.repository/pom.xml b/releng/org.xmind.cathy.repository/pom.xml
index afb15e3d1..3a7aee217 100644
--- a/releng/org.xmind.cathy.repository/pom.xml
+++ b/releng/org.xmind.cathy.repository/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/releng/org.xmind.cathy.target/pom.xml b/releng/org.xmind.cathy.target/pom.xml
index 923400c9a..d7893b33e 100644
--- a/releng/org.xmind.cathy.target/pom.xml
+++ b/releng/org.xmind.cathy.target/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF b/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF
index 4e55c095d..c68db4933 100644
--- a/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF
+++ b/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.runtime.tests;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
- org.xmind.core.runtime;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.core.runtime;bundle-version="[3.7.2,3.8.0)"
diff --git a/tests/org.xmind.core.runtime.tests/pom.xml b/tests/org.xmind.core.runtime.tests/pom.xml
index 97b12d395..0f2b8c49d 100644
--- a/tests/org.xmind.core.runtime.tests/pom.xml
+++ b/tests/org.xmind.core.runtime.tests/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.tests</groupId>
     <artifactId>org.xmind.core.runtime.tests</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-test-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/tests/org.xmind.core.tests/META-INF/MANIFEST.MF b/tests/org.xmind.core.tests/META-INF/MANIFEST.MF
index c7257fad8..14dc1e2f0 100644
--- a/tests/org.xmind.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.xmind.core.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.tests;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.internal.tests.TestPluginForXMindCore
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
- org.xmind.core;bundle-version="[3.7.0,3.8.0)"
+ org.xmind.core;bundle-version="[3.7.2,3.8.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.core.internal.experiments;x-internal:=true,
diff --git a/tests/org.xmind.core.tests/pom.xml b/tests/org.xmind.core.tests/pom.xml
index c324e28c3..74bfb08e3 100644
--- a/tests/org.xmind.core.tests/pom.xml
+++ b/tests/org.xmind.core.tests/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.tests</groupId>
     <artifactId>org.xmind.core.tests</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-test-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
\ No newline at end of file