diff --git a/gui/org.eclipse.efm.ui/build.properties b/gui/org.eclipse.efm.ui/build.properties
index 9ff78de..06eb8ff 100644
--- a/gui/org.eclipse.efm.ui/build.properties
+++ b/gui/org.eclipse.efm.ui/build.properties
@@ -14,4 +14,5 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               resources/
diff --git a/gui/org.eclipse.efm.ui/plugin.xml b/gui/org.eclipse.efm.ui/plugin.xml
index 7da6e2e..e833aee 100644
--- a/gui/org.eclipse.efm.ui/plugin.xml
+++ b/gui/org.eclipse.efm.ui/plugin.xml
@@ -2,12 +2,12 @@
 <?eclipse version="3.4"?>
 <!--
     Copyright (c) 2017 CEA LIST.
-   
+
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
     which accompanies this distribution, and is available at
     http://www.eclipse.org/legal/epl-v10.html
-   
+
     Contributors:
      Arnault Lapitre (CEA LIST) arnault.lapitre@cea.fr
       - Initial API and Implementation
@@ -171,8 +171,14 @@
                id="org.eclipse.debug.ui.debugActionSet">
          </actionSet>
          <viewShortcut
+               id="org.eclipse.efm.ui.views.SymbexWorkflowView">
+         </viewShortcut>
+         <viewShortcut
                id="org.eclipse.efm.runconfiguration.ui.views.SymbolicExecutionView">
          </viewShortcut>
+         <newWizardShortcut
+               id="org.eclipse.efm.ui.newproject.standalone.EFMnp">
+         </newWizardShortcut>
       </perspectiveExtension>
    </extension>
 </plugin>
diff --git a/releng/org.eclipse.efm.modeling.product/efm-modeling.papyrus.product b/releng/org.eclipse.efm.modeling.product/efm-modeling.papyrus.product
index 1d49c32..10e2d17 100644
--- a/releng/org.eclipse.efm.modeling.product/efm-modeling.papyrus.product
+++ b/releng/org.eclipse.efm.modeling.product/efm-modeling.papyrus.product
@@ -1,58 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="EFM org.eclipse.efm-modeling as Papyrus DSML" uid="org.eclipse.efm.modeling.product" id="org.eclipse.efm.modeling.rcp.product" application="org.eclipse.ui.ide.workbench" version="0.0.1.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="/org.eclipse.efm.modeling.rcp/icons/papyrus_lg.png"/>
-      <text>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="EFM org.eclipse.efm-modeling as Papyrus DSML" uid="org.eclipse.efm.modeling.product" id="org.eclipse.efm.modeling.rcp.product" application="org.eclipse.ui.ide.workbench" version="0.0.1.qualifier" useFeatures="true" includeLaunchers="true">
+
+   <aboutInfo>
+      <image path="/org.eclipse.efm.modeling.rcp/icons/papyrus_lg.png"/>
+      <text>
          EFM org.eclipse.efm-modeling (Beta - Incubation)
 
 (c) Copyright Eclipse contributors and others 2000, 2016.  All rights reserved.
 Visit http://www.eclipse.org/platform
 
 This product includes software developed by the
-Apache Software Foundation http://www.apache.org/
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-showsplash org.eclipse.efm.rcp --launcher.XXMaxPermSize 256m
-      </programArgs>
-      <vmArgs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m
-      </vmArgs>
-      <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/org.eclipse.efm.modeling.rcp/icons/papyrus16.png" i32="/org.eclipse.efm.modeling.rcp/icons/papyrus32.png" i48="/org.eclipse.efm.modeling.rcp/icons/papyrus48.png" i64="/org.eclipse.efm.modeling.rcp/icons/papyrus64.png" i128="/org.eclipse.efm.modeling.rcp/icons/papyrus128.png"/>
-
-   <splash
-      location="org.eclipse.efm.modeling.rcp"
-      startupProgressRect="0,330,460,20"
-      startupMessageRect="7,4,445,16"
-      startupForegroundColor="9C9E9F" />
-   <launcher name="efm-papyrus">
-      <linux icon="../org.eclipse.efm.modeling.rcp/icons/icon.xpm"/>
-      <macosx icon="../org.eclipse.efm.modeling.rcp/icons/papyrus.icns"/>
-      <solaris/>
-      <win useIco="true">
-         <ico path="../org.eclipse.efm.modeling.rcp/icons/papyrus.ico"/>
-         <bmp/>
-      </win>
-   </launcher>
-
-
-   <vm>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
-   </vm>
-
-   <license>
-        <url>http://eclipse.org/legal/epl/notice.php</url>
-        <text>
+Apache Software Foundation http://www.apache.org/
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-showsplash org.eclipse.efm.rcp --launcher.XXMaxPermSize 256m
+      </programArgs>
+      <vmArgs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m
+      </vmArgs>
+      <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="/org.eclipse.efm.modeling.rcp/icons/papyrus16.png" i32="/org.eclipse.efm.modeling.rcp/icons/papyrus32.png" i48="/org.eclipse.efm.modeling.rcp/icons/papyrus48.png" i64="/org.eclipse.efm.modeling.rcp/icons/papyrus64.png" i128="/org.eclipse.efm.modeling.rcp/icons/papyrus128.png"/>
+
+   <splash
+      location="org.eclipse.efm.modeling.rcp"
+      startupProgressRect="8,316,470,15"
+      startupMessageRect="100,10,445,16"
+      startupForegroundColor="9C9E9F" />
+   <launcher name="efm-papyrus">
+      <linux icon="../org.eclipse.efm.modeling.rcp/icons/icon.xpm"/>
+      <macosx icon="../org.eclipse.efm.modeling.rcp/icons/papyrus.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="../org.eclipse.efm.modeling.rcp/icons/papyrus.ico"/>
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
+   </vm>
+
+   <license>
+        <url>http://eclipse.org/legal/epl/notice.php</url>
+        <text>
    Eclipse Foundation Software User Agreement
 February 1, 2011
 
@@ -175,94 +174,94 @@
 regulations and policies concerning the import, possession, or use, and
 re-export of encryption software, to see if this is permitted.
 
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
-         </text>
-   </license>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.eclipse.platform"/>
-      <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.efm.modeling.feature"/>
-      <feature id="org.eclipse.efm.modeling.rcp.feature"/>
-      <feature id="org.eclipse.rcp"/>
-      <feature id="org.eclipse.papyrus.customization.feature"/>
-      <feature id="org.eclipse.papyrus.editor.feature"/>
-      <feature id="org.eclipse.papyrus.infra.core.feature"/>
-      <feature id="org.eclipse.papyrus.infra.feature"/>
-      <feature id="org.eclipse.papyrus.infra.gmfdiag.feature"/>
-      <feature id="org.eclipse.papyrus.infra.services.feature"/>
-      <feature id="org.eclipse.papyrus.infra.widget.feature"/>
-      <feature id="org.eclipse.papyrus.uml.feature"/>
-      <feature id="org.eclipse.papyrus.uml.modelexplorer.feature"/>
-      <feature id="org.eclipse.papyrus.uml.properties.feature"/>
-      <feature id="org.eclipse.papyrus.uml.tools.feature"/>
-      <feature id="org.eclipse.papyrus.views.modelexplorer.feature"/>
-      <feature id="org.eclipse.papyrus.views.properties.feature"/>
-      <feature id="org.eclipse.papyrus.uml.diagram.feature"/>
-      <feature id="org.eclipse.papyrus.infra.emf.feature"/>
-      <feature id="org.eclipse.papyrus.uml.textedit.feature"/>
-      <feature id="org.eclipse.papyrus.uml.alf.feature"/>
-      <feature id="org.eclipse.papyrus.infra.discovery.feature"/>
-      <feature id="org.eclipse.papyrus.views.validation.feature"/>
-      <feature id="org.eclipse.papyrus.doc.feature"/>
-      <feature id="org.eclipse.papyrus.views.search.feature"/>
-      <feature id="org.eclipse.papyrus.uml.search.feature"/>
-      <feature id="org.eclipse.papyrus.uml.xtext.integration.feature"/>
-      <feature id="org.eclipse.papyrus.infra.nattable.feature"/>
-      <feature id="org.eclipse.papyrus.uml.nattable.feature"/>
-      <feature id="org.eclipse.papyrus.infra.gmfdiag.css.feature"/>
-      <feature id="org.eclipse.papyrus.uml.diagram.css.feature"/>
-      <feature id="org.eclipse.papyrus.emf.facet.feature"/>
-      <feature id="org.eclipse.papyrus.infra.viewpoints.feature"/>
-      <feature id="org.eclipse.papyrus.uml.decoratormodel.feature"/>
-      <feature id="org.eclipse.papyrus.uml.assistants.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-      <feature id="org.eclipse.help"/>
-      <feature id="org.eclipse.papyrus.uml.ui.feature"/>
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
-      <feature id="org.eclipse.ecf.core.ssl.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-      <feature id="org.eclipse.papyrus.views.references.feature"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
-      <feature id="org.eclipse.papyrus.infra.ui.feature"/>
-      <feature id="org.eclipse.emf.common"/>
-      <feature id="org.eclipse.emf.ecore"/>
-      <feature id="org.eclipse.papyrus.designer.languages.common.feature"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.papyrus.sdk.feature"/>
-      <feature id="org.eclipse.ecf.core.feature"/>
-      <feature id="org.eclipse.e4.rcp"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace-efm" />
-      <property name="osgi.requiredJavaVersion" value="1.8" />
-   </configurations>
-
-   <repositories>
-      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/org.eclipse.efm-modeling/" enabled="true" />
-      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon" enabled="true" />
-   </repositories>
-
-   <preferencesInfo>
-      <targetfile overwrite="true"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
-</product>
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+         </text>
+   </license>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.platform"/>
+      <feature id="org.eclipse.equinox.p2.user.ui"/>
+      <feature id="org.eclipse.efm.modeling.feature"/>
+      <feature id="org.eclipse.efm.modeling.rcp.feature"/>
+      <feature id="org.eclipse.rcp"/>
+      <feature id="org.eclipse.papyrus.customization.feature"/>
+      <feature id="org.eclipse.papyrus.editor.feature"/>
+      <feature id="org.eclipse.papyrus.infra.core.feature"/>
+      <feature id="org.eclipse.papyrus.infra.feature"/>
+      <feature id="org.eclipse.papyrus.infra.gmfdiag.feature"/>
+      <feature id="org.eclipse.papyrus.infra.services.feature"/>
+      <feature id="org.eclipse.papyrus.infra.widget.feature"/>
+      <feature id="org.eclipse.papyrus.uml.feature"/>
+      <feature id="org.eclipse.papyrus.uml.modelexplorer.feature"/>
+      <feature id="org.eclipse.papyrus.uml.properties.feature"/>
+      <feature id="org.eclipse.papyrus.uml.tools.feature"/>
+      <feature id="org.eclipse.papyrus.views.modelexplorer.feature"/>
+      <feature id="org.eclipse.papyrus.views.properties.feature"/>
+      <feature id="org.eclipse.papyrus.uml.diagram.feature"/>
+      <feature id="org.eclipse.papyrus.infra.emf.feature"/>
+      <feature id="org.eclipse.papyrus.uml.textedit.feature"/>
+      <feature id="org.eclipse.papyrus.uml.alf.feature"/>
+      <feature id="org.eclipse.papyrus.infra.discovery.feature"/>
+      <feature id="org.eclipse.papyrus.views.validation.feature"/>
+      <feature id="org.eclipse.papyrus.doc.feature"/>
+      <feature id="org.eclipse.papyrus.views.search.feature"/>
+      <feature id="org.eclipse.papyrus.uml.search.feature"/>
+      <feature id="org.eclipse.papyrus.uml.xtext.integration.feature"/>
+      <feature id="org.eclipse.papyrus.infra.nattable.feature"/>
+      <feature id="org.eclipse.papyrus.uml.nattable.feature"/>
+      <feature id="org.eclipse.papyrus.infra.gmfdiag.css.feature"/>
+      <feature id="org.eclipse.papyrus.uml.diagram.css.feature"/>
+      <feature id="org.eclipse.papyrus.emf.facet.feature"/>
+      <feature id="org.eclipse.papyrus.infra.viewpoints.feature"/>
+      <feature id="org.eclipse.papyrus.uml.decoratormodel.feature"/>
+      <feature id="org.eclipse.papyrus.uml.assistants.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+      <feature id="org.eclipse.help"/>
+      <feature id="org.eclipse.papyrus.uml.ui.feature"/>
+      <feature id="org.eclipse.equinox.p2.core.feature"/>
+      <feature id="org.eclipse.ecf.core.ssl.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+      <feature id="org.eclipse.papyrus.views.references.feature"/>
+      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+      <feature id="org.eclipse.papyrus.infra.ui.feature"/>
+      <feature id="org.eclipse.emf.common"/>
+      <feature id="org.eclipse.emf.ecore"/>
+      <feature id="org.eclipse.papyrus.designer.languages.common.feature"/>
+      <feature id="org.eclipse.equinox.p2.extras.feature"/>
+      <feature id="org.eclipse.papyrus.sdk.feature"/>
+      <feature id="org.eclipse.ecf.core.feature"/>
+      <feature id="org.eclipse.e4.rcp"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace-efm" />
+      <property name="osgi.requiredJavaVersion" value="1.8" />
+   </configurations>
+
+   <repositories>
+      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/org.eclipse.efm-modeling/" enabled="true" />
+      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon" enabled="true" />
+   </repositories>
+
+   <preferencesInfo>
+      <targetfile overwrite="true"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>
diff --git a/releng/org.eclipse.efm.modeling.product/efm-modeling.textual.product b/releng/org.eclipse.efm.modeling.product/efm-modeling.textual.product
index 6485a09..8b38eb5 100644
--- a/releng/org.eclipse.efm.modeling.product/efm-modeling.textual.product
+++ b/releng/org.eclipse.efm.modeling.product/efm-modeling.textual.product
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="EFM org.eclipse.efm-modeling as textual editor" uid="org.eclipse.efm.modeling.textual.product" id="org.eclipse.efm.modeling.rcp.product" application="org.eclipse.ui.ide.workbench" version="0.0.1.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="icons/papyrus_lg.png"/>
-      <text>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="EFM org.eclipse.efm-modeling as textual editor" uid="org.eclipse.efm.modeling.textual.product" id="org.eclipse.efm.modeling.rcp.product" application="org.eclipse.ui.ide.workbench" version="0.0.1.qualifier" useFeatures="true" includeLaunchers="true">
+
+   <aboutInfo>
+      <image path="icons/papyrus_lg.png"/>
+      <text>
          EFM org.eclipse.efm-modeling (Beta - Incubation)
 
 (c) Copyright Eclipse contributors and others 2000, 2016.  All rights reserved.
 Visit http://www.eclipse.org/platform
 
 This product includes software developed by the
-Apache Software Foundation http://www.apache.org/
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="icons/papyrus16.png" i32="icons/papyrus32.png" i48="icons/papyrus48.png" i64="icons/papyrus64.png" i128="icons/papyrus128.png"/>
-
-   <splash
-      location="org.eclipse.efm.modeling.rcp"
-      startupProgressRect="0,330,460,20"
-      startupMessageRect="7,4,445,16"
-      startupForegroundColor="9C9E9F" />
-   <launcher name="efm-basic">
-      <linux icon="../org.eclipse.efm.modeling.rcp/icons/icon.xpm"/>
-      <solaris/>
-      <win useIco="true">
-         <ico path="/org.eclipse.efm.modeling.rcp/icons/papyrus.ico"/>
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
-   </vm>
-
-   <license>
-        <url>http://eclipse.org/legal/epl/notice.php</url>
-        <text>
+Apache Software Foundation http://www.apache.org/
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="icons/papyrus16.png" i32="icons/papyrus32.png" i48="icons/papyrus48.png" i64="icons/papyrus64.png" i128="icons/papyrus128.png"/>
+
+   <splash
+      location="org.eclipse.efm.modeling.rcp"
+      startupProgressRect="8,316,470,15"
+      startupMessageRect="100,10,445,16"
+      startupForegroundColor="9C9E9F" />
+   <launcher name="efm-basic">
+      <linux icon="../org.eclipse.efm.modeling.rcp/icons/icon.xpm"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="/org.eclipse.efm.modeling.rcp/icons/papyrus.ico"/>
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
+   </vm>
+
+   <license>
+        <url>http://eclipse.org/legal/epl/notice.php</url>
+        <text>
    Eclipse Foundation Software User Agreement
 February 1, 2011
 
@@ -169,134 +169,134 @@
 regulations and policies concerning the import, possession, or use, and
 re-export of encryption software, to see if this is permitted.
 
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
-         </text>
-   </license>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="javax.inject"/>
-      <plugin id="javax.xml"/>
-      <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.batik.util.gui"/>
-      <plugin id="org.apache.commons.jxpath"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.e4.core.commands"/>
-      <plugin id="org.eclipse.e4.core.contexts"/>
-      <plugin id="org.eclipse.e4.core.di"/>
-      <plugin id="org.eclipse.e4.core.di.annotations"/>
-      <plugin id="org.eclipse.e4.core.di.extensions"/>
-      <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.emf.xpath"/>
-      <plugin id="org.eclipse.e4.ui.bindings"/>
-      <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.swt"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-      <plugin id="org.eclipse.e4.ui.di"/>
-      <plugin id="org.eclipse.e4.ui.model.workbench"/>
-      <plugin id="org.eclipse.e4.ui.services"/>
-      <plugin id="org.eclipse.e4.ui.widgets"/>
-      <plugin id="org.eclipse.e4.ui.workbench"/>
-      <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench3"/>
-      <plugin id="org.eclipse.efm.modeling.rcp"/>
-      <plugin id="org.eclipse.emf.cdo.ecore.retrofit" fragment="true"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.bidi"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.p2.core"/>
-      <plugin id="org.eclipse.equinox.p2.engine"/>
-      <plugin id="org.eclipse.equinox.p2.metadata"/>
-      <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
-      <plugin id="org.eclipse.equinox.p2.repository"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.security"/>
-      <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.jface.text"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.text"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.ide"/>
-      <plugin id="org.eclipse.ui.win32" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.tukaani.xz"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
-   </plugins>
-
-   <features>
-      <feature id="org.eclipse.efm.modeling.textual.feature" version="0.0.1.qualifier"/>
-      <feature id="org.eclipse.emf.ecore"/>
-      <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-      <feature id="org.eclipse.help"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.rcp"/>
-      <feature id="org.eclipse.emf.common"/>
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
-      <feature id="org.eclipse.ecf.core.feature"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.feature"/>
-      <feature id="org.eclipse.xtext.ui"/>
-      <feature id="org.eclipse.ecf.core.ssl.feature"/>
-      <feature id="org.eclipse.platform"/>
-      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-      <feature id="org.eclipse.xtext.runtime"/>
-      <feature id="org.eclipse.e4.rcp"/>
-      <feature id="org.eclipse.efm.modeling.rcp.feature" version="0.0.1.qualifier"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="osgi.bundles.defaultStartLevel" value="4" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace-efm" />
-      <property name="osgi.requiredJavaVersion" value="1.8" />
-   </configurations>
-
-   <repositories>
-      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/org.eclipse.efm-modeling/" enabled="true" />
-      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon" enabled="true" />
-   </repositories>
-
-   <preferencesInfo>
-      <targetfile overwrite="true"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
-</product>
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+         </text>
+   </license>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="javax.inject"/>
+      <plugin id="javax.xml"/>
+      <plugin id="org.apache.batik.css"/>
+      <plugin id="org.apache.batik.util"/>
+      <plugin id="org.apache.batik.util.gui"/>
+      <plugin id="org.apache.commons.jxpath"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.e4.core.commands"/>
+      <plugin id="org.eclipse.e4.core.contexts"/>
+      <plugin id="org.eclipse.e4.core.di"/>
+      <plugin id="org.eclipse.e4.core.di.annotations"/>
+      <plugin id="org.eclipse.e4.core.di.extensions"/>
+      <plugin id="org.eclipse.e4.core.services"/>
+      <plugin id="org.eclipse.e4.emf.xpath"/>
+      <plugin id="org.eclipse.e4.ui.bindings"/>
+      <plugin id="org.eclipse.e4.ui.css.core"/>
+      <plugin id="org.eclipse.e4.ui.css.swt"/>
+      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
+      <plugin id="org.eclipse.e4.ui.di"/>
+      <plugin id="org.eclipse.e4.ui.model.workbench"/>
+      <plugin id="org.eclipse.e4.ui.services"/>
+      <plugin id="org.eclipse.e4.ui.widgets"/>
+      <plugin id="org.eclipse.e4.ui.workbench"/>
+      <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
+      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
+      <plugin id="org.eclipse.e4.ui.workbench3"/>
+      <plugin id="org.eclipse.efm.modeling.rcp"/>
+      <plugin id="org.eclipse.emf.cdo.ecore.retrofit" fragment="true"/>
+      <plugin id="org.eclipse.emf.common"/>
+      <plugin id="org.eclipse.emf.ecore"/>
+      <plugin id="org.eclipse.emf.ecore.change"/>
+      <plugin id="org.eclipse.emf.ecore.xmi"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.bidi"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.p2.core"/>
+      <plugin id="org.eclipse.equinox.p2.engine"/>
+      <plugin id="org.eclipse.equinox.p2.metadata"/>
+      <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+      <plugin id="org.eclipse.equinox.p2.repository"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.jface.text"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.text"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.ide"/>
+      <plugin id="org.eclipse.ui.win32" fragment="true"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.tukaani.xz"/>
+      <plugin id="org.w3c.css.sac"/>
+      <plugin id="org.w3c.dom.events"/>
+      <plugin id="org.w3c.dom.smil"/>
+      <plugin id="org.w3c.dom.svg"/>
+   </plugins>
+
+   <features>
+      <feature id="org.eclipse.efm.modeling.textual.feature" version="0.0.1.qualifier"/>
+      <feature id="org.eclipse.emf.ecore"/>
+      <feature id="org.eclipse.equinox.p2.user.ui"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+      <feature id="org.eclipse.help"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+      <feature id="org.eclipse.equinox.p2.extras.feature"/>
+      <feature id="org.eclipse.rcp"/>
+      <feature id="org.eclipse.emf.common"/>
+      <feature id="org.eclipse.equinox.p2.core.feature"/>
+      <feature id="org.eclipse.ecf.core.feature"/>
+      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.feature"/>
+      <feature id="org.eclipse.xtext.ui"/>
+      <feature id="org.eclipse.ecf.core.ssl.feature"/>
+      <feature id="org.eclipse.platform"/>
+      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+      <feature id="org.eclipse.xtext.runtime"/>
+      <feature id="org.eclipse.e4.rcp"/>
+      <feature id="org.eclipse.efm.modeling.rcp.feature" version="0.0.1.qualifier"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace-efm" />
+      <property name="osgi.requiredJavaVersion" value="1.8" />
+   </configurations>
+
+   <repositories>
+      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/org.eclipse.efm-modeling/" enabled="true" />
+      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon" enabled="true" />
+   </repositories>
+
+   <preferencesInfo>
+      <targetfile overwrite="true"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>
diff --git a/releng/org.eclipse.efm.modeling.rcp/plugin.xml b/releng/org.eclipse.efm.modeling.rcp/plugin.xml
index a3f9fbf..6dbd341 100644
--- a/releng/org.eclipse.efm.modeling.rcp/plugin.xml
+++ b/releng/org.eclipse.efm.modeling.rcp/plugin.xml
@@ -31,11 +31,11 @@
          </property>
          <property
                name="startupMessageRect"
-               value="7,4,445,16">
+               value="100,10,445,16">
          </property>
          <property
                name="startupProgressRect"
-               value="0,330,460,20">
+               value="8,316,470,15">
          </property>
          <property
 				name="cssTheme"